Merge pull request #330 from airgradienthq/feat/post-ccid

Provide SIM card ICCID when performing ota update

.github/workflows/check.yml

@@ -17,11 +17,14 @@ jobs:
           - "esp32:esp32:esp32c3"
         include:
           - fqbn: "esp8266:esp8266:d1_mini"
-            core: "esp8266:esp8266@3.1.2"
+            core: "esp8266:esp8266"
+            core_version: "3.1.2"
             core_url: "https://arduino.esp8266.com/stable/package_esp8266com_index.json"
           - fqbn: "esp32:esp32:esp32c3"
+            core: "esp32:esp32"
+            core_version: "2.0.17"
+            core_url: "https://espressif.github.io/arduino-esp32/package_esp32_index.json"
             board_options: "JTAGAdapter=default,CDCOnBoot=cdc,PartitionScheme=min_spiffs,CPUFreq=160,FlashMode=qio,FlashFreq=80,FlashSize=4M,UploadSpeed=921600,DebugLevel=verbose,EraseFlash=none"
-            core: "esp32:esp32@2.0.11"
         exclude:
           - example: "BASIC"
             fqbn: "esp32:esp32:esp32c3"
@@ -31,30 +34,30 @@ jobs:
             fqbn: "esp32:esp32:esp32c3"
           - example: "OneOpenAir"
             fqbn: "esp8266:esp8266:d1_mini"
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
-      - run:
-          curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh |
-          sh -s 0.35.3
-      - run: bin/arduino-cli --verbose core install '${{ matrix.core }}'
-          --additional-urls '${{ matrix.core_url }}'
-      - run: bin/arduino-cli --verbose lib install
-          WiFiManager@2.0.16-rc.2
-          Arduino_JSON@0.2.0
-          U8g2@2.34.22
-      # In some cases, actions/checkout@v4 will check out a detached HEAD; for
-      # example, this happens on pull request events, where an hypothetical
-      # PR merge commit is checked out. This tends to confuse
-      # `arduino-cli lib install --git-url`, making it fail with errors such as:
-      #   Error installing Git Library: Library install failed: object not found
-      # Create and check out a dummy branch to work around this issue.
-      - run: git checkout -b check
-      - run: bin/arduino-cli --verbose lib install --git-url .
-        env:
-          ARDUINO_LIBRARY_ENABLE_UNSAFE_INSTALL: "true"
-      - run: bin/arduino-cli --verbose compile 'examples/${{ matrix.example }}'
-          --fqbn '${{ matrix.fqbn }}' --board-options '${{ matrix.board_options }}'
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+          submodules: 'true'
+      - uses: arduino/compile-sketches@v1.1.2
+        with:
+          fqbn: ${{ matrix.fqbn }}
+          sketch-paths: |
+            examples/${{ matrix.example }}
+          libraries: |
+            - source-path: ./
+          cli-compile-flags: |
+            - --warnings
+            - none
+            - --board-options
+            - "${{ matrix.board_options }}"
+          platforms: |
+            - name: ${{ matrix.core }}
+              version: ${{ matrix.core_version}}
+              source-url: ${{ matrix.core_url }}
+          enable-deltas-report: true
+
       # TODO: at this point it would be a good idea to run some smoke tests on
       # the resulting image (e.g. that it boots successfully and sends metrics)
       # but that would either require a high fidelity device emulator, or a

.gitignore

@@ -3,3 +3,8 @@ build
 .vscode
 /.idea/
 .pio
+.cache
+.clangd
+logs
+gen_compile_commands.py
+compile_commands.json

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "src/Libraries/airgradient-client"]
+	path = src/Libraries/airgradient-client
+	url = ../../airgradienthq/airgradient-client.git
+[submodule "src/Libraries/airgradient-ota"]
+	path = src/Libraries/airgradient-ota
+	url = ../../airgradienthq/airgradient-ota.git

docs/howto-compile.md

