Merge pull request #2 from smdn/devel-mhz19e

Add support for MH-Z19E

Author: smdn

README.md

@@ -78,6 +78,7 @@ void loop()
 
 ## Modules confirmed to work / 動作確認済みモジュール
 - MH-Z19C
+- MH-Z19E
 
 > [!NOTE]
 > 他のセンサーモジュールでも動作する可能性はありますが、実機での動作は未検証です。

src/MHZ19X.h

@@ -31,9 +31,13 @@ using Baud9600SloppySoftwareSerialStream = SloppySoftwareSerialStream<
 #if defined(ARDUINO_ARCH_ESP32)
 #include <ESP32HardwareSerialStream.hpp>
 
-// MHZ19C + UART1/2
+// alias for MHZ19C + UART1/2
 using MHZ19C_UART1 = MHZ19XDriver<ESP32HardwareSerialStream<1, 9, 10>>;
 using MHZ19C_UART2 = MHZ19XDriver<ESP32HardwareSerialStream<2, 16, 17>>;
+
+// alias for MHZ19E + UART1/2
+using MHZ19E_UART1 = MHZ19XDriver<ESP32HardwareSerialStream<1, 9, 10>>;
+using MHZ19E_UART2 = MHZ19XDriver<ESP32HardwareSerialStream<2, 16, 17>>;
 #endif // ARDUINO_ARCH_ESP32
 
 //
@@ -42,8 +46,11 @@ using MHZ19C_UART2 = MHZ19XDriver<ESP32HardwareSerialStream<2, 16, 17>>;
 #if defined (__AVR_ATmega328P__)
 #include <DefaultSerialStream.hpp>
 
-// MHZ19C
+// alias for MHZ19C
 using MHZ19C = MHZ19XDriver<DefaultSerialStream>;
+
+// alias for MHZ19E
+using MHZ19E = MHZ19XDriver<DefaultSerialStream>;
 #endif
 
 //
@@ -61,7 +68,11 @@ class Serial1Stream : public ArduinoHardwareSerialStream {
   }
 };
 
+// alias for MHZ19C + Serial1
 using MHZ19C_Serial1 = MHZ19XDriver<Serial1Stream>;
+
+// alias for MHZ19E + Serial1
+using MHZ19E_Serial1 = MHZ19XDriver<Serial1Stream>;
 #endif
 
 #if defined(HAVE_HWSERIAL2)
@@ -73,7 +84,11 @@ class Serial2Stream : public ArduinoHardwareSerialStream {
   }
 };
 
+// alias for MHZ19C + Serial2
 using MHZ19C_Serial2 = MHZ19XDriver<Serial2Stream>;
+
+// alias for MHZ19E + Serial2
+using MHZ19E_Serial2 = MHZ19XDriver<Serial2Stream>;
 #endif
 
 #if defined(HAVE_HWSERIAL3)
@@ -85,7 +100,11 @@ class Serial3Stream : public ArduinoHardwareSerialStream {
   }
 };
 
+// alias for MHZ19C + Serial3
 using MHZ19C_Serial3 = MHZ19XDriver<Serial3Stream>;
+
+// alias for MHZ19E + Serial3
+using MHZ19E_Serial3 = MHZ19XDriver<Serial3Stream>;
 #endif
 
 #endif //__AVR_ATmega4809__
@@ -123,12 +142,19 @@ using TunedBaud9600SloppySoftwareSerialStream = Baud9600SloppySoftwareSerialStre
 #endif // F_CPU == ***
 > ;
 
-// MHZ19C
+// alias for MHZ19C
 template <
   int8_t PIN_RX,
   int8_t PIN_TX
 >
 using MHZ19C = MHZ19XDriver<TunedBaud9600SloppySoftwareSerialStream<PIN_RX, PIN_TX>>;
+
+// alias for MHZ19E
+template <
+  int8_t PIN_RX,
+  int8_t PIN_TX
+>
+using MHZ19E = MHZ19XDriver<TunedBaud9600SloppySoftwareSerialStream<PIN_RX, PIN_TX>>;
 #endif // __AVR_ATtinyx02__
 
 #endif // MHZ19X_h

tests/test-build/ATtinyX02/main.cpp

@@ -4,14 +4,19 @@
 #include <MHZ19X.h>
 
 auto mhz19c = MHZ19C<PIN_PA6, PIN_PA7>();
+auto mhz19e = MHZ19E<PIN_PA6, PIN_PA7>();
 
 void setup()
 {
   // begin()
   mhz19c.begin();
 
+  mhz19e.begin();
+
   // switchSelfCalibration()
   mhz19c.switchSelfCalibration(true);
+
+  mhz19e.switchSelfCalibration(true);
 }
 
 void loop()
@@ -21,4 +26,6 @@ void loop()
 
   // getCO2Concentration()
   result = mhz19c.getCO2Concentration(co2ppm);
