Add battery level icons + disable battery WDT

Author: tyeth

platformio.ini

@@ -73,7 +73,8 @@ lib_deps =
     adafruit/Adafruit BME680 Library
     adafruit/Adafruit MAX1704X
     adafruit/Adafruit ADT7410 Library
-    adafruit/Adafruit GFX Library
+    ; adafruit/Adafruit GFX Library
+    https://github.com/adafruit/Adafruit-GFX-Library.git#nesso
     adafruit/Adafruit STMPE610
     adafruit/Adafruit TouchScreen
     adafruit/Adafruit MQTT Library
@@ -84,7 +85,8 @@ lib_deps =
     adafruit/Adafruit SH110X
     adafruit/Adafruit SSD1306
     adafruit/Adafruit EPD
-    adafruit/Adafruit ST7735 and ST7789 Library
+    ; adafruit/Adafruit ST7735 and ST7789 Library
+    https://github.com/adafruit/Adafruit-ST7735-Library.git#ExpanderPin
     https://github.com/tyeth/omron-devhub_d6t-arduino.git
     https://github.com/pstolarz/OneWireNg.git
     ; COMMENT OUT FOR RP2040/RP2350 BOARDS
@@ -205,18 +207,19 @@ board_build.partitions = min_spiffs.csv
 [env:arduino_nesso_n1]
 extends = common:esp32
 board = arduino_nesso_n1
+; build_type = release
 build_type = debug
-; debug_tool = esp-builtin
 ; upload_protocol = esp-builtin
-; debug_init_break = tbreak setup
+; debug_tool = esp-builtin
+; debug_init_break = tbreak provision
 build_flags =
     -DARDUINO_ARDUINO_NESSO_N1
     ; -DDEBUG=1
-    ; -DARDUINO_USB_MODE=1
-    ; -DARDUINO_USB_CDC_ON_BOOT=1
-    ; -DESP_LOG_LEVEL=5
-    ; -DARDUINO_LOG_LEVEL=5
-    ; -DCORE_DEBUG_LEVEL=5
+    -DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1
+    -DESP_LOG_LEVEL=5
+    -DARDUINO_LOG_LEVEL=5
+    -DCORE_DEBUG_LEVEL=5
     ; -DMQTT_DEBUG=1
 board_build.filesystem = littlefs
 board_build.partitions = huge_app.csv

src/Wippersnapper.cpp

@@ -98,6 +98,49 @@ void Wippersnapper::provision() {
   // Obtain device's MAC address
   getMacAddr();
 
+  // Board specific initializations
+#ifdef ARDUINO_ARDUINO_NESSO_N1
+  Wire.begin(SDA, SCL, 100000);
+
+  // verify chip id 0x49 at 0x0Ah
+  Wire.beginTransmission(0x49);
+  Wire.write(0x0A);
+  Wire.endTransmission();
+  Wire.requestFrom(0x49, 1);
+  uint8_t chipId = Wire.read();
+  if (chipId != 0x49) {
+    WS_DEBUG_PRINTLN("ERROR: AW32001E not found on I2C bus!");
+    Wire.endTransmission();
+    Wire.end();
+  } else {
+    WS_DEBUG_PRINTLN("AW32001E detected on I2C bus.");
+    // Disable AW32001E watchdog timer, read 05h, & 0x1F, write back
+    Wire.beginTransmission(0x49);
+    Wire.write(0x05);
+    Wire.endTransmission();
+    Wire.requestFrom(0x49, 1);
+    uint8_t regVal = Wire.read();
+    Wire.endTransmission();
+    WS_DEBUG_PRINTLN("AW32001E WDT reg before disable: " + String(regVal, BIN));
+    delay(10);
+    regVal &=
+        0b00011111; // Clear bits 5:6 to disable Watchdog timer, 7 for discharge
+    Wire.beginTransmission(0x49);
+    Wire.write(0x05);
+    Wire.write(regVal);
+    Wire.endTransmission();
+    Wire.end();
+    delay(10);
+
+    battery.enableCharge();
+  }
+
+  // // digitalWrite(LORA_ENABLE, FALSE);
+  // // digitalWrite(LORA_LNA_ENABLE, FALSE);
+  // // digitalWrite(GROVE_POWER_EN, TRUE);
+  // delay(10);
+#endif
+
   // Initialize the status LED for signaling FS errors
   initStatusLED();
 
@@ -2272,7 +2315,7 @@ bool Wippersnapper::generateWSTopics() {
                     strlen(_device_uid) + strlen("/wprsnpr/") +
                     strlen(TOPIC_SIGNALS) + strlen("broker/uart") + 1;
 
-// Allocate memory for dynamic MQTT topic
+  // Allocate memory for dynamic MQTT topic
 #ifdef USE_PSRAM
   WS._topic_signal_uart_brkr = (char *)ps_malloc(topicLen);
 #else
@@ -2301,7 +2344,7 @@ bool Wippersnapper::generateWSTopics() {
              strlen("/wprsnpr/") + strlen(TOPIC_SIGNALS) +
              strlen("device/uart") + 1;
 
-// Allocate memory for dynamic MQTT topic
+  // Allocate memory for dynamic MQTT topic
 #ifdef USE_PSRAM
   WS._topic_signal_uart_device = (char *)ps_malloc(topicLen);
 #else
@@ -2325,7 +2368,7 @@ bool Wippersnapper::generateWSTopics() {
              strlen("/wprsnpr/") + strlen(TOPIC_SIGNALS) + strlen("broker") +
              strlen(TOPIC_DISPLAY) + 1;
 
-// Pre-allocate memory for topic
+  // Pre-allocate memory for topic
 #ifdef USE_PSRAM
   WS._topic_signal_display_brkr = (char *)ps_malloc(topicLen);
 #else
@@ -2356,7 +2399,7 @@ bool Wippersnapper::generateWSTopics() {
              strlen("/wprsnpr/") + strlen(TOPIC_SIGNALS) + strlen("device") +
              strlen(TOPIC_DISPLAY) + 1;
 
-// Allocate memory for dynamic MQTT topic
+  // Allocate memory for dynamic MQTT topic
 #ifdef USE_PSRAM
   WS._topic_signal_display_device = (char *)ps_malloc(topicLen);
 #else

src/Wippersnapper.h

@@ -241,6 +241,11 @@ class ws_pixels;
 class ws_uart;
 class DisplayController;
 
+#ifdef ARDUINO_ARDUINO_NESSO_N1
+static NessoBattery battery; ///< Nesso-N1 Battery instance
+#endif
+
+
 /**************************************************************************/
 /*!
     @brief  Class that provides storage and functions for the Adafruit IO