aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2013-12-16 20:22:55 +0800
committerAndy Green <andy.green@linaro.org>2013-12-16 20:22:55 +0800
commitdd1191f1e52a5d929b710faa9dc978794d8e707a (patch)
tree7eb51a8338990c03dcc754eac13dc4efca41ad37
parent0f27bd4f8b77c1032f704d054e6e136ef050a65f (diff)
provide sane interpolation endpoints at 12V
Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--config6
-rw-r--r--libarmep/interpolation.c18
2 files changed, 21 insertions, 3 deletions
diff --git a/config b/config
index 1afc6c8..ace19ed 100644
--- a/config
+++ b/config
@@ -5,9 +5,9 @@ PandaBoardES-B1-ANDY
# <device path>
/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300012-if00
- DC_IN 0.100000 -14.500000 -0.061161 0.132000 -0.000000 0.017534 0 DCIN/12V none #ff0000 SoC
- V3.3 0.100000 -45.000000 -0.153000 0.226000 -0.000000 0.002000 0 V3.3 DC_IN #c0c000 SoC
- V0.9/P3 0.100000 -27.500000 -0.129000 0.212000 -0.000000 0.003000 0 V0.9/P3 DC_IN #a00000 SoC
+ DC_IN 0.100000 -14.500000 -0.179000 13.363000 -0.000000 0.163300 0 DCIN/12V none #ff0000 SoC
+ V3.3 0.100000 -45.000000 -0.019000 3.441000 -0.000000 0.111300 0 V3.3 DC_IN #c0c000 SoC
+ V0.9/P3 0.100000 -27.500000 -0.037000 13.225000 -0.002400 0.163500 0 V0.9/P3 DC_IN #a00000 SoC
#/dev/serial/by-id/usb-NXP_SEMICOND_ARM_Energy_Probe_S_NO12300011-if00
# V5.0 0.100000 -8.000000 -0.031000 0.064000 -0.000000 0.001942 0 SoCVIO\\_1V8 VBAT #a0c0e0 SoC
diff --git a/libarmep/interpolation.c b/libarmep/interpolation.c
index 6d07d0d..4b05bcf 100644
--- a/libarmep/interpolation.c
+++ b/libarmep/interpolation.c
@@ -283,6 +283,12 @@ struct interp map1[] = {
{ 10.51, 0.003841, 0.003295 },
{ 10.58, 0.000001, 0.000128 },
{ 10.58, 0.041109, 0.040845 },
+ { 13, 0.000010, 0.000032 },
+ { 13, 0.1, 0.1 },
+ { 13, 0.5, 0.5 },
+ { 13, 1, 1 },
+ { 13, 2, 2 },
+
};
struct interp map2[] = {
@@ -568,6 +574,12 @@ struct interp map2[] = {
{ 6.22, 0.041129, 0.039786 },
{ 6.22, 0.082615, 0.081756 },
{ 6.19, 0.159250, 0.158897 },
+ { 13, 0.000010, 0.000032 },
+ { 13, 0.1, 0.1 },
+ { 13, 0.5, 0.5 },
+ { 13, 1, 1 },
+ { 13, 2, 2 },
+
};
struct interp map3[] = {
@@ -866,6 +878,12 @@ struct interp map3[] = {
{ 6.2, 0.041061, 0.040084 },
{ 6.2, 0.082631, 0.082022 },
{ 6.2, 0.159115, 0.159089 },
+ { 13, 0.000010, 0.000032 },
+ { 13, 0.1, 0.1 },
+ { 13, 0.5, 0.5 },
+ { 13, 1, 1 },
+ { 13, 2, 2 },
+
};
struct interp_tables interp_tables[3] = {