summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitja Makarov <vitja.makarov@gmail.com>2008-12-21 19:16:54 +0000
committerVitja Makarov <vitja.makarov@gmail.com>2008-12-21 19:16:54 +0000
commit19413fc8060fb80eae668ddfdf3c4fa7e751e5b4 (patch)
treeaf22ea8e93f0b752fe43f012cbbe57656dcf14ba
parentf6789a7d7316c284e33a2ebbdf86d147ce703993 (diff)
downloadrockbox-19413fc8060fb80eae668ddfdf3c4fa7e751e5b4.tar.gz
rockbox-19413fc8060fb80eae668ddfdf3c4fa7e751e5b4.zip
iaudio7: add battery voltage monitoring
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19549 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/SOURCES4
-rw-r--r--firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c84
-rw-r--r--firmware/target/arm/tcc77x/system-tcc77x.c6
3 files changed, 89 insertions, 5 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES
index 711a7c0c56..fd0ec39f2f 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1129,14 +1129,14 @@ target/arm/as3525/powermgmt-as3525.c
1129#ifndef SIMULATOR 1129#ifndef SIMULATOR
1130drivers/nand_id.c 1130drivers/nand_id.c
1131drivers/pcf50606.c 1131drivers/pcf50606.c
1132target/arm/usb-tcc.c
1132target/arm/tcc77x/system-tcc77x.c 1133target/arm/tcc77x/system-tcc77x.c
1133target/arm/tcc77x/kernel-tcc77x.c 1134target/arm/tcc77x/kernel-tcc77x.c
1134target/arm/tcc77x/timer-tcc77x.c 1135target/arm/tcc77x/timer-tcc77x.c
1135target/arm/tcc77x/adc-tcc77x.c 1136target/arm/tcc77x/adc-tcc77x.c
1136target/arm/tcc77x/powermgmt-tcc77x.c
1137target/arm/usb-tcc.c
1138target/arm/tcc77x/iaudio7/lcd-iaudio7.c 1137target/arm/tcc77x/iaudio7/lcd-iaudio7.c
1139target/arm/tcc77x/iaudio7/power-iaudio7.c 1138target/arm/tcc77x/iaudio7/power-iaudio7.c
1139target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
1140target/arm/tcc77x/iaudio7/button-iaudio7.c 1140target/arm/tcc77x/iaudio7/button-iaudio7.c
1141target/arm/tcc77x/iaudio7/ata2501.c 1141target/arm/tcc77x/iaudio7/ata2501.c
1142#ifndef BOOTLOADER 1142#ifndef BOOTLOADER
diff --git a/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
new file mode 100644
index 0000000000..e391ada10a
--- /dev/null
+++ b/firmware/target/arm/tcc77x/iaudio7/powermgmt-iaudio7.c
@@ -0,0 +1,84 @@
1/***************************************************************************
2 * __________ __ ___.
3 * Open \______ \ ____ ____ | | _\_ |__ _______ ___
4 * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
5 * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
6 * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
7 * \/ \/ \/ \/ \/
8 * $Id: powermgmt-cowond2.c 17847 2008-06-28 18:10:04Z bagder $
9 *
10 * Copyright (C) 2007 by Karl Kurbjun
11 *
12 * This program is free software; you can redistribute it and/or
13 * modify it under the terms of the GNU General Public License
14 * as published by the Free Software Foundation; either version 2
15 * of the License, or (at your option) any later version.
16 *
17 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
18 * KIND, either express or implied.
19 *
20 ****************************************************************************/
21
22#include "config.h"
23#include "adc.h"
24#include "powermgmt.h"
25#include "kernel.h"
26#include "pcf50606.h"
27
28unsigned short current_voltage = 5150;
29
30const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] =
31{
32 /* FIXME: calibrate value */
33 3380
34};
35
36const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] =
37{
38 /* FIXME: calibrate value */
39 3300
40};
41
42/* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */
43const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] =
44{
45 /* FIXME: calibrate values. Table is "inherited" from iPod-PCF / H100 */
46 { 4500, 4810, 4910, 4970, 5030, 5070, 5120, 5140, 5170, 5250, 5400 }
47};
48
49#if CONFIG_CHARGING
50/* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */
51const unsigned short percent_to_volt_charge[11] =
52{
53 /* FIXME: calibrate values. Table is "inherited" from iPod-PCF / H100 */
54 4760, 5440, 5510, 5560, 5610, 5640, 5660, 5760, 5820, 5840, 5850 /* NiMH */
55};
56#endif /* CONFIG_CHARGING */
57
58#define BATTERY_SCALE_FACTOR 6000
59/* full-scale ADC readout (2^10) in millivolt */
60
61/* Returns battery voltage from ADC [millivolts] */
62unsigned int battery_adc_voltage(void)
63{
64 static unsigned last_tick = 0;
65
66 if (0 == last_tick || TIME_BEFORE(last_tick+HZ, current_tick))
67 {
68 int adc_val, irq_status;
69 unsigned char buf[2];
70
71 irq_status = disable_irq_save();
72 pcf50606_write(PCF5060X_ADCC2, 0x1);
73 pcf50606_read_multiple(PCF5060X_ADCS1, buf, 2);
74 restore_interrupt(irq_status);
75
76 adc_val = (buf[0]<<2) | (buf[1] & 3); //ADCDAT1H+ADCDAT1L
77 current_voltage = (adc_val * BATTERY_SCALE_FACTOR) >> 10;
78
79 last_tick = current_tick;
80 }
81
82 return current_voltage;
83}
84
diff --git a/firmware/target/arm/tcc77x/system-tcc77x.c b/firmware/target/arm/tcc77x/system-tcc77x.c
index 38004851bd..0896026b55 100644
--- a/firmware/target/arm/tcc77x/system-tcc77x.c
+++ b/firmware/target/arm/tcc77x/system-tcc77x.c
@@ -99,12 +99,12 @@ static void gpio_init(void)
99 GPIOD_FUNC = 0; 99 GPIOD_FUNC = 0;
100 GPIOE_FUNC = 0; 100 GPIOE_FUNC = 0;
101 GPIOA = 0x30; 101 GPIOA = 0x30;
102 GPIOB = 0x80000; 102 GPIOB = 0x00c00;
103 GPIOC = 0; 103 GPIOC = 0;
104 GPIOD = 0x180; 104 GPIOD = 0x180;
105 GPIOE = 0; 105 GPIOE = 0x80;
106 GPIOA_DIR = 0x84b0; 106 GPIOA_DIR = 0x84b0;
107 GPIOB_DIR = 0x80800; 107 GPIOB_DIR = 0x80c00;
108 GPIOC_DIR = 0x2000000; 108 GPIOC_DIR = 0x2000000;
109 GPIOD_DIR = 0x3e3; 109 GPIOD_DIR = 0x3e3;
110 GPIOE_DIR = 0x88; 110 GPIOE_DIR = 0x88;