jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Shelly Plus 2PM column swap

Browse Source 
- Fix Shelly Plus 2PM column swap
- Prep Shelly Plus 2PM ADE7953 reset pin
This commit is contained in:
Theo Arends 2022-10-03 17:13:01 +02:00
parent 7d8d51246f
commit a05f731a42
29 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasmota/include/tasmota_template.h
View File

@ -195,6 +195,7 @@ enum UserSelectablePins {
GPIO_REL1_BI, GPIO_REL1_BI_INV, // 8 x Relays bistable
GPIO_I2S_MCLK,
GPIO_MBR_TX, GPIO_MBR_RX, // Modbus Bridge Serial interface
GPIO_ADE7953_RST, // ADE7953 Reset
GPIO_SENSOR_END };
// Error as warning to rethink GPIO usage
@ -437,6 +438,7 @@ const char kSensorNames[] PROGMEM =
D_SENSOR_RELAY "_b|" D_SENSOR_RELAY "_bi|"
D_SENSOR_I2S_MCLK "|"
D_SENSOR_MBR_TX "|" D_SENSOR_MBR_RX "|"
D_SENSOR_ADE7953_RST "|"
;
const char kSensorNamesFixed[] PROGMEM =
@ -770,6 +772,7 @@ const uint16_t kGpioNiceList[] PROGMEM = {
#endif
#if defined(USE_I2C) && defined(USE_ADE7953)
AGPIO(GPIO_ADE7953_IRQ) + 2, // ADE7953 IRQ
AGPIO(GPIO_ADE7953_RST), // ADE7953 Reset
#endif
#ifdef USE_CSE7761
AGPIO(GPIO_CSE7761_TX), // CSE7761 Serial interface (Dual R3)

1
tasmota/language/af_AF.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Gonser"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/bg_BG.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Зумер"
#define D_SENSOR_DISP_RESET "Нулиране дисплей"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/ca_AD.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Brunzidor"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/cs_CZ.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/de_DE.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/el_GR.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/en_GB.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/es_ES.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/fr_FR.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE DAT"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "ZigBee TX"

1
tasmota/language/fy_NL.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Zoemer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/he_HE.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/hu_HU.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/it_IT.h
View File

@ -755,6 +755,7 @@
#define D_SENSOR_HRE_DATA "HRE - Dati"
#define D_SENSOR_ADE7880_IRQ "ADE7880 - IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 - IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 - RST"
#define D_SENSOR_BUZZER "Cicalino"
#define D_SENSOR_DISP_RESET "Display - RESET"
#define D_SENSOR_ZIGBEE_TXD "Zigbee - TX"

1
tasmota/language/ko_KO.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/nl_NL.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Zoemer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/pl_PL.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Dane"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Dzwonek"
#define D_SENSOR_DISP_RESET "Reset Display"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/pt_BR.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/pt_PT.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/ro_RO.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/ru_RU.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/sk_SK.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/sv_SE.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/tr_TR.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/uk_UA.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Зуммер"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/vi_VN.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/zh_CN.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

1
tasmota/language/zh_TW.h
View File

@ -757,6 +757,7 @@
#define D_SENSOR_HRE_DATA "HRE Data"
#define D_SENSOR_ADE7880_IRQ "ADE7880 IRQ"
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
#define D_SENSOR_ADE7953_RST "ADE7953 RST"
#define D_SENSOR_BUZZER "Buzzer"
#define D_SENSOR_DISP_RESET "Display Rst"
#define D_SENSOR_ZIGBEE_TXD "Zigbee Tx"

32
tasmota/tasmota_xnrg_energy/xnrg_07_ade7953.ino
View File

@ -21,10 +21,12 @@
#ifdef USE_ENERGY_SENSOR
#ifdef USE_ADE7953
/*********************************************************************************************\
* ADE7953 - Energy used in Shelly 2.5 (model 0) and Shelly EM (model 1)
* ADE7953 - Energy used in Shelly 2.5 (model 0) , Shelly EM (model 1) and Shelly Plus 2PM (model 1)
*
* {"NAME":"Shelly 2.5","GPIO":[320,0,32,0,224,193,0,0,640,192,608,225,3456,4736],"FLAG":0,"BASE":18}
* {"NAME":"Shelly EM","GPIO":[0,0,0,0,0,0,0,0,640,3457,608,224,0,1],"FLAG":0,"BASE":18}
* {"NAME":"Shelly Plus 2PM PCB v0.1.5","GPIO":[320,0,192,0,0,0,1,1,225,224,0,0,0,0,193,0,0,0,0,0,0,608,3840,32,0,0,0,0,0,640,0,0,3457,4736,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,32000,40000,3350"}
* {"NAME":"Shelly Plus 2PM PCB v0.1.9","GPIO":[320,0,0,0,32,192,0,0,225,224,0,0,0,0,193,0,0,0,0,0,0,608,640,3457,0,0,0,0,0,0,0,4736,0,0,0,0],"FLAG":0,"BASE":1,"CMND":"AdcParam1 2,10000,10000,3350"}
*
* Based on datasheet from https://www.analog.com/en/products/ade7953.html
*
@ -190,7 +192,7 @@ const uint16_t Ade7953CalibRegs[] {
};
// 24-bit data registers Shelly 2.5
const uint16_t Ade7953Registers[] {
const uint16_t Ade7953RegistersAis2Bis1[] {
ADE7953_IRMSB, // IRMSB - RMS current channel B (Relay 1)
ADE7953_BWATT, // BWATT - Active power channel B
ADE7953_BVA, // BVA - Apparent power channel B
@ -204,8 +206,8 @@ const uint16_t Ade7953Registers[] {
ADE7953_ACCMODE // ACCMODE - Accumulation mode
};
// 24-bit data registers Shelly EM
const uint16_t Ade7953RegistersShellyEM[] {
// 24-bit data registers Shelly EM and Plus 2PM
const uint16_t Ade7953RegistersAis1Bis2[] {
ADE7953_IRMSA, // IRMSA - RMS current channel A
ADE7953_AWATT, // AWATT - Active power channel A
ADE7953_AVA, // AVA - Apparent power channel A
@ -362,8 +364,8 @@ void Ade7953Init(void) {
void Ade7953GetData(void) {
uint32_t acc_mode;
int32_t reg[2][4];
for (uint32_t i = 0; i < sizeof(Ade7953Registers)/sizeof(uint16_t); i++) {
int32_t value = Ade7953Read((ADE7953_SHELLY_25 == Ade7953.model) ? Ade7953Registers[i] : Ade7953RegistersShellyEM[i]);
for (uint32_t i = 0; i < sizeof(Ade7953RegistersAis2Bis1)/sizeof(uint16_t); i++) {
int32_t value = Ade7953Read((ADE7953_SHELLY_25 == Ade7953.model) ? Ade7953RegistersAis2Bis1[i] : Ade7953RegistersAis1Bis2[i]);
if (8 == i) {
Ade7953.voltage_rms = value; // RMS voltage (Both relays)
} else if (9 == i) {
@ -546,14 +548,22 @@ void Ade7953DrvInit(void) {
if (PinUsed(GPIO_ADE7953_IRQ, GPIO_ANY)) { // Irq on GPIO16 is not supported...
uint32_t pin_irq = Pin(GPIO_ADE7953_IRQ, GPIO_ANY);
pinMode(pin_irq, INPUT); // Related to resetPins() - Must be set to input
Ade7953.model = GetPin(pin_irq) - AGPIO(GPIO_ADE7953_IRQ); // 0 (Shelly 2.5), 1 (Shelly EM)
Ade7953.model = GetPin(pin_irq) - AGPIO(GPIO_ADE7953_IRQ); // 0 (1 = Shelly 2.5), 1 (2 = Shelly EM)
int pin_reset = Pin(GPIO_ADE7953_RST); // -1 if not defined
#ifdef ESP8266
if (ADE7953_SHELLY_EM == Ade7953.model) {
pinMode(16, OUTPUT); // Reset pin ADE7953
digitalWrite(16, 0);
if (-1 == pin_reset) {
pin_reset = 16;
}
}
#endif
if (pin_reset > -1) {
pinMode(pin_reset, OUTPUT); // Reset pin ADE7953
digitalWrite(pin_reset, 0);
delay(1);
digitalWrite(16, 1);
pinMode(16, INPUT);
digitalWrite(pin_reset, 1);
pinMode(pin_reset, INPUT);
}
delay(100); // Need 100mS to init ADE7953