From 96907f2850e554c00c4dcb891c234da00e767855 Mon Sep 17 00:00:00 2001
From: vicobarberan <victor@smartcitizen.me>
Date: Thu, 9 Jun 2016 12:35:47 +0200
Subject: [PATCH] New battery percent calculation

Based on a lookup table now battery percent reporting is more accurate.
---
 sck_beta_v0_9/SCKBase.cpp | 118 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 113 insertions(+), 5 deletions(-)

diff --git a/sck_beta_v0_9/SCKBase.cpp b/sck_beta_v0_9/SCKBase.cpp
index 400f813..fa025d3 100644
--- a/sck_beta_v0_9/SCKBase.cpp
+++ b/sck_beta_v0_9/SCKBase.cpp
@@ -417,6 +417,109 @@ uint16_t SCKBase::getPanel(float Vref){
   return value;
 }
 
+const uint16_t batTable[] = {
+  3078,
+  3364,
+  3468,
+  3540,
+  3600,
+  3641,
+  3682,
+  3701,
+  3710,
+  3716,
+  3716,
+  3716,
+  3720,
+  3714,
+  3720,
+  3725,
+  3732,
+  3742,
+  3739,
+  3744,
+  3744,
+  3754,
+  3760,
+  3762,
+  3770,
+  3768,
+  3774,
+  3774,
+  3774,
+  3779,
+  3784,
+  3790,
+  3788,
+  3794,
+  3798,
+  3798,
+  3804,
+  3809,
+  3809,
+  3812,
+  3817,
+  3817,
+  3822,
+  3823,
+  3828,
+  3828,
+  3828,
+  3833,
+  3838,
+  3838,
+  3842,
+  3847,
+  3852,
+  3859,
+  3858,
+  3864,
+  3862,
+  3869,
+  3877,
+  3877,
+  3883,
+  3888,
+  3894,
+  3898,
+  3902,
+  3906,
+  3912,
+  3923,
+  3926,
+  3936,
+  3942,
+  3946,
+  3960,
+  3972,
+  3979,
+  3982,
+  3991,
+  3997,
+  4002,
+  4002,
+  4012,
+  4018,
+  4028,
+  4043,
+  4057,
+  4074,
+  4084,
+  4094,
+  4098,
+  4098,
+  4109,
+  4115,
+  4123,
+  4134,
+  4142,
+  4153,
+  4158,
+  4170,
+  4180,
+  4188
+};
+
 uint16_t SCKBase::getBattery(float Vref) {
   uint16_t temp = average(BAT);
 #if F_CPU == 8000000 
@@ -425,18 +528,23 @@ uint16_t SCKBase::getBattery(float Vref) {
 #else
   float voltage = Vref*temp/1023.;
 #endif
-  temp = map(voltage, VAL_MIN_BATTERY, VAL_MAX_BATTERY, 0, 1000);
-  if (temp>1000) temp=1000;
-  if (temp<0) temp=0;
+  uint16_t percent = 1000;
+  for(uint16_t i = 0; i < 100; i++) {
+    if(voltage < batTable[i]) {
+      percent = i * 10;
+      break;
+    }
+  }
+  if(percent < 10) percent = 10;
 #if debugBASE
   Serial.print("Vbat: ");
   Serial.print(voltage);
   Serial.print(" mV, ");
   Serial.print("Battery level: ");
-  Serial.print(temp/10.);
+  Serial.print(percent/10);
   Serial.println(" %");
 #endif
-  return temp; 
+  return percent;
 }
 
 boolean SCKBase::findInResponse(const char *toMatch,