devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Added battery profile change to correct file, removed unused powermgmt-as3525.c

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25541 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tobias Diedrich 2010-04-08 19:31:03 +00:00
parent 12a6ef5c18
commit f7b0224a9c
2 changed files with 11 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

81
firmware/target/arm/as3525/powermgmt-as3525.c
View file

@ -1,81 +0,0 @@
/***************************************************************************
* __________ __ ___.
* 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"
#include "adc.h"
#include "adc-target.h"
#include "powermgmt.h"
/* TODO
Each as3525 target should probably define its own battery properties
(dangerous/shutoff battery level, discharge/charge curves) in a file
called powermgmt-<target>.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] =
{
/*
* about 10%, calibrated with C240v2 battery profile at
* http://www.rockbox.org/wiki/bin/viewfile/Main/SansaRuntime?filename=c240v2_battery_bench_percent.png;rev=1
*/
3600
};
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:
* Below table is calibrated for C240v2 according to
* http://www.rockbox.org/wiki/bin/viewfile/Main/SansaRuntime?filename=c240v2_battery_bench_percent.png;rev=1
* Batteries for other models may have different discharging curves.
* OF seems to stop charging at 4150mV, so that's 100% here.
*/
{ 3300, 3597, 3674, 3719, 3745, 3776, 3825, 3890, 3954, 4035, 4150 }
};
#if CONFIG_CHARGING
/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
const unsigned short percent_to_volt_charge[11] =
{
/* 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 (adc_read(ADC_RTCSUP) * BATTERY_SCALE_FACTOR) >> 10;
}

14
firmware/target/arm/as3525/sansa-c200v2/powermgmt-c200v2.c
View file

@ -25,7 +25,11 @@
const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
{
3400
/*
* about 10%, calibrated with C240v2 battery profile at
* http://www.rockbox.org/wiki/bin/viewfile/Main/SansaRuntime?filename=c240v2_battery_bench_percent.png;rev=3
*/
3600
};
const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
@ -36,8 +40,12 @@ const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
/* 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 },
/*
* Below table is calibrated according to
* http://www.rockbox.org/wiki/bin/viewfile/Main/SansaRuntime?filename=c240v2_battery_bench_percent.png;rev=3
* OF seems to stop charging at 4150mV, so that's 100% here.
*/
{ 3300, 3597, 3674, 3719, 3745, 3776, 3825, 3890, 3954, 4035, 4150 }
};
/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */