Squashed commit of the following:

commit 5563b50 Author: Max <[email protected]> Date: Wed Jan 26 12:03:21 2022 +0300 Update xsns_95_cm1107.ino commit fbcfccb Merge: a7a792f 62458e3 Author: Max <[email protected]> Date: Wed Jan 26 09:44:09 2022 +0300 Merge pull request #3 from arendst/development Add command ``SspmEnergyTotal<relay>`` commit a7a792f Merge: a419912 d7664c0 Author: Max <[email protected]> Date: Tue Jan 25 18:48:12 2022 +0300 Merge remote-tracking branch 'upstream/development' into CM11_sensor commit a419912 Author: Max <[email protected]> Date: Tue Jan 25 18:38:35 2022 +0300 CM11 commit ff0c88b Author: Max <[email protected]> Date: Tue Jan 25 18:37:23 2022 +0300 Create xsns_95_cm1107.ino
gemu2015 · Jan 26, 2022 · 1ef08e1 · 1ef08e1
1 parent 62458e3
commit 1ef08e1
Show file tree

Hide file tree

Showing 7 changed files with 485 additions and 1 deletion.
diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h
@@ -852,6 +852,8 @@
 #define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
 #define D_GPIO_SHIFT595_OE     "74x595 OE"
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
+#define D_SENSOR_CM11_TX       "CM110x TX" 
+#define D_SENSOR_CM11_RX       "CM110x RX" 
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h
@@ -852,6 +852,8 @@
 #define D_GPIO_SHIFT595_RCLK   "74x595 RCLK"
 #define D_GPIO_SHIFT595_OE     "74x595 OE"
 #define D_GPIO_SHIFT595_SER    "74x595 SER"
+#define D_SENSOR_CM11_TX       "CM110x TX" 
+#define D_SENSOR_CM11_RX       "CM110x RX" 
 
 // Units
 #define D_UNIT_AMPERE "A"

diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino
@@ -788,6 +788,9 @@ void ResponseAppendFeatures(void)
 #ifdef USE_SDM230
     feature8 |= 0x00100000;  // xnrg_21_sdm230.ino
 #endif
+#ifdef USE_CM1107
+    feature8 |= 0x00200000; // xsns_95_cm1107.ino
+#endif
 //    feature8 |= 0x00200000;
 //    feature8 |= 0x00400000;
 //    feature8 |= 0x00800000;

diff --git a/tasmota/tasmota_template.h b/tasmota/tasmota_template.h
@@ -181,6 +181,7 @@ enum UserSelectablePins {
   GPIO_OPTION_E,                       // Emulated module
   GPIO_SDM230_TX, GPIO_SDM230_RX,      // SDM230 Serial interface
   GPIO_ADC_MQ,                         // Analog MQ Sensor
+  GPIO_CM11_TXD, GPIO_CM11_RXD,        // CM11 Serial interface
   GPIO_SENSOR_END };
 
 enum ProgramSelectablePins {
@@ -400,7 +401,8 @@ const char kSensorNames[] PROGMEM =
   D_SENSOR_SOLAXX1_RTS "|"
   D_SENSOR_OPTION " E|"
   D_SENSOR_SDM230_TX "|" D_SENSOR_SDM230_RX "|"
-  D_SENSOR_ADC_MQ
+  D_SENSOR_ADC_MQ "|"
+  D_SENSOR_CM11_TX "|" D_SENSOR_CM11_RX "|"
   ;
 
 const char kSensorNamesFixed[] PROGMEM =
@@ -934,6 +936,10 @@ const uint16_t kGpioNiceList[] PROGMEM = {
   AGPIO(GPIO_MAX7219CS),
 #endif  // USE_DISPLAY_MAX7219
 
+#ifdef USE_CM1107
+  AGPIO(GPIO_CM11_TXD),        // MH-Z19 Serial interface
+  AGPIO(GPIO_CM11_RXD),        // MH-Z19 Serial interface
+#endif
 /*-------------------------------------------------------------------------------------------*\
  * ESP32 specifics
 \*-------------------------------------------------------------------------------------------*/

diff --git a/tasmota/tasmota_template_legacy.h b/tasmota/tasmota_template_legacy.h
@@ -87,6 +87,8 @@ enum LegacyUserSelectablePins {
   GPI8_LED4_INV,
   GPI8_MHZ_TXD,        // MH-Z19 Serial interface
   GPI8_MHZ_RXD,        // MH-Z19 Serial interface
+  GPI8_CM11_TXD,        // MH-Z19 Serial interface
+  GPI8_CM11_RXD,        // MH-Z19 Serial interface
   GPI8_PZEM0XX_TX,     // PZEM0XX Serial interface
   GPI8_PZEM004_RX,     // PZEM004T Serial interface
   GPI8_SAIR_TX,        // SenseAir Serial interface
@@ -317,6 +319,8 @@ const uint16_t kGpioConvert[] PROGMEM = {
   AGPIO(GPIO_LED1_INV) +3,
   AGPIO(GPIO_MHZ_TXD),        // MH-Z19 Serial interface
   AGPIO(GPIO_MHZ_RXD),
+  AGPIO(GPIO_CM11_TXD),        // MH-Z19 Serial interface
+  AGPIO(GPIO_CM11_RXD),
   AGPIO(GPIO_PZEM0XX_TX),     // PZEM0XX Serial interface
   AGPIO(GPIO_PZEM004_RX),     // PZEM004T Serial interface
   AGPIO(GPIO_SAIR_TX),        // SenseAir Serial interface