summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2007-09-02 07:31:10 +0000
committerNils Wallménius <nils@rockbox.org>2007-09-02 07:31:10 +0000
commit58b9a1221611308def32d48b2d6ca753e9836ae8 (patch)
treec41e19e14f40b5dd778581c5564a81782fb17ff0
parenta514c60fd0952c0682aa544ee1e16445e6b7df84 (diff)
Accept patch in FS#6869 by Justin Foell, increases maximum settable battery capacity to 1200 mAh for ipod color and 4g, closes FS#6422
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14572 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--docs/CREDITS1
-rw-r--r--firmware/export/config-ipod4g.h3
-rw-r--r--firmware/export/config-ipodcolor.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/CREDITS b/docs/CREDITS
index b08ab1ad34..6bf771378c 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -322,6 +322,7 @@ Boris Gjenero
Sylvain Fourmanoit
Alex Parker
Mario Lang
+Justin Foell
The libmad team
The wavpack team
The ffmpeg team
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 588f8316b5..28f7b8b5a9 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -39,7 +39,6 @@
#define LCD_WIDTH 160
#define LCD_HEIGHT 128
#define LCD_DEPTH 2 /* 4 colours - 2bpp */
-
#define LCD_PIXELFORMAT HORIZONTAL_PACKING
/* LCD contrast */
@@ -84,7 +83,7 @@
#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 10 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index 728ff46413..8a4c19eda7 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -75,7 +75,7 @@
#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
+#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 10 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */