Voltage WITHOUT 26 PIN

geiger/Pangodream_18650_CL.cpp

@@ -0,0 +1,154 @@
+/*
+  MIT License
+
+  Copyright (c) 2019 Pangodream
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+#include "Arduino.h"
+#include "Pangodream_18650_CL.h"
+
+Pangodream_18650_CL::Pangodream_18650_CL(int addressPin, double convFactor, int reads)
+{
+    _reads = reads;
+    _convFactor = convFactor;
+    _addressPin = addressPin;
+    _initVoltsArray();
+}
+
+Pangodream_18650_CL::Pangodream_18650_CL(int addressPin, double convFactor)
+{
+    _reads = DEF_READS;
+    _convFactor = convFactor;
+    _addressPin = addressPin;
+    _initVoltsArray();
+}
+
+Pangodream_18650_CL::Pangodream_18650_CL(int addressPin)
+{
+    _reads = DEF_READS;
+    _convFactor = DEF_CONV_FACTOR;
+    _addressPin = addressPin;
+    _initVoltsArray();
+}
+
+Pangodream_18650_CL::Pangodream_18650_CL()
+{
+    _reads = DEF_READS;
+    _convFactor = DEF_CONV_FACTOR;
+    _addressPin = DEF_PIN;
+    _initVoltsArray();
+}
+
+int Pangodream_18650_CL::getAnalogPin()
+{
+    return _addressPin;
+}
+double Pangodream_18650_CL::getConvFactor()
+{
+    return _convFactor;
+}
+
+/**
+ * Loads each voltage value in its matching charge element (index)
+ */
+void Pangodream_18650_CL::_initVoltsArray(){
+    _vs[0] = 3.200; 
+    _vs[1] = 3.250; _vs[2] = 3.300; _vs[3] = 3.350; _vs[4] = 3.400; _vs[5] = 3.450;
+    _vs[6] = 3.500; _vs[7] = 3.550; _vs[8] = 3.600; _vs[9] = 3.650; _vs[10] = 3.700;
+    _vs[11] = 3.703; _vs[12] = 3.706; _vs[13] = 3.710; _vs[14] = 3.713; _vs[15] = 3.716;
+    _vs[16] = 3.719; _vs[17] = 3.723; _vs[18] = 3.726; _vs[19] = 3.729; _vs[20] = 3.732;
+    _vs[21] = 3.735; _vs[22] = 3.739; _vs[23] = 3.742; _vs[24] = 3.745; _vs[25] = 3.748;
+    _vs[26] = 3.752; _vs[27] = 3.755; _vs[28] = 3.758; _vs[29] = 3.761; _vs[30] = 3.765;
+    _vs[31] = 3.768; _vs[32] = 3.771; _vs[33] = 3.774; _vs[34] = 3.777; _vs[35] = 3.781;
+    _vs[36] = 3.784; _vs[37] = 3.787; _vs[38] = 3.790; _vs[39] = 3.794; _vs[40] = 3.797;
+    _vs[41] = 3.800; _vs[42] = 3.805; _vs[43] = 3.811; _vs[44] = 3.816; _vs[45] = 3.821;
+    _vs[46] = 3.826; _vs[47] = 3.832; _vs[48] = 3.837; _vs[49] = 3.842; _vs[50] = 3.847;
+    _vs[51] = 3.853; _vs[52] = 3.858; _vs[53] = 3.863; _vs[54] = 3.868; _vs[55] = 3.874;
+    _vs[56] = 3.879; _vs[57] = 3.884; _vs[58] = 3.889; _vs[59] = 3.895; _vs[60] = 3.900;
+    _vs[61] = 3.906; _vs[62] = 3.911; _vs[63] = 3.917; _vs[64] = 3.922; _vs[65] = 3.928;
+    _vs[66] = 3.933; _vs[67] = 3.939; _vs[68] = 3.944; _vs[69] = 3.950; _vs[70] = 3.956;
+    _vs[71] = 3.961; _vs[72] = 3.967; _vs[73] = 3.972; _vs[74] = 3.978; _vs[75] = 3.983;
+    _vs[76] = 3.989; _vs[77] = 3.994; _vs[78] = 4.000; _vs[79] = 4.008; _vs[80] = 4.015;
+    _vs[81] = 4.023; _vs[82] = 4.031; _vs[83] = 4.038; _vs[84] = 4.046; _vs[85] = 4.054;
+    _vs[86] = 4.062; _vs[87] = 4.069; _vs[88] = 4.077; _vs[89] = 4.085; _vs[90] = 4.092;
+    _vs[91] = 4.100; _vs[92] = 4.111; _vs[93] = 4.122; _vs[94] = 4.133; _vs[95] = 4.144;
+    _vs[96] = 4.156; _vs[97] = 4.167; _vs[98] = 4.178; _vs[99] = 4.189; _vs[100] = 4.200;
+}
+
+int Pangodream_18650_CL::getBatteryChargeLevel()
+{
+    int readValue = _analogRead(_addressPin);
+    double volts = _analogReadToVolts(readValue);
+    int chargeLevel = _getChargeLevel(volts);
+    return chargeLevel;
+}
+
+int Pangodream_18650_CL::pinRead(){
+    return _analogRead(_addressPin); 
+}
+
+int Pangodream_18650_CL::_analogRead(int pinNumber){
+    int totalValue = 0;
+    int averageValue = 0;
+    for(int i = 0; i < _reads; i++){
+       totalValue += analogRead(pinNumber);
+    }
+    averageValue = totalValue / _reads;
+    return averageValue; 
+}
+/**
+ * Performs a binary search to find the index corresponding to a voltage.
+ * The index of the array is the charge %
+*/
+int Pangodream_18650_CL::_getChargeLevel(double volts){
+  int idx = 50;
+  int prev = 0;
+  int half = 0;
+  if (volts >= 4.2){
+    return 100;
+  }
+  if (volts <= 3.2){
+    return 0;
+  }
+  while(true){
+    half = abs(idx - prev) / 2;
+    prev = idx;
+    if(volts >= _vs[idx]){
+      idx = idx + half;
+    }else{
+      idx = idx - half;
+    }
+    if (prev == idx){
+      break;
+    }
+  }
+  return idx;
+}
+
+double Pangodream_18650_CL::_analogReadToVolts(int readValue){
+  double volts; 
+  volts = readValue * _convFactor / 1000;
+  return volts;
+}
+
+double Pangodream_18650_CL::getBatteryVolts(){
+    int readValue = analogRead(_addressPin);
+    return _analogReadToVolts(readValue);
+}

