From 51cb7eb5f27d773db949d3491b544fdf42ff625c Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sun, 17 Jan 2010 14:19:31 +0000 Subject: Sansa c200v2: enable battery charging git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24257 a1c6a512-1295-4272-9138-f99709370657 --- apps/debug_menu.c | 5 ++- firmware/SOURCES | 3 +- firmware/export/config/sansac200v2.h | 4 +- firmware/target/arm/as3525/powermgmt-target.h | 10 +++++ .../arm/as3525/sansa-c200v2/powermgmt-c200v2.c | 48 ++++++++++++++++++++++ 5 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c diff --git a/apps/debug_menu.c b/apps/debug_menu.c index dd16a4ef4c..5162fc5cca 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -109,7 +109,7 @@ #endif #if defined(SANSA_E200) || defined(SANSA_C200) || defined(PHILIPS_SA9200) \ - || defined(SANSA_CLIP) || defined(SANSA_FUZE) + || defined(SANSA_CLIP) || defined(SANSA_FUZE) || defined(SANSA_C200V2) #include "ascodec.h" #include "as3514.h" #endif @@ -1618,7 +1618,8 @@ static bool view_battery(void) lcd_puts(0, line++, "T Battery: ?"); } -#elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) || defined(SANSA_FUZE) +#elif defined(SANSA_E200) || defined(SANSA_C200) || defined(SANSA_CLIP) || \ + defined(SANSA_FUZE) || defined (SANSA_C200V2) const int first = CHARGE_STATE_DISABLED; static const char * const chrgstate_strings[] = { diff --git a/firmware/SOURCES b/firmware/SOURCES index c1da067fd3..540ec8b1f4 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES @@ -1250,7 +1250,8 @@ target/arm/as3525/sansa-c200v2/button-c200v2.c target/arm/as3525/sansa-c200v2/backlight-c200v2.c target/arm/as3525/dbop-as3525.c #ifndef BOOTLOADER -target/arm/as3525/powermgmt-as3525.c +target/arm/powermgmt-ascodec.c +target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c #endif /* !BOOTLOADER */ #endif /* !SIMULATOR */ #endif /* SANSA_E200V2 */ diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index 65aebf245b..aa1ed1ab70 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h @@ -131,8 +131,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 269a89349e..159a051e70 100644 --- a/firmware/target/arm/as3525/powermgmt-target.h +++ b/firmware/target/arm/as3525/powermgmt-target.h @@ -52,6 +52,16 @@ #define CHARGER_TOTAL_TIMER (4*3600*2) #define ADC_BATTERY ADC_BVDD +#elif defined(SANSA_C200V2) + +/* 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-c200v2/powermgmt-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c new file mode 100644 index 0000000000..395e2a472c --- /dev/null +++ b/firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c @@ -0,0 +1,48 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2002 by Heikki Hannikainen, Uwe Freese + * Revisions copyright (C) 2005 by Gerald Van Baren + * + * 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" +#include "powermgmt.h" + +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: calibrate, copied from powermgmt-c200.c svn r22636 */ + { 3400, 3689, 3744, 3773, 3798, 3831, 3886, 3947, 4005, 4102, 4220 }, +}; + +/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ +const unsigned short percent_to_volt_charge[11] = +{ + /* TODO: simple uncalibrated curve with 10% knee at 3.60V */ + 3400, 3600, 3670, 3740, 3810, 3880, 3950, 4020, 4090, 4160, 4230 +}; -- cgit v1.2.3