diff options
author | Szymon Dziok <b0hoon@o2.pl> | 2014-07-27 11:36:34 +0000 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-07-28 22:11:33 +0200 |
commit | 228c47be4cb2d6612f06b443597885cc431152c1 (patch) | |
tree | a4f17632cee358eeccf4afc06303d572bac62f87 | |
parent | f74edac8c78469e1d3dded04d0c9e7cbe775fdfc (diff) | |
download | rockbox-228c47be4cb2d6612f06b443597885cc431152c1.tar.gz rockbox-228c47be4cb2d6612f06b443597885cc431152c1.zip |
Samsung YH-925: Don't add anything to adc value while reading it.
OF doesn't do such thing. Values in mV are converted proportionally, so no change
to the battery meter.
Change-Id: Ic545b0514535e7f17f0379ed02f6bdf515f69ac6
-rw-r--r-- | firmware/target/arm/pp/adc-pp5020.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/samsung/yh925/powermgmt-yh925.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/firmware/target/arm/pp/adc-pp5020.c b/firmware/target/arm/pp/adc-pp5020.c index 8afd88ff11..26d0d0d6ca 100644 --- a/firmware/target/arm/pp/adc-pp5020.c +++ b/firmware/target/arm/pp/adc-pp5020.c | |||
@@ -64,7 +64,8 @@ unsigned short adc_scan(int channel) | |||
64 | adcdata[channel] = (adc_data_1<<2 | adc_data_2); | 64 | adcdata[channel] = (adc_data_1<<2 | adc_data_2); |
65 | 65 | ||
66 | #if !(defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) ||\ | 66 | #if !(defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) ||\ |
67 | defined(SAMSUNG_YH820) || defined(SAMSUNG_YH920)) | 67 | defined(SAMSUNG_YH820) || defined(SAMSUNG_YH920) ||\ |
68 | defined(SAMSUNG_YH925)) | ||
68 | /* ADC values read low if PLL is enabled */ | 69 | /* ADC values read low if PLL is enabled */ |
69 | if(PLL_CONTROL & 0x80000000){ | 70 | if(PLL_CONTROL & 0x80000000){ |
70 | adcdata[channel] += 0x14; | 71 | adcdata[channel] += 0x14; |
diff --git a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c index ab9cbcdfc1..71a30aa8fc 100644 --- a/firmware/target/arm/samsung/yh925/powermgmt-yh925.c +++ b/firmware/target/arm/samsung/yh925/powermgmt-yh925.c | |||
@@ -24,28 +24,26 @@ | |||
24 | #include "adc.h" | 24 | #include "adc.h" |
25 | #include "powermgmt.h" | 25 | #include "powermgmt.h" |
26 | 26 | ||
27 | /* TODO: Not yet calibrated */ | ||
28 | |||
29 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = | 27 | const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = |
30 | { | 28 | { |
31 | 3750 | 29 | 3659 |
32 | }; | 30 | }; |
33 | 31 | ||
34 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = | 32 | const unsigned short battery_level_shutoff[BATTERY_TYPES_COUNT] = |
35 | { | 33 | { |
36 | 3700 | 34 | 3609 |
37 | }; | 35 | }; |
38 | 36 | ||
39 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ | 37 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging disabled */ |
40 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = | 38 | const unsigned short percent_to_volt_discharge[BATTERY_TYPES_COUNT][11] = |
41 | { | 39 | { |
42 | { 3700, 3822, 3880, 3909, 3946, 3976, 4024, 4086, 4141, 4223, 4307 } | 40 | { 3609, 3731, 3789, 3818, 3855, 3885, 3933, 3995, 4050, 4132, 4216 } |
43 | }; | 41 | }; |
44 | 42 | ||
45 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ | 43 | /* voltages (millivolt) of 0%, 10%, ... 100% when charging enabled */ |
46 | const unsigned short percent_to_volt_charge[11] = | 44 | const unsigned short percent_to_volt_charge[11] = |
47 | { | 45 | { |
48 | 3868, 3971, 3988, 3998, 4018, 4036, 4097, 4116, 4165, 4222, 4307 | 46 | 3777, 3880, 3897, 3907, 3927, 3945, 4006, 4025, 4074, 4131, 4216 |
49 | }; | 47 | }; |
50 | 48 | ||
51 | #define BATTERY_SCALE_FACTOR 4650 | 49 | #define BATTERY_SCALE_FACTOR 4650 |