geiger/Pangodream_18650_CL.h

@@ -0,0 +1,94 @@
+/*
+  MIT License
+
+  Copyright (c) 2019 Pangodream
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+*/
+
+/* 
+ *  18650 Ion-Li battery charge
+ */
+
+#ifndef Pangodream_18650_CL_h
+#define Pangodream_18650_CL_h
+
+#include "Arduino.h"
+
+#define DEF_PIN 34
+#define DEF_CONV_FACTOR 1.7
+#define DEF_READS 20
+
+/*
+ * 18650 Ion-Li battery charge
+ * Calculates charge level of an 18650 Ion-Li battery
+ */
+class Pangodream_18650_CL {    
+  public:  
+
+    /*
+    * Constructor
+    * @param addressPin, ADC pin number where the voltage divider is connected to
+    */
+    Pangodream_18650_CL(int addressPin);
+
+    /*
+    * Constructor
+    * @param addressPin, ADC pin number where the voltage divider is connected to
+    * @param convFactor, Convertion factor for analog read units to volts
+    */
+    Pangodream_18650_CL(int addressPin, double convFactor);
+
+    /*
+    * Constructor
+    * @param addressPin, ADC pin number where the voltage divider is connected to
+    * @param convFactor, Convertion factor for analog read units to volts
+    * @param reads, Number of reads of analog pin to calculate an average value
+    */
+    Pangodream_18650_CL(int addressPin, double convFactor, int reads);
+    /*
+    * Constructor
+    */
+    Pangodream_18650_CL();    
+
+    /*
+     * Get the battery charge level (0-100)
+     * @return The calculated battery charge level
+     */
+    int getBatteryChargeLevel();
+    double getBatteryVolts();
+    int getAnalogPin();
+    int pinRead();
+    double getConvFactor();
+
+  private:
+
+    int    _addressPin;               //!< ADC pin used, default is GPIO34 - ADC1_6
+    int    _reads;                    //Number of reads of ADC pin to calculate an average value
+    double _convFactor;               //!< Convertion factor to translate analog units to volts
+    double _vs[101];                 //Array with voltage - charge definitions
+
+    void   _initVoltsArray();
+    int    _getChargeLevel(double volts);
+    int    _analogRead(int pinNumber);
+    double _analogReadToVolts(int readValue);
+
+};
+
+#endif

