From 991e92fd3dc15f1e365761264c26305559ddb0a4 Mon Sep 17 00:00:00 2001 From: Torne Wuff Date: Sat, 5 Jun 2010 10:05:27 +0000 Subject: 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 --- apps/debug_menu.c | 5 ----- apps/lang/english.lang | 14 ++++++++++++++ apps/settings.h | 2 +- apps/settings_list.c | 4 +++- 4 files changed, 18 insertions(+), 7 deletions(-) (limited to 'apps') diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 1288d9acac..f14b7cdcdf 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1556,9 +1556,6 @@ static bool view_battery(void) lcd_puts(0, 7, power_message); lcd_putsf(0, 8, "USB Inserted: %s", usb_inserted() ? "yes" : "no"); -#elif defined IRIVER_H300_SERIES - lcd_putsf(0, 9, "USB Charging Enabled: %s", - usb_charging_enabled() ? "yes" : "no"); #elif defined IPOD_NANO || defined IPOD_VIDEO int usb_pwr = (GPIOL_INPUT_VAL & 0x10)?true:false; int ext_pwr = (GPIOL_INPUT_VAL & 0x08)?false:true; @@ -1610,8 +1607,6 @@ static bool view_battery(void) (st & POWER_INPUT_MAIN_CHARGER) ? " Main" : "", (st & POWER_INPUT_USB_CHARGER) ? " USB" : ""); - lcd_putsf(0, line++, "IUSB Max: %d", usb_allowed_current()); - y = ARRAYLEN(chrgstate_strings) - 1; switch (charge_state) 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 @@ *: "" + + id: LANG_FORCE + desc: alternative to yes/no for tristate settings + user: core + + *: "Force" + + + *: "Force" + + + *: "Force" + + diff --git a/apps/settings.h b/apps/settings.h index 5c28b4c0a6..3d0ef4c719 100644 --- a/apps/settings.h +++ b/apps/settings.h @@ -669,7 +669,7 @@ struct user_settings bool spdif_enable; /* S/PDIF power on/off */ #endif #ifdef HAVE_USB_CHARGING_ENABLE - bool usb_charging; + int usb_charging; #endif /* device settings */ diff --git a/apps/settings_list.c b/apps/settings_list.c index 1e2b4ebb18..32da25ab89 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c @@ -1595,7 +1595,9 @@ const struct settings_list settings[] = { TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), #endif #ifdef HAVE_USB_CHARGING_ENABLE - OFFON_SETTING(0,usb_charging,LANG_USB_CHARGING,false,"usb charging",NULL), + CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 0, "usb charging", + "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), + ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), #endif OFFON_SETTING(F_BANFROMQS,cuesheet,LANG_CUESHEET_ENABLE,false,"cuesheet support", NULL), -- cgit v1.2.3