mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-28 13:16:32 +00:00
Prep for Shelly 2.5 PM
Prep for Shelly 2.5 PM
This commit is contained in:
parent
5e5580c785
commit
36320853ec
@ -585,6 +585,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,8 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
#define D_UNIT_CENTIMETER "cm"
|
#define D_UNIT_CENTIMETER "cm"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "А"
|
#define D_UNIT_AMPERE "А"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "A"
|
#define D_UNIT_AMPERE "A"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "А"
|
#define D_UNIT_AMPERE "А"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "安"
|
#define D_UNIT_AMPERE "安"
|
||||||
|
@ -584,6 +584,7 @@
|
|||||||
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
#define D_SENSOR_ROTARY "Rotary" // Suffix "1A"
|
||||||
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
#define D_SENSOR_HRE_CLOCK "HRE Clock"
|
||||||
#define D_SENSOR_HRE_DATA "HRE Data"
|
#define D_SENSOR_HRE_DATA "HRE Data"
|
||||||
|
#define D_SENSOR_ADE7953_IRQ "ADE7953 IRQ"
|
||||||
|
|
||||||
// Units
|
// Units
|
||||||
#define D_UNIT_AMPERE "安"
|
#define D_UNIT_AMPERE "安"
|
||||||
|
@ -180,6 +180,7 @@ enum UserSelectablePins {
|
|||||||
GPIO_ROT2B, // Rotary switch2 B Pin
|
GPIO_ROT2B, // Rotary switch2 B Pin
|
||||||
GPIO_HRE_CLOCK, // Clock/Power line for HR-E Water Meter
|
GPIO_HRE_CLOCK, // Clock/Power line for HR-E Water Meter
|
||||||
GPIO_HRE_DATA, // Data line for HR-E Water Meter
|
GPIO_HRE_DATA, // Data line for HR-E Water Meter
|
||||||
|
GPIO_ADE7953_IRQ, // ADE7953 IRQ
|
||||||
GPIO_SENSOR_END };
|
GPIO_SENSOR_END };
|
||||||
|
|
||||||
// Programmer selectable GPIO functionality
|
// Programmer selectable GPIO functionality
|
||||||
@ -244,6 +245,7 @@ const char kSensorNames[] PROGMEM =
|
|||||||
D_SENSOR_ARIRFRCV "|" D_SENSOR_TXD "|" D_SENSOR_RXD "|"
|
D_SENSOR_ARIRFRCV "|" D_SENSOR_TXD "|" D_SENSOR_RXD "|"
|
||||||
D_SENSOR_ROTARY "1a|" D_SENSOR_ROTARY "1b|" D_SENSOR_ROTARY "2a|" D_SENSOR_ROTARY "2b|"
|
D_SENSOR_ROTARY "1a|" D_SENSOR_ROTARY "1b|" D_SENSOR_ROTARY "2a|" D_SENSOR_ROTARY "2b|"
|
||||||
D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|"
|
D_SENSOR_HRE_CLOCK "|" D_SENSOR_HRE_DATA "|"
|
||||||
|
D_SENSOR_ADE7953_IRQ "|"
|
||||||
;
|
;
|
||||||
|
|
||||||
/********************************************************************************************/
|
/********************************************************************************************/
|
||||||
@ -504,6 +506,9 @@ const uint8_t kGpioNiceList[] PROGMEM = {
|
|||||||
GPIO_NRG_CF1, // HLW8012/HLJ-01 CF1 voltage / current
|
GPIO_NRG_CF1, // HLW8012/HLJ-01 CF1 voltage / current
|
||||||
GPIO_HLW_CF, // HLW8012 CF power
|
GPIO_HLW_CF, // HLW8012 CF power
|
||||||
GPIO_HJL_CF, // HJL-01/BL0937 CF power
|
GPIO_HJL_CF, // HJL-01/BL0937 CF power
|
||||||
|
#endif
|
||||||
|
#if defined(USE_ENERGY_SENSOR) && defined(USE_I2C) && defined(USE_ADE7953)
|
||||||
|
GPIO_ADE7953_IRQ, // ADE7953 IRQ
|
||||||
#endif
|
#endif
|
||||||
GPIO_CSE7766_TX, // CSE7766 Serial interface (S31 and Pow R2)
|
GPIO_CSE7766_TX, // CSE7766 Serial interface (S31 and Pow R2)
|
||||||
GPIO_CSE7766_RX, // CSE7766 Serial interface (S31 and Pow R2)
|
GPIO_CSE7766_RX, // CSE7766 Serial interface (S31 and Pow R2)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user