mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update CM11

This commit is contained in:
Max 2022-01-26 15:03:21 +03:00
parent 1ef08e15f1
commit 22d549ca3d
29 changed files with 60 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasmota/language/bg_BG.h
View File

@ -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"

2
tasmota/language/cs_CZ.h
View File

@ -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"

2
tasmota/language/de_DE.h
View File

@ -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"

2
tasmota/language/el_GR.h
View File

@ -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"

2
tasmota/language/en_GB.h
View File

@ -854,6 +854,8 @@
#define D_GPIO_SHIFT595_SER "74x595 SER"
#define D_SENSOR_CM11_TX "CM110x TX"
#define D_SENSOR_CM11_RX "CM110x RX"
#define D_SENSOR_CM11_TX "CM110x TX"
#define D_SENSOR_CM11_RX "CM110x RX"
// Units
#define D_UNIT_AMPERE "A"

2
tasmota/language/es_ES.h
View File

@ -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"

2
tasmota/language/fr_FR.h
View File

@ -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"

2
tasmota/language/fy_NL.h
View File

@ -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"

2
tasmota/language/he_HE.h
View File

@ -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"

2
tasmota/language/hu_HU.h
View File

@ -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"

2
tasmota/language/it_IT.h
View File

@ -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"

2
tasmota/language/ko_KO.h
View File

@ -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"

2
tasmota/language/nl_NL.h
View File

@ -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"

2
tasmota/language/pl_PL.h
View File

@ -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"

2
tasmota/language/pt_BR.h
View File

@ -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"

2
tasmota/language/pt_PT.h
View File

@ -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"

2
tasmota/language/ro_RO.h
View File

@ -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"

2
tasmota/language/ru_RU.h
View File

@ -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 "А"

2
tasmota/language/sk_SK.h
View File

@ -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"

2
tasmota/language/sv_SE.h
View File

@ -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"

2
tasmota/language/tr_TR.h
View File

@ -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"

2
tasmota/language/uk_UA.h
View File

@ -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 "А"

2
tasmota/language/vi_VN.h
View File

@ -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"

2
tasmota/language/zh_CN.h
View File

@ -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"

2
tasmota/language/zh_TW.h
View File

@ -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 "安培"

5
tasmota/support_features.ino
View File

@ -788,10 +788,9 @@ void ResponseAppendFeatures(void)
#ifdef USE_SDM230
feature8 |= 0x00100000; // xnrg_21_sdm230.ino
#endif
#ifdef USE_CM1107
feature8 |= 0x00200000; // xsns_95_cm1107.ino
#ifdef USE_CM110x
feature8 |= 0x00200000; // xsns_95_cm110x.ino
#endif
// feature8 |= 0x00200000;
// feature8 |= 0x00400000;
// feature8 |= 0x00800000;

6
tasmota/tasmota_template.h
View File

@ -936,9 +936,9 @@ 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
#ifdef USE_CM110x
AGPIO(GPIO_CM11_TXD), // CM110x Serial interface
AGPIO(GPIO_CM11_RXD), // CM110x Serial interface
#endif
/*-------------------------------------------------------------------------------------------*\
* ESP32 specifics

6
tasmota/tasmota_template_legacy.h
View File

@ -87,8 +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_CM11_TXD, // CM110x Serial interface
GPI8_CM11_RXD, // CM110x Serial interface
GPI8_PZEM0XX_TX, // PZEM0XX Serial interface
GPI8_PZEM004_RX, // PZEM004T Serial interface
GPI8_SAIR_TX, // SenseAir Serial interface
@ -319,7 +319,7 @@ 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_TXD), // CM110x Serial interface
AGPIO(GPIO_CM11_RXD),
AGPIO(GPIO_PZEM0XX_TX), // PZEM0XX Serial interface
AGPIO(GPIO_PZEM004_RX), // PZEM004T Serial interface

4
tasmota/xsns_95_cm1107.ino → tasmota/xsns_95_cm110x.ino
View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef USE_CM1107
#ifdef USE_CM110x
/*********************************************************************************************\
* CM11xx - CO2 sensor
* https://en.gassensor.com.cn/CO2Sensor/list.html
@ -462,4 +462,4 @@ bool Xsns95(uint8_t function)
return result;
}
#endif // USE_CM1107
#endif // USE_CM110x