Update OpenAir provision ready led pattern

Feed watchdog when BLE client is connected
Replace BT icon with BLE text blinking
2025-12-17 19:18:27 +01:00 · 2025-12-05 23:45:14 +07:00 · 2025-12-04 11:32:30 +07:00 · 2025-12-04 10:41:17 +07:00 · 2025-11-29 22:29:07 +07:00 · 2025-11-29 21:49:32 +07:00
43 changed files with 1400 additions and 1973 deletions
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -1,5 +1,36 @@
 on: [push, pull_request]
 jobs:
+  trailing-whitespace:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4.2.2
+        with:
+          fetch-depth: 0
+      - name: Check for trailing whitespace
+        run: |
+          set -u
+
+          # Don't enforce checks on vendored libraries.
+          readonly EXCLUDED_DIR='src/Libraries'
+
+          has_trailing_whitespace=false
+
+          while read -r line; do
+            if grep \
+              "\s$" \
+              --line-number \
+              --with-filename \
+              --binary-files=without-match \
+              "${line}"; then
+              has_trailing_whitespace=true
+            fi
+          done < <(git ls-files | grep --invert-match "^${EXCLUDED_DIR}/")
+
+          if [ "$has_trailing_whitespace" = true ]; then
+            echo "ERROR: Found trailing whitespace"
+            exit 1
+          fi
+
  compile:
    strategy:
      fail-fast: false
@@ -38,6 +69,7 @@ jobs:
    steps:
      - uses: actions/checkout@v4.2.2
        with:
+          fetch-depth: 0
          submodules: 'true'
      - uses: arduino/compile-sketches@v1.1.2
        with:
--- a/.gitignore
+++ b/.gitignore
@@ -4,5 +4,7 @@ build
 /.idea/
 .pio
 .cache
+.clangd
 logs
-
+gen_compile_commands.py
+compile_commands.json
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "src/Libraries/airgradient-client"]
 	path = src/Libraries/airgradient-client
-	url = git@github.com:airgradienthq/airgradient-client.git
+	url = ../../airgradienthq/airgradient-client.git
 [submodule "src/Libraries/airgradient-ota"]
 	path = src/Libraries/airgradient-ota
-	url = git@github.com:airgradienthq/airgradient-ota.git
+	url = ../../airgradienthq/airgradient-ota.git
--- a/README.md
+++ b/README.md
@@ -20,13 +20,32 @@ Make sure you have exactly the versions of libraries and boards installed as des

 If you have an older version of the AirGradient PCB not mentioned in the example files, please downgrade this library to version 2.4.15 to support these legacy boards.

