iss #46: fix MH-Z19 reading error

maizy · Jan 20, 2019 · fee46c2 · fee46c2
1 parent 4e9a34c
commit fee46c2
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 93 deletions.
diff --git a/ambient7-arduino/platformio-version/include/Ambient7Co2.h b/ambient7-arduino/platformio-version/include/Ambient7Co2.h
diff --git a/ambient7-arduino/platformio-version/include/configs.h.example b/ambient7-arduino/platformio-version/include/configs.h.example
@@ -8,6 +8,7 @@ Copy that file as configs.h
 TODO: generate that header from .ini configs
       https://docs.platformio.org/en/latest/projectconf/advanced_scripting.html
 */
+const bool ENABLE_WIFI_CLIENT = true;
 const char* WIFI_NETWORK = "my_network";
 const char* WIFI_PASSWORD = "pa$$word";
 

diff --git a/ambient7-arduino/platformio-version/platformio.ini b/ambient7-arduino/platformio-version/platformio.ini
@@ -14,4 +14,5 @@ board = d1
 framework = arduino
 lib_deps =
     DHT@1.0.0
-monitor_speed = 115200
+    MHZ19_uart@0.3
+monitor_speed = 9600
diff --git a/ambient7-arduino/platformio-version/src/Ambient7Co2.cpp b/ambient7-arduino/platformio-version/src/Ambient7Co2.cpp
diff --git a/ambient7-arduino/platformio-version/src/main.cpp b/ambient7-arduino/platformio-version/src/main.cpp
@@ -4,18 +4,18 @@
 //#include <ESP8266mDNS.h>
 #include "configs.h"
 #include "Ambient7Wifi.h"
-#include "Ambient7Co2.h"
-#include "DHT.h"
+#include <DHT.h>
+#include <MHZ19_uart.h>
 
 
 unsigned long startTime = millis();
 
-SoftwareSerial co2Serial(CO2_RX, CO2_TX);
+MHZ19_uart mhz19;
 DHT dht;
 
 void setup()
 {
-  Serial.begin(115200);
+  Serial.begin(9600);
   Serial.println(""); Serial.println("");
   Serial.println("Ambient7");
   Serial.println("https://github.com/maizy/ambient7/");
@@ -24,10 +24,13 @@ void setup()
   Serial.print("  CO2 RX Pin: "); Serial.println(CO2_RX);
   Serial.print("  CO2 TX Pin: "); Serial.println(CO2_TX);
   Serial.print("  DHT22 1wire Pin: "); Serial.println(DTH22_1WIRE);
-  Serial.print("  Wifi network: "); Serial.println(WIFI_NETWORK);
-  Serial.print("  Wifi password: ");
-  for (unsigned int i = 0; i < strlen(WIFI_PASSWORD); i++) {
-    Serial.print('*');
+  Serial.print("  Wifi Client: "); Serial.println(ENABLE_WIFI_CLIENT ? "enabled" : "disabled");
+  if (ENABLE_WIFI_CLIENT) {
+    Serial.print("  Wifi network: "); Serial.println(WIFI_NETWORK);
+    Serial.print("  Wifi password: ");
+    for (unsigned int i = 0; i < strlen(WIFI_PASSWORD); i++) {
+      Serial.print('*');
+    }
   }
   Serial.println("");
   Serial.println("");
@@ -36,15 +39,24 @@ void setup()
   dht.setup(DTH22_1WIRE);
   Serial.println(" done");
 
-  setupWifi(WIFI_NETWORK, WIFI_PASSWORD);
-  Serial.println("");
+  Serial.println("Setup MH-Z19 ...");
+  mhz19.begin(CO2_RX, CO2_TX);
+  mhz19.setAutoCalibration(false);
+  Serial.println("Done");
+
+  if (ENABLE_WIFI_CLIENT) {
+    setupWifi(WIFI_NETWORK, WIFI_PASSWORD);
+    Serial.println("");
+  }
 }
 
 void loop()
 {
   Serial.print("Uptime: "); Serial.print((millis() - startTime) / 1000); Serial.println(" s");
 
-  int co2Ppm = readCO2UART(co2Serial, 1000);
+  Serial.print("MH-Z19 status: "); Serial.print(mhz19.getStatus());
+  Serial.print(" warming: "); Serial.println(mhz19.isWarming() ? "true" : "false");
+  int co2Ppm = mhz19.getPPM();
   if (co2Ppm < 0) {
     Serial.println("ERROR: failed to read from Co2 sensor");
   } else {