diff options
Diffstat (limited to 'firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c')
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c index 6e361aac15..d0f1a0bf59 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c | |||
@@ -68,17 +68,14 @@ unsigned int battery_adc_voltage(void) | |||
68 | current_bat2=((short)((int)(bat2<<10)/4096*6*2.5)); | 68 | current_bat2=((short)((int)(bat2<<10)/4096*6*2.5)); |
69 | current_aux=((short)((int)(aux<<10)/4096*6*2.5)); | 69 | current_aux=((short)((int)(aux<<10)/4096*6*2.5)); |
70 | } | 70 | } |
71 | 71 | ||
72 | if (TIME_BEFORE(last_tick+2*HZ, current_tick) || last_tick==0) | 72 | tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS); |
73 | |||
74 | /* Set the TSC2100 to read voltages if not busy with pen */ | ||
75 | if(!(tsadc & TSADC_PSTCM)) | ||
73 | { | 76 | { |
74 | tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS); | 77 | tsc2100_set_mode(true, 0x0B); |
75 | 78 | last_tick = current_tick; | |
76 | /* Set the TSC2100 to read voltages if not busy with pen */ | ||
77 | if(!(tsadc & TSADC_PSTCM)) | ||
78 | { | ||
79 | tsc2100_set_mode(true, 0x0B); | ||
80 | last_tick = current_tick; | ||
81 | } | ||
82 | } | 79 | } |
83 | 80 | ||
84 | return current_voltage; | 81 | return current_voltage; |