+### Release Process
+
+Releases published on GitHub are **not immediately deployed to all devices in the market**. Each release first goes through internal testing, including limited deployments in select locations to verify stability and functionality.
+
+If the tests pass, the firmware is then made available for:
+- **FOTA (Firmware Over-The-Air) updates** from AirGradient dashboard
+- **Manual flashing** via [Airgradient](https://www.airgradient.com/documentation/firmwares/) website
+
+Each GitHub release note will also include the planned rollout date for wider availability.
+
 ## Help & Support

 If you have any questions or problems, check out [our forum](https://forum.airgradient.com/).

-## Documentation
+## Development

-Local server API documentation is available in [/docs/local-server.md](/docs/local-server.md) and AirGradient server API on [https://api.airgradient.com/public/docs/api/v1/](https://api.airgradient.com/public/docs/api/v1/).
+* See [compilation instructions](/docs/howto-compile.md) for details about how to customize AirGradient's firmware and flash it to your device.
+
+## Over the air (OTA) updates
+
+* See the [OTA Updates documentation](/docs/ota-updates.md) for details about how AirGradient monitors receive over the air updates.
+
+## API documentation
+
+* [Local server API documentation](/docs/local-server.md)
+* [AirGradient Cloud server API documentation](https://api.airgradient.com/public/docs/api/v1/).

 ## The following libraries have been integrated into this library for ease of use

--- a/compile_commands.json
+++ b/compile_commands.json
--- a/docs/howto-compile.md
+++ b/docs/howto-compile.md
@@ -90,7 +90,7 @@ Choose based on how python installed on your machine. But most user, using `apt`

 ## 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.
+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 which you plan to contribute back to the main project, instead of installing the AirGradient library, check out the repository at Documents/Arduino/libraries (for Windows and Mac) or ~/Arduino/libraries (for 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`

@@ -100,6 +100,3 @@ There are 2 environment options to compile this project, PlatformIO and ArduinoI

 - 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
-
-
-
--- a/docs/local-server.md
+++ b/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,
@@ -107,7 +108,6 @@ Compensated values apply correction algorithms to make the sensor values more ac
      "slr": {}
    }
  }
-  }
 }
 ```

@@ -146,7 +146,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 +155,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**
--- a/examples/BASIC/BASIC.ino
+++ b/examples/BASIC/BASIC.ino
@@ -294,7 +294,7 @@ static bool sgp41Init(void) {
    configuration.hasSensorSGP = true;
    return true;
  } else {
-    Serial.println("Init SGP41 failuire");
+    Serial.println("Init SGP41 failure");
    configuration.hasSensorSGP = false;
  }
  return false;
--- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
+++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
@@ -351,7 +351,7 @@ static bool sgp41Init(void) {
    configuration.hasSensorSGP = true;
    return true;
  } else {
-    Serial.println("Init SGP41 failuire");
+    Serial.println("Init SGP41 failure");
    configuration.hasSensorSGP = false;
  }
  return false;
--- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
+++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
@@ -374,7 +374,7 @@ static bool sgp41Init(void) {
    configuration.hasSensorSGP = true;
    return true;
  } else {
-    Serial.println("Init SGP41 failuire");
+    Serial.println("Init SGP41 failure");
    configuration.hasSensorSGP = false;
  }
  return false;
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -26,7 +26,6 @@ https://forum.airgradient.com/
 CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License

 */
-
 #include "AgConfigure.h"
 #include "AgSchedule.h"
 #include "AgStateMachine.h"
@@ -37,6 +36,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #include "Arduino.h"
 #include "EEPROM.h"
 #include "ESPmDNS.h"
+#include "Libraries/airgradient-client/src/common.h"
 #include "LocalServer.h"
 #include "MqttClient.h"
 #include "OpenMetrics.h"
@@ -45,6 +45,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #include <HardwareSerial.h>
 #include <WebServer.h>
 #include <WiFi.h>
+#include <cstdint>
 #include <string>

 #include "Libraries/airgradient-client/src/agSerial.h"
@@ -65,7 +66,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #define WIFI_TRANSMISSION_INTERVAL 1 * 60000               /** ms */
 #define CELLULAR_SERVER_CONFIG_SYNC_INTERVAL 30 * 60000    /** ms */
 #define CELLULAR_MEASUREMENT_INTERVAL 3 * 60000            /** ms */
-#define CELLULAR_TRANSMISSION_INTERVAL 9 * 60000       /** ms */
+#define CELLULAR_TRANSMISSION_INTERVAL 3 * 60000           /** ms */
 #define MQTT_SYNC_INTERVAL 60000                           /** ms */
 #define SENSOR_CO2_CALIB_COUNTDOWN_MAX 5                   /** sec */
 #define SENSOR_TVOC_UPDATE_INTERVAL 1000                   /** ms */
@@ -74,7 +75,10 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #define SENSOR_TEMP_HUM_UPDATE_INTERVAL 6000               /** ms */
 #define DISPLAY_DELAY_SHOW_CONTENT_MS 2000                 /** ms */
 #define FIRMWARE_CHECK_FOR_UPDATE_MS (60 * 60 * 1000)      /** ms */
+#define TIME_TO_START_POWER_CYCLE_CELLULAR_MODULE (1 * 60) /** minutes */
+#define TIMEOUT_WAIT_FOR_CELLULAR_MODULE_READY (2 * 60)    /** minutes */

+#define MEASUREMENT_TRANSMIT_CYCLE 3
 #define MAXIMUM_MEASUREMENT_CYCLE_QUEUE 80
 #define RESERVED_MEASUREMENT_CYCLE_CAPACITY 10

@@ -88,35 +92,36 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #define GPIO_EXPANSION_CARD_POWER 4
 #define GPIO_IIC_RESET 3

+#define MINUTES() ((uint32_t)(esp_timer_get_time() / 1000 / 1000 / 60))
+
 static MqttClient mqttClient(Serial);
 static TaskHandle_t mqttTask = NULL;
 static Configuration configuration(Serial);
 static Measurements measurements(configuration);
 static AirGradient *ag;
 static OledDisplay oledDisplay(configuration, measurements, Serial);
-static StateMachine stateMachine(oledDisplay, Serial, measurements,
-                                 configuration);
-static WifiConnector wifiConnector(oledDisplay, Serial, stateMachine,
-                                   configuration);
+static StateMachine stateMachine(oledDisplay, Serial, measurements, configuration);
+static WifiConnector wifiConnector(oledDisplay, Serial, stateMachine, configuration);
 static OpenMetrics openMetrics(measurements, configuration, wifiConnector);
-static LocalServer localServer(Serial, openMetrics, measurements, configuration,
-                               wifiConnector);
+static LocalServer localServer(Serial, openMetrics, measurements, configuration, wifiConnector);
 static AgSerial *agSerial;
-static CellularModule *cell;
+static CellularModule *cellularCard;
 static AirgradientClient *agClient;

-enum NetworkOption {
-  UseWifi,
-  UseCellular
-};
+enum NetworkOption { UseWifi, UseCellular };
 NetworkOption networkOption;
 TaskHandle_t handleNetworkTask = NULL;
-static bool otaInProgress = false;
+static bool firmwareUpdateInProgress = false;

 static uint32_t factoryBtnPressTime = 0;
 static AgFirmwareMode fwMode = FW_MODE_I_9PSL;
 static bool ledBarButtonTest = false;
 static String fwNewVersion;
+static int lastCellSignalQuality = 99; // CSQ
+
+// Default value is 0, indicate its not started yet
+// In minutes
+uint32_t agCeClientProblemDetectedTime = 0;

 SemaphoreHandle_t mutexMeasurementCycleQueue;
 static std::vector<Measurements::Measures> measurementCycleQueue;
@@ -132,6 +137,7 @@ static void updatePm(void);
 static void sendDataToServer(void);
 static void tempHumUpdate(void);
 static void co2Update(void);
+static void printMeasurements();
 static void mdnsInit(void);
 static void createMqttTask(void);
 static void initMqtt(void);
@@ -145,12 +151,12 @@ static void displayExecuteOta(AirgradientOTA::OtaResult result, String msg, int
 static int calculateMaxPeriod(int updateInterval);
 static void setMeasurementMaxPeriod();
 static void newMeasurementCycle();
+static void restartIfCeClientIssueOverTwoHours();
 static void networkSignalCheck();
 static void networkingTask(void *args);

 AgSchedule dispLedSchedule(DISP_UPDATE_INTERVAL, updateDisplayAndLedBar);
-AgSchedule configSchedule(WIFI_SERVER_CONFIG_SYNC_INTERVAL,
-                          configurationUpdateSchedule);
+AgSchedule configSchedule(WIFI_SERVER_CONFIG_SYNC_INTERVAL, configurationUpdateSchedule);
 AgSchedule transmissionSchedule(WIFI_TRANSMISSION_INTERVAL, sendDataToServer);
 AgSchedule measurementSchedule(WIFI_MEASUREMENT_INTERVAL, newMeasurementCycle);
 AgSchedule co2Schedule(SENSOR_CO2_UPDATE_INTERVAL, co2Update);
@@ -160,6 +166,7 @@ AgSchedule tvocSchedule(SENSOR_TVOC_UPDATE_INTERVAL, updateTvoc);
 AgSchedule watchdogFeedSchedule(60000, wdgFeedUpdate);
 AgSchedule checkForUpdateSchedule(FIRMWARE_CHECK_FOR_UPDATE_MS, checkForFirmwareUpdate);
 AgSchedule networkSignalCheckSchedule(10000, networkSignalCheck);
+AgSchedule printMeasurementsSchedule(6000, printMeasurements);

 void setup() {
  /** Serial for print debug message */
@@ -179,6 +186,7 @@ void setup() {

  /** Initialize local configure */
  configuration.begin();
+  configuration.setConfigurationUpdatedCallback(configUpdateHandle);

  /** Init I2C */
  Wire.begin(I2C_SDA_PIN, I2C_SCL_PIN);
@@ -198,7 +206,7 @@ void setup() {
  oledDisplay.setAirGradient(ag);
  stateMachine.setAirGradient(ag);
  wifiConnector.setAirGradient(ag);
-  openMetrics.setAirGradient(ag, agClient);
+  openMetrics.setAirGradient(ag);
  localServer.setAirGraident(ag);
  measurements.setAirGradient(ag);

@@ -206,24 +214,19 @@ void setup() {
  boardInit();
  setMeasurementMaxPeriod();

-  // Comment below line to disable debug measurement readings
-  measurements.setDebug(true);
-
  bool connectToNetwork = true;
  if (ag->isOne()) { // Offline mode only available for indoor monitor
    /** Show message confirm offline mode, should me perform if LED bar button
     * test pressed */
    if (ledBarButtonTest == false) {
-      oledDisplay.setText(
-          "Press now for",
+      oledDisplay.setText("Press now for",
                          configuration.isOfflineMode() ? "online mode" : "offline mode", "");
      uint32_t startTime = millis();
      while (true) {
        if (ag->button.getState() == ag->button.BUTTON_PRESSED) {
          configuration.setOfflineMode(!configuration.isOfflineMode());

-          oledDisplay.setText(
-              "Offline Mode",
+          oledDisplay.setText("Offline Mode",
                              configuration.isOfflineMode() ? " = True" : "  = False", "");
          delay(1000);
          break;
@@ -244,12 +247,7 @@ void setup() {
  if (connectToNetwork) {
    oledDisplay.setText("Initialize", "network...", "");
    initializeNetwork();
-  }
-
-  /** Set offline mode without saving, cause wifi is not configured */
-  if (wifiConnector.hasConfigurated() == false && networkOption == UseWifi) {
-    Serial.println("Set offline mode cause wifi is not configurated");
-    configuration.setOfflineModeWithoutSave(true);
+    wifiConnector.stopBLE();
  }

  /** Show display Warning up */
@@ -259,9 +257,9 @@ void setup() {

    Serial.println("Display brightness: " + String(configuration.getDisplayBrightness()));
    oledDisplay.setBrightness(configuration.getDisplayBrightness());
+    delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
  }

-
  if (networkOption == UseCellular) {
    // If using cellular re-set scheduler interval
    configSchedule.setPeriod(CELLULAR_SERVER_CONFIG_SYNC_INTERVAL);
@@ -289,19 +287,23 @@ void setup() {
  // Log monitor mode for debugging purpose
  if (configuration.isOfflineMode()) {
    Serial.println("Running monitor in offline mode");
-  }
-  else if (configuration.isCloudConnectionDisabled()) {
+  } else if (configuration.isCloudConnectionDisabled()) {
    Serial.println("Running monitor without connection to AirGradient server");
  }
-
 }

 void loop() {
+  if (networkOption == UseCellular) {
+    // Check if cellular client not ready until certain time
+    // Redundant check in both task to make sure its executed
+    restartIfCeClientIssueOverTwoHours();
+  }
+
  // Schedule to feed external watchdog
  watchdogFeedSchedule.run();

-  if (otaInProgress) {
-    // OTA currently in progress, temporarily disable running sensor schedules
+  if (firmwareUpdateInProgress) {
+    // Firmare update currently in progress, temporarily disable running sensor schedules
    delay(10000);
    return;
  }
@@ -334,7 +336,7 @@ void loop() {
      static bool pmsConnected = false;
      if (pmsConnected != ag->pms5003.connected()) {
        pmsConnected = ag->pms5003.connected();
-        Serial.printf("PMS sensor %s ", pmsConnected?"connected":"removed");
+        Serial.printf("PMS sensor %s \n", pmsConnected ? "connected" : "removed");
      }
    }
  } else {
@@ -346,11 +348,17 @@ void loop() {
    }
  }

+  /* Run measurement schedule */
+  printMeasurementsSchedule.run();
+
  /** factory reset handle */
  factoryConfigReset();

-  /** check that local configuration changed then do some action */
-  configUpdateHandle();
+  if (configuration.isCommandRequested()) {
+    // Each state machine already has an independent request command check
+    stateMachine.executeCo2Calibration();
+    stateMachine.executeLedBarTest();
+  }
 }

 static void co2Update(void) {
@@ -367,6 +375,8 @@ static void co2Update(void) {
  }
 }

+void printMeasurements() { measurements.printCurrentAverage(); }
+
 static void mdnsInit(void) {
  if (!MDNS.begin(localServer.getHostname().c_str())) {
    Serial.println("Init mDNS failed");
@@ -374,8 +384,7 @@ static void mdnsInit(void) {
  }

  MDNS.addService("_airgradient", "_tcp", 80);
-  MDNS.addServiceTxt("_airgradient", "_tcp", "model",
-                     AgFirmwareModeName(fwMode));
+  MDNS.addServiceTxt("_airgradient", "_tcp", "model", AgFirmwareModeName(fwMode));
  MDNS.addServiceTxt("_airgradient", "_tcp", "serialno", ag->deviceId());
  MDNS.addServiceTxt("_airgradient", "_tcp", "fw_ver", ag->getVersion());
  MDNS.addServiceTxt("_airgradient", "_tcp", "vendor", "AirGradient");
@@ -399,8 +408,7 @@ static void createMqttTask(void) {
            String payload = measurements.toString(true, fwMode, wifiConnector.RSSI());
            String topic = "airgradient/readings/" + ag->deviceId();

-            if (mqttClient.publish(topic.c_str(), payload.c_str(),
-                                   payload.length())) {
+            if (mqttClient.publish(topic.c_str(), payload.c_str(), payload.length())) {
              Serial.println("MQTT sync success");
            } else {
              Serial.println("MQTT sync failure");
@@ -418,8 +426,12 @@ static void createMqttTask(void) {
 static void initMqtt(void) {
  String mqttUri = configuration.getMqttBrokerUri();
  if (mqttUri.isEmpty()) {
-    Serial.println(
-        "MQTT is not configured, skipping initialization of MQTT client");
+    Serial.println("MQTT is not configured, skipping initialization of MQTT client");
+    return;
+  }
+
+  if (networkOption == UseCellular) {
+    Serial.println("MQTT not available for cellular options");
    return;
  }

@@ -475,7 +487,7 @@ static void factoryConfigReset(void) {
              Serial.println("Factory reset successful");
            }
            delay(3000);
-            oledDisplay.setText("","","");
+            oledDisplay.setText("", "", "");
            ESP.restart();
          }
        }
@@ -525,42 +537,44 @@ static bool sgp41Init(void) {
    configuration.hasSensorSGP = true;
    return true;
  } else {
-    Serial.println("Init SGP41 failuire");
+    Serial.println("Init SGP41 failure");
    configuration.hasSensorSGP = false;
  }
  return false;
 }

 void checkForFirmwareUpdate(void) {
+  if (configuration.isCloudConnectionDisabled()) {
+    Serial.println("Cloud connection is disabled, skip firmware update");
+    return;
+  }
+
  AirgradientOTA *agOta;
  if (networkOption == UseWifi) {
    agOta = new AirgradientOTAWifi;
  } else {
-    agOta = new AirgradientOTACellular(cell);
+    agOta = new AirgradientOTACellular(cellularCard, agClient->getICCID());
  }

-  // Indicate main task that ota is performing
-  Serial.println("Check for firmware update, disabling main task");
-  otaInProgress = true;
-  if (configuration.hasSensorSGP && networkOption == UseCellular) {
-    // Only for cellular because it can disturb i2c line
-    Serial.println("Disable SGP41 task for cellular OTA");
-    ag->sgp41.end();
-  }
+  // Indicate main task that firmware update is in progress
+  firmwareUpdateInProgress = true;

  agOta->setHandlerCallback(otaHandlerCallback);
-  agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION);

-  // Only goes to this line if OTA is not success
+  String httpDomain = configuration.getHttpDomain();
+  if (httpDomain != "") {
+    Serial.printf("httpDomain configuration available, start OTA with custom domain\n",
+                  httpDomain.c_str());
+    agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION, httpDomain.c_str());
+  } else {
+    agOta->updateIfAvailable(ag->deviceId().c_str(), GIT_VERSION);
+  }
+
+  // Only goes to this line if firmware update is not success
  // Handled by otaHandlerCallback

-  otaInProgress = false;
-  if (configuration.hasSensorSGP && networkOption == UseCellular) {
-    // Re-start SGP41 task
-    if (!sgp41Init()) {
-      Serial.println("Failed re-start SGP41 task");
-    }
-  }
+  // Indicate main task that firmware update finish
+  firmwareUpdateInProgress = false;

  delete agOta;
  Serial.println();
@@ -568,14 +582,25 @@ void checkForFirmwareUpdate(void) {

 void otaHandlerCallback(AirgradientOTA::OtaResult result, const char *msg) {
  switch (result) {
-  case AirgradientOTA::Starting:
+  case AirgradientOTA::Starting: {
+    Serial.println("Firmware update starting...");
+    if (configuration.hasSensorSGP && networkOption == UseCellular) {
+      // Temporary pause SGP41 task while cellular firmware update is in progress
+      ag->sgp41.pause();
+    }
    displayExecuteOta(result, fwNewVersion, 0);
    break;
+  }
  case AirgradientOTA::InProgress:
    Serial.printf("OTA progress: %s\n", msg);
    displayExecuteOta(result, "", std::stoi(msg));
    break;
  case AirgradientOTA::Failed:
+    displayExecuteOta(result, "", 0);
+    if (configuration.hasSensorSGP && networkOption == UseCellular) {
+      ag->sgp41.resume();
+    }
+    break;
  case AirgradientOTA::Skipped:
  case AirgradientOTA::AlreadyUpToDate:
    displayExecuteOta(result, "", 0);
@@ -642,7 +667,11 @@ static void displayExecuteOta(AirgradientOTA::OtaResult result, String msg, int
      }
      delay(1000);
    }
+
+    if (ag->isOne()) {
      oledDisplay.setAirGradient(0);
+      oledDisplay.setBrightness(0);
+    }
    break;
  }
  default:
@@ -656,6 +685,7 @@ static void sendDataToAg() {
    stateMachine.displayHandle(AgStateMachineWiFiOkServerConnecting);
  }
  stateMachine.handleLeds(AgStateMachineWiFiOkServerConnecting);
+  wifiConnector.bleNotifyStatus(PROV_CONNECTING_TO_SERVER);

  /** Task handle led connecting animation */
  xTaskCreate(
@@ -663,8 +693,7 @@ static void sendDataToAg() {
        for (;;) {
          // ledSmHandler();
          stateMachine.handleLeds();
-          if (stateMachine.getLedState() !=
-              AgStateMachineWiFiOkServerConnecting) {
+          if (stateMachine.getLedState() != AgStateMachineWiFiOkServerConnecting) {
            break;
          }
          delay(LED_BAR_ANIMATION_PERIOD);
@@ -685,11 +714,13 @@ static void sendDataToAg() {
      stateMachine.displayHandle(AgStateMachineWiFiOkServerConnected);
    }
    stateMachine.handleLeds(AgStateMachineWiFiOkServerConnected);
+    wifiConnector.bleNotifyStatus(PROV_SERVER_REACHABLE);
  } else {
    if (ag->isOne()) {
      stateMachine.displayHandle(AgStateMachineWiFiOkServerConnectFailed);
    }
    stateMachine.handleLeds(AgStateMachineWiFiOkServerConnectFailed);
+    wifiConnector.bleNotifyStatus(PROV_ERR_SERVER_UNREACHABLE);
  }

  stateMachine.handleLeds(AgStateMachineNormal);
@@ -710,8 +741,7 @@ static void oneIndoorInit(void) {
  /** Show boot display */
  Serial.println("Firmware Version: " + ag->getVersion());

-  oledDisplay.setText("AirGradient ONE",
-                      "FW Version: ", ag->getVersion().c_str());
+  oledDisplay.setText("AirGradient ONE", "FW Version: ", ag->getVersion().c_str());
  delay(DISPLAY_DELAY_SHOW_CONTENT_MS);

  ag->ledBar.begin();
@@ -742,9 +772,9 @@ static void oneIndoorInit(void) {
      WiFi.begin("airgradient", "cleanair");
      oledDisplay.setText("Configure WiFi", "connect to", "\'airgradient\'");
      delay(2500);
-      oledDisplay.setText("Rebooting...", "","");
+      oledDisplay.setText("Rebooting...", "", "");
      delay(2500);
-      oledDisplay.setText("","","");
+      oledDisplay.setText("", "", "");
      ESP.restart();
    }
  }
@@ -808,8 +838,6 @@ static void openAirInit(void) {
      Serial.println("CO2 S8 sensor not found");
      Serial.println("Can not detect S8 run mode 'PPT'");
      fwMode = FW_MODE_O_1PPT;
-
-      Serial0.end();
      delay(200);
    } else {
      Serial.println("Found S8 on Serial0");
@@ -872,8 +900,7 @@ static void openAirInit(void) {
    }

    if (fwMode == FW_MODE_O_1PP) {
-      int count = (configuration.hasSensorPMS1 ? 1 : 0) +
-                  (configuration.hasSensorPMS2 ? 1 : 0);
+      int count = (configuration.hasSensorPMS1 ? 1 : 0) + (configuration.hasSensorPMS2 ? 1 : 0);
      if (count == 1) {
        fwMode = FW_MODE_O_1P;
      }
@@ -922,8 +949,8 @@ void initializeNetwork() {
  if (agSerial->open()) {
    Serial.println("Cellular module found");
    // Initialize cellular module and use cellular as agClient
-    cell = new CellularModuleA7672XX(agSerial, GPIO_POWER_MODULE_PIN);
-    agClient = new AirgradientCellularClient(cell);
+    cellularCard = new CellularModuleA7672XX(agSerial, GPIO_POWER_MODULE_PIN);
+    agClient = new AirgradientCellularClient(cellularCard);
    networkOption = UseCellular;
  } else {
    Serial.println("Cellular module not available, using wifi");
@@ -934,6 +961,19 @@ void initializeNetwork() {
    networkOption = UseWifi;
  }

+  if (networkOption == UseCellular) {
+    // Enable serial stream debugging to check the AT command when doing registration
+    agSerial->setDebug(true);
+  }
+
+  String httpDomain = configuration.getHttpDomain();
+  if (httpDomain != "") {
+    agClient->setHttpDomain(httpDomain.c_str());
+    Serial.printf("HTTP domain name is set to: %s\n", httpDomain.c_str());
+    oledDisplay.setText("HTTP domain name", "using local", "configuration");
+    delay(2500);
+  }
+
  if (!agClient->begin(ag->deviceId().c_str())) {
    oledDisplay.setText("Client", "initialization", "failed");
    delay(5000);
@@ -943,25 +983,29 @@ void initializeNetwork() {
    ESP.restart();
  }

+  // Provide openmetrics to have access to last transmission result
+  openMetrics.setAirgradientClient(agClient);
+
+  if (networkOption == UseCellular) {
+    // Disabling it again
+    agSerial->setDebug(false);
+  }
+
  if (networkOption == UseWifi) {
-    if (!wifiConnector.connect()) {
+    String modelName = AgFirmwareModeName(fwMode);
+    if (!wifiConnector.connect(modelName)) {
      Serial.println("Cannot initiate wifi connection");
      return;
    }

    if (!wifiConnector.isConnected()) {
      Serial.println("Failed connect to WiFi");
-      if (wifiConnector.isConfigurePorttalTimeout()) {
      oledDisplay.showRebooting();
      delay(2500);
      oledDisplay.setText("", "", "");
      ESP.restart();
    }

-      // Directly return because the rest of the function applied if wifi is connect only
-      return;
-    }
-  
    // Initiate local network configuration
    mdnsInit();
    localServer.begin();
@@ -973,10 +1017,17 @@ void initializeNetwork() {
      return;
    }

-    // Send data for the first time to AG server at boot 
+    // Send data for the first time to AG server at boot only if postDataToAirgradient is enabled
+    if (configuration.isPostDataToAirGradient()) {
      sendDataToAg();
    }
+  }

+  // Skip fetch configuration if configuration control is set to "local" only
+  if (configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
+    ledBarEnabledUpdate();
+    return;
+  }

  std::string config = agClient->httpFetchConfig();
  configSchedule.update();
@@ -987,29 +1038,30 @@ void initializeNetwork() {
      if (agClient->isRegisteredOnAgServer() == false) {
        stateMachine.displaySetAddToDashBoard();
        stateMachine.displayHandle(AgStateMachineWiFiOkServerOkSensorConfigFailed);
+        wifiConnector.bleNotifyStatus(PROV_ERR_MONITOR_NOT_REGISTERED);
      } else {
        stateMachine.displayClearAddToDashBoard();
+        wifiConnector.bleNotifyStatus(PROV_ERR_GET_MONITOR_CONFIG_FAILED);
      }
    }
    stateMachine.handleLeds(AgStateMachineWiFiOkServerOkSensorConfigFailed);
    delay(DISPLAY_DELAY_SHOW_CONTENT_MS);
-  }
-  else {
+  } else {
    ledBarEnabledUpdate();
+    wifiConnector.bleNotifyStatus(PROV_MONITOR_CONFIGURED);
  }
 }

 static void configurationUpdateSchedule(void) {
-  if (configuration.getConfigurationControl() ==
-      ConfigurationControl::ConfigurationControlLocal) {
+  if (configuration.getConfigurationControl() == ConfigurationControl::ConfigurationControlLocal) {
    Serial.println("Ignore fetch server configuration, configurationControl set to local");
    agClient->resetFetchConfigurationStatus();
    return;
  }

  std::string config = agClient->httpFetchConfig();
-  if (agClient->isLastFetchConfigSucceed() && configuration.parse(config.c_str(), false)) {
-    configUpdateHandle();
+  if (agClient->isLastFetchConfigSucceed()) {
+    configuration.parse(config.c_str(), false);
  }
 }

@@ -1018,17 +1070,24 @@ static void configUpdateHandle() {
    return;
  }

-  stateMachine.executeCo2Calibration();
-
  String mqttUri = configuration.getMqttBrokerUri();
  if (mqttClient.isCurrentUri(mqttUri) == false) {
    mqttClient.end();
    initMqtt();
  }

+  String httpDomain = configuration.getHttpDomain();
+  if (httpDomain != "") {
+    Serial.printf("HTTP domain name set to: %s\n", httpDomain.c_str());
+    agClient->setHttpDomain(httpDomain.c_str());
+  } else {
+    // Its empty, set to default
+    Serial.println("HTTP domain name from configuration empty, set to default");
+    agClient->setHttpDomainDefault();
+  }
+
  if (configuration.hasSensorSGP) {
-    if (configuration.noxLearnOffsetChanged() ||
-        configuration.tvocLearnOffsetChanged()) {
+    if (configuration.noxLearnOffsetChanged() || configuration.tvocLearnOffsetChanged()) {
      ag->sgp41.end();

      int oldTvocOffset = ag->sgp41.getTvocLearningOffset();
@@ -1039,14 +1098,12 @@ static void configUpdateHandle() {
        resultStr = "failure";
      }
      if (oldTvocOffset != configuration.getTvocLearningOffset()) {
-        Serial.printf("Setting tvocLearningOffset from %d to %d hours %s\r\n",
-                      oldTvocOffset, configuration.getTvocLearningOffset(),
-                      resultStr);
+        Serial.printf("Setting tvocLearningOffset from %d to %d hours %s\r\n", oldTvocOffset,
+                      configuration.getTvocLearningOffset(), resultStr);
      }
      if (oldNoxOffset != configuration.getNoxLearningOffset()) {
-        Serial.printf("Setting noxLearningOffset from %d to %d hours %s\r\n",
-                      oldNoxOffset, configuration.getNoxLearningOffset(),
-                      resultStr);
+        Serial.printf("Setting noxLearningOffset from %d to %d hours %s\r\n", oldNoxOffset,
+                      configuration.getNoxLearningOffset(), resultStr);
      }
    }
  }
@@ -1068,7 +1125,7 @@ static void configUpdateHandle() {
      if (configuration.getLedBarBrightness() == 0) {
        ag->ledBar.setEnable(false);
      } else {
-        if(configuration.getLedBarMode() == LedBarMode::LedBarModeOff) {
+        if (configuration.getLedBarMode() == LedBarMode::LedBarModeOff) {
          ag->ledBar.setEnable(false);
        } else {
          ag->ledBar.setEnable(true);
@@ -1081,11 +1138,6 @@ static void configUpdateHandle() {
    if (configuration.isDisplayBrightnessChanged()) {
      oledDisplay.setBrightness(configuration.getDisplayBrightness());
    }
-
-    stateMachine.executeLedBarTest();
-  }
-  else if(ag->isOpenAir()) {
-    stateMachine.executeLedBarTest();
  }

  // Update display and led bar notification based on updated configuration
@@ -1111,8 +1163,7 @@ static void updateDisplayAndLedBar(void) {
      stateMachine.handleLeds(AgStateMachineWiFiLost);
      return;
    }
-  }
-  else if (networkOption == UseCellular) {
+  } else if (networkOption == UseCellular) {
    if (agClient->isClientReady() == false) {
      // Same action as wifi
      stateMachine.displayHandle(AgStateMachineWiFiLost);
@@ -1309,7 +1360,10 @@ void postUsingWifi() {
  Serial.printf("Free heap: %u\n", ESP.getFreeHeap());
 }

-void postUsingCellular() {
+/**
+ * forcePost to force post without checking transmit cycle
+ */
+void postUsingCellular(bool forcePost) {
  // Aquire queue mutex to get queue size
  xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY);

@@ -1321,6 +1375,14 @@ void postUsingCellular() {
    return;
  }

+  // Check queue size if its ready to transmit
+  // It is ready if size is divisible by 3
+  if (!forcePost && (queueSize % MEASUREMENT_TRANSMIT_CYCLE) > 0) {
+    Serial.printf("Not ready to transmit, queue size are %d\n", queueSize);
+    xSemaphoreGive(mutexMeasurementCycleQueue);
+    return;
+  }
+
  // Build payload include all measurements from queue
  std::string payload;
  payload += std::to_string(CELLULAR_MEASUREMENT_INTERVAL / 1000); // Convert to seconds
@@ -1342,13 +1404,17 @@ void postUsingCellular() {

  // Post success, remove the data that previously sent from queue
  xSemaphoreTake(mutexMeasurementCycleQueue, portMAX_DELAY);
-  measurementCycleQueue.erase(measurementCycleQueue.begin(),
-                              measurementCycleQueue.begin() + queueSize);

  if (measurementCycleQueue.capacity() > RESERVED_MEASUREMENT_CYCLE_CAPACITY) {
    Serial.println("measurementCycleQueue capacity more than reserved space, resizing..");
-    measurementCycleQueue.resize(RESERVED_MEASUREMENT_CYCLE_CAPACITY);
+    std::vector<Measurements::Measures> tmp;
+    tmp.reserve(RESERVED_MEASUREMENT_CYCLE_CAPACITY);
+    measurementCycleQueue.swap(tmp);
+  } else {
+    // If not more than the capacity, then just clear all the values
+    measurementCycleQueue.clear();
  }
+
  xSemaphoreGive(mutexMeasurementCycleQueue);
 }

@@ -1362,7 +1428,7 @@ void sendDataToServer(void) {
  if (networkOption == UseWifi) {
    postUsingWifi();
  } else if (networkOption == UseCellular) {
-    postUsingCellular();
+    postUsingCellular(false);
  }
 }

@@ -1432,39 +1498,63 @@ void setMeasurementMaxPeriod() {

 int calculateMaxPeriod(int updateInterval) {
  // 0.8 is 80% reduced interval for max period
-  if (networkOption == UseWifi) {
+  // NOTE: Both network option use the same measurement interval
  return (WIFI_MEASUREMENT_INTERVAL - (WIFI_MEASUREMENT_INTERVAL * 0.8)) / updateInterval;
-  } else {
-    // Cellular
-    return (CELLULAR_MEASUREMENT_INTERVAL - (CELLULAR_MEASUREMENT_INTERVAL * 0.8)) / updateInterval;
-  }
 }

-
 void networkSignalCheck() {
  if (networkOption == UseWifi) {
    Serial.printf("WiFi RSSI %d\n", wifiConnector.RSSI());
  } else if (networkOption == UseCellular) {
-    auto result = cell->retrieveSignal();
+    auto result = cellularCard->retrieveSignal();
    if (result.status != CellReturnStatus::Ok) {
      agClient->setClientReady(false);
+      lastCellSignalQuality = 99;
      return;
    }
+
+    // Save last signal quality
+    lastCellSignalQuality = result.data;
+
    if (result.data == 99) {
      // 99 indicate cellular not attached to network
      agClient->setClientReady(false);
      return;
    }
-    Serial.printf("Cellular signal strength %d\n", result.data);
+
+    Serial.printf("Cellular signal quality %d\n", result.data);
+  }
+}
+
+/**
+ * If in 2 hours cellular client still not ready, then restart system
+ */
+void restartIfCeClientIssueOverTwoHours() {
+  if (agCeClientProblemDetectedTime > 0 &&
+      (MINUTES() - agCeClientProblemDetectedTime) > TIMEOUT_WAIT_FOR_CELLULAR_MODULE_READY) {
+    // Give up wait
+    Serial.println("Rebooting because CE client issues for 2 hours detected");
+    int i = 3;
+    while (i != 0) {
+      if (ag->isOne()) {
+        String tmp = "Rebooting in " + String(i);
+        oledDisplay.setText("CE error", "since 2h", tmp.c_str());
+      } else {
+        Serial.println("Rebooting... " + String(i));
+      }
+      i = i - 1;
+      delay(1000);
+    }
+    oledDisplay.setBrightness(0);
+    esp_restart();
  }
 }

 void networkingTask(void *args) {
+  // If cloud connection enabled, run first transmission to server at boot
+  if (configuration.isCloudConnectionDisabled() == false) {
    // OTA check on boot
-#ifdef ESP8266
-  // ota not supported
-#else
-  // because cellular it takes too long, watchdog triggered
+#ifndef ESP8266
    checkForFirmwareUpdate();
    checkForUpdateSchedule.update();
 #endif
@@ -1474,14 +1564,15 @@ void networkingTask(void *args) {
    if (networkOption == UseCellular) {
      Serial.println("Prepare first measures cycle to send on boot for 20s");
      delay(20000);
+      networkSignalCheck();
      newMeasurementCycle();
-    sendDataToServer();
+      postUsingCellular(true);
      measurementSchedule.update();
    }
-
    // Reset scheduler
    configSchedule.update();
    transmissionSchedule.update();
+  }

  while (1) {
    // Handle reconnection based on mode
@@ -1491,31 +1582,61 @@ void networkingTask(void *args) {
        delay(1000);
        continue;
      }
-    }
-    else if (networkOption == UseCellular) {
+    } else if (networkOption == UseCellular) {
      if (agClient->isClientReady() == false) {
+        // Start time if value still default
+        if (agCeClientProblemDetectedTime == 0) {
+          agCeClientProblemDetectedTime = MINUTES();
+        }
+
+        // Enable at command debug
+        agSerial->setDebug(true);
+
+        // Check if cellular client not ready until certain time
+        // Redundant check in both task to make sure its executed
+        restartIfCeClientIssueOverTwoHours();
+
+        // Power cycling cellular module due to network issues for more than 1 hour
+        bool resetModule = true;
+        if ((MINUTES() - agCeClientProblemDetectedTime) >
+            TIME_TO_START_POWER_CYCLE_CELLULAR_MODULE) {
+          Serial.println("The CE client hasn't recovered in more than 1 hour, "
+                         "performing a power cycle");
+          cellularCard->powerOff();
+          delay(2000);
+          cellularCard->powerOn();
+          delay(10000);
+          // no need to reset module when calling ensureClientConnection()
+          resetModule = false;
+        }
+
+        // Attempt to reconnect
        Serial.println("Cellular client not ready, ensuring connection...");
-        if (agClient->ensureClientConnection() == false) {
-          Serial.println("Cellular client connection not ready, retry in 5s...");
-          delay(5000);
+        if (agClient->ensureClientConnection(resetModule) == false) {
+          Serial.println("Cellular client connection not ready, retry in 30s...");
+          delay(30000); // before retry, wait for 30s
          continue;
        }
+
+        // Client is ready
+        agCeClientProblemDetectedTime = 0; // reset to default
+        agSerial->setDebug(false);         // disable at command debug
      }
    }

    // If connection to AirGradient server disable don't run config and transmission schedule
    if (configuration.isCloudConnectionDisabled()) {
      delay(1000);
-      return;
+      continue;
    }

    // Run scheduler
    networkSignalCheckSchedule.run();
-    configSchedule.run();
    transmissionSchedule.run();
+    configSchedule.run();
    checkForUpdateSchedule.run();

-    delay(1000);
+    delay(50);
  }

  vTaskDelete(handleNetworkTask);
@@ -1529,7 +1650,10 @@ void newMeasurementCycle() {
      measurementCycleQueue.erase(measurementCycleQueue.begin());
    }

+    // Get current measures
    auto mc = measurements.getMeasures();
+    mc.signal = cellularCard->csqToDbm(lastCellSignalQuality); // convert to RSSI
+
    measurementCycleQueue.push_back(mc);
    Serial.println("New measurement cycle added to queue");
    // Release mutex
@@ -1538,4 +1662,3 @@ void newMeasurementCycle() {
    Serial.printf("Free heap: %u\n", ESP.getFreeHeap());
  }
 }
-
--- a/examples/OneOpenAir/OpenMetrics.cpp
+++ b/examples/OneOpenAir/OpenMetrics.cpp
@@ -6,8 +6,11 @@ OpenMetrics::OpenMetrics(Measurements &measure, Configuration &config,

 OpenMetrics::~OpenMetrics() {}

-void OpenMetrics::setAirGradient(AirGradient *ag, AirgradientClient *client) { 
+void OpenMetrics::setAirGradient(AirGradient *ag) {
  this->ag = ag;
+}
+
+void OpenMetrics::setAirgradientClient(AirgradientClient *client) {
  this->agClient = client;
 }

@@ -199,14 +202,14 @@ String OpenMetrics::getPayload(void) {
    }
    if (utils::isValidNOx(nox)) {
      add_metric("nox_index",
-                 "The processed Nitrous Oxide (NOx) index as measured by the "
+                 "The processed Nitrogen Oxide (NOx) index as measured by the "
                 "AirGradient SGP sensor",
                 "gauge");
      add_metric_point("", String(nox));
    }
    if (utils::isValidNOx(noxRaw)) {
      add_metric("nox_raw",
-                 "The raw input value to the Nitrous Oxide (NOx) index as "
+                 "The raw input value to the Nitrogen Oxide (NOx) index as "
                 "measured by the AirGradient SGP sensor",
                 "gauge");
      add_metric_point("", String(noxRaw));
--- a/examples/OneOpenAir/OpenMetrics.h
+++ b/examples/OneOpenAir/OpenMetrics.h
@@ -19,7 +19,8 @@ public:
  OpenMetrics(Measurements &measure, Configuration &config,
              WifiConnector &wifiConnector);
  ~OpenMetrics();
-  void setAirGradient(AirGradient *ag, AirgradientClient *client);
+  void setAirGradient(AirGradient *ag);
+  void setAirgradientClient(AirgradientClient *client);
  const char *getApiContentType(void);
  const char* getApi(void);
  String getPayload(void);
--- a/library.properties
+++ b/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.
--- a/platformio.ini
+++ b/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 CORE_DEBUG_LEVEL=3 -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 =
@@ -26,6 +26,7 @@ lib_deps =
 	WiFiClientSecure
 	Update
 	DNSServer
+	h2zero/NimBLE-Arduino@^2.1.0

 [env:esp8266]
 platform = espressif8266
--- a/src/AgConfigure.cpp
+++ b/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;
--- a/src/AgConfigure.h
+++ b/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_ */
--- a/src/AgOledDisplay.cpp
+++ b/src/AgOledDisplay.cpp
@@ -19,10 +19,7 @@ static unsigned char OFFLINE_BITS[] = {
    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
 *
@@ -270,6 +267,37 @@ void OledDisplay::setText(const char *line1, const char *line2,
  }
 }

+void OledDisplay::showWiFiProvisioning(bool firstRun, int countdown) {
+  if (firstRun) {
+    DISP()->clearBuffer();
+    DISP()->setFont(u8g2_font_t0_16_tf);
+    DISP()->drawStr(1, 25, "to WiFi hotspot:");
+    DISP()->drawStr(1, 40, "\"airgradient-");
+    DISP()->drawStr(1, 55, (ag->deviceId() + "\"").c_str());
+  }
+
+  // Now just update countdown area
+  char buf[16];
+  snprintf(buf, sizeof(buf), "%ds to connect", countdown);
+  DISP()->setDrawColor(0);  // erase previous text
+  DISP()->drawBox(0, 0, 128, 14); // clear top region
+  DISP()->setDrawColor(1);  // draw new text in white
+  DISP()->setFont(u8g2_font_t0_16_tf);
+  DISP()->drawStr(1, 10, buf);
+
+  // Blink the BLE mark section
+  if (countdown % 2 == 0) {
+    DISP()->setFont(u8g2_font_t0_12b_tf);
+    DISP()->drawStr(108, 60, "BLE");
+  } else {
+    DISP()->setDrawColor(0);
+    DISP()->drawBox(108, 48, 20, 16);
+    DISP()->setDrawColor(1);
+  }
+
+  DISP()->sendBuffer();
+}
+
 /**
 * @brief Update dashboard content
 *
--- a/src/AgOledDisplay.h
+++ b/src/AgOledDisplay.h
@@ -48,6 +48,7 @@ public:
  void setText(String &line1, String &line2, String &line3, String &line4);
  void setText(const char *line1, const char *line2, const char *line3,
               const char *line4);
+  void showWiFiProvisioning(bool firstRun, int countdown);
  void showDashboard(void);
  void showDashboard(DashboardStatus status);
  void setBrightness(int percent);
--- a/src/AgSchedule.cpp
+++ b/src/AgSchedule.cpp
@@ -8,8 +8,8 @@ AgSchedule::~AgSchedule() {}
 void AgSchedule::run(void) {
  uint32_t ms = (uint32_t)(millis() - count);
  if (ms >= period) {
-    handler();
    count = millis();
+    handler();
  }
 }

--- a/src/AgStateMachine.cpp
+++ b/src/AgStateMachine.cpp
@@ -11,8 +11,8 @@

 #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_Y 255, 255, 0 /** Yellow */
+#define RGB_COLOR_O 255, 128, 0 /** Orange */
 #define RGB_COLOR_P 180, 0, 255 /** Purple */
 #define RGB_COLOR_CLEAR 0, 0, 0 /** No color */

@@ -494,13 +494,10 @@ void StateMachine::displayHandle(AgStateMachineState state) {
      if (ag->isBasic()) {
        String ssid = "\"airgradient-" + ag->deviceId() + "\"    " +
                      String(wifiConnectCountDown) + String("s");
-        disp.setText("Connect tohotspot:", ssid.c_str(), "");
+        disp.setText("Connect to hotspot:", ssid.c_str(), "");
      } else {
-        String line1 = String(wifiConnectCountDown) + "s to connect";
-        String line2 = "to WiFi hotspot:";
-        String line3 = "\"airgradient-";
-        String line4 = ag->deviceId() + "\"";
-        disp.setText(line1, line2, line3, line4);
+        // NOTE: This bool is hardcoded!
+        disp.showWiFiProvisioning((wifiConnectCountDown == 180), wifiConnectCountDown);
      }
      wifiConnectCountDown--;
    }
@@ -648,7 +645,7 @@ void StateMachine::handleLeds(AgStateMachineState state) {
      ag->ledBar.clear();
      ag->ledBar.setColor(0, 0, 255, ag->ledBar.getNumberOfLeds() / 2);
    } else {
-      ag->statusLed.setToggle();
+      ag->statusLed.setStep();
    }
    break;
  }
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -76,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:
@@ -570,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);
@@ -804,16 +955,16 @@ std::string Measurements::buildMeasuresPayload(Measures &mc) {

  oss << ",";

-  // NOx
-  if (utils::isValidNOx(mc.nox)) {
-    oss << std::round(mc.nox);
+  // TVOC
+  if (utils::isValidVOC(mc.tvoc)) {
+    oss << std::round(mc.tvoc);
  }

  oss << ",";

-  // TVOC
-  if (utils::isValidVOC(mc.tvoc)) {
-    oss << std::round(mc.tvoc);
+  // NOx
+  if (utils::isValidNOx(mc.nox)) {
+    oss << std::round(mc.nox);
  }

  oss << ",";
@@ -827,9 +978,11 @@ std::string Measurements::buildMeasuresPayload(Measures &mc) {
    oss << std::round(mc.pm_03_pc[1]);
  }

-  // char datapoint[128] = {0};
-  // snprintf(datapoint, 128, "%d,%.0f,%.0f,%.0f,%.0f,%.0f,%d,%d,%d", co2, temp * 10,
-  //          hum * 10, pm01 * 10, pm25 * 10, pm10 * 10, tvoc, nox, pm003Count);
+  oss << ",";
+
+  if (mc.signal < 0) {
+    oss << mc.signal;
+  }

  return oss.str();
 }
--- a/src/AgValue.h
+++ b/src/AgValue.h
@@ -88,6 +88,8 @@ public:
    PM10_PC, // Particle 10 count
  };

+  void printCurrentAverage();
+
  /**
   * @brief Set each MeasurementType maximum period length for moving average
   *
@@ -258,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);
--- a/src/AgWiFiConnector.cpp
+++ b/src/AgWiFiConnector.cpp
@@ -1,9 +1,21 @@
 #include "AgWiFiConnector.h"
+#include "Arduino.h"
 #include "Libraries/WiFiManager/WiFiManager.h"
+#include "Libraries/Arduino_JSON/src/Arduino_JSON.h"
+#include "WiFiType.h"
+#include "esp32-hal.h"

 #define WIFI_CONNECT_COUNTDOWN_MAX 180
 #define WIFI_HOTSPOT_PASSWORD_DEFAULT "cleanair"

+
+#define BLE_SERVICE_UUID "acbcfea8-e541-4c40-9bfd-17820f16c95c"
+#define BLE_CRED_CHAR_UUID "703fa252-3d2a-4da9-a05c-83b0d9cacb8e"
+#define BLE_SCAN_CHAR_UUID "467a080f-e50f-42c9-b9b2-a2ab14d82725"
+
+#define BLE_CRED_BIT (1 << 0)
+#define BLE_SCAN_BIT (1 << 1)
+
 #define WIFI() ((WiFiManager *)(this->wifi))

 /**
@@ -32,7 +44,7 @@ WifiConnector::~WifiConnector() {}
 * @return true Success
 * @return false Failure
 */
-bool WifiConnector::connect(void) {
+bool WifiConnector::connect(String modelName) {
  if (wifi == NULL) {
    wifi = new WiFiManager();
    if (wifi == NULL) {
@@ -61,46 +73,69 @@ bool WifiConnector::connect(void) {
        break;
      }
    }
+
+    if (!WiFi.isConnected()) {
+      // Erase already saved default credentials
+      WiFi.disconnect(false, true);
    }
-
-  WIFI()->setConfigPortalBlocking(false);
-  WIFI()->setConnectTimeout(15);
-  WIFI()->setTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
-
-  WIFI()->setAPCallback([this](WiFiManager *obj) { _wifiApCallback(); });
-  WIFI()->setSaveConfigCallback([this]() { _wifiSaveConfig(); });
-  WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); });
-  WIFI()->setConfigPortalTimeoutCallback([this]() {_wifiTimeoutCallback();});
-  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
-    disp.setText("Connecting to", "WiFi", "...");
  } else {
-    logInfo("Connecting to WiFi...");
+    Serial.printf("Attempt connect to configured ssid: %d\n", wifiSSID.c_str());
+    // WiFi.begin() already called before, it will attempt connect when wifi creds already persist
+
+    sm.ledAnimationInit();
+    sm.handleLeds(AgStateMachineWiFiManagerStaConnecting);
+    sm.displayHandle(AgStateMachineWiFiManagerStaConnecting);
+
+    uint32_t ledPeriod = millis();
+    uint32_t startTime = millis();
+    while (WiFi.status() != WL_CONNECTED && (millis() - startTime) < 15000) {
+      /** LED animations */
+      if ((millis() - ledPeriod) >= 100) {
+        ledPeriod = millis();
+        sm.handleLeds();
+      }
+      delay(1);
    }
-  ssid = "airgradient-" + ag->deviceId();

-  // ssid = "AG-" + String(ESP.getChipId(), HEX);
-  WIFI()->setConfigPortalTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
+    if (!WiFi.isConnected()) {
+      // WiFi not connect, show indicator.
+      sm.ledAnimationInit();
+      sm.handleLeds(AgStateMachineWiFiManagerConnectFailed);
+      sm.displayHandle(AgStateMachineWiFiManagerConnectFailed);
+      delay(3000);
+    }
+  }

+  if (WiFi.isConnected()) {
+    sm.handleLeds(AgStateMachineWiFiManagerStaConnected);
+    return true;
+  }
+
+  // Enable provision by both BLE and WiFi portal
  WiFiManagerParameter disableCloud("chbPostToAg", "Prevent Connection to AirGradient Server", "T",
                                    2, "type=\"checkbox\" ", WFM_LABEL_AFTER);
-  WIFI()->addParameter(&disableCloud);
  WiFiManagerParameter disableCloudInfo(
      "<p>Prevent connection to the AirGradient Server. Important: Only enable "
      "it if you are sure you don't want to use any AirGradient cloud "
      "features. As a result you will not receive automatic firmware updates, "
      "configuration settings from cloud and the measure data will not reach the AirGradient dashboard.</p>");
-  WIFI()->addParameter(&disableCloudInfo);
-
-  WIFI()->autoConnect(ssid.c_str(), WIFI_HOTSPOT_PASSWORD_DEFAULT);
-
-  logInfo("Wait for configure portal");
+  setupProvisionByPortal(&disableCloud, &disableCloudInfo);

 #ifdef ESP32
-  // Task handle WiFi connection.
+  // Provision by BLE only for ESP32
+  setupProvisionByBLE(modelName.c_str());
+
+  // Task handling WiFi portal
  xTaskCreate(
    [](void *obj) {
      WifiConnector *connector = (WifiConnector *)obj;
      while (connector->_wifiConfigPortalActive()) {
+        if (connector->isBleClientConnected()) {
+          Serial.println("Stopping portal because BLE connected");
+          connector->_wifiStop();
+          connector->provisionMethod = ProvisionMethod::BLE;
+          break;
+        }
        connector->_wifiProcess();
        vTaskDelay(1);
      }
@@ -108,14 +143,19 @@ bool WifiConnector::connect(void) {
    },
    "wifi_cfg", 4096, this, 10, NULL);

-  /** Wait for WiFi connect and show LED, display status */
+
+  // Wait for WiFi connect and show LED, display status
  uint32_t dispPeriod = millis();
  uint32_t ledPeriod = millis();
  bool clientConnectChanged = false;

+  // By default wifi portal loops run first
+  // Provision method defined when either wifi or ble client connected first
+  // If wifi client connect, then ble server will be stopped
+  // If ble client connect, then wifi portal will be stopped (see wifi_cfg task)
  AgStateMachineState stateOld = sm.getDisplayState();
  while (WIFI()->getConfigPortalActive()) {
-    /** LED animatoin and display update content */
+    /** LED animation and display update content */
    if (WiFi.isConnected() == false) {
      /** Display countdown */
      uint32_t ms;
@@ -145,6 +185,11 @@ bool WifiConnector::connect(void) {
        clientConnectChanged = clientConnected;
        if (clientConnectChanged) {
          sm.handleLeds(AgStateMachineWiFiManagerPortalActive);
+          if (bleServerRunning) {
+            Serial.println("Stopping BLE since wifi is connected");
+            stopBLE();
+            provisionMethod = ProvisionMethod::WiFi;
+          }
        } else {
          sm.ledAnimationInit();
          sm.handleLeds(AgStateMachineWiFiManagerMode);
@@ -157,6 +202,74 @@ bool WifiConnector::connect(void) {

    delay(1); // avoid watchdog timer reset.
  }
+
+  if (provisionMethod == ProvisionMethod::BLE) {
+    disp.setText("Provision by", "BLE", "");
+    sm.ledAnimationInit();
+    sm.handleLeds(AgStateMachineWiFiManagerPortalActive);
+
+    uint32_t wdMillis = 0;
+
+    // Loop until the BLE client disconnected or WiFi connected
+    while (isBleClientConnected() && !WiFi.isConnected()) {
+      EventBits_t bits = xEventGroupWaitBits(
+        bleEventGroup,
+        BLE_SCAN_BIT | BLE_CRED_BIT,
+        pdTRUE,
+        pdFALSE,
+        10 / portTICK_PERIOD_MS
+      );
+
+      if (bits & BLE_CRED_BIT) {
+        Serial.printf("Connecting to %s...\n", ssid.c_str());
+        wifiConnecting = true;
+
+        sm.ledAnimationInit();
+        sm.handleLeds(AgStateMachineWiFiManagerStaConnecting);
+        sm.displayHandle(AgStateMachineWiFiManagerStaConnecting);
+
+        uint32_t startTime = millis();
+        while (WiFi.status() != WL_CONNECTED && (millis() - startTime) < 15000) {
+          // Led animations
+          if ((millis() - ledPeriod) >= 100) {
+            ledPeriod = millis();
+            sm.handleLeds();
+          }
+          delay(1);
+        }
+
+        if (WiFi.status() != WL_CONNECTED) {
+          Serial.println("Failed connect to WiFi");
+          // If not connect send status through BLE while also turn led and display indicator
+          WiFi.disconnect();
+          wifiConnecting = false;
+          bleNotifyStatus(PROV_ERR_WIFI_CONNECT_FAILED);
+
+          // Show failed inficator then revert back to provision mode
+          sm.ledAnimationInit();
+          sm.handleLeds(AgStateMachineWiFiManagerConnectFailed);
+          sm.displayHandle(AgStateMachineWiFiManagerConnectFailed);
+          delay(3000);
+          sm.ledAnimationInit();
+          disp.setText("Provision by", "BLE", "");
+          sm.handleLeds(AgStateMachineWiFiManagerPortalActive);
+        }
+      }
+      else if (bits & BLE_SCAN_BIT) {
+        handleBleScanRequest();
+      }
+
+      // Ensure watchdog fed every minute
+      if ((millis() - wdMillis) >= 60000) {
+        wdMillis = millis();
+        ag->watchdog.reset();
+      }
+
+      delay(1);
+    }
+
+    Serial.println("Exit provision by BLE");
+  }
 #else
  _wifiProcess();
 #endif
@@ -180,6 +293,7 @@ bool WifiConnector::connect(void) {
      config.setDisableCloudConnection(result == "T");
    }
    hasPortalConfig = false;
+    bleNotifyStatus(PROV_WIFI_CONNECT);
  }

  return true;
@@ -206,6 +320,11 @@ bool WifiConnector::wifiClientConnected(void) {
  return WiFi.softAPgetStationNum() ? true : false;
 }

+
+bool WifiConnector::isBleClientConnected() {
+  return bleClientConnected;
+}
+
 /**
 * @brief Handle WiFiManage softAP setup completed callback
 *
@@ -248,6 +367,10 @@ bool WifiConnector::_wifiConfigPortalActive(void) {
 }
 void WifiConnector::_wifiTimeoutCallback(void) { connectorTimeout = true; }

+void WifiConnector::_wifiStop() {
+  WIFI()->stopConfigPortal();
+}
+
 /**
 * @brief Process WiFiManager connection
 *
@@ -404,6 +527,28 @@ bool WifiConnector::hasConfigurated(void) {
 */
 bool WifiConnector::isConfigurePorttalTimeout(void) { return connectorTimeout; }

+
+void WifiConnector::bleNotifyStatus(int status) {
+  if (!bleServerRunning) {
+    return;
+  }
+
+  if (pServer->getConnectedCount()) {
+    NimBLEService* pSvc = pServer->getServiceByUUID(BLE_SERVICE_UUID);
+    if (pSvc) {
+      NimBLECharacteristic* pChr = pSvc->getCharacteristic(BLE_CRED_CHAR_UUID);
+      if (pChr) {
+        char tosend[50];
+        memset(tosend, 0, 50);
+        sprintf(tosend, "{\"status\":%d}", status);
+        Serial.printf("BLE Notify >> %s \n", tosend);
+        pChr->setValue(String(tosend));
+        pChr->notify();
+      }
+    }
+  }
+}
+
 /**
 * @brief Set wifi connect to default WiFi
 *
@@ -411,3 +556,307 @@ bool WifiConnector::isConfigurePorttalTimeout(void) { return connectorTimeout; }
 void WifiConnector::setDefault(void) {
  WiFi.begin("airgradient", "cleanair");
 }
+
+int WifiConnector::scanAndFilterWiFi(WiFiNetwork networks[], int maxResults) {
+  Serial.println("Scanning for Wi-Fi networks...");
+  int n = WiFi.scanNetworks(false, true);  // async=false, show_hidden=true
+  Serial.printf("Found %d networks\n", n);
+
+  const int MAX_NETWORKS = 50;
+
+  if (n <= 0) {
+    Serial.println("No networks found");
+    return 0;
+  }
+
+  WiFiNetwork allNetworks[MAX_NETWORKS];
+  int allCount = 0;
+
+  // Collect valid networks (filter weak or empty SSID)
+  for (int i = 0; i < n && allCount < MAX_NETWORKS; ++i) {
+    String ssid = WiFi.SSID(i);
+    int32_t rssi = WiFi.RSSI(i);
+    bool open = (WiFi.encryptionType(i) == WIFI_AUTH_OPEN);
+
+    if (ssid.length() == 0 || rssi < -75) continue;
+
+    allNetworks[allCount++] = {ssid, rssi, open};
+  }
+
+  // Remove duplicates (keep the strongest)
+  WiFiNetwork uniqueNetworks[MAX_NETWORKS];
+  int uniqueCount = 0;
+
+  for (int i = 0; i < allCount; i++) {
+    bool exists = false;
+    for (int j = 0; j < uniqueCount; j++) {
+      if (uniqueNetworks[j].ssid == allNetworks[i].ssid) {
+        exists = true;
+        if (allNetworks[i].rssi > uniqueNetworks[j].rssi)
+          uniqueNetworks[j] = allNetworks[i]; // keep stronger one
+        break;
+      }
+    }
+    if (!exists && uniqueCount < MAX_NETWORKS) {
+      uniqueNetworks[uniqueCount++] = allNetworks[i];
+    }
+  }
+
+  // Sort by RSSI descending (simple bubble sort for small lists)
+  for (int i = 0; i < uniqueCount - 1; i++) {
+    for (int j = i + 1; j < uniqueCount; j++) {
+      if (uniqueNetworks[j].rssi > uniqueNetworks[i].rssi) {
+        WiFiNetwork temp = uniqueNetworks[i];
+        uniqueNetworks[i] = uniqueNetworks[j];
+        uniqueNetworks[j] = temp;
+      }
+    }
+  }
+
+  // Copy to output array
+  int resultCount = (uniqueCount > maxResults) ? maxResults : uniqueCount;
+  for (int i = 0; i < resultCount; i++) {
+    networks[i] = uniqueNetworks[i];
+  }
+
+  Serial.printf("Returning %d filtered networks\n", resultCount);
+  return resultCount;
+}
+
+String WifiConnector::buildPaginatedWiFiJSON(WiFiNetwork networks[], int totalFound,
+                                              int page, int batchSize, int totalPages) {
+  // Calculate start and end indices for this page
+  int startIdx = (page - 1) * batchSize;
+  int endIdx = startIdx + batchSize;
+  if (endIdx > totalFound) {
+    endIdx = totalFound;
+  }
+
+  // Build JSON object with pagination
+  JSONVar jsonRoot;
+  JSONVar jsonArray;
+
+  for (int i = startIdx; i < endIdx; i++) {
+    JSONVar obj;
+    obj["s"] = networks[i].ssid;
+    obj["r"] = networks[i].rssi;
+    obj["o"] = networks[i].open ? 1 : 0;
+    jsonArray[i - startIdx] = obj;
+  }
+
+  jsonRoot["wifi"] = jsonArray;
+  jsonRoot["page"] = page;
+  jsonRoot["tpage"] = totalPages;
+  jsonRoot["found"] = totalFound;
+
+  String jsonString = JSON.stringify(jsonRoot);
+
+  Serial.printf("Page %d/%d JSON: %s\n", page, totalPages, jsonString.c_str());
+
+  return jsonString;
+}
+
+void WifiConnector::handleBleScanRequest() {
+  const int BATCH_SIZE = 3;
+  const int MAX_RESULTS = 30;
+  WiFiNetwork networks[MAX_RESULTS];
+
+  // Scan and filter networks once
+  int networkCount = scanAndFilterWiFi(networks, MAX_RESULTS);
+
+  // Calculate total pages
+  int totalFound = (networkCount + BATCH_SIZE - 1) / BATCH_SIZE;
+
+  NimBLEService* pSvc = pServer->getServiceByUUID(BLE_SERVICE_UUID);
+  if (!pSvc) {
+    Serial.println("BLE service not found");
+    return;
+  }
+
+  NimBLECharacteristic* pChr = pSvc->getCharacteristic(BLE_SCAN_CHAR_UUID);
+  if (!pChr) {
+    Serial.println("BLE scan characteristic not found");
+    return;
+  }
+
+  if (networkCount == 0) {
+    Serial.println("No networks found to send");
+    String tosend = "{\"found\":0}";
+    pChr->setValue(tosend);
+    pChr->notify();
+    return;
+  }
+
+  // Send results in batches
+  for (int page = 1; page <= totalFound; page++) {
+    String batchJson = buildPaginatedWiFiJSON(networks, networkCount,
+                                              page, BATCH_SIZE, totalFound);
+    pChr->setValue(batchJson);
+    pChr->notify();
+
+    Serial.printf("Sent WiFi scan page %d/%d through BLE notify\n", page, totalFound);
+
+    // Delay between batches (except last one)
+    if (page < totalFound) {
+      delay(100);
+    }
+  }
+
+  Serial.println("All WiFi scan pages sent successfully");
+}
+
+void WifiConnector::setupProvisionByPortal(WiFiManagerParameter *disableCloudParam, WiFiManagerParameter *disableCloudInfo) {
+  WIFI()->setConfigPortalBlocking(false);
+  WIFI()->setConnectTimeout(15);
+  WIFI()->setTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
+  WIFI()->setBreakAfterConfig(true);
+
+  WIFI()->setAPCallback([this](WiFiManager *obj) { _wifiApCallback(); });
+  WIFI()->setSaveConfigCallback([this]() { _wifiSaveConfig(); });
+  WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); });
+  WIFI()->setConfigPortalTimeoutCallback([this]() {_wifiTimeoutCallback();});
+  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
+    disp.setText("Connecting to", "WiFi", "...");
+  } else {
+    logInfo("Connecting to WiFi...");
+  }
+  ssid = "airgradient-" + ag->deviceId();
+
+  // ssid = "AG-" + String(ESP.getChipId(), HEX);
+  WIFI()->setConfigPortalTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
+
+  WIFI()->addParameter(disableCloudParam);
+  WIFI()->addParameter(disableCloudInfo);
+
+  WIFI()->autoConnect(ssid.c_str(), WIFI_HOTSPOT_PASSWORD_DEFAULT);
+
+  logInfo("Wait for configure portal");
+}
+
+void WifiConnector::setupProvisionByBLE(const char *modelName) {
+  NimBLEDevice::init("AirGradient");
+  NimBLEDevice::setPower(3); /** +3db */
+
+  /** bonding, MITM, don't need BLE secure connections as we are using passkey pairing */
+  NimBLEDevice::setSecurityAuth(false, false, true);
+  NimBLEDevice::setSecurityIOCap(BLE_HS_IO_NO_INPUT_OUTPUT);
+
+  pServer = NimBLEDevice::createServer();
+  pServer->setCallbacks(new ServerCallbacks(this));
+
+  // Service and characteristics for device information
+  NimBLEService *pServDeviceInfo = pServer->createService("180A");
+  NimBLECharacteristic *pModelCharacteristic = pServDeviceInfo->createCharacteristic("2A24", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
+  pModelCharacteristic->setValue(modelName);
+  NimBLECharacteristic *pSerialCharacteristic = pServDeviceInfo->createCharacteristic("2A25", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
+  pSerialCharacteristic->setValue(ag->deviceId().c_str());
+  NimBLECharacteristic *pFwCharacteristic = pServDeviceInfo->createCharacteristic("2A26", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
+  pFwCharacteristic->setValue(ag->getVersion().c_str());
+  NimBLECharacteristic *pManufCharacteristic = pServDeviceInfo->createCharacteristic("2A29", NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
+  pManufCharacteristic->setValue("AirGradient");
+
+  // Service and characteristics for wifi provisioning 
+  NimBLEService *pServProvisioning = pServer->createService(BLE_SERVICE_UUID);
+  auto characteristicCallback = new CharacteristicCallbacks(this);
+  NimBLECharacteristic *pCredentialCharacteristic =
+      pServProvisioning->createCharacteristic(BLE_CRED_CHAR_UUID,
+                                     NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC |
+                                         NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_ENC | NIMBLE_PROPERTY::NOTIFY);
+  pCredentialCharacteristic->setCallbacks(characteristicCallback);
+  NimBLECharacteristic *pScanCharacteristic =
+      pServProvisioning->createCharacteristic(BLE_SCAN_CHAR_UUID, NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_ENC | NIMBLE_PROPERTY::NOTIFY);
+  pScanCharacteristic->setCallbacks(characteristicCallback);
+
+  // Start services
+  pServProvisioning->start();
+  pServDeviceInfo->start();
+
+  // Advertise
+  NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+  // Format advertising data
+  String mdata;
+  mdata += (char)0xFF;
+  mdata += (char)0xFF;
+  mdata += modelName;
+  mdata += '#';
+  mdata += ag->deviceId();
+  pAdvertising->setManufacturerData(mdata.c_str());
+  // Start advertise
+  pAdvertising->start();
+  bleServerRunning = true;
+
+  // Create event group
+  bleEventGroup = xEventGroupCreate();
+  if (bleEventGroup == NULL) {
+    Serial.println("Failed to create BLE event group!");
+    // This case is very unlikely
+  }
+
+  Serial.println("Provision by BLE ready");
+}
+
+void WifiConnector::stopBLE() {
+  if (bleServerRunning) {
+    Serial.println("Stopping BLE");
+    NimBLEDevice::deinit();
+  }
+  bleServerRunning = false;
+}
+
+//
+// BLE innerclass implementation
+//
+
+WifiConnector::ServerCallbacks::ServerCallbacks(WifiConnector* parent)
+    : parent(parent) {}
+
+void WifiConnector::ServerCallbacks::onConnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo) {
+  Serial.printf("Client address: %s\n", connInfo.getAddress().toString().c_str());
+  parent->bleClientConnected = true;
+  NimBLEDevice::stopAdvertising();
+}
+
+void WifiConnector::ServerCallbacks::onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) {
+  Serial.printf("Client disconnected - start advertising\n");
+  NimBLEDevice::startAdvertising();
+  parent->bleClientConnected = false;
+}
+
+void WifiConnector::ServerCallbacks::onAuthenticationComplete(NimBLEConnInfo& connInfo) {
+  Serial.println("\n========== PAIRING COMPLETE ==========");
+  Serial.printf("Peer Address: %s\n", connInfo.getAddress().toString().c_str());
+  Serial.printf("Encrypted: %s\n", connInfo.isEncrypted() ? "YES" : "NO");
+  Serial.printf("Authenticated: %s\n", connInfo.isAuthenticated() ? "YES" : "NO");
+  Serial.printf("Key Size: %d bits\n", connInfo.getSecKeySize() * 8);
+  Serial.println("======================================\n");
+}
+
+WifiConnector::CharacteristicCallbacks::CharacteristicCallbacks(WifiConnector* parent)
+    : parent(parent) {}
+
+void WifiConnector::CharacteristicCallbacks::onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) {
+  Serial.printf("%s : onRead(), value: %s\n", pCharacteristic->getUUID().toString().c_str(),
+                pCharacteristic->getValue().c_str());
+}
+
+void WifiConnector::CharacteristicCallbacks::onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) {
+  Serial.printf("%s : onWrite(), value: %s\n", pCharacteristic->getUUID().toString().c_str(),
+                pCharacteristic->getValue().c_str());
+
+  auto bleCred = NimBLEUUID(BLE_CRED_CHAR_UUID);
+  if (pCharacteristic->getUUID().equals(bleCred)) {
+    if (!parent->wifiConnecting) {
+      JSONVar root = JSON.parse(pCharacteristic->getValue().c_str());
+
+      String ssid = root["ssid"];
+      String pass = root["password"];
+
+      WiFi.begin(ssid.c_str(), pass.c_str());
+      xEventGroupSetBits(parent->bleEventGroup, BLE_CRED_BIT);
+    }
+  } else {
+    xEventGroupSetBits(parent->bleEventGroup, BLE_SCAN_BIT);
+  }
+
+}
+
--- a/src/AgWiFiConnector.h
+++ b/src/AgWiFiConnector.h
@@ -5,16 +5,49 @@
 #include "AgStateMachine.h"
 #include "AirGradient.h"
 #include "AgConfigure.h"
+#include "Libraries/WiFiManager/WiFiManager.h"
 #include "Main/PrintLog.h"
+#include "NimBLECharacteristic.h"
+#include "NimBLEService.h"
+#include "esp32-hal.h"

 #include <Arduino.h>
+#include <NimBLEDevice.h>
+
+// Provisioning Status Codes
+#define PROV_WIFI_CONNECT                         0   // WiFi Connect
+#define PROV_CONNECTING_TO_SERVER                 1   // Connecting to server
+#define PROV_SERVER_REACHABLE                     2   // Server reachable
+#define PROV_MONITOR_CONFIGURED                   3   // Monitor configured properly on dashboard
+
+// Provisioning Error Codes
+#define PROV_ERR_WIFI_CONNECT_FAILED             10   // Failed to connect to WiFi
+#define PROV_ERR_SERVER_UNREACHABLE              11   // Server unreachable
+#define PROV_ERR_GET_MONITOR_CONFIG_FAILED       12   // Failed to get monitor configuration from dashboard
+#define PROV_ERR_MONITOR_NOT_REGISTERED          13   // Monitor is not registered on dashboard

 class WifiConnector : public PrintLog {
+public:
+  enum class ProvisionMethod {
+    Unknown = 0,
+    WiFi,
+    BLE
+  };
+
+  struct WiFiNetwork {
+    String ssid;
+    int32_t rssi;
+    bool open;
+  };
+
 private:
  AirGradient *ag;
  OledDisplay &disp;
  StateMachine &sm;
  Configuration &config;
+  NimBLEServer *pServer;
+
+  EventGroupHandle_t bleEventGroup;

  String ssid;
  void *wifi = NULL;
@@ -22,16 +55,51 @@ private:
  uint32_t lastRetry;
  bool hasPortalConfig = false;
  bool connectorTimeout = false;
+  bool bleServerRunning = false;
+  bool bleClientConnected = false;
+  bool wifiConnecting = false;
+  ProvisionMethod provisionMethod = ProvisionMethod::Unknown;

  bool wifiClientConnected(void);
+  bool isBleClientConnected();
+  int scanAndFilterWiFi(WiFiNetwork networks[], int maxResults);
+  String buildPaginatedWiFiJSON(WiFiNetwork networks[], int totalCount,
+                                 int page, int batchSize, int totalPages);
+  void handleBleScanRequest();
+
+  // BLE server handler
+  class ServerCallbacks : public NimBLEServerCallbacks {
+  public:
+    explicit ServerCallbacks(WifiConnector *parent);
+    void onConnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo) override;
+    void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason) override;
+    void onAuthenticationComplete(NimBLEConnInfo &connInfo) override;
+
+  private:
+    WifiConnector *parent;
+  };
+
+  // BLE Characteristics handler
+  class CharacteristicCallbacks : public NimBLECharacteristicCallbacks {
+  public:
+    explicit CharacteristicCallbacks(WifiConnector *parent);
+    void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) override;
+    void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo) override;
+  private:
+    WifiConnector *parent;
+  };
+

 public:
  void setAirGradient(AirGradient *ag);

-  WifiConnector(OledDisplay &disp, Stream &log, StateMachine &sm, Configuration& config);
+  WifiConnector(OledDisplay &disp, Stream &log, StateMachine &sm, Configuration &config);
  ~WifiConnector();

-  bool connect(void);
+  void setupProvisionByPortal(WiFiManagerParameter *disableCloudParam, WiFiManagerParameter *disableCloudInfo);
+  void setupProvisionByBLE(const char *modelName);
+  void stopBLE();
+  bool connect(String modelName = "");
  void disconnect(void);
  void handle(void);
  void _wifiApCallback(void);
@@ -39,6 +107,7 @@ public:
  void _wifiSaveParamCallback(void);
  bool _wifiConfigPortalActive(void);
  void _wifiTimeoutCallback(void);
+  void _wifiStop();
  void _wifiProcess();
  bool isConnected(void);
  void reset(void);
@@ -47,8 +116,11 @@ public:
  bool hasConfigurated(void);
  bool isConfigurePorttalTimeout(void);

-  const char* defaultSsid = "airgradient";
-  const char* defaultPassword = "cleanair";
+
+  void bleNotifyStatus(int status);
+
+  const char *defaultSsid = "airgradient";
+  const char *defaultPassword = "cleanair";
  void setDefault(void);
 };

--- a/src/AirGradient.h
+++ b/src/AirGradient.h
@@ -15,7 +15,7 @@
 #include "Main/utils.h"

 #ifndef GIT_VERSION
-#define GIT_VERSION "3.2.0-snap"
+#define GIT_VERSION "3.3.9-snap"
 #endif


--- a/src/Libraries/airgradient-client
+++ b/src/Libraries/airgradient-client
--- a/src/Libraries/airgradient-ota
+++ b/src/Libraries/airgradient-ota
--- a/src/Main/StatusLed.cpp
+++ b/src/Main/StatusLed.cpp
@@ -72,6 +72,36 @@ void StatusLed::setToggle(void) {
  }
 }

+
+void StatusLed::setStep(void) {
+  static uint8_t step = 0;
+
+  // Pattern definition
+  const bool pattern[] = {
+      true,  // 0: ON
+      false, // 1: OFF
+      true,  // 2: ON
+      false, // 3: OFF
+      false, // 4: OFF
+      false, // 5: OFF
+      false, // 6: OFF
+      false, // 7: OFF
+      false, // 8: OFF
+      false  // 9: OFF
+  };
+
+  if (pattern[step]) {
+      this->setOn();
+  } else {
+      this->setOff();
+  }
+
+  step++;
+  if (step >= sizeof(pattern)) {
+      step = 0; // restart pattern
+  }
+}
+
 /**
 * @brief Get current LED state
 *
--- a/src/Main/StatusLed.h
+++ b/src/Main/StatusLed.h
@@ -25,6 +25,7 @@ public:
  void setOn(void);
  void setOff(void);
  void setToggle(void);
+  void setStep(void);
  State getState(void);
  String toString(StatusLed::State state);

--- a/src/MqttClient.cpp
+++ b/src/MqttClient.cpp
@@ -260,13 +260,14 @@ bool MqttClient::connect(String id) {
  connected = false;
  if (user.isEmpty()) {
    logInfo("Connect without auth");
-    if(CLIENT()->connect(id.c_str())) {
-      connected = true;
+    connected = CLIENT()->connect(id.c_str());
+  } else {
+    logInfo("Connect with auth");
+    connected = CLIENT()->connect(id.c_str(), user.c_str(), password.c_str());
  }
  return connected;
-  }
-  return CLIENT()->connect(id.c_str(), user.c_str(), password.c_str());
 }
+
 void MqttClient::handle(void) {
  if (isBegin == false) {
    return;
--- a/src/Sgp41/Sgp41.cpp
+++ b/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;
--- a/src/Sgp41/Sgp41.h
+++ b/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;
Author	SHA1	Message	Date
samuelbles07	0f1846f040	Update OpenAir provision ready led pattern	2025-12-05 23:45:14 +07:00
samuelbles07	b5d89cf118	Feed watchdog when BLE client is connected	2025-12-04 11:32:30 +07:00
samuelbles07	b178ad12a5	Replace BT icon with BLE text blinking	2025-12-04 10:41:17 +07:00
samuelbles07	a55677422b	Advertise serial number and model	2025-11-29 22:29:07 +07:00
samuelbles07	da694edcab	Reboot when wifi is not connected when provision failed Only applied for network option is wifi	2025-11-29 21:49:32 +07:00
samuelbles07	ae247ead48	Save some bytes on the wifi scanned result payload format	2025-11-26 00:34:57 +07:00
samuelbles07	49eed70863	Increase the rssi limit to -75 as valid network	2025-11-26 00:07:06 +07:00
samuelbles07	b8768e0ed6	Send wifi scanned result in batch	2025-11-26 00:05:38 +07:00
samuelbles07	94bd0adf8b	Fix led connected state	2025-11-10 16:21:22 +07:00
samuelbles07	38bcf4c05e	Show BT icon on countdown	2025-11-10 15:59:35 +07:00
samuelbles07	f1110905ca	Add device information service	2025-11-10 14:36:29 +07:00
samuelbles07	e196e6c6b8	Fix wifi persistent	2025-10-31 13:20:07 +07:00
samuelbles07	3a56ee448d	Provision status BLE proper definition	2025-10-31 02:08:02 +07:00
samuelbles07	2f13c8fa66	Provision by ble stable candidate	2025-10-31 01:50:39 +07:00
samuelbles07	449817a384	wifi scan characteristic more or less how the flow would be	2025-10-28 11:46:07 +07:00
samuelbles07	19df574130	POC BLE provision	2025-10-26 23:25:20 +07:00
samuelbles07	16339acb97	WIP	2025-10-24 13:11:39 +07:00
samuelbles07	d075d12011	First test	2025-10-02 18:17:18 +07:00
Samuel Siburian	75be7d9fc5	Merge pull request #342 from mtlynch/no-trailing-spaces Eliminate trailing whitespace	2025-09-25 13:45:11 +07:00
Samuel Siburian	309d322100	Merge pull request #343 from sysboy/typo-fix-failuire Simple typo fix	2025-09-25 11:37:54 +07:00
Steve	89ebe6c39f	Simple typo fix	2025-09-23 15:40:36 +01:00
Michael Lynch	29db5469f5	Eliminate trailing whitespace	2025-09-17 20:06:50 -04:00
Samuel Siburian	5802cf17f6	Merge pull request #328 from MallocArray/patch-3 Correct Yellow and Orange LED colors	2025-09-15 19:58:19 +07:00
Samuel Siburian	4a4ce89f00	Merge pull request #340 from airgradienthq/release-information Add release information section on README	2025-09-15 13:15:42 +07:00
samuelbles07	8985e08a00	fix link typo	2025-09-15 13:05:19 +07:00
samuelbles07	e984aced18	Add release process	2025-09-15 13:03:28 +07:00
samuelbles07	73edf56c97	Fix points to how to compile documents	2025-09-15 13:03:16 +07:00
samuelbles07	e54c62a2ef	Merge remote-tracking branch 'origin/develop' into develop	2025-09-12 14:34:50 +07:00
samuelbles07	5c95f011e4	Fix typo in openmetrics	2025-09-12 14:33:36 +07:00
Samuel Siburian	bed448e7d6	Merge pull request #289 from hestiahacker/contributing_improvements docs: added some details about how to compile and contribute changes upstream	2025-09-03 15:53:17 +07:00
Samuel Siburian	eb8378adfa	Merge pull request #338 from Adrien-P/fix/mqtt-with-auth-connected-flag fix: ensure connected flag set for both authenticated connections.	2025-08-19 10:03:47 +07:00
Adrien-P	f94ed5c5f5	fix: ensure connected flag set for both authenticated connections.	2025-08-18 19:33:30 +02:00
Samuel Siburian	9471f3e323	Merge pull request #337 from mtlynch/fix-js-example Fix JSON example in /config docs	2025-08-14 01:45:50 +07:00
Samuel Siburian	e6d90372c2	Merge pull request #336 from mtlynch/link-docs Link to inner docs pages from main README	2025-08-14 01:45:05 +07:00
Michael Lynch	fabf0550fc	Fix JSON example in /config docs The JSON example has an extra closing brace, causing the JSON to be invalid. The fix is to remove the stray closing brace.	2025-08-12 20:45:41 -04:00
Michael Lynch	ce0af5bf60	Link to inner docs pages from main README Fixes #335 There's useful documentation in the docs/ directory, but it's hard for users to discover it, as there are no links to it. This change updates the README to add links to the inner docs pages for users interested in customizing and re-flashing firmware onto their devices as well as understanding the OTA update system.	2025-08-12 20:08:29 -04:00
Samuel Siburian	93bdbd85d5	Merge pull request #333 from airgradienthq/feat/support-2g Support 2G fallback for CE network options	2025-08-01 12:03:45 +07:00
samuelbles07	29f583f20d	Fix compile error for esp8266 env	2025-08-01 11:59:41 +07:00
samuelbles07	0f6a2fe908	Bump airgradient-client	2025-08-01 11:54:11 +07:00
Samuel Siburian	e3ce2c41be	Merge pull request #332 from airgradienthq/fix/post-time-resolution Fix post measures time resolutions closer to 1 second	2025-07-28 11:47:53 +07:00
samuelbles07	92b3c69b98	Decrease network task iteration delay Position post measure first before get configuration	2025-07-26 18:23:04 +07:00
samuelbles07	f4d518aa87	Fix agschedule anon function call order	2025-07-26 18:22:30 +07:00
Samuel Siburian	831c844c24	Merge pull request #330 from airgradienthq/feat/post-ccid Provide SIM card ICCID when performing ota update	2025-06-20 17:38:22 +07:00
samuelbles07	060a7f6815	Provide iccid when checking if firmware update available	2025-06-20 01:08:46 +07:00
samuelbles07	d8eb6b3c1a	Prepare release 3.3.9	2025-06-18 14:25:14 +07:00
MallocArray	77859bea22	Correct Yellow and Orange LED colors	2025-06-16 20:38:19 -05:00
Samuel Siburian	969858b5cb	Merge pull request #324 from airgradienthq/fix/comms-ag-server Post measures and fetch configuration on boot only if respective configuration is set	2025-06-10 01:29:58 +07:00
samuelbles07	09b5805686	Apply brightness	2025-06-10 01:26:29 +07:00
samuelbles07	b09b753339	Only send first measures on boot if postDataToAirgradient is enabled	2025-06-10 01:10:14 +07:00
samuelbles07	ddb3dba131	Skip fetch configuration on boot when configuration control is local	2025-06-10 01:09:53 +07:00
Samuel Siburian	e780b0ace6	Merge pull request #323 from airgradienthq/fix/local-config-update Update configuration changes by callback	2025-06-09 02:21:07 +07:00
samuelbles07	e82da5401e	Add new flag for command request Such as led bar test and co2 calibration test	2025-06-09 02:13:32 +07:00
samuelbles07	50a98acde4	Update configuration changes to main by callback	2025-06-06 04:10:53 +07:00
samuelbles07	7049d21a41	Prepare release 3.3.8	2025-05-14 13:09:12 +07:00
samuelbles07	d5cdeaa9f3	Fix print average function schedule if pms value invalid show the channel	2025-05-14 13:01:23 +07:00
Samuel Siburian	09207c6923	Merge pull request #319 from airgradienthq/fix/resizing-queue Fix resizing measurement queue after post by cellular post	2025-05-14 12:53:07 +07:00
samuelbles07	0a64424196	add show content delay for display brightness	2025-05-14 12:39:42 +07:00
samuelbles07	5b38ca222b	Prepare release 3.3.7	2025-05-12 10:54:38 +07:00
Samuel Siburian	9ee35341a5	Merge pull request #318 from airgradienthq/feat/improve-measure-logs Improve measurements logging	2025-05-11 14:22:08 +07:00
samuelbles07	cec0514444	print measurements on schedule	2025-05-11 14:10:51 +07:00
hestiahacker	21b9ddb2ed	Improved contribution instructions Improved wording suggested by @Iroxxar	2025-05-11 01:10:25 -05:00
hestia	1ee05da5d1	docs: added some details about how to compile and contribute changes upstream	2025-05-11 01:10:22 -05:00
samuelbles07	626a2240fa	Fix resizing queue after success post This fix should be make it more consistent	2025-05-09 15:45:53 +07:00
Samuel Siburian	174ec6568f	Merge pull request #313 from airgradienthq/fix/mode-cloud-disable Fix bootloop when cloud connection is disabled	2025-05-08 01:28:07 +07:00
samuelbles07	6b55719399	Fix cloud connection mode Use continue instead of return to ignore the rest of transmission code	2025-05-05 17:37:28 +07:00
samuelbles07	e2084f0738	Fix OTA request on boot when cloud Connection disabled	2025-05-05 17:36:14 +07:00
Samuel Siburian	5e07923690	Merge pull request #311 from ccoley/fix/submodule-url Fix failing to clone submodules recursively	2025-05-04 14:13:47 +07:00
Samuel Siburian	04049439b1	Merge pull request #310 from airgradienthq/fix/openmetrics Fix calling airgradient client before initialization on open metrics	2025-05-04 13:29:24 +07:00
Chris Coley	c148d256d7	Use a relative path for submodule URL We keep the username in the path so that forks don't need to also fork the submodules	2025-04-30 23:25:30 -07:00
samuelbles07	02849a1938	Fix pass agclient to openmetrics previously, agclient initialized after setAirgradient	2025-05-01 13:38:42 +08:00
Samuel Siburian	074337a96d	Merge pull request #304 from airgradienthq/fix/api-root FIX: HTTP domain configuration changes applied for OTA too	2025-04-21 13:42:26 +07:00
samuelbles07	4daa817a0b	Change airgradient-ota commit to main branch	2025-04-21 13:41:15 +07:00
samuelbles07	81a4502952	Fix: http domain applied for OTA	2025-04-21 13:27:05 +07:00
samuelbles07	764e2eae38	Prepare release 3.3.6	2025-04-16 12:34:17 +07:00
Samuel Siburian	79bf9811be	Merge pull request #303 from airgradienthq/fix/ce-tvoc Fix incorrect TVOC / NOx values when when network option is cellular	2025-04-15 12:25:39 +07:00
samuelbles07	9475724d0c	Remove comment	2025-04-15 12:20:26 +07:00
samuelbles07	e7603a7659	Update feedback Change airgradient-ota submodule to latest main instead of branch	2025-04-14 15:24:53 +07:00
samuelbles07	9bba89722e	Fix sgp unreliable value by only pause task when performing ota	2025-04-12 02:25:04 +07:00
samuelbles07	81945a358e	SGP41 add method to pause and resume task handle	2025-04-12 02:22:55 +07:00
samuelbles07	3d26a54d69	Prepare release 3.3.5	2025-04-11 15:56:05 +07:00
Samuel Siburian	b70ee75d50	Merge pull request #302 from airgradienthq/improve-ce-reconnection Improve cellular client reconnection	2025-04-11 15:49:25 +07:00
samuelbles07	c6846c818a	Rename MICROS_TO_MINUTES() to follow convention	2025-04-11 15:46:21 +07:00
samuelbles07	0b1c901a76	Rename cellularModule object name to cellularCard Rename checkCellularClientNotReady to restartIfCeClientIssueOverTwoHours	2025-04-11 13:41:07 +07:00
samuelbles07	83504c8628	Bump libs to latest	2025-04-10 19:05:28 +07:00
samuelbles07	4487992748	Remove unnecessary code	2025-04-10 14:58:51 +07:00
samuelbles07	3c8a65a329	Use esp_timer_get_time for timer of ce client not ready	2025-04-10 14:58:11 +07:00
samuelbles07	673d564ddb	Fix based on feedback	2025-04-10 12:45:18 +07:00
samuelbles07	423eb4808f	Change airgradient-client to latest main	2025-04-10 02:14:34 +07:00
samuelbles07	18a710ffc2	Make sure transmit cycle not too long to wait divisible by 3	2025-04-10 02:06:11 +07:00
samuelbles07	040cb79a4d	Transmit measures only if queue size is 1 or divisible by 3	2025-04-10 00:27:44 +07:00
samuelbles07	52d3dc03f1	Redundant check if cellular client not ready for 2 hours Check calls happen in both task	2025-04-09 23:46:03 +07:00
samuelbles07	1c6bc3ec55	Bump airgradient-client fix esp8266 compile	2025-04-09 22:48:21 +07:00
samuelbles07	34d7c93e14	Improve reconnection of CE network option Restart system if it already too long	2025-04-09 15:51:54 +07:00
samuelbles07	fee1dc25d6	Improve reconnection of CE network option Restart system if it already too long Bump airgradient-client: Improve ensureClientConnection	2025-04-09 15:49:34 +07:00
samuelbles07	9fb01d42f4	Prepare release 3.3.4	2025-04-07 16:56:54 +07:00
Samuel Siburian	7bb013939c	Merge pull request #301 from airgradienthq/feat/signal Include cellular signal in RSSI (dbm) when post measures	2025-04-07 16:55:42 +07:00
samuelbles07	0da21155e7	bump submodule to post measures with new endpoint that include signal in rssi	2025-04-07 16:29:54 +07:00
samuelbles07	7a153cc0ea	add cellular signal quality to post measures payload If value invalid 0, then do include it to payload	2025-04-07 16:29:15 +07:00
samuelbles07	b079c35e6b	Include cellular signal in rssi to measurement cycle	2025-04-07 16:28:37 +07:00
Samuel Siburian	6051e183b8	Merge pull request #300 from airgradienthq/fix/pms-error Remove CORE_DEBUG_LEVEL that affected PM sensor reading	2025-04-07 15:33:37 +07:00
samuelbles07	c95379b957	Update submodule to the latest main branch	2025-04-07 15:30:52 +07:00
samuelbles07	0cae8bc185	Change ag log level to info	2025-04-05 23:56:14 +07:00
samuelbles07	5902a4c8e4	Remove arduino-esp32 core debug level from build_flags And change it to airgradient log level that take effect to airgradient submodules Temporary bump submodule to WIP branch	2025-04-05 23:45:46 +07:00
samuelbles07	66818cd075	prepare 3.3.3 release	2025-04-04 11:31:19 +07:00
Samuel Siburian	c1a6ddc68f	Merge pull request #299 from airgradienthq/tmp/avg-max-period Calculate measurement average max period use the same constant	2025-04-04 11:04:15 +07:00
samuelbles07	20a32dd22c	Measures average max period use the same constant Cellular network options using wifi measurement interval as the constant reference to calculate max period	2025-04-04 10:54:03 +07:00
Samuel Siburian	263dc9934e	Merge pull request #298 from airgradienthq/fix/recover-cellular-connection Restarting cellular module when cellular client is not ready	2025-04-04 10:43:59 +07:00
samuelbles07	61b863b7f1	Fix esp_log logs not come out on O-PP	2025-04-04 10:21:50 +07:00
samuelbles07	e01c1029fe	Bump ag client ensure client connection properly	2025-04-04 10:09:34 +07:00
Samuel Siburian	ba5d817739	Merge pull request #297 from airgradienthq/feat/api-root New local configuration to set HTTP domain name for monitor to post measures and fetch configuration from server	2025-04-03 16:51:04 +07:00
samuelbles07	a91747e379	Update config sample	2025-04-02 16:30:13 +07:00
samuelbles07	029457c3fa	Add accepted value to http domain	2025-04-02 16:26:07 +07:00
samuelbles07	55710dd4d9	Update docs for new configuration http domain	2025-04-02 16:18:55 +07:00
samuelbles07	4886163cda	Show on oled when httpDomain is set	2025-04-02 02:33:24 +07:00
samuelbles07	7c57477238	Add local configuration to set http domain change http domain by PUT from local server request	2025-04-02 02:12:13 +07:00
samuelbles07	9ed58d1853	Prepare release 3.3.2	2025-03-31 17:12:15 +07:00
Samuel Siburian	6c52b038e9	Merge pull request #295 from airgradienthq/feat/enable-at-debug Enable cellular AT command debug when in network registration	2025-03-31 17:09:43 +07:00
samuelbles07	2f69932ef7	add depth submodule update	2025-03-31 17:04:37 +07:00
samuelbles07	1d96a274a6	Merge branch 'develop' into feat/enable-at-debug	2025-03-31 16:55:12 +07:00
Samuel Siburian	df9f6dfc95	Fix bugs from 3.3.1 release	2025-03-31 16:52:09 +07:00
samuelbles07	3fc02b3f54	Check signal when initialize cellular client	2025-03-31 16:51:29 +07:00
samuelbles07	958ed0bd80	Fix TVOC and NOx payload position	2025-03-31 15:26:34 +07:00
samuelbles07	e9be9dcc83	Fix mqtt host still exist on local when on server is disabled	2025-03-31 14:51:53 +07:00
samuelbles07	7fbab82088	Change log level when correction not found	2025-03-31 14:07:30 +07:00
samuelbles07	decdecdf22	Don't start mqtt when network option is cellular Even when mqtt host is set	2025-03-31 14:01:49 +07:00
samuelbles07	145c612867	Enable cellular at debug when registering network On boot, airgradient-client change cellular init timeout to 5 mins	2025-03-31 13:53:56 +07:00
samuelbles07	37de127887	prepare 3.3.1 release	2025-03-28 14:37:08 +07:00
samuelbles07	baf80ce250	untrack compile_commands.json	2025-03-28 14:24:13 +07:00
samuelbles07	80100e2475	prepare 3.3.0 release	2025-03-28 14:13:40 +07:00
Samuel Siburian	d9c3fc6ec4	Merge pull request #292 from airgradienthq/feat/cellular Add cellular connection as network options for AirGradient ONE and Open Air	2025-03-28 13:55:17 +07:00