Devel

.github/workflows/platformio.yml

@@ -1,31 +1,36 @@
 name: PlatformIO
 
 on:
-  push:
+  pull_request:
     branches:
       - master
     paths-ignore:
       - '**/README.md'
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 1
       matrix:
-        python-version: [3.7]
+        os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio
-          platformio update
-      - name: Build test
+          pio pkg update
+      - name: PlatformIO Build Test
         run: |
-          pio run -e TTGO_T7 -e ESP32DEVKIT -e TTGO_TDISPLAY -e M5STICKCPLUS -e ESP32C3LOLIN
-
+          pio run -e TTGO_T7 -e TTGO_TDISPLAY -e ESP32C3LOLIN

.github/workflows/pull-request.yml

@@ -1,31 +1,37 @@
 name: PlatformIO
 
 on:
-  push:
+  pull_request:
     branches:
       - devel
     paths-ignore:
       - '**/README.md'
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       max-parallel: 1
       matrix:
-        python-version: [3.7]
+        os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - uses: actions/checkout@v4
+      - uses: actions/cache@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          path: |
+            ~/.cache/pip
+            ~/.platformio/.cache
+          key: ${{ runner.os }}-pio
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
           pip install -U platformio
-          platformio update
-      - name: Build test
+          pio pkg update
+      - name: Devel Build Test
         run: |
-          pio run -e TTGO_T7 -e TTGO_TDISPLAY -e M5STICKCPLUS -e ESP32C3LOLIN
-     
+          pio run -e TTGO_T7 -e TTGO_TDISPLAY -e ESP32C3LOLIN
+

.gitignore

@@ -55,7 +55,7 @@ esptool.py
 md5output.txt
 releases/manifest
 releases/installer/rev*
-
+lib/easy-preferences
 # IDE
 .travis.yml
 extensions.json

build

@@ -26,7 +26,8 @@ OWNER="kike-canaries"
 REPO="canairio_firmware"
 INSDIR=$RELDIR/installer/${NAME}_installer
 
-flavors="TTGO_T7 WEMOSOLED HELTEC TTGO_TQ ESP32DEVKIT TTGO_TDISPLAY ESP32PICOD4 M5STICKCPLUS M5ATOM M5PICOD4 ESP32C3 ESP32C3OIPLUS ESP32C3LOLIN ESP32C3SEEDX ESP32S3 TTGO_T7S3 LORADEVKIT"
+flavors="TTGO_T7 WEMOSOLED HELTEC TTGO_TQ ESP32DEVKIT TTGO_TDISPLAY ESP32PICOD4 M5ATOM M5PICOD4 ESP32C3 ESP32C3OIPLUS ESP32C3LOLIN ESP32C3SEEDX ESP32S3 TTGO_T7S3 LORADEVKIT AG_OPENAIR"
+#flavors="TTGO_T7 WEMOSOLED HELTEC TTGO_TQ ESP32DEVKIT TTGO_TDISPLAY ESP32PICOD4 M5STICKCPLUS M5ATOM M5PICOD4 ESP32C3 ESP32C3OIPLUS ESP32C3LOLIN ESP32C3SEEDX ESP32S3 TTGO_T7S3 LORADEVKIT AG_OPENAIR"
 #flavors="TTGO_T7 WEMOSOLED ESP32DEVKIT TTGO_TDISPLAY M5STICKCPLUS M5ATOM ESP32C3 ESP32C3OIPLUS ESP32C3LOLIN ESP32C3SEEDX"
 #flavors="TTGO_T7 ESP32C3 ESP32C3OIPLUS ESP32C3LOLIN ESP32C3SEEDX"
 

lib/batterylib/Batterylib.hpp

@@ -1,3 +1,4 @@
+#ifndef DISABLE_BATT
 #ifndef Batterylib_hpp
 #define Batterylib_hpp
 
@@ -16,3 +17,4 @@
 #endif
 
 #endif
+#endif

lib/batterylib/battery.hpp

@@ -143,4 +143,4 @@ class Battery {
     }
     return (int)percentage;
   }
-};
+};

lib/batterylib/battery_m5stack.cpp

@@ -4,7 +4,7 @@
 
 void Battery_M5STACK::init(bool debug) {
     this->debug = debug;
-    M5.Axp.EnableCoulombcounter();  // Enable Coulomb counter.
+    // M5.Axp.EnableCoulombcounter();  // Enable Coulomb counter.
     setLimits(BATTERY_MIN_V, BATTERY_MAX_V, BATTCHARG_MIN_V, BATTCHARG_MAX_V);
 }
 
