add Lipo battery % reading

LyndLabs · Jan 24, 2024 · 0145077 · 0145077
1 parent eed82d1
commit 0145077
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 15 deletions.
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -218,6 +218,8 @@
                 "/home/alex/Arduino/libraries/ESP8266_and_ESP32_OLED_driver_for_SSD1306_displays/src",
                 "/home/alex/.arduino15/packages/esp32/hardware/esp32/2.0.4/libraries/Wire/src",
                 "/home/alex/.arduino15/packages/esp32/hardware/esp32/2.0.4/libraries/WiFi/src",
+                "/home/alex/Arduino/libraries/Adafruit_MAX1704X",
+                "/home/alex/Arduino/libraries/Adafruit_BusIO",
                 "/home/alex/Arduino/libraries/TinyGPSPlus-master/src",
                 "/home/alex/.arduino15/packages/esp32/tools/riscv32-esp-elf-gcc/gcc8_4_0-esp-2021r2-patch3/riscv32-esp-elf/include/c++/8.4.0",
                 "/home/alex/.arduino15/packages/esp32/tools/riscv32-esp-elf-gcc/gcc8_4_0-esp-2021r2-patch3/riscv32-esp-elf/include/c++/8.4.0/riscv32-esp-elf/rv32imc/ilp32",

diff --git a/src/Wardriver/src/Wardriver.cpp b/src/Wardriver/src/Wardriver.cpp
@@ -4,6 +4,7 @@
 #include "Screen.h"
 #include "graphics.h"
 #include "driver/temp_sensor.h"
+#include "Adafruit_MAX1704X.h"
 
 #include <TinyGPSPlus.h>
 #include "../Vars.h"
@@ -15,6 +16,7 @@
 #endif
 
 TinyGPSPlus gps;
+Adafruit_MAX17048 maxlipo;
 
 // CURRENT GPS & DATTIME STRING
 float lat = 0; float lng = 0;
@@ -30,6 +32,8 @@ uint8_t  sats = 0;
 uint8_t  bat = 0;
 uint8_t  speed = 0;
 
+
+float batF =0;
 //
 char satsC[4]="..."; 
 
@@ -50,10 +54,8 @@ Wardriver::Wardriver() {
 }
 
 uint8_t getBattery() {
-    // float analogVal = analogRead(A0);
-    // bat = map(analogVal,0,100);
-    // bat = 0;
-    return 0;
+    bat = (uint8_t) maxlipo.cellPercent();
+    return bat;
 }
 
 uint8_t getTemp() {
@@ -93,14 +95,7 @@ void updateGPS() {
     sprintf(currTime,"%02d:%02d",hr,mn);
 
     sprintf(satsC,"%u",sats);
-    //     if (totalNets-1 > 999) {
-    //     // sprintf(totalC,"%uK",((totalNets-1)/1000));
-    //     sprintf(totalC,"%gK",((totalNets-1)/100)/10.0);
-    //     // Serial.println(((totalNets-1)/100)/10.0);
-    // }
-    // else {
-    //     sprintf(totalC,"%u",totalNets-1);
-    // }
+
 
 
     sprintf(openNetsC,"%u",openNets);
@@ -110,6 +105,14 @@ void updateGPS() {
     sprintf(batC,"%u",getBattery());
     sprintf(speedC,"%u",speed);
     sprintf(totalC, "%u", totalNets);
+    //     if (totalNets-1 > 999) {
+    //     // sprintf(totalC,"%uK",((totalNets-1)/1000));
+    //     sprintf(totalC,"%gK",((totalNets-1)/100)/10.0);
+    //     // Serial.println(((totalNets-1)/100)/10.0);
+    // }
+    // else {
+    //     sprintf(totalC,"%u",totalNets);
+    // }
 
     Screen::setFooter("GPS: UPDATED");
     Screen::update();
@@ -149,6 +152,21 @@ void updateGPS(uint8_t override) {
 }
 
 // initialize GPS & get first coords
+void initBat() {
+    Screen::setFooter("BAT: Initializing...");
+    Screen::update();
+
+    if (!maxlipo.begin()) {
+        Screen::setFooter("Charger NOT FOUND!");
+        Screen::update();
+    }
+    Screen::setFooter("Charger FOUND!");
+    Screen::update();
+
+    getBattery();
+
+}
+
 void initGPS() {
 
     #if defined(ESP32)
@@ -259,16 +277,16 @@ void Wardriver::init() {
     temp_sensor_set_config(temp_sensor);
     temp_sensor_start();
 
+
     Screen::init();
     Screen::drawSplash(2);
 
-
     Screen::setIcons(icons_bits, test, 6);    
     Screen::setHeader(currentGPS,currTime);
 
     Filesys::init(updateScreen); delay(1000);
-
-    // getBattery();
+    initBat();
+
     initGPS();
     char fileDT[150]; sprintf(fileDT,"%i-%02d-%02d",yr, mt, dy);
     // Serial.println(sats);
@@ -282,10 +300,22 @@ void Wardriver::updateScreen(char* message) {
     Screen::setFooter(message); Screen::update();
 }
 
+unsigned long lastTime = millis();
+unsigned long tmpTime = millis();
+
 void Wardriver::scan() {
     Serial.println("In scan.");
     updateGPS(); // poll current GPS coordinates
 
+    tmpTime = millis();
+    if ((tmpTime-lastTime)>3000) {
+        getBattery();
+        lastTime = tmpTime;
+          Serial.print(F("Batt Voltage: ")); Serial.print(maxlipo.cellVoltage(), 3); Serial.println(" V");
+  Serial.print(F("Batt Percent: ")); Serial.print(maxlipo.cellPercent(), 1); Serial.println(" %");
+    }
+
+
     // Serial.print("Total: ");
     // Serial.println(totalNets);
     // Serial.println(test[1]);