@@ -0,0 +1,105 @@
+# How to compile AirGradient firmware on Arduino IDE
+
+## Prequisite
+
+Arduino IDE version 2.x ([download](https://www.arduino.cc/en/software))
+
+> For AirGradient model ONE and Open Air, the codebase **WILL NOT** work on the latest major version of arduino-esp32 which is *3.x* . This related to when installing "esp32 by Espressif Systems" in board manager. Instead use version **2.0.17**, please follow the first step carefully.
+
+## Steps for ESP32C3 based board (ONE and Open Air Model)
+
+1. Install "esp32 by Espressif Systems" in board manager with version **2.0.17** (Tools ➝ Board ➝ Boards Manager ➝ search for `"espressif"`)
+
+![board manager](images/esp32-board.png)
+
+2. Install AirGradient library
+
+#### Version < 3.2.0
+
+Using library manager install the latest version (Tools ➝ Manage Libraries... ➝ search for `"airgradient"`) 
+
+![Aigradient Library](images/ag-lib.png)
+
+#### Version >= 3.3.0
+
+- From your terminal, go to Arduino libraries folder (windows and mac: `Documents/Arduino/libraries` or linux: `~/Arduino/Libraries`).
+- With **git** cli, execute this command `git clone --recursive https://github.com/airgradienthq/arduino.git AirGradient_Air_Quality_Sensor` 
+- Restart Arduino IDE 
+
+3. On tools tab, follow settings below
+
+```
+Board ➝ ESP32C3 Dev Module
+USB CDC On Boot ➝ Enabled
+CPU Frequency ➝ 160MHz (WiFi)
+Core Debug Level ➝ Info
+Erase All Flash Before Sketch Upload ➝ Enabled (or choose as needed)
+Flash Frequency ➝ 80MHz
+Flash Mode ➝ QIO
+Flash Size ➝ 4MB (32Mb)
+JTAG Adapter ➝ Disabled
+Partition Scheme ➝ Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+Upload Speed ➝ 921600
+```
+
+4. Open sketch to compile (File ➝ Examples ➝ AirGradient Air Quality Sensor ➝ OneOpenAir). This sketch for AirGradient ONE and Open Air monitor model
+5. Compile
+
+![compiled esp32](images/compiled.png)
+
+## Steps for ESP8266 based board (DIY model)
+
+1. Add esp8266 board by adding http://arduino.esp8266.com/stable/package_esp8266com_index.json into Additional Board Manager URLs field (File ➝ Preferences ➝ Additional boards manager URLs)
+
+![additional-board](images/additional-board.png)
+
+2. Install esp8266 board on board manager with version **3.1.2** (Tools ➝ Board ➝ Boards Manager ➝ search for `"esp8266"`)
+
+![board manager](images/esp8266-board.png)
+
+3. Install AirGradient library on library manager using the latest version (Tools ➝ Manage Libraries... ➝ search for `"airgradient"`) 
+
+![Aigradient Library](images/ag-lib.png)
+
+4. On tools tab, set board to `LOLIN(WEMOS) D1 R2 & mini`, and let other settings to default
+
+![settings esp8266](images/settings-esp8266.png)
+
+5. Open sketch to compile (File ➝ Examples ➝ AirGradient Air Quality Sensor ➝ `<Model Option>`). Depends on the DIY model, either `BASIC`, `DiyProIndoorV3_3` and `DiyProIndoorV4_2` 
+6. Compile
+
+![compiled esp8266](images/compiled-esp8266.png)
+
+## Possible Issues
+
+### Linux (Debian)
+
+ModuleNotFoundError: No module named ‘serial’
+
+![Linux Failed](images/linux-failed.png)
+
+Make sure python pyserial module installed globally in the environment by executing: 
+
+`$ sudo apt install -y python3-pyserial`
+
+or 
+
+`$ pip install pyserial` 
+
+Choose based on how python installed on your machine. But most user, using `apt` is better.
+
+## How to contribute
+
+The instructions above are the instructions for how to build an official release of the AirGradient firmware using the Arduino IDE. If you intend to make changes that will you intent to contribute back to the main project, instead of installing the AirGradient library, check out the repo at `Documents/Arduino/libraries` (for Windows and Mac), or `~/Arduino/Libraries` (Linux). If you installed the library, you can remove it from the library manager in the Arduino IDE, or just delete the directory.
+
+**NOTE:** When cloning the repository, for version >= 3.3.0 it has submodule, please use `--recursive` flag like this: `git clone --recursive https://github.com/airgradienthq/arduino.git AirGradient_Air_Quality_Sensor`
+
+Please follow github [contributing to a project](https://docs.github.com/en/get-started/exploring-projects-on-github/contributing-to-a-project) tutorial to contribute to this project.
+
+There are 2 environment options to compile this project, PlatformIO and ArduinoIDE.
+
+- For PlatformIO, it should work out of the box
+- For arduino, files in `src` folder and also from `Examples` can be modified at `Documents/Arduino/libraries` for Windows and Mac, and `~/Arduino/Libraries` for Linux
+
+
+

docs/local-server.md

@@ -93,6 +93,7 @@ Compensated values apply correction algorithms to make the sensor values more ac
   "tvocLearningOffset": 12,
   "noxLearningOffset": 12,
   "mqttBrokerUrl": "",
+  "httpDomain": "",
   "temperatureUnit": "c",
   "configurationControl": "local",
   "postDataToAirGradient": true,
@@ -146,7 +147,8 @@ If the monitor is set up on the AirGradient dashboard, it will also receive the
 | `displayBrightness`               | Brightness of the Display.                                       | Number  | 0-100                                                                                                                                   | `{"displayBrightness": 50}`                     |
 | `ledBarBrightness`                | Brightness of the LEDBar.                                        | Number  | 0-100                                                                                                                                   | `{"ledBarBrightness": 40}`                      |
 | `abcDays`                         | Number of days for CO2 automatic baseline calibration.           | Number  | Maximum 200 days. Default 8 days.                                                                                                       | `{"abcDays": 8}`                                |
-| `mqttBrokerUrl`                   | MQTT broker URL.                                                 | String  |                                                                                                                                         | `{"mqttBrokerUrl": "mqtt://192.168.0.18:1883"}` |
+| `mqttBrokerUrl`                   | MQTT broker URL.                                                 | String  | Maximum 255 characters. Set value to empty string to disable mqtt connection.                                                           | `{"mqttBrokerUrl": "mqtt://192.168.0.18:1883"}` |
+| `httpDomain`                      | Domain name for http request. (version > 3.3.2)                  | String  | Maximum 255 characters. Set value to empty string to set http domain to default airgradient                                             | `{"httpDomain": "sub.domain.com"}`              |
 | `temperatureUnit`                 | Temperature unit shown on the display.                           | String  | `c` or `C`: Degree Celsius °C <br>`f` or `F`: Degree Fahrenheit °F                                                                      | `{"temperatureUnit": "c"}`                      |
 | `configurationControl`            | The configuration source of the device.                          | String  | `both`: Accept local and cloud configuration <br>`local`: Accept only local configuration  <br>`cloud`: Accept only cloud configuration | `{"configurationControl": "both"}`              |
 | `postDataToAirGradient`           | Send data to AirGradient cloud.                                  | Boolean | `true`: Enabled <br>`false`: Disabled                                                                                                   | `{"postDataToAirGradient": true}`               |
@@ -154,8 +156,8 @@ If the monitor is set up on the AirGradient dashboard, it will also receive the
 | `ledBarTestRequested`             | Can be set to trigger a test.                                    | Boolean | `true` : LEDs will run test sequence                                                                                                    | `{"ledBarTestRequested": true}`                 |
 | `noxLearningOffset`               | Set NOx learning gain offset.                                    | Number  | 0-720 (default 12)                                                                                                                      | `{"noxLearningOffset": 12}`                     |
 | `tvocLearningOffset`              | Set VOC learning gain offset.                                    | Number  | 0-720 (default 12)                                                                                                                      | `{"tvocLearningOffset": 12}`                    |
-| `monitorDisplayCompensatedValues` | Set the display show the PM value with/without compensate  value (only on [3.1.9]()) | Boolean | `false`: Without compensate (default) <br> `true`: with compensate                                                                      | `{"monitorDisplayCompensatedValues": false }`   |
-| `corrections`                     | Sets correction options to display and measurement values on local server response. (version >= [3.1.11]())    | Object |  _see corrections section_             | _see corrections section_                         |
+| `monitorDisplayCompensatedValues` | Set the display show the PM value with/without compensate  value (only on 3.1.9) | Boolean | `false`: Without compensate (default) <br> `true`: with compensate                                                  | `{"monitorDisplayCompensatedValues": false }`   |
+| `corrections`                     | Sets correction options to display and measurement values on local server response. (version >= 3.1.11)    | Object |  _see corrections section_             | _see corrections section_                         |
 
 
 **Notes**

examples/BASIC/BASIC.ino

@@ -12,10 +12,8 @@ Outdoor Monitor: https://www.airgradient.com/outdoor/
 Build Instructions:
 https://www.airgradient.com/documentation/diy-v4/
 
-Please make sure you have esp8266 board manager installed. Tested with
-version 3.1.2.
-
-Set board to "LOLIN(WEMOS) D1 R2 & mini"
+Compile Instructions:
+https://github.com/airgradienthq/arduino/blob/master/docs/howto-compile.md
 
 Configuration parameters, e.g. Celsius / Fahrenheit or PM unit (US AQI vs ug/m3)
 can be set through the AirGradient dashboard.

examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino

@@ -12,10 +12,8 @@ Outdoor Monitor: https://www.airgradient.com/outdoor/
 Build Instructions:
 https://www.airgradient.com/documentation/diy-v4/
 
-Please make sure you have esp8266 board manager installed. Tested with
-version 3.1.2.
-
-Set board to "LOLIN(WEMOS) D1 R2 & mini"
+Compile Instructions:
+https://github.com/airgradienthq/arduino/blob/master/docs/howto-compile.md
 
 Configuration parameters, e.g. Celsius / Fahrenheit or PM unit (US AQI vs ug/m3)
 can be set through the AirGradient dashboard.

examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino

@@ -12,10 +12,8 @@ Outdoor Monitor: https://www.airgradient.com/outdoor/
 Build Instructions:
 https://www.airgradient.com/documentation/diy-v4/
 
-Please make sure you have esp8266 board manager installed. Tested with
-version 3.1.2.
-
-Set board to "LOLIN(WEMOS) D1 R2 & mini"
+Compile Instructions:
+https://github.com/airgradienthq/arduino/blob/master/docs/howto-compile.md
 
 Configuration parameters, e.g. Celsius / Fahrenheit or PM unit (US AQI vs ug/m3)
 can be set through the AirGradient dashboard.

examples/OneOpenAir/OpenMetrics.cpp

@@ -1,13 +1,18 @@
 #include "OpenMetrics.h"
 
 OpenMetrics::OpenMetrics(Measurements &measure, Configuration &config,
-                         WifiConnector &wifiConnector, AgApiClient &apiClient)
-    : measure(measure), config(config), wifiConnector(wifiConnector),
-      apiClient(apiClient) {}
+                         WifiConnector &wifiConnector)
+    : measure(measure), config(config), wifiConnector(wifiConnector) {}
 
 OpenMetrics::~OpenMetrics() {}
 
-void OpenMetrics::setAirGradient(AirGradient *ag) { this->ag = ag; }
+void OpenMetrics::setAirGradient(AirGradient *ag) { 
+  this->ag = ag; 
+}
+
+void OpenMetrics::setAirgradientClient(AirgradientClient *client) {
+  this->agClient = client;
+}
 
 const char *OpenMetrics::getApiContentType(void) {
   return "application/openmetrics-text; version=1.0.0; charset=utf-8";
@@ -43,13 +48,13 @@ String OpenMetrics::getPayload(void) {
              "1 if the AirGradient device was able to successfully fetch its "
              "configuration from the server",
              "gauge");
-  add_metric_point("", apiClient.isFetchConfigurationFailed() ? "0" : "1");
+  add_metric_point("", agClient->isLastFetchConfigSucceed() ? "1" : "0");
 
   add_metric(
       "post_ok",
       "1 if the AirGradient device was able to successfully send to the server",
       "gauge");
-  add_metric_point("", apiClient.isPostToServerFailed() ? "0" : "1");
+  add_metric_point("", agClient->isLastPostMeasureSucceed() ? "1" : "0");
 
   add_metric(
       "wifi_rssi",

examples/OneOpenAir/OpenMetrics.h

@@ -5,21 +5,22 @@
 #include "AgValue.h"
 #include "AgWiFiConnector.h"
 #include "AirGradient.h"
-#include "AgApiClient.h"
+#include "Libraries/airgradient-client/src/airgradientClient.h"
 
 class OpenMetrics {
 private:
   AirGradient *ag;
+  AirgradientClient *agClient;
   Measurements &measure;
   Configuration &config;
   WifiConnector &wifiConnector;
-  AgApiClient &apiClient;
 
 public:
-  OpenMetrics(Measurements &measure, Configuration &conig,
-              WifiConnector &wifiConnector, AgApiClient& apiClient);
+  OpenMetrics(Measurements &measure, Configuration &config,
+              WifiConnector &wifiConnector);
   ~OpenMetrics();
   void setAirGradient(AirGradient *ag);
+  void setAirgradientClient(AirgradientClient *client);
   const char *getApiContentType(void);
   const char* getApi(void);
   String getPayload(void);

library.properties

@@ -1,5 +1,5 @@
 name=AirGradient Air Quality Sensor
-version=3.2.0
+version=3.3.9
 author=AirGradient <support@airgradient.com>
 maintainer=AirGradient <support@airgradient.com>
 sentence=ESP32-C3 / ESP8266 library for air quality monitor measuring PM, CO2, Temperature, TVOC and Humidity with OLED display.

platformio.ini

@@ -12,7 +12,7 @@
 platform = espressif32
 board = esp32-c3-devkitm-1
 framework = arduino
-build_flags = !echo '-D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1 -D GIT_VERSION=\\"'$(git describe --tags --always --dirty)'\\"'
+build_flags = !echo '-D ARDUINO_USB_CDC_ON_BOOT=1 -D ARDUINO_USB_MODE=1 -D AG_LOG_LEVEL=AG_LOG_LEVEL_INFO -D GIT_VERSION=\\"'$(git describe --tags --always --dirty)'\\"'
 board_build.partitions = partitions.csv
 monitor_speed = 115200
 lib_deps = 

src/AgConfigure.cpp

@@ -46,6 +46,7 @@ JSON_PROP_DEF(abcDays);
 JSON_PROP_DEF(tvocLearningOffset);
 JSON_PROP_DEF(noxLearningOffset);
 JSON_PROP_DEF(mqttBrokerUrl);
+JSON_PROP_DEF(httpDomain);
 JSON_PROP_DEF(temperatureUnit);
 JSON_PROP_DEF(configurationControl);
 JSON_PROP_DEF(postDataToAirGradient);
@@ -68,6 +69,7 @@ JSON_PROP_DEF(rhum);
 #define jprop_tvocLearningOffset_default              12
 #define jprop_noxLearningOffset_default               12
 #define jprop_mqttBrokerUrl_default                   ""
+#define jprop_httpDomain_default                      ""
 #define jprop_temperatureUnit_default                 "c"
 #define jprop_configurationControl_default            String(CONFIGURATION_CONTROL_NAME[ConfigurationControl::ConfigurationControlBoth])
 #define jprop_postDataToAirGradient_default           true
@@ -240,7 +242,7 @@ bool Configuration::updateTempHumCorrection(JSONVar &json, TempHumCorrection &ta
 
   JSONVar corrections = json[jprop_corrections];
   if (!corrections.hasOwnProperty(correctionName)) {
-    logWarning(String(correctionName) + " correction field not found on configuration");
+    logInfo(String(correctionName) + " correction field not found on configuration");
     return false;
   }
 
@@ -377,6 +379,7 @@ void Configuration::defaultConfig(void) {
 
   jconfig[jprop_country] = jprop_country_default;
   jconfig[jprop_mqttBrokerUrl] = jprop_mqttBrokerUrl_default;
+  jconfig[jprop_httpDomain] = jprop_httpDomain_default;
   jconfig[jprop_configurationControl] = jprop_configurationControl_default;
   jconfig[jprop_pmStandard] = jprop_pmStandard_default;
   jconfig[jprop_temperatureUnit] = jprop_temperatureUnit_default;
@@ -453,6 +456,10 @@ bool Configuration::begin(void) {
   return true;
 }
 
+void Configuration::setConfigurationUpdatedCallback(ConfigurationUpdatedCallback_t callback) {
+  _callback = callback;
+}
+
 /**
  * @brief Parse JSON configura string to local configure
  *
@@ -735,11 +742,17 @@ bool Configuration::parse(String data, bool isLocal) {
         jconfig[jprop_mqttBrokerUrl] = broker;
       }
     } else {
-      failedMessage = "\"mqttBrokerUrl\" length should <= 255";
+      failedMessage = "\"mqttBrokerUrl\" length should less than 255 character";
       jsonInvalid();
       return false;
     }
-  } else {
+  }
+  else if (JSON.typeof_(root[jprop_mqttBrokerUrl]) == "null" and !isLocal) {
+    // So if its not available on the json and json comes from aigradient server
+    // then set its value to default (empty) 
+    jconfig[jprop_mqttBrokerUrl] = jprop_mqttBrokerUrl_default;
+  }
+  else {
     if (jsonTypeInvalid(root[jprop_mqttBrokerUrl], "string")) {
       failedMessage =
           jsonTypeInvalidMessage(String(jprop_mqttBrokerUrl), "string");
@@ -748,6 +761,32 @@ bool Configuration::parse(String data, bool isLocal) {
     }
   }
 
+  if (isLocal) {
+    if (JSON.typeof_(root[jprop_httpDomain]) == "string") {
+      String httpDomain = root[jprop_httpDomain];
+      String oldHttpDomain = jconfig[jprop_httpDomain];
+      if (httpDomain.length() <= 255) {
+        if (httpDomain != oldHttpDomain) {
+          changed = true;
+          configLogInfo(String(jprop_httpDomain), oldHttpDomain, httpDomain);
+          jconfig[jprop_httpDomain] = httpDomain;
+        }
+      } else {
+        failedMessage = "\"httpDomain\" length should less than 255 character";
+        jsonInvalid();
+        return false;
+      }
+    }
+    else {
+      if (jsonTypeInvalid(root[jprop_httpDomain], "string")) {
+        failedMessage =
+            jsonTypeInvalidMessage(String(jprop_httpDomain), "string");
+        jsonInvalid();
+        return false;
+      }
+    }
+  }
+
   if (JSON.typeof_(root[jprop_temperatureUnit]) == "string") {
     String unit = root[jprop_temperatureUnit];
     String oldUnit = jconfig[jprop_temperatureUnit];
@@ -916,15 +955,18 @@ bool Configuration::parse(String data, bool isLocal) {
     changed = true;
   }
 
+  if (ledBarTestRequested || co2CalibrationRequested) {
+    commandRequested = true;
+    updated = true;
+  }
+
   if (changed) {
     updated = true;
     saveConfig();
     printConfig();
-  } else {
-    if (ledBarTestRequested || co2CalibrationRequested) {
-      updated = true;
-    }
+    _callback();
   }
+
   return true;
 }
 
@@ -1030,6 +1072,16 @@ String Configuration::getMqttBrokerUri(void) {
   return broker;
 }
 
+/**
+ * @brief Get HTTP domain for post measures and get configuration 
+ *
+ * @return String http domain, might be empty string
+ */
+String Configuration::getHttpDomain(void) {
+  String httpDomain = jconfig[jprop_httpDomain];
+  return httpDomain;
+}
+
 /**
  * @brief Get configuratoin post data to AirGradient cloud
  *
@@ -1114,8 +1166,14 @@ bool Configuration::isUpdated(void) {
   return updated;
 }
 
+bool Configuration::isCommandRequested(void) {
+  bool oldState = this->commandRequested;
+  this->commandRequested = false;
+  return oldState;
+}
+
 String Configuration::jsonTypeInvalidMessage(String name, String type) {
-  return "'" + name + "' type invalid, it's should '" + type + "'";
+  return "'" + name + "' type is invalid, expecting '" + type + "'";
 }
 
 String Configuration::jsonValueInvalidMessage(String name, String value) {
@@ -1269,6 +1327,18 @@ void Configuration::toConfig(const char *buf) {
     logInfo("toConfig: mqttBroker changed");
   }
 
+  /** validate http domain */
+  if (JSON.typeof_(jconfig[jprop_httpDomain]) != "string") {
+    isConfigFieldInvalid = true;
+  } else {
+    isConfigFieldInvalid = false;
+  }
+  if (isConfigFieldInvalid) {
+    changed = true;
+    jconfig[jprop_httpDomain] = jprop_httpDomain_default;
+    logInfo("toConfig: httpDomain changed");
+  }
+
   /** Validate temperature unit */
   if (JSON.typeof_(jconfig[jprop_temperatureUnit]) != "string") {
     isConfigFieldInvalid = true;

src/AgConfigure.h

@@ -28,6 +28,7 @@ private:
   bool co2CalibrationRequested;
   bool ledBarTestRequested;
   bool updated;
+  bool commandRequested = false;
   String failedMessage;
   bool _noxLearnOffsetChanged;
   bool _tvocLearningOffsetChanged;
@@ -70,6 +71,9 @@ public:
   bool hasSensorSGP = true;
   bool hasSensorSHT = true;
 
+  typedef void (*ConfigurationUpdatedCallback_t)();
+  void setConfigurationUpdatedCallback(ConfigurationUpdatedCallback_t callback);
+
   bool begin(void);
   bool parse(String data, bool isLocal);
   String toString(void);
@@ -82,6 +86,7 @@ public:
   String getLedBarModeName(void);
   bool getDisplayMode(void);
   String getMqttBrokerUri(void);
+  String getHttpDomain(void);
   bool isPostDataToAirGradient(void);
   ConfigurationControl getConfigurationControl(void);
   bool isCo2CalibrationRequested(void);
@@ -89,6 +94,7 @@ public:
   void reset(void);
   String getModel(void);
   bool isUpdated(void);
+  bool isCommandRequested(void);
   String getFailedMesage(void);
   void setPostToAirGradient(bool enable);
   bool noxLearnOffsetChanged(void);
@@ -115,6 +121,8 @@ public:
   PMCorrection getPMCorrection(void);
   TempHumCorrection getTempCorrection(void);
   TempHumCorrection getHumCorrection(void);
+private:
+  ConfigurationUpdatedCallback_t _callback;
 };
 
 #endif /** _AG_CONFIG_H_ */

src/AgOledDisplay.cpp

@@ -5,12 +5,31 @@
 /** Cast U8G2 */
 #define DISP() ((U8G2_SH1106_128X64_NONAME_F_HW_I2C *)(this->u8g2))
 
+static const unsigned char WIFI_ISSUE_BITS[] = {
+    0xd8, 0xc6, 0xde, 0xde, 0xc7, 0xf8, 0xd1, 0xe2, 0xdc, 0xce, 0xcc,
+    0xcc, 0xc0, 0xc0, 0xd0, 0xc2, 0x00, 0xc0, 0xc0, 0xc0, 0xc0, 0xc0};
+
+static const unsigned char CLOUD_ISSUE_BITS[] = {
+    0x70, 0xc0, 0x88, 0xc0, 0x04, 0xc1, 0x04, 0xcf, 0x02, 0xd0, 0x01,
+    0xe0, 0x01, 0xe0, 0x01, 0xe0, 0xa2, 0xd0, 0x4c, 0xce, 0xa0, 0xc0};
+
+// Offline mode icon
+static unsigned char OFFLINE_BITS[] = {
+    0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x30, 0x00, 0x62, 0x00,
+    0xE6, 0x00, 0xFE, 0x1F, 0xFE, 0x1F, 0xE6, 0x00, 0x62, 0x00,
+    0x30, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+// {
+//   0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0x60, 0x00, 0x62, 0x00, 0xE2, 0x00,
+//   0xFE, 0x1F, 0xFE, 0x1F, 0xE2, 0x00, 0x62, 0x00, 0x60, 0x00, 0x30, 0x00,
+//   0x00, 0x00, 0x00, 0x00, };
 /**
  * @brief Show dashboard temperature and humdity
  *
  * @param hasStatus
  */
-void OledDisplay::showTempHum(bool hasStatus, char *buf, int buf_size) {
+void OledDisplay::showTempHum(bool hasStatus) {
+  char buf[10];
   /** Temperature */
   float temp = value.getCorrectedTempHum(Measurements::Temperature, 1);
   if (utils::isValidTemperature(temp)) {
@@ -23,22 +42,22 @@ void OledDisplay::showTempHum(bool hasStatus, char *buf, int buf_size) {
 
     if (config.isTemperatureUnitInF()) {
       if (hasStatus) {
-        snprintf(buf, buf_size, "%0.1f", t);
+        snprintf(buf, sizeof(buf), "%0.1f", t);
       } else {
-        snprintf(buf, buf_size, "%0.1f°F", t);
+        snprintf(buf, sizeof(buf), "%0.1f°F", t);
       }
     } else {
       if (hasStatus) {
-        snprintf(buf, buf_size, "%.1f", t);
+        snprintf(buf, sizeof(buf), "%.1f", t);
       } else {
-        snprintf(buf, buf_size, "%.1f°C", t);
+        snprintf(buf, sizeof(buf), "%.1f°C", t);
       }
     }
   } else { /** Show invalid value */
     if (config.isTemperatureUnitInF()) {
-      snprintf(buf, buf_size, "-°F");
+      snprintf(buf, sizeof(buf), "-°F");
     } else {
-      snprintf(buf, buf_size, "-°C");
+      snprintf(buf, sizeof(buf), "-°C");
     }
   }
   DISP()->drawUTF8(1, 10, buf);
@@ -46,9 +65,9 @@ void OledDisplay::showTempHum(bool hasStatus, char *buf, int buf_size) {
   /** Show humidity */
   int rhum = round(value.getCorrectedTempHum(Measurements::Humidity, 1));
   if (utils::isValidHumidity(rhum)) {
-    snprintf(buf, buf_size, "%d%%", rhum);
+    snprintf(buf, sizeof(buf), "%d%%", rhum);
   } else {
-    snprintf(buf, buf_size, "-%%");
+    snprintf(buf, sizeof(buf), "-%%");
   }
 
   if (rhum > 99.0) {
@@ -67,6 +86,9 @@ void OledDisplay::setCentralText(int y, const char *text) {
   DISP()->drawStr(x, y, text);
 }
 
+void OledDisplay::showIcon(int x, int y, xbm_icon_t *icon) {
+  DISP()->drawXBM(x, y, icon->width, icon->height, icon->icon);
+}
 /**
  * @brief Construct a new Ag Oled Display:: Ag Oled Display object
  *
@@ -252,36 +274,60 @@ void OledDisplay::setText(const char *line1, const char *line2,
  * @brief Update dashboard content
  *
  */
-void OledDisplay::showDashboard(void) { showDashboard(NULL); }
+void OledDisplay::showDashboard(void) { showDashboard(DashBoardStatusNone); }
 
 /**
  * @brief Update dashboard content and error status
  *
  */
-void OledDisplay::showDashboard(const char *status) {
+void OledDisplay::showDashboard(DashboardStatus status) {
   if (isDisplayOff) {
     return;
   }
 
   char strBuf[16];
+  const int icon_pos_x = 64;
+  xbm_icon_t xbm_icon = {
+      .width = 0,
+      .height = 0,
+      .icon = nullptr,
+  };
+
   if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     DISP()->firstPage();
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);
-      if ((status == NULL) || (strlen(status) == 0)) {
-        showTempHum(false, strBuf, sizeof(strBuf));
-      } else {
-        String strStatus = "Show status: " + String(status);
-        logInfo(strStatus);
-
-        int strWidth = DISP()->getStrWidth(status);
-        DISP()->drawStr((DISP()->getWidth() - strWidth) / 2, 10, status);
-
-        /** Show WiFi NA*/
-        if (strcmp(status, "WiFi N/A") == 0) {
-          DISP()->setFont(u8g2_font_t0_12_tf);
-          showTempHum(true, strBuf, sizeof(strBuf));
-        }
+      switch (status) {
+      case DashBoardStatusNone: {
+        // Maybe show signal strength?
+        showTempHum(false);
+        break;
+      }
+      case DashBoardStatusWiFiIssue: {
+        DISP()->drawXBM(icon_pos_x, 0, 14, 11, WIFI_ISSUE_BITS);
+        showTempHum(false);
+        break;
+      }
+      case DashBoardStatusServerIssue: {
+        DISP()->drawXBM(icon_pos_x, 0, 14, 11, CLOUD_ISSUE_BITS);
+        showTempHum(false);
+        break;
+      }
+      case DashBoardStatusAddToDashboard: {
+        setCentralText(10, "Add To Dashboard");
+        break;
+      }
+      case DashBoardStatusDeviceId: {
+        setCentralText(10, ag->deviceId().c_str());
+        break;
+      }
+      case DashBoardStatusOfflineMode: {
+        DISP()->drawXBM(icon_pos_x, 0, 14, 14, OFFLINE_BITS);
+        showTempHum(false); // First true
+        break;
+      }
+      default:
+        break;
       }
 
       /** Draw horizonal line */
@@ -392,7 +438,8 @@ void OledDisplay::showDashboard(const char *status) {
     float temp = value.getCorrectedTempHum(Measurements::Temperature, 1);
     if (utils::isValidTemperature(temp)) {
       if (config.isTemperatureUnitInF()) {
-        snprintf(strBuf, sizeof(strBuf), "T:%0.1f F", utils::degreeC_To_F(temp));
+        snprintf(strBuf, sizeof(strBuf), "T:%0.1f F",
+                 utils::degreeC_To_F(temp));
       } else {
         snprintf(strBuf, sizeof(strBuf), "T:%0.1f C", temp);
       }
@@ -442,8 +489,7 @@ void OledDisplay::setBrightness(int percent) {
       // Clear display.
       ag->display.clear();
       ag->display.show();
-    }
-    else {
+    } else {
       isDisplayOff = false;
       ag->display.setContrast((255 * percent) / 100);
     }

src/AgOledDisplay.h

@@ -16,17 +16,32 @@ private:
   Measurements &value;
   bool isDisplayOff = false;
 
-  void showTempHum(bool hasStatus, char* buf, int buf_size);
+  typedef struct {
+    int width;
+    int height;
+    unsigned char *icon;
+  } xbm_icon_t;
+
+  void showTempHum(bool hasStatus);
   void setCentralText(int y, String text);
   void setCentralText(int y, const char *text);
+  void showIcon(int x, int y, xbm_icon_t *icon);
 
 public:
-  OledDisplay(Configuration &config, Measurements &value,
-                Stream &log);
+  OledDisplay(Configuration &config, Measurements &value, Stream &log);
   ~OledDisplay();
 
+  enum DashboardStatus {
+    DashBoardStatusNone,
+    DashBoardStatusWiFiIssue,
+    DashBoardStatusServerIssue,
+    DashBoardStatusAddToDashboard,
+    DashBoardStatusDeviceId,
+    DashBoardStatusOfflineMode,
+  };
+
   void setAirGradient(AirGradient *ag);
-  bool begin(void); 
+  bool begin(void);
   void end(void);
   void setText(String &line1, String &line2, String &line3);
   void setText(const char *line1, const char *line2, const char *line3);
@@ -34,7 +49,7 @@ public:
   void setText(const char *line1, const char *line2, const char *line3,
                const char *line4);
   void showDashboard(void);
-  void showDashboard(const char *status);
+  void showDashboard(DashboardStatus status);
   void setBrightness(int percent);
 #ifdef ESP32
   void showFirmwareUpdateVersion(String version);

src/AgStateMachine.cpp

@@ -1,6 +1,7 @@
 #include "AgStateMachine.h"
+#include "AgOledDisplay.h"
 
-#define LED_TEST_BLINK_DELAY  50  /** ms */
+#define LED_TEST_BLINK_DELAY 50   /** ms */
 #define LED_FAST_BLINK_DELAY 250  /** ms */
 #define LED_SLOW_BLINK_DELAY 1000 /** ms */
 #define LED_SHORT_BLINK_DELAY 500 /** ms */
@@ -8,9 +9,9 @@
 
 #define SENSOR_CO2_CALIB_COUNTDOWN_MAX 5 /** sec */
 
-#define RGB_COLOR_R 255, 0, 0    /** Red */
-#define RGB_COLOR_G 0, 255, 0    /** Green */
-#define RGB_COLOR_Y 255, 150, 0  /** Yellow */
+#define RGB_COLOR_R 255, 0, 0   /** Red */
+#define RGB_COLOR_G 0, 255, 0   /** Green */
+#define RGB_COLOR_Y 255, 150, 0 /** Yellow */
 #define RGB_COLOR_O 255, 40, 0  /** Orange */
 #define RGB_COLOR_P 180, 0, 255 /** Purple */
 #define RGB_COLOR_CLEAR 0, 0, 0 /** No color */
@@ -50,7 +51,7 @@ void StateMachine::ledStatusBlinkDelay(uint32_t ms) {
 /**
  * @brief Led bar show PM or CO2 led color status
  *
- * @return true if all led bar are used, false othwerwise 
+ * @return true if all led bar are used, false othwerwise
  */
 bool StateMachine::sensorhandleLeds(void) {
   int totalLedUsed = 0;
@@ -82,7 +83,7 @@ bool StateMachine::sensorhandleLeds(void) {
 /**
  * @brief Show CO2 LED status
  *
- * @return return total number of led that are used on the monitor 
+ * @return return total number of led that are used on the monitor
  */
 int StateMachine::co2handleLeds(void) {
   int totalUsed = ag->ledBar.getNumberOfLeds();
@@ -166,8 +167,8 @@ int StateMachine::co2handleLeds(void) {
 
 /**
  * @brief Show PM2.5 LED status
- * 
- * @return return total number of led that are used on the monitor 
+ *
+ * @return return total number of led that are used on the monitor
  */
 int StateMachine::pm25handleLeds(void) {
   int totalUsed = ag->ledBar.getNumberOfLeds();
@@ -369,18 +370,17 @@ void StateMachine::ledBarTest(void) {
       } else {
         ledBarRunTest();
       }
-    }
-    else if(ag->isOpenAir()) {
+    } else if (ag->isOpenAir()) {
       ledBarRunTest();
     }
   }
 }
 
-void StateMachine::ledBarPowerUpTest(void) { 
+void StateMachine::ledBarPowerUpTest(void) {
   if (ag->isOne()) {
     ag->ledBar.clear();
   }
-  ledBarRunTest(); 
+  ledBarRunTest();
 }
 
 void StateMachine::ledBarRunTest(void) {
@@ -544,11 +544,11 @@ void StateMachine::displayHandle(AgStateMachineState state) {
     break;
   }
   case AgStateMachineWiFiLost: {
-    disp.showDashboard("WiFi N/A");
+    disp.showDashboard(OledDisplay::DashBoardStatusWiFiIssue);
     break;
   }
   case AgStateMachineServerLost: {
-    disp.showDashboard("AG Server N/A");
+    disp.showDashboard(OledDisplay::DashBoardStatusServerIssue);
     break;
   }
   case AgStateMachineSensorConfigFailed: {
@@ -557,19 +557,24 @@ void StateMachine::displayHandle(AgStateMachineState state) {
       if (ms >= 5000) {
         addToDashboardTime = millis();
         if (addToDashBoardToggle) {
-          disp.showDashboard("Add to AG Dashb.");
+          disp.showDashboard(OledDisplay::DashBoardStatusAddToDashboard);
         } else {
-          disp.showDashboard(ag->deviceId().c_str());
+          disp.showDashboard(OledDisplay::DashBoardStatusDeviceId);
         }
         addToDashBoardToggle = !addToDashBoardToggle;
       }
     } else {
-      disp.showDashboard("");
+      disp.showDashboard();
     }
     break;
   }
   case AgStateMachineNormal: {
-    disp.showDashboard();
+    if (config.isOfflineMode()) {
+      disp.showDashboard(
+          OledDisplay::DashBoardStatusOfflineMode);
+    } else {
+      disp.showDashboard();
+    }
     break;
   }
   case AgStateMachineCo2Calibration:

src/AgValue.cpp

@@ -2,8 +2,10 @@
 #include "AgConfigure.h"
 #include "AirGradient.h"
 #include "App/AppDef.h"
+#include <cmath>
+#include <sstream>
 
-#define json_prop_pmFirmware     "firmware"
+#define json_prop_pmFirmware "firmware"
 #define json_prop_pm01Ae "pm01"
 #define json_prop_pm25Ae "pm02"
 #define json_prop_pm10Ae "pm10"
@@ -31,7 +33,7 @@ Measurements::Measurements(Configuration &config) : config(config) {
 #ifndef ESP8266
   _resetReason = (int)ESP_RST_UNKNOWN;
 #endif
-  
+
   /* Set invalid value for each measurements as default value when initialized*/
   _temperature[0].update.avg = utils::getInvalidTemperature();
   _temperature[1].update.avg = utils::getInvalidTemperature();
@@ -49,7 +51,7 @@ Measurements::Measurements(Configuration &config) : config(config) {
   _pm_05_pc[1].update.avg = utils::getInvalidPmValue();
   _pm_5_pc[0].update.avg = utils::getInvalidPmValue();
   _pm_5_pc[1].update.avg = utils::getInvalidPmValue();
-  
+
   _pm_01[0].update.avg = utils::getInvalidPmValue();
   _pm_01_sp[0].update.avg = utils::getInvalidPmValue();
   _pm_01_pc[0].update.avg = utils::getInvalidPmValue();
@@ -74,6 +76,86 @@ Measurements::Measurements(Configuration &config) : config(config) {
 
 void Measurements::setAirGradient(AirGradient *ag) { this->ag = ag; }
 
+void Measurements::printCurrentAverage() {
+  Serial.println();
+  if (config.hasSensorS8) {
+    if (utils::isValidCO2(_co2.update.avg)) {
+      Serial.printf("CO2 = %.2f ppm\n", _co2.update.avg);
+    } else {
+      Serial.printf("CO2 = -\n");
+    }
+  }
+
+  if (config.hasSensorSHT) {
+    if (utils::isValidTemperature(_temperature[0].update.avg)) {
+      Serial.printf("Temperature = %.2f C\n", _temperature[0].update.avg);
+    } else {
+      Serial.printf("Temperature = -\n");
+    }
+    if (utils::isValidHumidity(_humidity[0].update.avg)) {
+      Serial.printf("Relative Humidity = %.2f\n", _humidity[0].update.avg);
+    } else {
+      Serial.printf("Relative Humidity = -\n");
+    }
+  }
+
+  if (config.hasSensorSGP) {
+    if (utils::isValidVOC(_tvoc.update.avg)) {
+      Serial.printf("TVOC Index = %.1f\n", _tvoc.update.avg);
+    } else {
+      Serial.printf("TVOC Index = -\n");
+    }
+    if (utils::isValidVOC(_tvoc_raw.update.avg)) {
+      Serial.printf("TVOC Raw = %.1f\n", _tvoc_raw.update.avg);
+    } else {
+      Serial.printf("TVOC Raw = -\n");
+    }
+    if (utils::isValidNOx(_nox.update.avg)) {
+      Serial.printf("NOx Index = %.1f\n", _nox.update.avg);
+    } else {
+      Serial.printf("NOx Index = -\n");
+    }
+    if (utils::isValidNOx(_nox_raw.update.avg)) {
+      Serial.printf("NOx Raw = %.1f\n", _nox_raw.update.avg);
+    } else {
+      Serial.printf("NOx Raw = -\n");
+    }
+  }
+
+  if (config.hasSensorPMS1) {
+    printCurrentPMAverage(1);
+    if (!config.hasSensorSHT) {
+      if (utils::isValidTemperature(_temperature[0].update.avg)) {
+        Serial.printf("[1] Temperature = %.2f C\n", _temperature[0].update.avg);
+      } else {
+        Serial.printf("[1] Temperature = -\n");
+      }
+      if (utils::isValidHumidity(_humidity[0].update.avg)) {
+        Serial.printf("[1] Relative Humidity = %.2f\n", _humidity[0].update.avg);
+      } else {
+        Serial.printf("[1] Relative Humidity = -\n");
+      }
+    }
+  }
+  if (config.hasSensorPMS2) {
+    printCurrentPMAverage(2);
+    if (!config.hasSensorSHT) {
+      if (utils::isValidTemperature(_temperature[1].update.avg)) {
+        Serial.printf("[2] Temperature = %.2f C\n", _temperature[1].update.avg);
+      } else {
+        Serial.printf("[2] Temperature = -\n");
+      }
+      if (utils::isValidHumidity(_humidity[1].update.avg)) {
+        Serial.printf("[2] Relative Humidity = %.2f\n", _humidity[1].update.avg);
+      } else {
+        Serial.printf("[2] Relative Humidity = -\n");
+      }
+    }
+  }
+
+  Serial.println();
+}
+
 void Measurements::maxPeriod(MeasurementType type, int max) {
   switch (type) {
   case Temperature:
@@ -568,6 +650,77 @@ String Measurements::measurementTypeStr(MeasurementType type) {
   return str;
 }
 
+void Measurements::printCurrentPMAverage(int ch) {
+  int idx = ch - 1;
+
+  if (utils::isValidPm(_pm_01[idx].update.avg)) {
+    Serial.printf("[%d] Atmospheric PM 1.0 = %.2f ug/m3\n", ch, _pm_01[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Atmospheric PM 1.0 = -\n", ch);
+  }
+  if (utils::isValidPm(_pm_25[idx].update.avg)) {
+    Serial.printf("[%d] Atmospheric PM 2.5 = %.2f ug/m3\n", ch, _pm_25[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Atmospheric PM 2.5 = -\n", ch);
+  }
+  if (utils::isValidPm(_pm_10[idx].update.avg)) {
+    Serial.printf("[%d] Atmospheric PM 10 = %.2f ug/m3\n", ch, _pm_10[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Atmospheric PM 10 = -\n", ch);
+  }
+  if (utils::isValidPm(_pm_01_sp[idx].update.avg)) {
+    Serial.printf("[%d] Standard Particle PM 1.0 = %.2f ug/m3\n", ch, _pm_01_sp[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Standard Particle PM 1.0 = -\n", ch);
+  }
+  if (utils::isValidPm(_pm_25_sp[idx].update.avg)) {
+    Serial.printf("[%d] Standard Particle PM 2.5 = %.2f ug/m3\n", ch, _pm_25_sp[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Standard Particle PM 2.5 = -\n", ch);
+  }
+  if (utils::isValidPm(_pm_10_sp[idx].update.avg)) {
+    Serial.printf("[%d] Standard Particle PM 10 = %.2f ug/m3\n", ch, _pm_10_sp[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Standard Particle PM 10 = -\n", ch);
+  }
+  if (utils::isValidPm03Count(_pm_03_pc[idx].update.avg)) {
+    Serial.printf("[%d] Particle Count 0.3 = %.1f\n", ch, _pm_03_pc[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Particle Count 0.3 = -\n", ch);
+  }
+  if (utils::isValidPm03Count(_pm_05_pc[idx].update.avg)) {
+    Serial.printf("[%d] Particle Count 0.5 = %.1f\n", ch, _pm_05_pc[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Particle Count 0.5 = -\n", ch);
+  }
+  if (utils::isValidPm03Count(_pm_01_pc[idx].update.avg)) {
+    Serial.printf("[%d] Particle Count 1.0 = %.1f\n", ch, _pm_01_pc[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Particle Count 1.0 = -\n", ch);
+  }
+  if (utils::isValidPm03Count(_pm_25_pc[idx].update.avg)) {
+    Serial.printf("[%d] Particle Count 2.5 = %.1f\n", ch, _pm_25_pc[idx].update.avg);
+  } else {
+    Serial.printf("[%d] Particle Count 2.5 = -\n", ch);
+  }
+
+  if (_pm_5_pc[idx].listValues.empty() == false) {
+    if (utils::isValidPm03Count(_pm_5_pc[idx].update.avg)) {
+      Serial.printf("[%d] Particle Count 5.0 = %.1f\n", ch, _pm_5_pc[idx].update.avg);
+    } else {
+      Serial.printf("[%d] Particle Count 5.0 = -\n", ch);
+    }
+  }
+
+  if (_pm_10_pc[idx].listValues.empty() == false) {
+    if (utils::isValidPm03Count(_pm_10_pc[idx].update.avg)) {
+      Serial.printf("[%d] Particle Count 10 = %.1f\n", ch, _pm_10_pc[idx].update.avg);
+    } else {
+      Serial.printf("[%d] Particle Count 10 = -\n", ch);
+    }
+  }
+}
+
 void Measurements::validateChannel(int ch) {
   if (ch != 1 && ch != 2) {
     Serial.printf("ERROR! Channel %d is undefined. Only channel 1 or 2 is the optional value!", ch);
@@ -686,6 +839,155 @@ float Measurements::getCorrectedPM25(bool useAvg, int ch, bool forceCorrection)
   return corrected;
 }
 
+Measurements::Measures Measurements::getMeasures() {
+  Measures mc;
+  mc.bootCount = _bootCount;
+  mc.freeHeap = ESP.getFreeHeap();
+  // co2, tvoc, nox
+  mc.co2 = _co2.update.avg;
+  mc.tvoc = _tvoc.update.avg;
+  mc.tvoc_raw = _tvoc_raw.update.avg;
+  mc.nox = _nox.update.avg;
+  mc.nox_raw = _nox_raw.update.avg;
+  // Temperature & Humidity
+  mc.temperature[0] = _temperature[0].update.avg;
+  mc.humidity[0] = _humidity[0].update.avg;
+  mc.temperature[1] = _temperature[1].update.avg;
+  mc.humidity[1] = _humidity[1].update.avg;
+  // PM atmospheric
+  mc.pm_01[0] = _pm_01[0].update.avg;
+  mc.pm_25[0] = _pm_25[0].update.avg;
+  mc.pm_10[0] = _pm_10[0].update.avg;
+  mc.pm_01[1] = _pm_01[1].update.avg;
+  mc.pm_25[1] = _pm_25[1].update.avg;
+  mc.pm_10[1] = _pm_10[1].update.avg;
+  // PM standard particle
+  mc.pm_01_sp[0] = _pm_01_sp[0].update.avg;
+  mc.pm_25_sp[0] = _pm_25_sp[0].update.avg;
+  mc.pm_10_sp[0] = _pm_10_sp[0].update.avg;
+  mc.pm_01_sp[1] = _pm_01_sp[1].update.avg;
+  mc.pm_25_sp[1] = _pm_25_sp[1].update.avg;
+  mc.pm_10_sp[1] = _pm_10_sp[1].update.avg;
+  // Particle Count
+  mc.pm_03_pc[0] = _pm_03_pc[0].update.avg;
+  mc.pm_05_pc[0] = _pm_05_pc[0].update.avg;
+  mc.pm_01_pc[0] = _pm_01_pc[0].update.avg;
+  mc.pm_25_pc[0] = _pm_25_pc[0].update.avg;
+  mc.pm_5_pc[0] = _pm_5_pc[0].update.avg;
+  mc.pm_10_pc[0] = _pm_10_pc[0].update.avg;
+  mc.pm_03_pc[1] = _pm_03_pc[1].update.avg;
+  mc.pm_05_pc[1] = _pm_05_pc[1].update.avg;
+  mc.pm_01_pc[1] = _pm_01_pc[1].update.avg;
+  mc.pm_25_pc[1] = _pm_25_pc[1].update.avg;
+  mc.pm_5_pc[1] = _pm_5_pc[1].update.avg;
+  mc.pm_10_pc[1] = _pm_10_pc[1].update.avg;
+
+  return mc;
+}
+
+std::string Measurements::buildMeasuresPayload(Measures &mc) {
+  std::ostringstream oss;
+
+  // CO2
+  if (utils::isValidCO2(mc.co2)) {
+    oss << std::round(mc.co2);
+  }
+
+  oss << ",";
+
+  // Temperature 
+  if (utils::isValidTemperature(mc.temperature[0]) && utils::isValidTemperature(mc.temperature[1])) {
+    float temp = (mc.temperature[0] + mc.temperature[1]) / 2.0f;
+    oss << std::round(temp * 10);
+  } else if (utils::isValidTemperature(mc.temperature[0])) {
+    oss << std::round(mc.temperature[0] * 10);
+  } else if (utils::isValidTemperature(mc.temperature[1])) {
+    oss << std::round(mc.temperature[1] * 10);
+  }
+
+  oss << ",";
+
+  // Humidity
+  if (utils::isValidHumidity(mc.humidity[0]) && utils::isValidHumidity(mc.humidity[1])) {
+    float hum = (mc.humidity[0] + mc.humidity[1]) / 2.0f;
+    oss << std::round(hum * 10);
+  } else if (utils::isValidHumidity(mc.humidity[0])) {
+    oss << std::round(mc.humidity[0] * 10);
+  } else if (utils::isValidHumidity(mc.humidity[1])) {
+    oss << std::round(mc.humidity[1] * 10);
+  }
+
+  oss << ",";
+
+  /// PM1.0 atmospheric environment
+  if (utils::isValidPm(mc.pm_01[0]) && utils::isValidPm(mc.pm_01[1])) {
+    float pm01 = (mc.pm_01[0] + mc.pm_01[1]) / 2.0f;
+    oss << std::round(pm01 * 10);
+  } else if (utils::isValidPm(mc.pm_01[0])) {
+    oss << std::round(mc.pm_01[0] * 10);
+  } else if (utils::isValidPm(mc.pm_01[1])) {
+    oss << std::round(mc.pm_01[1] * 10);
+  }
+
+  oss << ",";
+
+  /// PM2.5 atmospheric environment
+  if (utils::isValidPm(mc.pm_25[0]) && utils::isValidPm(mc.pm_25[1])) {
+    float pm25 = (mc.pm_25[0] + mc.pm_25[1]) / 2.0f;
+    oss << std::round(pm25 * 10);
+  } else if (utils::isValidPm(mc.pm_25[0])) {
+    oss << std::round(mc.pm_25[0] * 10);
+  } else if (utils::isValidPm(mc.pm_25[1])) {
+    oss << std::round(mc.pm_25[1] * 10);
+  }
+
+  oss << ",";
+
+  /// PM10 atmospheric environment
+  if (utils::isValidPm(mc.pm_10[0]) && utils::isValidPm(mc.pm_10[1])) {
+    float pm10 = (mc.pm_10[0] + mc.pm_10[1]) / 2.0f;
+    oss << std::round(pm10 * 10);
+  } else if (utils::isValidPm(mc.pm_10[0])) {
+    oss << std::round(mc.pm_10[0] * 10);
+  } else if (utils::isValidPm(mc.pm_10[1])) {
+    oss << std::round(mc.pm_10[1] * 10);
+  }
+
+  oss << ",";
+
+  // TVOC
+  if (utils::isValidVOC(mc.tvoc)) {
+    oss << std::round(mc.tvoc);
+  }
+
+  oss << ",";
+
+  // NOx
+  if (utils::isValidNOx(mc.nox)) {
+    oss << std::round(mc.nox);
+  }
+
+  oss << ",";
+
+  /// PM 0.3 particle count
+  if (utils::isValidPm03Count(mc.pm_03_pc[0]) && utils::isValidPm03Count(mc.pm_03_pc[1])) {
+    oss << std::round((mc.pm_03_pc[0] + mc.pm_03_pc[1]) / 2.0f);
+  } else if (utils::isValidPm03Count(mc.pm_03_pc[0])) {
+    oss << std::round(mc.pm_03_pc[0]);
+  } else if (utils::isValidPm03Count(mc.pm_03_pc[1])) {
+    oss << std::round(mc.pm_03_pc[1]);
+  }
+
+  oss << ",";
+
+  if (mc.signal < 0) {
+    oss << mc.signal;
+  }
+
+  return oss.str();
+}
+
+
 String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi) {
   JSONVar root;
 
@@ -1219,4 +1521,4 @@ void Measurements::setResetReason(esp_reset_reason_t reason) {
 
   _resetReason = (int)reason;
 }
-#endif
+#endif

src/AgValue.h

@@ -7,6 +7,7 @@
 #include "Libraries/Arduino_JSON/src/Arduino_JSON.h"
 #include "Main/utils.h"
 #include <Arduino.h>
+#include <cstdint>
 #include <vector>
 
 class Measurements {
@@ -37,6 +38,31 @@ public:
   Measurements(Configuration &config);
   ~Measurements() {}
 
+  struct Measures {
+    float temperature[2];
+    float humidity[2];
+    float co2;
+    float tvoc; // Index value
+    float tvoc_raw;
+    float nox; // Index value
+    float nox_raw;
+    float pm_01[2];    // pm 1.0 atmospheric environment
+    float pm_25[2];    // pm 2.5 atmospheric environment
+    float pm_10[2];    // pm 10 atmospheric environment
+    float pm_01_sp[2]; // pm 1.0 standard particle
+    float pm_25_sp[2]; // pm 2.5 standard particle
+    float pm_10_sp[2]; // pm 10 standard particle
+    float pm_03_pc[2]; // particle count 0.3
+    float pm_05_pc[2]; // particle count 0.5
+    float pm_01_pc[2]; // particle count 1.0
+    float pm_25_pc[2]; // particle count 2.5
+    float pm_5_pc[2];  // particle count 5.0
+    float pm_10_pc[2]; // particle count 10
+    int bootCount;
+    int signal;
+    uint32_t freeHeap;
+  };
+
   void setAirGradient(AirGradient *ag);
 
   // Enumeration for every AG measurements
@@ -62,6 +88,8 @@ public:
     PM10_PC, // Particle 10 count
   };
 
+  void printCurrentAverage();
+
   /**
    * @brief Set each MeasurementType maximum period length for moving average
    *
@@ -154,6 +182,10 @@ public:
    */
   String toString(bool localServer, AgFirmwareMode fwMode, int rssi);
 
+  Measures getMeasures();
+
+  std::string buildMeasuresPayload(Measures &measures);
+
   /**
    * Set to true if want to debug every update value
    */
@@ -228,6 +260,8 @@ private:
    */
   void validateChannel(int ch);
 
+  void printCurrentPMAverage(int ch);
+
   JSONVar buildOutdoor(bool localServer, AgFirmwareMode fwMode);
   JSONVar buildIndoor(bool localServer);
   JSONVar buildPMS(int ch, bool allCh, bool withTempHum, bool compensate);

src/AirGradient.h

@@ -15,9 +15,10 @@
 #include "Main/utils.h"
 
 #ifndef GIT_VERSION
-#define GIT_VERSION "3.2.0-snap"
+#define GIT_VERSION "3.3.9-snap"
 #endif
 
+
 #ifndef ESP8266
 // Airgradient server root ca certificate
 const char *const AG_SERVER_ROOT_CA =

src/OtaHandler.cpp

@@ -1,171 +0,0 @@
-#include "OtaHandler.h"
-
-#ifndef ESP8266 // Only for esp32 based mcu
-
-#include "AirGradient.h"
-
-void OtaHandler::setHandlerCallback(OtaHandlerCallback_t callback) { _callback = callback; }
-
-void OtaHandler::updateFirmwareIfOutdated(String deviceId) {
-  String url =
-      "https://hw.airgradient.com/sensors/airgradient:" + deviceId + "/generic/os/firmware.bin";
-  url += "?current_firmware=";
-  url += GIT_VERSION;
-  char urlAsChar[URL_BUF_SIZE];
-  url.toCharArray(urlAsChar, URL_BUF_SIZE);
-  Serial.printf("checking for new OTA update @ %s\n", urlAsChar);
-
-  esp_http_client_config_t config = {};
-  config.url = urlAsChar;
-  config.cert_pem = AG_SERVER_ROOT_CA;
-  OtaUpdateOutcome ret = attemptToPerformOta(&config);
-  Serial.println(ret);
-  if (_callback) {
-    switch (ret) {
-    case OtaUpdateOutcome::UPDATE_PERFORMED:
-      _callback(OtaState::OTA_STATE_SUCCESS, "");
-      break;
-    case OtaUpdateOutcome::UPDATE_SKIPPED:
-      _callback(OtaState::OTA_STATE_SKIP, "");
-      break;
-    case OtaUpdateOutcome::ALREADY_UP_TO_DATE:
-      _callback(OtaState::OTA_STATE_UP_TO_DATE, "");
-      break;
-    case OtaUpdateOutcome::UPDATE_FAILED:
-      _callback(OtaState::OTA_STATE_FAIL, "");
-      break;
-    default:
-      break;
-    }
-  }
-}
-
-OtaHandler::OtaUpdateOutcome
-OtaHandler::attemptToPerformOta(const esp_http_client_config_t *config) {
-  esp_http_client_handle_t client = esp_http_client_init(config);
-  if (client == NULL) {
-    Serial.println("Failed to initialize HTTP connection");
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-
-  esp_err_t err = esp_http_client_open(client, 0);
-  if (err != ESP_OK) {
-    esp_http_client_cleanup(client);
-    Serial.printf("Failed to open HTTP connection: %s\n", esp_err_to_name(err));
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-  esp_http_client_fetch_headers(client);
-
-  int httpStatusCode = esp_http_client_get_status_code(client);
-  if (httpStatusCode == 304) {
-    Serial.println("Firmware is already up to date");
-    cleanupHttp(client);
-    return OtaUpdateOutcome::ALREADY_UP_TO_DATE;
-  } else if (httpStatusCode != 200) {
-    Serial.printf("Firmware update skipped, the server returned %d\n", httpStatusCode);
-    cleanupHttp(client);
-    return OtaUpdateOutcome::UPDATE_SKIPPED;
-  }
-
-  esp_ota_handle_t update_handle = 0;
-  const esp_partition_t *update_partition = NULL;
-  Serial.println("Starting OTA update ...");
-  update_partition = esp_ota_get_next_update_partition(NULL);
-  if (update_partition == NULL) {
-    Serial.println("Passive OTA partition not found");
-    cleanupHttp(client);
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-  Serial.printf("Writing to partition subtype %d at offset 0x%x\n", update_partition->subtype,
-                update_partition->address);
-
-  err = esp_ota_begin(update_partition, OTA_SIZE_UNKNOWN, &update_handle);
-  if (err != ESP_OK) {
-    Serial.printf("esp_ota_begin failed, error=%d\n", err);
-    cleanupHttp(client);
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-
-  esp_err_t ota_write_err = ESP_OK;
-  char *upgrade_data_buf = (char *)malloc(OTA_BUF_SIZE);
-  if (!upgrade_data_buf) {
-    Serial.println("Couldn't allocate memory for data buffer");
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-
-  int binary_file_len = 0;
-  int totalSize = esp_http_client_get_content_length(client);
-  Serial.println("File size: " + String(totalSize) + String(" bytes"));
-
-  // Show display start update new firmware.
-  if (_callback) {
-    _callback(OtaState::OTA_STATE_BEGIN, "");
-  }
-
-  // Download file and write new firmware to OTA partition
-  uint32_t lastUpdate = millis();
-  while (1) {
-    int data_read = esp_http_client_read(client, upgrade_data_buf, OTA_BUF_SIZE);
-    if (data_read == 0) {
-      if (_callback) {
-        _callback(OtaState::OTA_STATE_PROCESSING, String(100));
-      }
-      Serial.println("Connection closed, all data received");
-      break;
-    }
-    if (data_read < 0) {
-      Serial.println("Data read error");
-      if (_callback) {
-        _callback(OtaState::OTA_STATE_FAIL, "");
-      }
-      break;
-    }
-    if (data_read > 0) {
-      ota_write_err = esp_ota_write(update_handle, (const void *)upgrade_data_buf, data_read);
-      if (ota_write_err != ESP_OK) {
-        if (_callback) {
-          _callback(OtaState::OTA_STATE_FAIL, "");
-        }
-        break;
-      }
-      binary_file_len += data_read;
-
-      int percent = (binary_file_len * 100) / totalSize;
-      uint32_t ms = (uint32_t)(millis() - lastUpdate);
-      if (ms >= 250) {
-        // sm.executeOTA(StateMachine::OtaState::OTA_STATE_PROCESSING, "",
-        //               percent);
-        if (_callback) {
-          _callback(OtaState::OTA_STATE_PROCESSING, String(percent));
-        }
-        lastUpdate = millis();
-      }
-    }
-  }
-  free(upgrade_data_buf);
-  cleanupHttp(client);
-  Serial.printf("# of bytes written: %d\n", binary_file_len);
-
-  esp_err_t ota_end_err = esp_ota_end(update_handle);
-  if (ota_write_err != ESP_OK) {
-    Serial.printf("Error: esp_ota_write failed! err=0x%d\n", err);
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  } else if (ota_end_err != ESP_OK) {
-    Serial.printf("Error: esp_ota_end failed! err=0x%d. Image is invalid", ota_end_err);
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-
-  err = esp_ota_set_boot_partition(update_partition);
-  if (err != ESP_OK) {
-    Serial.printf("esp_ota_set_boot_partition failed! err=0x%d\n", err);
-    return OtaUpdateOutcome::UPDATE_FAILED;
-  }
-  return OtaUpdateOutcome::UPDATE_PERFORMED;
-}
-
-void OtaHandler::cleanupHttp(esp_http_client_handle_t client) {
-  esp_http_client_close(client);
-  esp_http_client_cleanup(client);
-}
-
-#endif

src/OtaHandler.h

@@ -1,43 +0,0 @@
-#ifndef OTA_HANDLER_H
-#define OTA_HANDLER_H
-#ifndef ESP8266 // Only for esp32 based mcu
-
-#include <Arduino.h>
-#include <esp_err.h>
-#include <esp_http_client.h>
-#include <esp_ota_ops.h>
-
-#define OTA_BUF_SIZE 1024
-#define URL_BUF_SIZE 256
-
-class OtaHandler {
-public:
-  enum OtaState {
-    OTA_STATE_BEGIN,
-    OTA_STATE_FAIL,
-    OTA_STATE_SKIP,
-    OTA_STATE_UP_TO_DATE,
-    OTA_STATE_PROCESSING,
-    OTA_STATE_SUCCESS
-  };
-
-  typedef void (*OtaHandlerCallback_t)(OtaState state, String message);
-  void setHandlerCallback(OtaHandlerCallback_t callback);
-  void updateFirmwareIfOutdated(String deviceId);
-
-private:
-  OtaHandlerCallback_t _callback;
-
-  enum OtaUpdateOutcome {
-    UPDATE_PERFORMED = 0,
-    ALREADY_UP_TO_DATE,
-    UPDATE_FAILED,
-    UPDATE_SKIPPED
-  }; // Internal use
-
-  OtaUpdateOutcome attemptToPerformOta(const esp_http_client_config_t *config);
-  void cleanupHttp(esp_http_client_handle_t client);
-};
-
-#endif // ESP8266
-#endif //  OTA_HANDLER_H

src/Sgp41/Sgp41.cpp

@@ -131,6 +131,22 @@ void Sgp41::handle(void) {
 }
 
 #else
+
+void Sgp41::pause() {
+  onPause = true;
+  Serial.println("Pausing SGP41 handler task");
+  // Set latest value to invalid
+  tvocRaw = utils::getInvalidVOC();
+  tvoc = utils::getInvalidVOC();
+  noxRaw = utils::getInvalidNOx();
+  nox = utils::getInvalidNOx();
+} 
+
+void Sgp41::resume() {
+  onPause = false;
+  Serial.println("Resuming SGP41 handler task");
+}
+
 /**
  * @brief Handle the sensor conditioning and run time udpate value, This method
  * must not call, it's called on private task
@@ -152,6 +168,11 @@ void Sgp41::_handle(void) {
   uint16_t srawVoc, srawNox;
   for (;;) {
     vTaskDelay(pdMS_TO_TICKS(1000));
+
+    if (onPause) {
+      continue;
+    }
+
     if (getRawSignal(srawVoc, srawNox)) {
       tvocRaw = srawVoc;
       noxRaw = srawNox;

src/Sgp41/Sgp41.h

@@ -18,6 +18,10 @@ public:
   bool begin(TwoWire &wire, Stream &stream);
   void handle(void);
 #else
+  /* pause _handle task to read sensor */
+  void pause();
+  /* resume _handle task to read sensor */
+  void resume();
   void _handle(void);
 #endif
   void end(void);
@@ -32,6 +36,7 @@ public:
   int getTvocLearningOffset(void);
 
 private:
+  bool onPause = false;
   bool onConditioning = true;
   bool ready = false;
   bool _isBegin = false;