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 | 19 |
1 files changed, 9 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 78f9bbb9c2..6e428ac01f 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c | |||
@@ -58,33 +58,32 @@ const unsigned short percent_to_volt_charge[11] = | |||
58 | { | 58 | { |
59 | 4000, 4105, 4210, 4315, 4420, 4525, 4630, 4735, 4840, 4945, 5050, | 59 | 4000, 4105, 4210, 4315, 4420, 4525, 4630, 4735, 4840, 4945, 5050, |
60 | }; | 60 | }; |
61 | 61 | ||
62 | /* Returns battery voltage from ADC [millivolts] */ | 62 | /* Returns battery voltage from ADC [millivolts] */ |
63 | int _battery_voltage(void) | 63 | int _battery_voltage(void) |
64 | { | 64 | { |
65 | short bat1, bat2, aux; | 65 | short bat1, bat2, aux; |
66 | static unsigned last_tick = 0; | 66 | // static unsigned last_tick = 0; |
67 | short tsadc; | 67 | short tsadc; |
68 | 68 | ||
69 | tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS); | 69 | tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS); |
70 | 70 | ||
71 | /* Set the TSC2100 to read voltages if not busy with pen */ | 71 | /* Set the TSC2100 to read voltages if not busy with pen */ |
72 | if(!(tsadc & TSADC_PSTCM)) | 72 | if(!(tsadc & TSADC_PSTCM)) |
73 | { | 73 | { |
74 | tsc2100_set_mode(true, 0x0B); | 74 | tsc2100_set_mode(true, 0x0B); |
75 | last_tick = current_tick; | 75 | // last_tick = current_tick; |
76 | } | 76 | } |
77 | 77 | ||
78 | if(tsc2100_read_volt(&bat1, &bat2, &aux)) | 78 | if(tsc2100_read_volt(&bat1, &bat2, &aux)) |
79 | { | 79 | { |
80 | /* Calculation was: | 80 | /* Calculation was: |
81 | * (val << 10) / 4096 * 6 * 2.5 | 81 | * (val << 10) / 4096 * 6 * 2.5 |
82 | */ | 82 | */ |
83 | current_voltage = (short)( (int) (bat1 * 15) >> 2 ); | 83 | current_voltage = (short)( (int) (bat1 * 15) >> 2 ); |
84 | current_bat2 = (short)( (bat2 * 15) >> 2 ); | 84 | current_bat2 = (short)( (bat2 * 15) >> 2 ); |
85 | current_aux = (short)( (aux * 15) >> 2 ); | 85 | current_aux = (short)( (aux * 15) >> 2 ); |
86 | } | 86 | } |
87 | 87 | ||
88 | return current_voltage; | 88 | return current_voltage; |
89 | } | 89 | } |
90 | |||