Rename board type 3.7 to 3.3

.github/workflows/check.yml

@@ -7,7 +7,7 @@ jobs:
         example:
           - "BASIC"
           - "DiyProIndoorV4_2"
-          - "DiyProIndoorV3_7"
+          - "DiyProIndoorV3_3"
           - "TestCO2"
           - "TestPM"
           - "TestSht"
@@ -27,7 +27,7 @@ jobs:
             fqbn: "esp32:esp32:esp32c3"
           - example: "DiyProIndoorV4_2"
             fqbn: "esp32:esp32:esp32c3"
-          - example: "DiyProIndoorV3_7"
+          - example: "DiyProIndoorV3_3"
             fqbn: "esp32:esp32:esp32c3"
           - example: "OneOpenAir"
             fqbn: "esp8266:esp8266:d1_mini"

examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino

@@ -53,7 +53,7 @@ CC BY-SA 4.0 Attribution-ShareAlike 4.0 International License
 #define DISPLAY_DELAY_SHOW_CONTENT_MS 2000            /** ms */
 #define FIRMWARE_CHECK_FOR_UPDATE_MS (60 * 60 * 1000) /** ms */
 
-static AirGradient ag(DIY_PRO_INDOOR_V3_7);
+static AirGradient ag(DIY_PRO_INDOOR_V3_3);
 static Configuration configuration(Serial);
 static AgApiClient apiClient(Serial, configuration);
 static Measurements measurements;

src/AgConfigure.cpp