+
+  result = mhz19e.getCO2Concentration(co2ppm);
 }

tests/test-build/ArduinoNano/main.cpp

@@ -4,14 +4,19 @@
 #include <MHZ19X.h>
 
 auto mhz19c = MHZ19C();
+auto mhz19e = MHZ19E();
 
 void setup()
 {
   // begin()
   mhz19c.begin();
 
+  mhz19e.begin();
+
   // switchSelfCalibration()
   mhz19c.switchSelfCalibration(true);
+
+  mhz19e.switchSelfCalibration(true);
 }
 
 void loop()
@@ -21,4 +26,6 @@ void loop()
 
   // getCO2Concentration()
   result = mhz19c.getCO2Concentration(co2ppm);
+
+  result = mhz19e.getCO2Concentration(co2ppm);
 }

tests/test-build/ArduinoNano/platformio.ini

@@ -9,4 +9,4 @@ board = nanoatmega328
 framework = arduino
 lib_extra_dirs = ../../../
 
-build_flags = -Wno-unused-but-set-variable # disable -Wunused-but-set-variable
+build_flags = -Wno-unused-but-set-variable # disable -Wunused-but-set-variable

tests/test-build/ArduinoNanoEvery/main.cpp

@@ -4,37 +4,52 @@
 #include <MHZ19X.h>
 
 auto mhz19c_serial1 = MHZ19C_Serial1();
+auto mhz19e_serial1 = MHZ19E_Serial1();
 
 #if defined(HAVE_HWSERIAL2)
 auto mhz19c_serial2 = MHZ19C_Serial2();
+auto mhz19e_serial2 = MHZ19E_Serial2();
 #endif
 
 #if defined(HAVE_HWSERIAL3)
 auto mhz19c_serial3 = MHZ19C_Serial3();
+auto mhz19e_serial3 = MHZ19E_Serial3();
 #endif
 
 void setup()
 {
   // begin()
   mhz19c_serial1.begin();
 
+  mhz19e_serial1.begin();
+
 #if defined(HAVE_HWSERIAL2)
   mhz19c_serial2.begin();
+
+  mhz19e_serial2.begin();
 #endif
 
 #if defined(HAVE_HWSERIAL3)
   mhz19c_serial3.begin();
+
+  mhz19e_serial3.begin();
 #endif
 
   // switchSelfCalibration()
   mhz19c_serial1.switchSelfCalibration(true);
 
+  mhz19e_serial1.switchSelfCalibration(true);
+
 #if defined(HAVE_HWSERIAL2)
   mhz19c_serial2.switchSelfCalibration(true);
+
+  mhz19e_serial2.switchSelfCalibration(true);
 #endif
 
 #if defined(HAVE_HWSERIAL3)
   mhz19c_serial3.switchSelfCalibration(true);
+
+  mhz19e_serial3.switchSelfCalibration(true);
 #endif
 }
 
@@ -46,11 +61,17 @@ void loop()
   // getCO2Concentration()
   result = mhz19c_serial1.getCO2Concentration(co2ppm);
 
+  result = mhz19e_serial1.getCO2Concentration(co2ppm);
+
 #if defined(HAVE_HWSERIAL2)
   result = mhz19c_serial2.getCO2Concentration(co2ppm);
+
+  result = mhz19e_serial2.getCO2Concentration(co2ppm);
 #endif
 
 #if defined(HAVE_HWSERIAL3)
   result = mhz19c_serial3.getCO2Concentration(co2ppm);
+
+  result = mhz19e_serial3.getCO2Concentration(co2ppm);
 #endif
 }

tests/test-build/ESP32/main.cpp

@@ -6,15 +6,24 @@
 auto mhz19c_uart1 = MHZ19C_UART1();
 auto mhz19c_uart2 = MHZ19C_UART2();
 
+auto mhz19e_uart1 = MHZ19C_UART1();
+auto mhz19e_uart2 = MHZ19C_UART2();
+
 void setup()
 {
   // begin()
   mhz19c_uart1.begin();
   mhz19c_uart2.begin();
 
+  mhz19e_uart1.begin();
+  mhz19e_uart2.begin();
+
   // switchSelfCalibration()
   mhz19c_uart1.switchSelfCalibration(true);
   mhz19c_uart2.switchSelfCalibration(true);
+
+  mhz19e_uart1.switchSelfCalibration(true);
+  mhz19e_uart2.switchSelfCalibration(true);
 }
 
 void loop()
@@ -25,4 +34,7 @@ void loop()
   // getCO2Concentration()
   result = mhz19c_uart1.getCO2Concentration(co2ppm);
   result = mhz19c_uart2.getCO2Concentration(co2ppm);
+
+  result = mhz19e_uart1.getCO2Concentration(co2ppm);
+  result = mhz19e_uart2.getCO2Concentration(co2ppm);
 }