diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-11-14 07:39:46 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-11-14 07:39:46 +0000 |
| commit | 166aaf7b74f4e3bf3fe2bd2ee668fa5be5392391 (patch) | |
| tree | 5df750204f0334eec6dbc0ec2621ea9701021755 /firmware/export | |
| parent | 85b325fdb991a0602a2f16a55fc1df2c303aded1 (diff) | |
| download | rockbox-166aaf7b74f4e3bf3fe2bd2ee668fa5be5392391.tar.gz rockbox-166aaf7b74f4e3bf3fe2bd2ee668fa5be5392391.zip | |
Accept FS#8139 - Correct assumed current consumption for iPod Video
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15614 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
| -rw-r--r-- | firmware/export/powermgmt.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 265e723655..0666b5af37 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h | |||
| @@ -104,15 +104,15 @@ extern int trickle_sec; /* trickle charge: How many seconds per minute | |||
| 104 | # define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery from IriverRuntime wiki page */ | 104 | # define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery from IriverRuntime wiki page */ |
| 105 | # define CURRENT_BACKLIGHT 23 /* FIXME: This needs to be measured, copied from H100 */ | 105 | # define CURRENT_BACKLIGHT 23 /* FIXME: This needs to be measured, copied from H100 */ |
| 106 | # define CURRENT_RECORD 110 /* additional current while recording */ | 106 | # define CURRENT_RECORD 110 /* additional current while recording */ |
| 107 | #elif defined(IPOD_ARCH) && (MODEL_NUMBER==4) /* iPOD Nano */ | 107 | #elif defined(IPOD_NANO) /* iPOD Nano */ |
| 108 | # define CURRENT_NORMAL 35 /* 8.5-9.0h playback out of 300mAh battery from IpodRuntime */ | 108 | # define CURRENT_NORMAL 35 /* 8.5-9.0h playback out of 300mAh battery from IpodRuntime */ |
| 109 | # define CURRENT_BACKLIGHT 20 /* FIXME: estimation took over from iPOD Video */ | 109 | # define CURRENT_BACKLIGHT 20 /* FIXME: this needs adjusting */ |
| 110 | #if defined(HAVE_RECORDING) | 110 | #if defined(HAVE_RECORDING) |
| 111 | # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ | 111 | # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ |
| 112 | #endif | 112 | #endif |
| 113 | #elif defined(IPOD_ARCH) && (MODEL_NUMBER==5) /* iPOD Video */ | 113 | #elif defined(IPOD_VIDEO) /* iPOD Video */ |
| 114 | # define CURRENT_NORMAL 50 /* 8h out of 400mAh battery (30GB) or 11h out of 600mAh (60GB) from IpodRuntime */ | 114 | # define CURRENT_NORMAL 42 /* 9.5h out of 400mAh battery (30GB) or 14h out of 600mAh (60GB) from IpodRuntime */ |
| 115 | # define CURRENT_BACKLIGHT 20 /* estimation calculated from IpodRuntime measurement */ | 115 | # define CURRENT_BACKLIGHT 20 /* FIXME: this needs adjusting */ |
| 116 | #if defined(HAVE_RECORDING) | 116 | #if defined(HAVE_RECORDING) |
| 117 | # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ | 117 | # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ |
| 118 | #endif | 118 | #endif |