@@ -153,10 +153,10 @@ void Configuration::defaultConfig(void) {
   jconfig[jprop_pmStandard] = jprop_pmStandard_default;
   jconfig[jprop_temperatureUnit] = jprop_temperatureUnit_default;
   jconfig[jprop_postDataToAirGradient] = jprop_postDataToAirGradient_default;
-  if (ag->isOne) {
+  if (ag->isOne()) {
     jconfig[jprop_ledBarBrightness] = jprop_ledBarBrightness_default;
   }
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2() || ag->isBasic()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2() || ag->isBasic()) {
     jconfig[jprop_displayBrightness] = jprop_displayBrightness_default;
   }
   if (ag->isOne()) {

src/AgOledDisplay.cpp

@@ -90,7 +90,7 @@ bool OledDisplay::begin(void) {
     return true;
   }
 
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     /** Create u8g2 instance */
     u8g2 = new U8G2_SH1106_128X64_NONAME_F_HW_I2C(U8G2_R0, U8X8_PIN_NONE);
     if (u8g2 == NULL) {
@@ -133,7 +133,7 @@ void OledDisplay::end(void) {
     return;
   }
 
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     /** Free u8g2 */
     delete DISP();
     u8g2 = NULL;
@@ -169,7 +169,7 @@ void OledDisplay::setText(const char *line1, const char *line2,
     return;
   }
 
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     DISP()->firstPage();
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);
@@ -218,7 +218,7 @@ void OledDisplay::setText(const char *line1, const char *line2,
     return;
   }
 
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     DISP()->firstPage();
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);
@@ -255,7 +255,7 @@ void OledDisplay::showDashboard(const char *status) {
   }
 
   char strBuf[16];
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     DISP()->firstPage();
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);
@@ -389,7 +389,7 @@ void OledDisplay::showDashboard(const char *status) {
 }
 
 void OledDisplay::setBrightness(int percent) {
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     if (percent == 0) {
       isDisplayOff = true;
 
@@ -493,7 +493,7 @@ void OledDisplay::showFirmwareUpdateUpToDate(void) {
 #endif
 
 void OledDisplay::showRebooting(void) {
-  if (ag->isOne() || ag->isPro3_7() || ag->isPro4_2()) {
+  if (ag->isOne() || ag->isPro3_3() || ag->isPro4_2()) {
     DISP()->firstPage();
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);

src/AgStateMachine.cpp

@@ -224,7 +224,7 @@ void StateMachine::co2Calibration(void) {
 
     /** Count down to 0 then start */
     for (int i = 0; i < SENSOR_CO2_CALIB_COUNTDOWN_MAX; i++) {
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3()) {
         String str =
             "after " + String(SENSOR_CO2_CALIB_COUNTDOWN_MAX - i) + " sec";
         disp.setText("Start CO2 calib", str.c_str(), "");
@@ -239,7 +239,7 @@ void StateMachine::co2Calibration(void) {
     }
 
     if (ag->s8.setBaselineCalibration()) {
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3()) {
         disp.setText("Calibration", "success", "");
       } else if (ag->isBasic()) {
         disp.setText("CO2 Calib", "success", "");
@@ -247,7 +247,7 @@ void StateMachine::co2Calibration(void) {
         logInfo("CO2 Calibration: success");
       }
       delay(1000);
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3()) {
         disp.setText("Wait for", "calib finish", "...");
       } else {
         logInfo("CO2 Calibration: Wait for calibration finish...");
@@ -259,7 +259,7 @@ void StateMachine::co2Calibration(void) {
         delay(1000);
         count++;
       }
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3()) {
         String str = "after " + String(count);
         disp.setText("Calib finish", str.c_str(), "sec");
       } else {
@@ -267,7 +267,7 @@ void StateMachine::co2Calibration(void) {
       }
       delay(2000);
     } else {
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3()) {
         disp.setText("Calibration", "failure!!!", "");
       } else if(ag->isBasic()) {
         disp.setText("CO2 calib", "failure!!!", "");
@@ -406,7 +406,7 @@ StateMachine::~StateMachine() {}
  */
 void StateMachine::displayHandle(AgStateMachineState state) {
   // Ignore handle if not support display
-  if (!(ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7() || ag->isBasic())) {
+  if (!(ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic())) {
     if (state == AgStateMachineCo2Calibration) {
       co2Calibration();
     }

src/AgValue.cpp

@@ -19,7 +19,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
     }
   }
 
-  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7() || ag->isBasic()) {
+  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
     if (config->hasSensorPMS1) {
       if (this->pm01_1 >= 0) {
         root["pm01"] = this->pm01_1;

src/AgWiFiConnector.cpp

@@ -49,7 +49,7 @@ bool WifiConnector::connect(void) {
   WIFI()->setSaveConfigCallback([this]() { _wifiSaveConfig(); });
   WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); });
   WIFI()->setConfigPortalTimeoutCallback([this]() {_wifiTimeoutCallback();});
-  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7() || ag->isBasic()) {
+  if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
     disp.setText("Connect to", "WiFi", "...");
   } else {
     logInfo("Connecting to WiFi...");
@@ -143,7 +143,7 @@ bool WifiConnector::connect(void) {
   /** Show display wifi connect result failed */
   if (WiFi.isConnected() == false) {
     sm.handleLeds(AgStateMachineWiFiManagerConnectFailed);
-    if (ag->isOne() || ag->isPro4_2() || ag->isPro3_7() || ag->isBasic()) {
+    if (ag->isOne() || ag->isPro4_2() || ag->isPro3_3() || ag->isBasic()) {
       sm.displayHandle(AgStateMachineWiFiManagerConnectFailed);
     }
     delay(6000);
@@ -248,7 +248,7 @@ void WifiConnector::_wifiProcess() {
     if (WiFi.isConnected() == false) {
       /** Display countdown */
       uint32_t ms;
-      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_7() || ag->isBasic()) {
+      if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
         ms = (uint32_t)(millis() - dispPeriod);
         if (ms >= 1000) {
           dispPeriod = millis();

src/AirGradient.cpp

@@ -62,8 +62,8 @@ bool AirGradient::isPro4_2(void) {
   return boardType == BoardType::DIY_PRO_INDOOR_V4_2;
 }
 
-bool AirGradient::isPro3_7(void) { 
+bool AirGradient::isPro3_3(void) { 
-  return boardType == BoardType::DIY_PRO_INDOOR_V3_7;
+  return boardType == BoardType::DIY_PRO_INDOOR_V3_3;
 }
 
 bool AirGradient::isBasic(void) { return boardType == BoardType::DIY_BASIC; }

src/AirGradient.h

@@ -147,7 +147,7 @@ public:
    * @return true Yes
    * @return false No
    */
-  bool isPro3_7(void);
+  bool isPro3_3(void);
 
   /**
    * @brief Check that Airgradient object is DIY_BASIC

src/Main/BoardDef.cpp

@@ -322,8 +322,8 @@ const BoardDef bsps[_BOARD_MAX] = {
                 },
             .name = "OPEN_AIR_OUTDOOR",
         },
-    /** DIY_PRO_INDOOR_V3_7 */
+    /** DIY_PRO_INDOOR_V3_3 */
-    [DIY_PRO_INDOOR_V3_7] =
+    [DIY_PRO_INDOOR_V3_3] =
         {
             .SenseAirS8 =
                 {
@@ -394,7 +394,7 @@ const BoardDef bsps[_BOARD_MAX] = {
                     .resetPin = -1,
                     .supported = false,
                 },
-            .name = "DIY_PRO_INDOOR_V3_7",
+            .name = "DIY_PRO_INDOOR_V3_3",
         },
 };
 

src/Main/BoardDef.h

@@ -21,7 +21,7 @@ enum BoardType {
   DIY_PRO_INDOOR_V4_2 = 0x01,
   ONE_INDOOR = 0x02,
   OPEN_AIR_OUTDOOR = 0x03,
-  DIY_PRO_INDOOR_V3_7 = 0x04,
+  DIY_PRO_INDOOR_V3_3 = 0x04,
   _BOARD_MAX
 };