summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Kurbjun <kkurbjun@gmail.com>2010-04-25 16:11:49 +0000
committerKarl Kurbjun <kkurbjun@gmail.com>2010-04-25 16:11:49 +0000
commitb15b7fac7e5aeafc0171ec51bb39b60f9024335d (patch)
tree04e442458b4b8df5024b3d94354d9e09c7b014f6
parent967e16f7c92cddcf75a0edb859faeb2eb362d97c (diff)
downloadrockbox-b15b7fac7e5aeafc0171ec51bb39b60f9024335d.tar.gz
rockbox-b15b7fac7e5aeafc0171ec51bb39b60f9024335d.tar.bz2
rockbox-b15b7fac7e5aeafc0171ec51bb39b60f9024335d.zip
M:Robe 500 Power: Update battery Curve and simplify calculations.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25715 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c31
1 files changed, 19 insertions, 12 deletions
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
index d0f1a0bf59..5da03692f7 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/powermgmt-mr500.c
@@ -25,17 +25,20 @@
#include "tsc2100.h"
#include "kernel.h"
-unsigned short current_bat2 = 4200;
-unsigned short current_aux = 4200;
-static unsigned short current_voltage = 4200;
+unsigned short current_bat2 = 4100;
+unsigned short current_aux = 4100;
+static unsigned short current_voltage = 4100;
+
+/* This specifies the battery level that writes are still safe */
const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
{
- 3450
+ 3600
};
+/* Below this the player cannot be considered to operate reliably */
const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
{
- 3400
+ 3580
};
/* Right now these are linear translations, it would be good to model them
@@ -47,7 +50,7 @@ const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
{
- { 3400, 3300, 3600, 3700, 3800, 3900, 4000, 4100, 4200, 4300, 4400 },
+ { 3600, 3650, 3700, 3750, 3800, 3850, 3900, 3950, 4000, 4090, 4150 },
};
/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
@@ -63,12 +66,6 @@ unsigned int battery_adc_voltage(void)
static unsigned last_tick = 0;
short tsadc;
- if(tsc2100_read_volt(&bat1, &bat2, &aux)){
- current_voltage=((short)((int)(bat1<<10)/4096*6*2.5));
- current_bat2=((short)((int)(bat2<<10)/4096*6*2.5));
- current_aux=((short)((int)(aux<<10)/4096*6*2.5));
- }
-
tsadc=tsc2100_readreg(TSADC_PAGE, TSADC_ADDRESS);
/* Set the TSC2100 to read voltages if not busy with pen */
@@ -77,6 +74,16 @@ unsigned int battery_adc_voltage(void)
tsc2100_set_mode(true, 0x0B);
last_tick = current_tick;
}
+
+ if(tsc2100_read_volt(&bat1, &bat2, &aux))
+ {
+ /* Calculation was:
+ * (val << 10) / 4096 * 6 * 2.5
+ */
+ current_voltage = (short)( (int) (bat1 * 15) >> 2 );
+ current_bat2 = (short)( (bat2 * 15) >> 2 );
+ current_aux = (short)( (aux * 15) >> 2 );
+ }
return current_voltage;
}