diff options
author | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
---|---|---|
committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-06-05 10:05:27 +0000 |
commit | 991e92fd3dc15f1e365761264c26305559ddb0a4 (patch) | |
tree | ac6d18cf1a803c416c0dbc8f61f521444d265ec9 /apps/lang/english.lang | |
parent | e49464b38735585eaa0ce01f5734c0bcfad851dd (diff) | |
download | rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.tar.gz rockbox-991e92fd3dc15f1e365761264c26305559ddb0a4.zip |
New USB charging system, part 1 - API rework and user-visible setting update
1) "Charge during USB connection" option is now tristate: off/on/force. Currently "force" behaves just like "on", but in future it will allow charging even when it was not possible to positively identify a charger.
2) The H300 code has been adjusted to use the new system but there should be no functional differences, it already had the USB charging option and its USB/charging support is hardware controlled.
3) The Gigabeat S code has been adjusted to use the new system: the player now has the USB charging option, which wasn't previously available. The player will only charge at full speed when allowed to do so by a working USB host, so USB AC adapters won't work very well; however, they didn't work before either, so this is not a change in functionality.
4) The iPod Nano 2G code has been adjusted to use the new system: it already had the USB charging option. Using a USB AC adapter won't charge at full speed any more (it did before) - the old implementation was equivalent to the not-yet-implemented "force" option in the new system.
No other target should be affected. Support for the "force" mode and support for at least some other iPod models will come in a future commit :)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26570 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/lang/english.lang')
-rw-r--r-- | apps/lang/english.lang | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 6cdef29edb..709abbdf75 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -13776,3 +13776,17 @@ | |||
13776 | *: "" | 13776 | *: "" |
13777 | </voice> | 13777 | </voice> |
13778 | </phrase> | 13778 | </phrase> |
13779 | <phrase> | ||
13780 | id: LANG_FORCE | ||
13781 | desc: alternative to yes/no for tristate settings | ||
13782 | user: core | ||
13783 | <source> | ||
13784 | *: "Force" | ||
13785 | </source> | ||
13786 | <dest> | ||
13787 | *: "Force" | ||
13788 | </dest> | ||
13789 | <voice> | ||
13790 | *: "Force" | ||
13791 | </voice> | ||
13792 | </phrase> | ||