geiger/geiger.ino

@@ -35,17 +35,21 @@
 #include <TFT_eSPI.h>       // Hardware-specific library for TFT display
 #include <SPI.h>
 #include "radiation64.h"    // icon file with yellow radiation symbol
+#include "Pangodream_18650_CL.h"
 
 // Define Hardware PIN numbers
 #define PINTIC 27           // GPIO27 is tic from geiger counter
 #define PINTOUCH 12         // GPIO12 is touch interface display mode switch
-#define PINADC 26           // GPIO26 to measure battery voltage
 #define TICFACTOR 0.05      // factor between number of tics/second --> mR/hr
 
 // Program paramters
 #define M_SIZE 1            // Define size of analog meter size (1 = full screen, 0.667 fills 2/3 of screen)
 #define TOUCHTHRESHOLD 60   // value from touchRead() to consider the button to be touched (needs to be lower)
-#define BATTFACTOR 758.0    // devision factor from ADC read to batt voltage in Volt
+
+#define MIN_USB_VOL 4.9
+#define ADC_PIN 34
+#define CONV_FACTOR 1.8
+#define READS 20
 
 // Bar graph page parameters
 #define TFT_GREY 0x5AEB     // color of bar graph outline
@@ -59,6 +63,8 @@
 #define BARGREEN 33         // Y threshold value that marks green colored bar
 #define BARORANGE 67        // Y threshold value that marks magenta colored bar (red above)
 
+Pangodream_18650_CL BL(ADC_PIN, CONV_FACTOR, READS);
+
 // variables shared between main code and interrupt code
 hw_timer_t * timer = NULL;
 volatile uint32_t updateTime = 0;       // time for next update
@@ -77,7 +83,6 @@ volatile bool sec10updated = false;     // set to true when sec10_buf is updated
 
 // Other vars
 TFT_eSPI tft = TFT_eSPI();              // TFT custom library
-int batt = 0;                           // raw ADC value (*5) of battery voltage (32 bits)
 bool displaymode = false;               // false= normal mode (analog meter) or true= history bar graph (and batt value)
 
 // #########################################################################
@@ -142,9 +147,6 @@ void setup(void) {
 void loop() {
   static unsigned long flashtime = millis(); // to ensure thr touch pin can only be pressed once/second
 
-  // get battery voltage (simplified walking average over 5)
-  batt = (4*batt/5) + analogRead(PINADC); 
-
   // see if the touch sensor is active
   if (getTouch(PINTOUCH) && flashtime+1000<millis()) {
     // we see touch -> switch display mode
@@ -185,7 +187,7 @@ void loop() {
     tft.drawRightString(buf, 230, TEXTBARY, 2);
 
     // show value for batt
-    dtostrf(float(batt)/(5*BATTFACTOR), 7, 2, buf);
+    dtostrf(BL.getBatteryVolts(), 7, 2, buf);
     tft.drawRightString(buf, 85, 120, 2);
 
     // update bar graph (redraw ever 10 secs)