len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-11 06:02:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

H300: Read battery voltage with 10bit precision.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14379 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-08-17 20:47:24 +00:00
parent 98a3789071
commit bfa1adcd06
2 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
firmware/target/coldfire/iriver/h300/adc-h300.c
View file

@ -26,20 +26,23 @@
static int adcc2_parms[] = static int adcc2_parms[] =
{ {
[ADC_BUTTONS] = 0x80 | (5 << 1) | 1, /* ADCIN2 */ [ADC_BUTTONS] = 0x80 | (5 << 1) | 1, /* 8b, ADCIN2 */
[ADC_REMOTE] = 0x80 | (6 << 1) | 1, /* ADCIN3 */ [ADC_REMOTE] = 0x80 | (6 << 1) | 1, /* 8b, ADCIN3 */
[ADC_BATTERY] = 0x80 | (0 << 1) | 1, /* BATVOLT, resistive divider */ [ADC_BATTERY] = 0x00 | (0 << 1) | 1, /* 10b, BATVOLT, resistive divider */
[ADC_REMOTEDETECT] = 0x80 | (2 << 1) | 1, /* ADCIN1, resistive divider */ [ADC_REMOTEDETECT] = 0x80 | (2 << 1) | 1, /* 8b, ADCIN1, resistive divider */
}; };
unsigned short adc_scan(int channel) unsigned short adc_scan(int channel)
{ {
int level = set_irq_level(HIGHEST_IRQ_LEVEL); int level = set_irq_level(HIGHEST_IRQ_LEVEL);
unsigned char data; unsigned data;
pcf50606_write(0x2f, adcc2_parms[channel]); pcf50606_write(0x2f, adcc2_parms[channel]);
data = pcf50606_read(0x30); data = pcf50606_read(0x30);
if (channel == ADC_BATTERY)
data = (data << 2) | (pcf50606_read(0x31) & 0x03);
set_irq_level(level); set_irq_level(level);
return data; return data;
} }

4
firmware/target/coldfire/iriver/h300/powermgmt-h300.c
View file

@ -48,11 +48,11 @@ const unsigned short percent_to_volt_charge[11] =
/* FIX: this value is picked at random */ /* FIX: this value is picked at random */
#define BATTERY_SCALE_FACTOR 6000 #define BATTERY_SCALE_FACTOR 6000
/* full-scale ADC readout (2^8) in millivolt */ /* full-scale ADC readout (2^10) in millivolt */
/* Returns battery voltage from ADC [millivolts] */ /* Returns battery voltage from ADC [millivolts] */
unsigned int battery_adc_voltage(void) unsigned int battery_adc_voltage(void)
{ {
return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 8; return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10;
} }