diff options
| -rw-r--r-- | apps/debug_menu.c | 4 | ||||
| -rw-r--r-- | firmware/SOURCES | 3 | ||||
| -rw-r--r-- | firmware/export/config-fuze.h | 4 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/powermgmt-target.h | 10 | ||||
| -rw-r--r-- | firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c | 52 |
5 files changed, 68 insertions, 5 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 92ef222d98..bb6dd1033a 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -107,7 +107,7 @@ #endif #if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \ - || defined(SANSA_CLIP) + || defined(SANSA_CLIP) || defined(SANSA_FUZE) #include "ascodec.h" #include "as3514.h" #endif @@ -1765,7 +1765,7 @@ static bool view_battery(void) } lcd_puts(0, line++, buf); -#elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) +#elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) || defined(SANSA_FUZE) const int first = CHARGE_STATE_DISABLED; static const char * const chrgstate_strings[] = { diff --git a/firmware/SOURCES b/firmware/SOURCES index 742a582d6f..65652b8523 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1166,7 +1166,8 @@ target/arm/as3525/sansa-fuze/lcd-fuze.c target/arm/as3525/lcd-as-e200v2-fuze.S target/arm/as3525/backlight-e200v2-fuze.c #ifndef BOOTLOADER -target/arm/as3525/powermgmt-as3525.c +target/arm/powermgmt-ascodec.c +target/arm/as3525/sansa-fuze/powermgmt-fuze.c #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_FUZE */ diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index a30f95e5b0..c8fae9aca9 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h @@ -148,8 +148,8 @@ #define BATTERY_CAPACITY_INC 0 /* capacity increment */ #define BATTERY_TYPES_COUNT 1 /* only one type */ -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE +/* Charging implemented in a target-specific algorithm */ +#define CONFIG_CHARGING CHARGING_TARGET /* define this if the unit can be powered or charged via USB */ #define HAVE_USB_POWER diff --git a/firmware/target/arm/as3525/powermgmt-target.h b/firmware/target/arm/as3525/powermgmt-target.h index 3f23d6d3d7..d458508275 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h @@ -42,6 +42,16 @@ #define CHARGER_TOTAL_TIMER (4*3600*2) #define ADC_BATTERY ADC_BVDD +#elif defined(SANSA_FUZE) + +/* Check if topped-off and monitor voltage while plugged. */ +#define BATT_FULL_VOLTAGE 4160 +#define BATT_VAUTO_RECHARGE 4100 +#define BATT_CHG_V CHG_V_4_20V +#define BATT_CHG_I CHG_I_200MA +#define CHARGER_TOTAL_TIMER (4*3600*2) +#define ADC_BATTERY ADC_BVDD + #else #error "Charger settings not defined!" #endif diff --git a/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c new file mode 100644 index 0000000000..d0d39912f2 --- /dev/null +++ b/firmware/target/arm/as3525/sansa-fuze/powermgmt-fuze.c @@ -0,0 +1,52 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright © 2008 Rafaël Carré + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + +#include "config.h" + +/* The battery manufacturer's website shows discharge curves down to 3.0V, + so 'dangerous' and 'shutoff' levels of 3.4V and 3.3V should be safe. + */ +const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = +{ + 3400 +}; + +const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = +{ + 3300 +}; + +/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ +const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = +{ + /* TODO: simple linear uncalibrated curve */ + { 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 } +}; + +#if CONFIG_CHARGING +/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ +const unsigned short percent_to_volt_charge[11] = +{ + /* TODO: simple linear uncalibrated curve */ + 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 +}; +#endif /* CONFIG_CHARGING */ + |