@@ -13,12 +13,12 @@ float Battery_M5STACK::getVoltage() {
 }
 
 void Battery_M5STACK::update() {
-    curv = M5.Axp.GetBatVoltage();
-    vusb = M5.Axp.GetVBusVoltage();
+    curv = M5.Power.getBatteryVoltage();
+    // vusb = M5.Power.getUsbOutput();
 }
 
 bool Battery_M5STACK::isCharging() {
-    return M5.axp.GetVBusVoltage() > btCharVMax;
+    return M5.Power.getUsbOutput();
 }
 
 int Battery_M5STACK::getCharge() {
@@ -31,15 +31,16 @@ int Battery_M5STACK::getCharge() {
 
 void Battery_M5STACK::printValues() {
     if (!debug) return;
-    Serial.printf("-->[BATT] AXP Temp       \t: %.1fC  \tC: %03d\r\n", M5.Axp.GetTempInAXP192(), getCharge());                                          //Get the temperature of AXP192
-    Serial.printf("-->[BATT] AXP Bat Volts  \t: %.3fv  \tI: %.3fma\r\n", curv, M5.Axp.GetBatCurrent());  //Output voltage and current of Bat
-    Serial.printf("-->[BATT] AXP USB Volts  \t: %.3fv  \tI: %.3fma\r\n", M5.Axp.GetVBusVoltage(), M5.Axp.GetVBusCurrent());  //Output current and voltage of USB
-    Serial.printf("-->[BATT] AXP 5V  Volts  \t: %.3fv  \tI: %.3fma\r\n", M5.Axp.GetVinVoltage(), M5.Axp.GetVinCurrent());
-    Serial.printf("-->[BATT] AXP Bat power  \t: %.3fmw\r\n", M5.Axp.GetBatPower());
+    // Serial.printf("-->[BATT] AXP Temp       \t: %.1fC  \tC: %03d\r\n", M5.Power.GetTempInAXP192(), getCharge());                                          //Get the temperature of AXP192
+    Serial.printf("-->[BATT] AXP Bat Volts  \t: %.3fv  \tI: %.3fma\r\n", curv, M5.Power.getBatteryVoltage());  //Output voltage and current of Bat
+    // Serial.printf("-->[BATT] AXP USB Volts  \t: %.3fv  \tI: %.3fma\r\n", M5.Axp.GetVBusVoltage(), M5.Axp.GetVBusCurrent());  //Output current and voltage of USB
+    Serial.printf("-->[BATT] AXP Bat Level  \t: %.3fv  \tI: %.3fma\r\n", M5.Power.getBatteryLevel(), M5.Power.getBatteryCurrent());
+    // Serial.printf("-->[BATT] AXP 5V  Volts  \t: %.3fv  \tI: %.3fma\r\n", M5.Axp.GetVinVoltage(), M5.Axp.GetVinCurrent());
+    // Serial.printf("-->[BATT] AXP Bat power  \t: %.3fmw\r\n", M5.Axp.GetBatPower());
 }
 
 #if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_M5STACKBATTERY)
 Battery_M5STACK battery;
 #endif
 
-#endif
+#endif

lib/batterylib/battery_m5stack.hpp

@@ -3,7 +3,7 @@
 
 #include <battery.hpp>
 #ifdef M5STICKCPLUS 
-#include <M5StickCPlus.h>
+#include <M5Unified.h>
 #endif
 
 #define BATTERY_MIN_V 3.4
@@ -13,7 +13,7 @@
 
 class Battery_M5STACK : public Battery {
   public:
-    float vusb = 0.0;
+    // float vusb = 0.0;
     void init(bool debug = false);
     float getVoltage();
     float getCurrent();

lib/batterylib/battery_oled.cpp

@@ -9,6 +9,9 @@
 #elif TTGO_T7S3
     #define ADC_PIN 2
     int channel_atten = ADC1_CHANNEL_1;
+#elif ESP32C3_AIRGRADIENT
+    #define ADC_PIN 4
+    int channel_atten = ADC1_CHANNEL_1;
 #else
     #define ADC_PIN 34
     int channel_atten = 0;

src/bluetooth.cpp → lib/ble/bluetooth.cpp

@@ -1,4 +1,6 @@
+#ifndef DISABLE_BLE
 #include <bluetooth.hpp>
+#include "ConfigApp.hpp"
 
 BLEServer* pServer = NULL;
 BLECharacteristic* pCharactData = NULL;
@@ -12,7 +14,7 @@ bool oldDeviceConnected = false;
 *************************************************************************/
 
 String getNotificationData() {
-    StaticJsonDocument<40> doc;   // notification capacity is reduced, only main value
+    JsonDocument doc;   // notification capacity is reduced, only main value
     int deviceType = sensors.getUARTDeviceTypeSelected();
     if (deviceType <= 3) {
         doc["P25"] = sensors.getPM25();  
@@ -25,7 +27,7 @@ String getNotificationData() {
 }
 
 String getSensorData() {
-    StaticJsonDocument<512> doc;
+    JsonDocument doc;
 
     doc["P1"] = sensors.getPM1();
     doc["P25"] = sensors.getPM25();
@@ -40,8 +42,10 @@ String getSensorData() {
     doc["pre"] = sensors.getPressure();
     doc["nh3"] = sensors.getNH3();
     doc["co"] = sensors.getCO();
+    #ifndef DISABLE_BATT
     doc["bat"] = battery.getCharge();
     doc["vol"] = battery.getVoltage();
+    #endif
     doc["PAX"] = getPaxCount();
     doc["dsl"] = sensors.getSensorName((SENSORS) sensors.getUARTDeviceTypeSelected());
     String json;
@@ -58,52 +62,52 @@ void bleServerDataRefresh(){
 }
 
 void bleServerConfigRefresh(){
-    if (FAMILY == "ESP32-C3") return;
-    cfg.setWifiConnected(WiFi.isConnected());  // for notify on each write
-    pCharactConfig->setValue(cfg.getCurrentConfig().c_str());
+    // if (FAMILY == "ESP32-C3") return;
+    setWifiConnected(WiFi.isConnected());  // for notify on each write
+    pCharactConfig->setValue(getCurrentConfig().c_str());
 }
 
 // Config BLE callbacks
 class MyConfigCallbacks : public BLECharacteristicCallbacks {
     void onWrite(BLECharacteristic* pCharacteristic) {
-        if (FAMILY == "ESP32-C3") return;
+        // if (FAMILY == "ESP32-C3") return;
         std::string value = pCharacteristic->getValue();
         if (value.length() > 0) {
-            if (cfg.save(value.c_str())) {
-                cfg.reload();
+            if (save(value.c_str())) {
+                reload();
                 gui.displayPreferenceSaveIcon();
 
-                gui.setWifiMode(cfg.isWifiEnable());
-                if (!cfg.isWifiEnable()) wifiStop();
+                gui.setWifiMode(isWifiEnable());
+                if (!isWifiEnable()) wifiStop();
 
-                if(sensors.sample_time != cfg.stime) {
-                    sensors.setSampleTime(cfg.stime);
-                    gui.setSampleTime(cfg.stime);
+                if(sensors.sample_time != stime) {
+                    sensors.setSampleTime(stime);
+                    gui.setSampleTime(stime);
                 }
-                if(sensors.toffset != cfg.toffset) sensors.setTempOffset(cfg.toffset);
-                if(sensors.devmode != cfg.devmode) sensors.setDebugMode(cfg.devmode);
+                if(sensors.toffset != toffset) sensors.setTempOffset(toffset);
+                if(sensors.devmode != devmode) sensors.setDebugMode(devmode);
             }
             else{
-                Serial.println("[E][BTLE][CONFIG] saving error!");
+                log_w("[W][BTLE][CONFIG] save return false with %s",value.c_str());
             }
         }
     };
 
     void onRead(BLECharacteristic* pCharacteristic) {
-        if (FAMILY == "ESP32-C3") return;
+        // if (FAMILY == "ESP32-C3") return;
         bleServerConfigRefresh();
     }
 };
 
 // Status BLE callbacks
 class MyStatusCallbacks : public BLECharacteristicCallbacks {
     void onWrite(BLECharacteristic* pCharacteristic) {
-        if (FAMILY == "ESP32-C3") return;
+        // if (FAMILY == "ESP32-C3") return;
         std::string value = pCharacteristic->getValue();
-        if (value.length() > 0 && cfg.getTrackStatusValues(value.c_str())) {
+        if (value.length() > 0 && getTrackStatusValues(value.c_str())) {
             log_v("[E][BTLE][STATUS] "+String(value.c_str()));
-            gui.setTrackValues(cfg.track.spd,cfg.track.kms);
-            gui.setTrackTime(cfg.track.hrs,cfg.track.min,cfg.track.seg);
+            gui.setTrackValues(track.spd,track.kms);
+            gui.setTrackTime(track.hrs,track.min,track.seg);
         }
         else {
             Serial.println("[E][BTLE][STATUS] write error!");
@@ -164,7 +168,7 @@ void bleServerInit() {
 void bleLoop() {
     static uint_fast64_t bleTimeStamp = 0;
     // notify changed value
-    if (deviceConnected && (millis() - bleTimeStamp > cfg.stime * 1000)) {  // each 5 secs
+    if (deviceConnected && (millis() - bleTimeStamp > stime * 1000)) {  // each 5 secs
         log_i("[BTLE] sending notification..");
         log_d("[BTLE] %s",getNotificationData().c_str());
         bleTimeStamp = millis();
@@ -189,3 +193,4 @@ void bleLoop() {
 bool bleIsConnected(){
     return deviceConnected;
 }
+#endif