From 078753395d8e184000ed3c08ef372783e997b3c0 Mon Sep 17 00:00:00 2001 From: Bertrik Sikken Date: Sun, 23 Nov 2008 15:00:44 +0000 Subject: Implement a basic uncalibrated battery reading for all as3525 targets with a lithium battery. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19189 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/powermgmt-as3525.c | 29 +++++++++++++++++----- firmware/target/arm/as3525/sansa-clip/adc-target.h | 24 ------------------ .../target/arm/as3525/sansa-e200v2/adc-target.h | 24 ------------------ firmware/target/arm/as3525/sansa-fuze/adc-target.h | 24 ------------------ .../target/arm/as3525/sansa-m200v4/adc-target.h | 24 ------------------ 5 files changed, 23 insertions(+), 102 deletions(-) delete mode 100644 firmware/target/arm/as3525/sansa-clip/adc-target.h delete mode 100644 firmware/target/arm/as3525/sansa-e200v2/adc-target.h delete mode 100644 firmware/target/arm/as3525/sansa-fuze/adc-target.h delete mode 100644 firmware/target/arm/as3525/sansa-m200v4/adc-target.h diff --git a/firmware/target/arm/as3525/powermgmt-as3525.c b/firmware/target/arm/as3525/powermgmt-as3525.c index ac1ee79f00..47e037684a 100644 --- a/firmware/target/arm/as3525/powermgmt-as3525.c +++ b/firmware/target/arm/as3525/powermgmt-as3525.c @@ -21,36 +21,53 @@ #include "config.h" #include "adc.h" +#include "adc-target.h" #include "powermgmt.h" -/* TODO */ +/* TODO + Each as3525 target should probably define its own battery properties + (dangerous/shutoff battery level, discharge/charge curves) in a file + called powermgmt-.c in its own sub-directory. + + For now, this file provides simple uncalibrated settings to get at least + a basic reading for all as3525 targets with a lithium battery. + */ const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { - 0 + /* TODO: this is just an initial guess */ + 3400 }; const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = { - 0 + /* TODO: this is just an initial guess */ + 3300 }; /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = { - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + /* TODO: simple uncalibrated curve, linear except for first 10% */ + { 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] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 + /* TODO: simple uncalibrated curve, linear except for first 10% */ + 3300, 3390, 3480, 3570, 3660, 3750, 3840, 3930, 4020, 4110, 4200 }; #endif /* CONFIG_CHARGING */ +/* ADC should read 0x3ff=5.12V */ +#define BATTERY_SCALE_FACTOR 5125 +/* full-scale ADC readout (2^10) in millivolt */ + /* Returns battery voltage from ADC [millivolts] */ unsigned int battery_adc_voltage(void) { - return 1; + return (adc_read(ADC_RTCSUP) * BATTERY_SCALE_FACTOR) >> 10; } + diff --git a/firmware/target/arm/as3525/sansa-clip/adc-target.h b/firmware/target/arm/as3525/sansa-clip/adc-target.h deleted file mode 100644 index bea0272496..0000000000 --- a/firmware/target/arm/as3525/sansa-clip/adc-target.h +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 ?? - * - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif /* _ADC_TARGET_H_ */ diff --git a/firmware/target/arm/as3525/sansa-e200v2/adc-target.h b/firmware/target/arm/as3525/sansa-e200v2/adc-target.h deleted file mode 100644 index bea0272496..0000000000 --- a/firmware/target/arm/as3525/sansa-e200v2/adc-target.h +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 ?? - * - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif /* _ADC_TARGET_H_ */ diff --git a/firmware/target/arm/as3525/sansa-fuze/adc-target.h b/firmware/target/arm/as3525/sansa-fuze/adc-target.h deleted file mode 100644 index bea0272496..0000000000 --- a/firmware/target/arm/as3525/sansa-fuze/adc-target.h +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 ?? - * - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif /* _ADC_TARGET_H_ */ diff --git a/firmware/target/arm/as3525/sansa-m200v4/adc-target.h b/firmware/target/arm/as3525/sansa-m200v4/adc-target.h deleted file mode 100644 index bea0272496..0000000000 --- a/firmware/target/arm/as3525/sansa-m200v4/adc-target.h +++ /dev/null @@ -1,24 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 ?? - * - * 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. - * - ****************************************************************************/ -#ifndef _ADC_TARGET_H_ -#define _ADC_TARGET_H_ - -#endif /* _ADC_TARGET_H_ */ -- cgit v1.2.3