summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2009-01-02 03:16:12 +0000
committerMichael Giacomelli <giac2000@hotmail.com>2009-01-02 03:16:12 +0000
commitb115ae3f9e1cf9b1e20addac5d08f94b30e96168 (patch)
tree78062875ab91e0e71b6bc55a18dfe22f30d07b5c
parentb86f2d05fcfdeda187a1b1b33f1a05fbdaa5d543 (diff)
downloadrockbox-b115ae3f9e1cf9b1e20addac5d08f94b30e96168.tar.gz
rockbox-b115ae3f9e1cf9b1e20addac5d08f94b30e96168.zip
Add very rough battery life estimateion for iPod minis. Also, update Sansav1 estimation while I'm at it.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19637 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/export/config-c200.h4
-rw-r--r--firmware/export/config-e200.h4
-rw-r--r--firmware/export/config-ipodmini.h5
-rw-r--r--firmware/export/config-ipodmini2g.h5
4 files changed, 14 insertions, 4 deletions
diff --git a/firmware/export/config-c200.h b/firmware/export/config-c200.h
index ac64f20e62..f4ab33fb56 100644
--- a/firmware/export/config-c200.h
+++ b/firmware/export/config-c200.h
@@ -130,9 +130,9 @@
130#define HAVE_USB_POWER 130#define HAVE_USB_POWER
131 131
132/* define current usage levels */ 132/* define current usage levels */
133#define CURRENT_NORMAL 45 /* Should be nearly identical to E200 */ 133#define CURRENT_NORMAL 30 /* Should be nearly identical to E200 */
134#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ 134#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */
135#define CURRENT_RECORD 40 /* flash player, so this is just unboosted current*/ 135#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/
136 136
137/** Non-simulator section **/ 137/** Non-simulator section **/
138#ifndef SIMULATOR 138#ifndef SIMULATOR
diff --git a/firmware/export/config-e200.h b/firmware/export/config-e200.h
index b290a24952..602a84707c 100644
--- a/firmware/export/config-e200.h
+++ b/firmware/export/config-e200.h
@@ -124,9 +124,9 @@
124#define CONFIG_CHARGING CHARGING_SIMPLE 124#define CONFIG_CHARGING CHARGING_SIMPLE
125 125
126/* define current usage levels */ 126/* define current usage levels */
127#define CURRENT_NORMAL 45 /* Mike's measurements in Jan 2008 */ 127#define CURRENT_NORMAL 30 /* Toni's measurements in Nov 2008 */
128#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ 128#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */
129#define CURRENT_RECORD 40 /* flash player, so this is just unboosted current*/ 129#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/
130 130
131/* define this if the unit can be powered or charged via USB */ 131/* define this if the unit can be powered or charged via USB */
132#define HAVE_USB_POWER 132#define HAVE_USB_POWER
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index 5d7781a486..210eb1d717 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -112,6 +112,11 @@
112#define BATTERY_CAPACITY_INC 10 /* capacity increment */ 112#define BATTERY_CAPACITY_INC 10 /* capacity increment */
113#define BATTERY_TYPES_COUNT 1 /* only one type */ 113#define BATTERY_TYPES_COUNT 1 /* only one type */
114 114
115/* define current usage levels */
116#define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */
117#define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */
118#define CURRENT_RECORD 110 /* FIXME: Needs to be measured */
119
115/* Hardware controlled charging? */ 120/* Hardware controlled charging? */
116#define CONFIG_CHARGING CHARGING_MONITOR 121#define CONFIG_CHARGING CHARGING_MONITOR
117 122
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index dbbbc4356c..49630d7b3d 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -119,6 +119,11 @@
119#define BATTERY_CAPACITY_INC 50 /* capacity increment */ 119#define BATTERY_CAPACITY_INC 50 /* capacity increment */
120#define BATTERY_TYPES_COUNT 1 /* only one type */ 120#define BATTERY_TYPES_COUNT 1 /* only one type */
121 121
122/* define current usage levels */
123#define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */
124#define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */
125#define CURRENT_RECORD 110 /* FIXME: Needs to be measured */
126
122/* Hardware controlled charging? */ 127/* Hardware controlled charging? */
123#define CONFIG_CHARGING CHARGING_MONITOR 128#define CONFIG_CHARGING CHARGING_MONITOR
124 129