diff --git a/tasmota/include/tasmota_template.h b/tasmota/include/tasmota_template.h index 34a1e9642..9fb8e8e87 100644 --- a/tasmota/include/tasmota_template.h +++ b/tasmota/include/tasmota_template.h @@ -197,6 +197,7 @@ enum UserSelectablePins { GPIO_MBR_TX, GPIO_MBR_RX, // Modbus Bridge Serial interface GPIO_ADE7953_RST, // ADE7953 Reset GPIO_NRG_MBS_TX, GPIO_NRG_MBS_RX, // Generic Energy Modbus device + GPIO_ADE7953_CS, // ADE7953 SPI Chip Select GPIO_SENSOR_END }; // Error as warning to rethink GPIO usage with max 2045 @@ -441,6 +442,7 @@ const char kSensorNames[] PROGMEM = D_SENSOR_MBR_TX "|" D_SENSOR_MBR_RX "|" D_SENSOR_ADE7953_RST "|" D_SENSOR_NRG_MBS_TX "|" D_SENSOR_NRG_MBS_RX "|" + D_SENSOR_ADE7953_CS "|" ; const char kSensorNamesFixed[] PROGMEM = @@ -776,10 +778,15 @@ const uint16_t kGpioNiceList[] PROGMEM = { #if defined(USE_I2C) && defined(USE_ADE7880) AGPIO(GPIO_ADE7880_IRQ) + 2, // ADE7880 IRQ - (1 = IRQ1, 2 = IRQ2) #endif -#if defined(USE_I2C) && defined(USE_ADE7953) - AGPIO(GPIO_ADE7953_IRQ) + 3, // ADE7953 IRQ - (1 = Shelly 2.5, 2 = Shelly EM, 3 = Shelly Plus 2PM) +#ifdef USE_ADE7953 +#if defined(USE_I2C) || defined(USE_SPI) + AGPIO(GPIO_ADE7953_IRQ) + 5, // ADE7953 IRQ - (1 = Shelly 2.5, 2 = Shelly EM, 3 = Shelly Plus 2PM, 4 = Shelly Pro 1PM, 5 = Shelly Pro 2PM) AGPIO(GPIO_ADE7953_RST), // ADE7953 Reset -#endif +#ifdef USE_SPI + AGPIO(GPIO_ADE7953_CS), // ADE7953 SPI Chip Select +#endif // USE_SPI +#endif // USE_I2C or USE_SPI +#endif // USE_ADE7953 #ifdef USE_CSE7761 AGPIO(GPIO_CSE7761_TX), // CSE7761 Serial interface (Dual R3) AGPIO(GPIO_CSE7761_RX), // CSE7761 Serial interface (Dual R3) diff --git a/tasmota/language/af_AF.h b/tasmota/language/af_AF.h index 51431cb18..58b48a17a 100644 --- a/tasmota/language/af_AF.h +++ b/tasmota/language/af_AF.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Gonser" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/bg_BG.h b/tasmota/language/bg_BG.h index a184ee348..968746cd4 100644 --- a/tasmota/language/bg_BG.h +++ b/tasmota/language/bg_BG.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Зумер" #define D_SENSOR_DISP_RESET "Нулиране дисплей" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/ca_AD.h b/tasmota/language/ca_AD.h index dc9e953c9..26bafafd8 100644 --- a/tasmota/language/ca_AD.h +++ b/tasmota/language/ca_AD.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Brunzidor" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/cs_CZ.h b/tasmota/language/cs_CZ.h index f970244f0..2d32dcc9a 100644 --- a/tasmota/language/cs_CZ.h +++ b/tasmota/language/cs_CZ.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/de_DE.h b/tasmota/language/de_DE.h index 62237ae3d..05f940706 100644 --- a/tasmota/language/de_DE.h +++ b/tasmota/language/de_DE.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/el_GR.h b/tasmota/language/el_GR.h index 8a93f5e95..d7cdbfe65 100644 --- a/tasmota/language/el_GR.h +++ b/tasmota/language/el_GR.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/en_GB.h b/tasmota/language/en_GB.h index 2fdfd1a71..ea85e0861 100644 --- a/tasmota/language/en_GB.h +++ b/tasmota/language/en_GB.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/es_ES.h b/tasmota/language/es_ES.h index d52cd714c..fa8dd2b67 100644 --- a/tasmota/language/es_ES.h +++ b/tasmota/language/es_ES.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/fr_FR.h b/tasmota/language/fr_FR.h index 9de3e227c..3364ff482 100644 --- a/tasmota/language/fr_FR.h +++ b/tasmota/language/fr_FR.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "ZigBee TX" diff --git a/tasmota/language/fy_NL.h b/tasmota/language/fy_NL.h index 2054bd5f8..1e1a25927 100644 --- a/tasmota/language/fy_NL.h +++ b/tasmota/language/fy_NL.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Zoemer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/he_HE.h b/tasmota/language/he_HE.h index 81da7bfa0..4db4cc9ff 100644 --- a/tasmota/language/he_HE.h +++ b/tasmota/language/he_HE.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/hu_HU.h b/tasmota/language/hu_HU.h index 368de4c26..d90312b00 100644 --- a/tasmota/language/hu_HU.h +++ b/tasmota/language/hu_HU.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/it_IT.h b/tasmota/language/it_IT.h index fd2a0c33b..99301cc0e 100644 --- a/tasmota/language/it_IT.h +++ b/tasmota/language/it_IT.h @@ -764,6 +764,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 - IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 - IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 - RST" +#define D_SENSOR_ADE7953_CS "ADE7953 - CS" #define D_SENSOR_BUZZER "Cicalino" #define D_SENSOR_DISP_RESET "Display - RESET" #define D_SENSOR_ZIGBEE_TXD "Zigbee - TX" diff --git a/tasmota/language/ko_KO.h b/tasmota/language/ko_KO.h index 669a803d9..5554f07a0 100644 --- a/tasmota/language/ko_KO.h +++ b/tasmota/language/ko_KO.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index 975f6da08..960a8fcf2 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Zoemer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/pl_PL.h b/tasmota/language/pl_PL.h index 56b45c3a1..1157da535 100644 --- a/tasmota/language/pl_PL.h +++ b/tasmota/language/pl_PL.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Dzwonek" #define D_SENSOR_DISP_RESET "Reset Display" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/pt_BR.h b/tasmota/language/pt_BR.h index 6658540c7..fe96b16b8 100644 --- a/tasmota/language/pt_BR.h +++ b/tasmota/language/pt_BR.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/pt_PT.h b/tasmota/language/pt_PT.h index 45a9cf352..3607f8252 100644 --- a/tasmota/language/pt_PT.h +++ b/tasmota/language/pt_PT.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/ro_RO.h b/tasmota/language/ro_RO.h index 189b782f5..f51f0d07a 100644 --- a/tasmota/language/ro_RO.h +++ b/tasmota/language/ro_RO.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/ru_RU.h b/tasmota/language/ru_RU.h index 1e9bdb7cb..d45530605 100644 --- a/tasmota/language/ru_RU.h +++ b/tasmota/language/ru_RU.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/sk_SK.h b/tasmota/language/sk_SK.h index d4e10bfd2..945bd72c1 100644 --- a/tasmota/language/sk_SK.h +++ b/tasmota/language/sk_SK.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/sv_SE.h b/tasmota/language/sv_SE.h index f00257d5d..ffc3e2764 100644 --- a/tasmota/language/sv_SE.h +++ b/tasmota/language/sv_SE.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/tr_TR.h b/tasmota/language/tr_TR.h index b33bbd15a..a19995a43 100644 --- a/tasmota/language/tr_TR.h +++ b/tasmota/language/tr_TR.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/uk_UA.h b/tasmota/language/uk_UA.h index e499efe8c..8e832b9d8 100644 --- a/tasmota/language/uk_UA.h +++ b/tasmota/language/uk_UA.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Зуммер" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/vi_VN.h b/tasmota/language/vi_VN.h index aae3a48f3..f87ba1029 100644 --- a/tasmota/language/vi_VN.h +++ b/tasmota/language/vi_VN.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/zh_CN.h b/tasmota/language/zh_CN.h index 884b26b63..348718091 100644 --- a/tasmota/language/zh_CN.h +++ b/tasmota/language/zh_CN.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx" diff --git a/tasmota/language/zh_TW.h b/tasmota/language/zh_TW.h index 66ffdd1aa..50c8c5dfb 100644 --- a/tasmota/language/zh_TW.h +++ b/tasmota/language/zh_TW.h @@ -766,6 +766,7 @@ #define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ" #define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ" #define D_SENSOR_ADE7953_RST "ADE7953 RST" +#define D_SENSOR_ADE7953_CS "ADE7953 CS" #define D_SENSOR_BUZZER "Buzzer" #define D_SENSOR_DISP_RESET "Display Rst" #define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"