diff options
-rw-r--r-- | apps/debug_menu.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/debug-pp.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/adc-ipod-pcf.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/ipod/adc-target.h | 2 |
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) | |||
889 | if(probed_ramsize == 64) | 889 | if(probed_ramsize == 64) |
890 | x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 2); | 890 | x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 2); |
891 | else | 891 | else |
892 | #endif | ||
892 | x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 3); | 893 | x = (adc_read(ADC_4066_ISTAT) * 2400) / (1024 * 3); |
893 | lcd_putsf(0, 8, "Ibat: %d mA", x); | 894 | lcd_putsf(0, 8, "Ibat: %d mA", x); |
894 | lcd_putsf(0, 9, "Vbat * Ibat: %d mW", x * y / 1000); | 895 | lcd_putsf(0, 9, "Vbat * Ibat: %d mW", x * y / 1000); |
895 | #endif | ||
896 | #elif defined TOSHIBA_GIGABEAT_S | 896 | #elif defined TOSHIBA_GIGABEAT_S |
897 | int line = 3; | 897 | int line = 3; |
898 | unsigned int st; | 898 | 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) | |||
124 | #ifdef ADC_ACCESSORY | 124 | #ifdef ADC_ACCESSORY |
125 | lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY)); | 125 | lcd_putsf(0, line++, "ACCESSORY: %d", adc_read(ADC_ACCESSORY)); |
126 | #endif | 126 | #endif |
127 | #ifdef IPOD_VIDEO | 127 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
128 | lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT)); | 128 | lcd_putsf(0, line++, "4066_ISTAT: %d", adc_read(ADC_4066_ISTAT)); |
129 | #endif | 129 | #endif |
130 | 130 | ||
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) | |||
87 | adc_battery->timeout = 0; | 87 | adc_battery->timeout = 0; |
88 | adcdata[ADC_ACCESSORY].channelnum = 4; | 88 | adcdata[ADC_ACCESSORY].channelnum = 4; |
89 | adcdata[ADC_ACCESSORY].timeout = 0; | 89 | adcdata[ADC_ACCESSORY].timeout = 0; |
90 | #ifdef IPOD_VIDEO | 90 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
91 | adcdata[ADC_4066_ISTAT].channelnum = 7; | 91 | adcdata[ADC_4066_ISTAT].channelnum = 7; |
92 | adcdata[ADC_4066_ISTAT].timeout = 0; | 92 | adcdata[ADC_4066_ISTAT].timeout = 0; |
93 | #endif | 93 | #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 @@ | |||
24 | #define ADC_BATTERY 0 | 24 | #define ADC_BATTERY 0 |
25 | #define ADC_ACCESSORY 1 | 25 | #define ADC_ACCESSORY 1 |
26 | #define ADC_UNREG_POWER ADC_BATTERY | 26 | #define ADC_UNREG_POWER ADC_BATTERY |
27 | #ifdef IPOD_VIDEO | 27 | #if defined(IPOD_VIDEO) || defined(IPOD_NANO) |
28 | #define ADC_4066_ISTAT 2 | 28 | #define ADC_4066_ISTAT 2 |
29 | #define NUM_ADC_CHANNELS 3 | 29 | #define NUM_ADC_CHANNELS 3 |
30 | #else | 30 | #else |