Merge pull request #133 from kike-canaries/devel

Devel
kike-canaries · Nov 1, 2021 · 66c086e · 66c086e
2 parents 4f22691 + e039565
commit 66c086e
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 14 deletions.
diff --git a/build b/build
@@ -52,8 +52,10 @@ updateFlavorBinaries() {
 }
 
 clean () {
-  rm -r $RELDIR/$BINDIR
-  rm -r $RELDIR/$MANIFEST
+  rm -rf $RELDIR/$BINDIR
+  rm -rf $RELDIR/$MANIFEST
+  rm -f $INSDIR/*.bin
+  rm -f $INSDIR/*.py   # old installer
 }
 
 build () {

diff --git a/include/wifi.hpp b/include/wifi.hpp
@@ -19,6 +19,7 @@ void wifiStop();
 void wifiRestart();
 void wifiLoop();
 int  getWifiRSSI();
+String getDeviceInfo();
 
 void influxDbInit();
 void influxDbLoop();

diff --git a/lib/gui-utils-oled/src/GUIUtils.cpp b/lib/gui-utils-oled/src/GUIUtils.cpp
@@ -414,6 +414,10 @@ void GUIUtils::setGUIStatusFlags(bool wifiOn, bool bleOn, bool blePair) {
     }
 }
 
+void GUIUtils::setInfoData(String info) {
+    // TODO: 
+}
+
 void GUIUtils::displayGUIStatusFlags() {
 #ifdef TTGO_TQ
     if (_bleOn)

diff --git a/lib/gui-utils-oled/src/GUIUtils.hpp b/lib/gui-utils-oled/src/GUIUtils.hpp
@@ -45,6 +45,8 @@ class GUIUtils {
 
     void setGUIStatusFlags(bool wifiOn, bool bleOn, bool blePair);
 
+    void setInfoData(String info);
+
     void setBrightness(uint32_t value);
 
     void setWifiMode(bool enable);

diff --git a/lib/gui-utils-tft/src/TFTUtils.cpp b/lib/gui-utils-tft/src/TFTUtils.cpp
@@ -146,7 +146,31 @@ void TFTUtils::showWindowBike(){
     Serial.println("-->[TGUI] displayed bike screen");
 }
 
+void TFTUtils::showInfoWindow() {
+    showStatus();
+    tft.setTextColor(TFT_GREENYELLOW, TFT_BLACK);
+    tft.setTextFont(1);
+    tft.setFreeFont(&Orbitron_Medium_20);
+    tft.setTextDatum(MC_DATUM);
+    tft.drawString("DEVINFO", tft.width() / 2, 30);
+    tft.drawLine(18,44,117,44,TFT_GREY);
+    state = 7;
+    refreshInfoWindow();
+    Serial.println("-->[TGUI] displayed info screen");
+}
+
+void TFTUtils::refreshInfoWindow() {
+    if (state != 7) return;
+    tft.setTextColor(TFT_WHITE, TFT_BLACK);
+    tft.setTextFont(2);
+    tft.setTextPadding(5);
+    tft.setTextDatum(CR_DATUM);
+    tft.setCursor(0, 50, 2);
+    tft.println(_info);
+}
+
 void TFTUtils::showSetup() {
+
     showStatus();
     tft.setTextColor(TFT_GREENYELLOW, TFT_BLACK);
     tft.setFreeFont(&Orbitron_Medium_20);
@@ -173,6 +197,12 @@ void TFTUtils::showSetup() {
     tft.setCursor(MARGINL, SSTART+PRESETH*4, 2);
     tft.println("CALIBRT:");
 
+    tft.setCursor(MARGINL, SSTART+PRESETH*5, 2);
+    tft.println("INFO:");
+
+    tft.setCursor(MARVALL, SSTART+PRESETH*5, 2);
+    tft.println(String(VERSION));
+
     updateInvertValue();
     updateWifiMode();
     updateSampleTime();
@@ -269,16 +299,17 @@ void TFTUtils::setSampleTime(int time){
     updateSampleTime();
 }
 
-void TFTUtils::updateSampleTime(){
-    tft.fillRect(MARVALL, SSTART+PRESETH*3, 54, 13, TFT_BLACK);
+void TFTUtils::updateSampleTime() {
+    if (state < 1) return;
+    tft.fillRect(MARVALL, SSTART + PRESETH * 3, 54, 13, TFT_BLACK);
     tft.setTextColor(TFT_WHITE, TFT_BLACK);
-    tft.setCursor(MARVALL, SSTART+PRESETH*3, 2);
-    tft.println(""+String(_sample_time)+"s");
+    tft.setCursor(MARVALL, SSTART + PRESETH * 3, 2);
+    tft.println("" + String(_sample_time) + "s");
 }
 
 void TFTUtils::updateCalibrationField(){
     static uint_fast64_t calibretts = 0;   // timestamp for GUI refresh
-    if (state >= 1 && millis() - calibretts > 1000) {
+    if (state >= 1 && state < 6 && millis() - calibretts > 1000) {
         calibretts = millis();
         tft.fillRect(MARVALL, SSTART + PRESETH * 4, 54, 13, TFT_BLACK);
         tft.setTextColor(TFT_WHITE, TFT_BLACK);
@@ -333,6 +364,7 @@ void TFTUtils::checkButtons() {
             if(state==3)notifyWifiMode();
             if(state==4)notifySampleTime();
             if(state==5)startCalibration();
+            if(state==6)showInfoWindow();
         }
         if (holdR > 20) suspend();
     } else {
@@ -346,7 +378,7 @@ void TFTUtils::checkButtons() {
             pressL = 1;
             if (state++ == 0) showSetup();
             if (state >= 1) refreshSetup();
-            if (state == 6) restoreMain();
+            if (state >= 7) restoreMain();
         }
         if(holdL > 10 && state >= 1) restoreMain();
     } else {
@@ -520,6 +552,12 @@ void TFTUtils::setGUIStatusFlags(bool wifiOn, bool bleOn, bool blePair) {
     }
 }
 
+void TFTUtils::setInfoData(String info) {
+    suspendTaskGUI();
+    _info = info;
+    resumeTaskGUI();
+}
+
 void TFTUtils::displayGUIStatusFlags() {
     static uint_fast64_t sensor_status_ts = 0;   // timestamp for GUI refresh
     if ((millis() - sensor_status_ts > 1000)) { 
@@ -649,6 +687,7 @@ void TFTUtils::pageStart() {
     }
     updateCalibrationField();
     displayGUIStatusFlags();
+    refreshInfoWindow();
 }
 
 void TFTUtils::pageEnd() {

diff --git a/lib/gui-utils-tft/src/TFTUtils.hpp b/lib/gui-utils-tft/src/TFTUtils.hpp
@@ -55,6 +55,8 @@ class TFTUtils {
 
     void setGUIStatusFlags(bool wifiOn, bool bleOn, bool blePair);
 
+    void setInfoData(String info);
+
     void displayMainValues();
 
     void displayDataOnIcon();
@@ -173,6 +175,8 @@ class TFTUtils {
 
     bool _blePair;
 
+    String _info = "";
+
     bool isNewData;
 
     TaskHandle_t xHandle;
@@ -189,6 +193,10 @@ class TFTUtils {
 
     void refreshSetup();
 
+    void showInfoWindow();
+
+    void refreshInfoWindow();
+
     void displaySensorAverage(int average);
 
     void displayMainUnit(String unit);

diff --git a/platformio.ini b/platformio.ini
@@ -16,9 +16,9 @@ platform = espressif32
 framework = arduino
 upload_speed = 1500000
 monitor_speed = 115200
-version = 0.4.4
-revision = 833
-target = prod
+version = 0.4.5
+revision = 837
+target = dev
 monitor_filters = time
 extra_scripts = pre:prebuild.py
 build_flags = 
@@ -28,7 +28,7 @@ lib_deps =
 	bblanchon/ArduinoJson @ ^6
 	tobiasschuerg/ESP8266 Influxdb @ ^3.8.0
 	https://github.com/hpsaturn/esp32FOTA.git
-	hpsaturn/CanAirIO Air Quality Sensors Library@^0.3.6
+	hpsaturn/CanAirIO Air Quality Sensors Library@^0.3.7
 
 [esp32_common]
 platform = espressif32

diff --git a/src/main.cpp b/src/main.cpp
@@ -42,6 +42,8 @@ void refreshGUIData() {
         temp,
         getWifiRSSI(),
         deviceType);
+
+    gui.setInfoData(getDeviceInfo());
 }
 
 class MyGUIUserPreferencesCallbacks : public GUIUserPreferencesCallbacks {
@@ -70,14 +72,14 @@ class MyGUIUserPreferencesCallbacks : public GUIUserPreferencesCallbacks {
     };
     void onCalibrationReady(){
         Serial.println("-->[MAIN] onCalibrationReady");
-        sensors.setCO2RecalibrationFactor(418);   // ==> Calibration factor on outdoors
+        sensors.setCO2RecalibrationFactor(400);   // ==> Calibration factor on outdoors
     };
 };
 
 class MyRemoteConfigCallBacks : public RemoteConfigCallbacks {
     void onCO2Calibration () {
         Serial.println("-->[MAIN] onRemoteConfig CO2 Calibration");
-        sensors.setCO2RecalibrationFactor(418);   // ==> Calibration factor on outdoors
+        sensors.setCO2RecalibrationFactor(400);   // ==> Calibration factor on outdoors
     };
 
     void onAltitudeOffset (float altitude) {

diff --git a/src/wifi.cpp b/src/wifi.cpp
@@ -224,3 +224,15 @@ int getWifiRSSI() {
     else return 0;
 }
 
+String getDeviceInfo () {
+    String info = String(FLAVOR) + "\n";
+    info = info + "Rev" + String(REVISION) +" v" + String(VERSION) + "\n";
+    info = info + sensors.getPmDeviceSelected() + "\n\n";
+
+    info = info + "Host: " + hostId + "\n";
+    info = info + "(" + WiFi.localIP().toString() + ")\n";
+    info = info + "OTA: " + String(TARGET) + " channel\n\n";
+    info = info + "Fixed station:\n";
+    info = info + influxdbGetStationName();
+    return info;
+}