summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/debug_menu.c2
-rw-r--r--firmware/target/arm/debug-pp.c2
-rw-r--r--firmware/target/arm/ipod/adc-ipod-pcf.c2
-rw-r--r--firmware/target/arm/ipod/adc-target.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index b557f46dc3..9e4621b749 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -889,10 +889,10 @@ static bool view_battery(void)
if(probed_ramsize == 64)
x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 2);
else
+#endif
x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 3);
lcd_putsf(0, 8, "Ibat: %d mA", x);
lcd_putsf(0, 9, "Vbat * Ibat: %d mW", x * y / 1000);
-#endif
#elif defined TOSHIBA_GIGABEAT_S
int line = 3;
unsigned int st;
diff --git a/firmware/target/arm/debug-pp.c b/firmware/target/arm/debug-pp.c
index 7872db714d..5f252db417 100644
--- a/firmware/target/arm/debug-pp.c
+++ b/firmware/target/arm/debug-pp.c
@@ -124,7 +124,7 @@ bool dbg_ports(void)
#ifdef ADC_ACCESSORY
lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY));
#endif
-#ifdef IPOD_VIDEO
+#if defined(IPOD_VIDEO) || defined(IPOD_NANO)
lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT));
#endif
diff --git a/firmware/target/arm/ipod/adc-ipod-pcf.c b/firmware/target/arm/ipod/adc-ipod-pcf.c
index e60d8ebb8f..5040e21fd8 100644
--- a/firmware/target/arm/ipod/adc-ipod-pcf.c
+++ b/firmware/target/arm/ipod/adc-ipod-pcf.c
@@ -87,7 +87,7 @@ void adc_init(void)
adc_battery->timeout = 0;
adcdata[ADC_ACCESSORY].channelnum = 4;
adcdata[ADC_ACCESSORY].timeout = 0;
-#ifdef IPOD_VIDEO
+#if defined(IPOD_VIDEO) || defined(IPOD_NANO)
adcdata[ADC_4066_ISTAT].channelnum = 7;
adcdata[ADC_4066_ISTAT].timeout = 0;
#endif
diff --git a/firmware/target/arm/ipod/adc-target.h b/firmware/target/arm/ipod/adc-target.h
index 708febac9d..6fa887708e 100644
--- a/firmware/target/arm/ipod/adc-target.h
+++ b/firmware/target/arm/ipod/adc-target.h
@@ -24,7 +24,7 @@
#define ADC_BATTERY 0
#define ADC_ACCESSORY 1
#define ADC_UNREG_POWER ADC_BATTERY
-#ifdef IPOD_VIDEO
+#if defined(IPOD_VIDEO) || defined(IPOD_NANO)
#define ADC_4066_ISTAT 2
#define NUM_ADC_CHANNELS 3
#else