diff options
| author | Nils Wallménius <nils@rockbox.org> | 2007-09-02 07:31:10 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2007-09-02 07:31:10 +0000 |
| commit | 58b9a1221611308def32d48b2d6ca753e9836ae8 (patch) | |
| tree | c41e19e14f40b5dd778581c5564a81782fb17ff0 | |
| parent | a514c60fd0952c0682aa544ee1e16445e6b7df84 (diff) | |
| download | rockbox-58b9a1221611308def32d48b2d6ca753e9836ae8.tar.gz rockbox-58b9a1221611308def32d48b2d6ca753e9836ae8.zip | |
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/CREDITS | 1 | ||||
| -rw-r--r-- | firmware/export/config-ipod4g.h | 3 | ||||
| -rw-r--r-- | firmware/export/config-ipodcolor.h | 2 |
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 | |||
| 322 | Sylvain Fourmanoit | 322 | Sylvain Fourmanoit |
| 323 | Alex Parker | 323 | Alex Parker |
| 324 | Mario Lang | 324 | Mario Lang |
| 325 | Justin Foell | ||
| 325 | The libmad team | 326 | The libmad team |
| 326 | The wavpack team | 327 | The wavpack team |
| 327 | The ffmpeg team | 328 | 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 @@ | |||
| 39 | #define LCD_WIDTH 160 | 39 | #define LCD_WIDTH 160 |
| 40 | #define LCD_HEIGHT 128 | 40 | #define LCD_HEIGHT 128 |
| 41 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ | 41 | #define LCD_DEPTH 2 /* 4 colours - 2bpp */ |
| 42 | |||
| 43 | #define LCD_PIXELFORMAT HORIZONTAL_PACKING | 42 | #define LCD_PIXELFORMAT HORIZONTAL_PACKING |
| 44 | 43 | ||
| 45 | /* LCD contrast */ | 44 | /* LCD contrast */ |
| @@ -84,7 +83,7 @@ | |||
| 84 | 83 | ||
| 85 | #define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ | 84 | #define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ |
| 86 | #define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ | 85 | #define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ |
| 87 | #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | 86 | #define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ |
| 88 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | 87 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ |
| 89 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 88 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
| 90 | 89 | ||
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 @@ | |||
| 75 | 75 | ||
| 76 | #define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ | 76 | #define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ |
| 77 | #define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ | 77 | #define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ |
| 78 | #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ | 78 | #define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ |
| 79 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ | 79 | #define BATTERY_CAPACITY_INC 10 /* capacity increment */ |
| 80 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 80 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
| 81 | 81 | ||