mirror of https://github.com/arendst/Tasmota.git
Merge branch 'development' into release
This commit is contained in:
commit
ea4cd8005f
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "Ю"
|
#define D_TX20_SOUTH "Ю"
|
||||||
#define D_TX20_WEST "З"
|
#define D_TX20_WEST "З"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Няма"
|
#define D_SENSOR_NONE "Няма"
|
||||||
#define D_SENSOR_USER "Потребит."
|
#define D_SENSOR_USER "Потребит."
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "J"
|
#define D_TX20_SOUTH "J"
|
||||||
#define D_TX20_WEST "Z"
|
#define D_TX20_WEST "Z"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Není"
|
#define D_SENSOR_NONE "Není"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Verbrauch"
|
||||||
|
#define D_TPWROUT "Einspeisung"
|
||||||
|
#define D_TPWRCURR "Aktueller Verbrauch"
|
||||||
|
#define D_TPWRCURR1 "Verbrauch P1"
|
||||||
|
#define D_TPWRCURR2 "Verbrauch P2"
|
||||||
|
#define D_TPWRCURR3 "Verbrauch P3"
|
||||||
|
#define D_Strom_L1 "Strom L1"
|
||||||
|
#define D_Strom_L2 "Strom L2"
|
||||||
|
#define D_Strom_L3 "Strom L3"
|
||||||
|
#define D_Spannung_L1 "Spannung L1"
|
||||||
|
#define D_Spannung_L2 "Spannung L2"
|
||||||
|
#define D_Spannung_L3 "Spannung L3"
|
||||||
|
#define D_METERNR "Zähler Nr"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Zählerstand" // Gas-Verbrauch
|
||||||
|
#define D_H2oIN "Zählerstand" // H2o-Verbrauch
|
||||||
|
#define D_StL1L2L3 "Ströme L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "None"
|
#define D_SENSOR_NONE "None"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "Ν"
|
#define D_TX20_SOUTH "Ν"
|
||||||
#define D_TX20_WEST "Δ"
|
#define D_TX20_WEST "Δ"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Κανένα"
|
#define D_SENSOR_NONE "Κανένα"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter" // Gas-Verbrauch
|
||||||
|
#define D_H2oIN "Counter" // H2o-Verbrauch
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "None"
|
#define D_SENSOR_NONE "None"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "O"
|
#define D_TX20_WEST "O"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total de Entrada"
|
||||||
|
#define D_TPWROUT "Total de Salida"
|
||||||
|
#define D_TPWRCURR "Corriente-En/Sal"
|
||||||
|
#define D_TPWRCURR1 "Corriente-Entr p1"
|
||||||
|
#define D_TPWRCURR2 "Corriente-Entr p2"
|
||||||
|
#define D_TPWRCURR3 "Corriente-Entr p3"
|
||||||
|
#define D_Strom_L1 "Corriente L1"
|
||||||
|
#define D_Strom_L2 "Corriente L2"
|
||||||
|
#define D_Strom_L3 "Corriente L3"
|
||||||
|
#define D_Spannung_L1 "Voltaje L1"
|
||||||
|
#define D_Spannung_L2 "Voltaje L2"
|
||||||
|
#define D_Spannung_L3 "Voltaje L3"
|
||||||
|
#define D_METERNR "Número de Medidor"
|
||||||
|
#define D_METERSID "ID de Servicio"
|
||||||
|
#define D_GasIN "Contador"
|
||||||
|
#define D_H2oIN "Contador"
|
||||||
|
#define D_StL1L2L3 "Corriente L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Ninguno"
|
#define D_SENSOR_NONE "Ninguno"
|
||||||
#define D_SENSOR_USER "Por Usuario"
|
#define D_SENSOR_USER "Por Usuario"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "O"
|
#define D_TX20_WEST "O"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Aucun"
|
#define D_SENSOR_NONE "Aucun"
|
||||||
#define D_SENSOR_USER "Utilisateur"
|
#define D_SENSOR_USER "Utilisateur"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "None"
|
#define D_SENSOR_NONE "None"
|
||||||
#define D_SENSOR_USER "משתמש"
|
#define D_SENSOR_USER "משתמש"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "D"
|
#define D_TX20_SOUTH "D"
|
||||||
#define D_TX20_WEST "NY"
|
#define D_TX20_WEST "NY"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Nincs"
|
#define D_SENSOR_NONE "Nincs"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "O"
|
#define D_TX20_WEST "O"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Nessuno"
|
#define D_SENSOR_NONE "Nessuno"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "없음"
|
#define D_SENSOR_NONE "없음"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Geen"
|
#define D_SENSOR_NONE "Geen"
|
||||||
#define D_SENSOR_USER "Gebruiker"
|
#define D_SENSOR_USER "Gebruiker"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Brak"
|
#define D_SENSOR_NONE "Brak"
|
||||||
#define D_SENSOR_USER "Użytkownik"
|
#define D_SENSOR_USER "Użytkownik"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "O"
|
#define D_TX20_WEST "O"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Nenhum"
|
#define D_SENSOR_NONE "Nenhum"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "O"
|
#define D_TX20_WEST "O"
|
||||||
|
|
||||||
|
//xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-Consumo"
|
||||||
|
#define D_TPWROUT "Total-Geração"
|
||||||
|
#define D_TPWRCURR "Corrente-Consumo/Geração"
|
||||||
|
#define D_TPWRCURR1 "Corrente-Consumo F1"
|
||||||
|
#define D_TPWRCURR2 "Corrente-Consumo F2"
|
||||||
|
#define D_TPWRCURR3 "Corrente-Consumo F3"
|
||||||
|
#define D_Strom_L1 "Corrente F1"
|
||||||
|
#define D_Strom_L2 "Corrente F2"
|
||||||
|
#define D_Strom_L3 "Corrente F3"
|
||||||
|
#define D_Spannung_L1 "Tensão F1"
|
||||||
|
#define D_Spannung_L2 "Tensão F2"
|
||||||
|
#define D_Spannung_L3 "Tensão F3"
|
||||||
|
#define D_METERNR "Número_Contador"
|
||||||
|
#define D_METERSID "ID Serviço"
|
||||||
|
#define D_GasIN "Contador"
|
||||||
|
#define D_H2oIN "Contador"
|
||||||
|
#define D_StL1L2L3 "Corrente F1+F2+F3"
|
||||||
|
#define D_SpL1L2L3 "Tensão F1+F2+F3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Nenhum"
|
#define D_SENSOR_NONE "Nenhum"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "V"
|
#define D_TX20_WEST "V"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Fără"
|
#define D_SENSOR_NONE "Fără"
|
||||||
#define D_SENSOR_USER "Utilizator"
|
#define D_SENSOR_USER "Utilizator"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "-нет-"
|
#define D_SENSOR_NONE "-нет-"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "J"
|
#define D_TX20_SOUTH "J"
|
||||||
#define D_TX20_WEST "Z"
|
#define D_TX20_WEST "Z"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Žiaden"
|
#define D_SENSOR_NONE "Žiaden"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "V"
|
#define D_TX20_WEST "V"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Ingen"
|
#define D_SENSOR_NONE "Ingen"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "None"
|
#define D_SENSOR_NONE "None"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "Пд"
|
#define D_TX20_SOUTH "Пд"
|
||||||
#define D_TX20_WEST "Зх"
|
#define D_TX20_WEST "Зх"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "Немає"
|
#define D_SENSOR_NONE "Немає"
|
||||||
#define D_SENSOR_USER "Користувач"
|
#define D_SENSOR_USER "Користувач"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "南"
|
#define D_TX20_SOUTH "南"
|
||||||
#define D_TX20_WEST "西"
|
#define D_TX20_WEST "西"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "无"
|
#define D_SENSOR_NONE "无"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -512,6 +512,26 @@
|
||||||
#define D_TX20_SOUTH "S"
|
#define D_TX20_SOUTH "S"
|
||||||
#define D_TX20_WEST "W"
|
#define D_TX20_WEST "W"
|
||||||
|
|
||||||
|
// xsns_53_sml.ino
|
||||||
|
#define D_TPWRIN "Total-In"
|
||||||
|
#define D_TPWROUT "Total-Out"
|
||||||
|
#define D_TPWRCURR "Current-In/Out"
|
||||||
|
#define D_TPWRCURR1 "Current-In p1"
|
||||||
|
#define D_TPWRCURR2 "Current-In p2"
|
||||||
|
#define D_TPWRCURR3 "Current-In p3"
|
||||||
|
#define D_Strom_L1 "Current L1"
|
||||||
|
#define D_Strom_L2 "Current L2"
|
||||||
|
#define D_Strom_L3 "Current L3"
|
||||||
|
#define D_Spannung_L1 "Voltage L1"
|
||||||
|
#define D_Spannung_L2 "Voltage L2"
|
||||||
|
#define D_Spannung_L3 "Voltage L3"
|
||||||
|
#define D_METERNR "Meter_number"
|
||||||
|
#define D_METERSID "Service ID"
|
||||||
|
#define D_GasIN "Counter"
|
||||||
|
#define D_H2oIN "Counter"
|
||||||
|
#define D_StL1L2L3 "Current L1+L2+L3"
|
||||||
|
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
||||||
|
|
||||||
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
// tasmota_template.h - keep them as short as possible to be able to fit them in GUI drop down box
|
||||||
#define D_SENSOR_NONE "None"
|
#define D_SENSOR_NONE "None"
|
||||||
#define D_SENSOR_USER "User"
|
#define D_SENSOR_USER "User"
|
||||||
|
|
|
@ -67,6 +67,12 @@ const char HASS_DISCOVER_BIN_SWITCH[] PROGMEM =
|
||||||
"\"pl_on\":\"%s\"," // ON
|
"\"pl_on\":\"%s\"," // ON
|
||||||
"\"pl_off\":\"%s\""; // OFF
|
"\"pl_off\":\"%s\""; // OFF
|
||||||
|
|
||||||
|
const char HASS_DISCOVER_BIN_PIR[] PROGMEM =
|
||||||
|
",\"val_tpl\":\"{{value_json.%s}}\"," // STATE
|
||||||
|
"\"frc_upd\":true," // In ON/OFF case, enable force_update to make automations work
|
||||||
|
"\"pl_on\":\"%s\"," // ON
|
||||||
|
"\"off_dly\":1"; // Switchmode13 and Switchmode14 doesn't transmit an OFF state.
|
||||||
|
|
||||||
const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
|
const char HASS_DISCOVER_LIGHT_DIMMER[] PROGMEM =
|
||||||
",\"bri_cmd_t\":\"%s\"," // cmnd/led2/Dimmer
|
",\"bri_cmd_t\":\"%s\"," // cmnd/led2/Dimmer
|
||||||
"\"bri_stat_t\":\"%s\"," // stat/led2/RESULT
|
"\"bri_stat_t\":\"%s\"," // stat/led2/RESULT
|
||||||
|
@ -292,7 +298,7 @@ void HAssAnnouncerTriggers(uint8_t device, uint8_t present, uint8_t key, uint8_t
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint8_t toggle)
|
void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint8_t toggle, uint8_t pir)
|
||||||
{
|
{
|
||||||
char stopic[TOPSZ];
|
char stopic[TOPSZ];
|
||||||
char stemp1[TOPSZ];
|
char stemp1[TOPSZ];
|
||||||
|
@ -321,7 +327,11 @@ void HAssAnnouncerBinSensors(uint8_t device, uint8_t present, uint8_t dual, uint
|
||||||
|
|
||||||
snprintf_P(name, sizeof(name), PSTR("%s Switch%d"), SettingsText(SET_FRIENDLYNAME1), device + 1);
|
snprintf_P(name, sizeof(name), PSTR("%s Switch%d"), SettingsText(SET_FRIENDLYNAME1), device + 1);
|
||||||
Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
|
Response_P(HASS_DISCOVER_BASE, name, state_topic, availability_topic);
|
||||||
|
if (!pir) {
|
||||||
TryResponseAppend_P(HASS_DISCOVER_BIN_SWITCH, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
|
TryResponseAppend_P(HASS_DISCOVER_BIN_SWITCH, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2), SettingsText(SET_STATE_TXT1));
|
||||||
|
} else {
|
||||||
|
TryResponseAppend_P(HASS_DISCOVER_BIN_PIR, PSTR(D_RSLT_STATE), SettingsText(SET_STATE_TXT2));
|
||||||
|
}
|
||||||
TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId());
|
TryResponseAppend_P(HASS_DISCOVER_DEVICE_INFO_SHORT, unique_id, ESP.getChipId());
|
||||||
TryResponseAppend_P(PSTR("}"));
|
TryResponseAppend_P(PSTR("}"));
|
||||||
}
|
}
|
||||||
|
@ -337,6 +347,7 @@ void HAssAnnounceSwitches(void)
|
||||||
uint8_t dual = 0;
|
uint8_t dual = 0;
|
||||||
uint8_t toggle = 1;
|
uint8_t toggle = 1;
|
||||||
uint8_t hold = 0;
|
uint8_t hold = 0;
|
||||||
|
uint8_t pir = 0;
|
||||||
|
|
||||||
if (pin[GPIO_SWT1 + switch_index] < 99) { switch_present = 1; }
|
if (pin[GPIO_SWT1 + switch_index] < 99) { switch_present = 1; }
|
||||||
|
|
||||||
|
@ -367,34 +378,38 @@ void HAssAnnounceSwitches(void)
|
||||||
uint8_t swmode = Settings.switchmode[switch_index];
|
uint8_t swmode = Settings.switchmode[switch_index];
|
||||||
|
|
||||||
switch (swmode) {
|
switch (swmode) {
|
||||||
case 1:
|
case FOLLOW:
|
||||||
case 2:
|
case FOLLOW_INV:
|
||||||
toggle = 0; // Binary sensor and no triggers
|
toggle = 0; // Binary sensor and no triggers
|
||||||
break;
|
break;
|
||||||
case 3:
|
case PUSHBUTTON:
|
||||||
case 4:
|
case PUSHBUTTON_INV:
|
||||||
dual = 1; // Binary sensor and TOGGLE (button_short_press) trigger
|
dual = 1; // Binary sensor and TOGGLE (button_short_press) trigger
|
||||||
break;
|
break;
|
||||||
case 5:
|
case PUSHBUTTONHOLD:
|
||||||
case 6:
|
case PUSHBUTTONHOLD_INV:
|
||||||
dual = 1; // Binary sensor, TOGGLE (button_short_press) and HOLD (button_long_press) triggers
|
dual = 1; // Binary sensor, TOGGLE (button_short_press) and HOLD (button_long_press) triggers
|
||||||
hold = 2;
|
hold = 2;
|
||||||
break;
|
break;
|
||||||
case 8:
|
case TOGGLEMULTI:
|
||||||
hold = 3; // TOGGLE (button_short_press) and HOLD (button_double_press) triggers
|
hold = 3; // TOGGLE (button_short_press) and HOLD (button_double_press) triggers
|
||||||
break;
|
break;
|
||||||
case 9:
|
case FOLLOWMULTI:
|
||||||
case 10:
|
case FOLLOWMULTI_INV:
|
||||||
dual = 1; // Binary sensor and HOLD (button_long_press) trigger
|
dual = 1; // Binary sensor and HOLD (button_long_press) trigger
|
||||||
toggle = 0;
|
toggle = 0;
|
||||||
hold = 3;
|
hold = 3;
|
||||||
break;
|
break;
|
||||||
|
case PUSHON:
|
||||||
|
case PUSHON_INV:
|
||||||
|
toggle = 0;
|
||||||
|
pir = 1; // Binary sensor with only ON state and automatic OFF after 1 second.
|
||||||
}
|
}
|
||||||
|
|
||||||
} else { switch_present = 0;}
|
} else { switch_present = 0;}
|
||||||
|
|
||||||
HAssAnnouncerTriggers(switch_index, switch_present, 1, toggle, hold);
|
HAssAnnouncerTriggers(switch_index, switch_present, 1, toggle, hold);
|
||||||
HAssAnnouncerBinSensors(switch_index, switch_present, dual, toggle);
|
HAssAnnouncerBinSensors(switch_index, switch_present, dual, toggle, pir);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -533,6 +548,7 @@ void HAssAnnounceSensors(void)
|
||||||
snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata); // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
|
snprintf_P(sensordata, sizeof(sensordata), PSTR("%s}"), sensordata); // {"INA219":{"Voltage":4.494,"Current":0.020,"Power":0.089}}
|
||||||
// USE THE FOLLOWING LINE TO TEST JSON
|
// USE THE FOLLOWING LINE TO TEST JSON
|
||||||
//snprintf_P(sensordata, sizeof(sensordata), PSTR("{\"HX711\":{\"Weight\":[22,34,1023.4], \"Battery\":25}}"));
|
//snprintf_P(sensordata, sizeof(sensordata), PSTR("{\"HX711\":{\"Weight\":[22,34,1023.4], \"Battery\":25}}"));
|
||||||
|
|
||||||
StaticJsonBuffer<500> jsonBuffer;
|
StaticJsonBuffer<500> jsonBuffer;
|
||||||
JsonObject &root = jsonBuffer.parseObject(sensordata);
|
JsonObject &root = jsonBuffer.parseObject(sensordata);
|
||||||
if (!root.success())
|
if (!root.success())
|
||||||
|
|
|
@ -50,70 +50,6 @@
|
||||||
// addresses a bug in meter DWS74
|
// addresses a bug in meter DWS74
|
||||||
//#define DWS74_BUG
|
//#define DWS74_BUG
|
||||||
|
|
||||||
// max 23 chars
|
|
||||||
#if MY_LANGUAGE==de-DE
|
|
||||||
// german web text
|
|
||||||
#define D_TPWRIN "Verbrauch"
|
|
||||||
#define D_TPWROUT "Einspeisung"
|
|
||||||
#define D_TPWRCURR "Aktueller Verbrauch"
|
|
||||||
#define D_TPWRCURR1 "Verbrauch P1"
|
|
||||||
#define D_TPWRCURR2 "Verbrauch P2"
|
|
||||||
#define D_TPWRCURR3 "Verbrauch P3"
|
|
||||||
#define D_Strom_L1 "Strom L1"
|
|
||||||
#define D_Strom_L2 "Strom L2"
|
|
||||||
#define D_Strom_L3 "Strom L3"
|
|
||||||
#define D_Spannung_L1 "Spannung L1"
|
|
||||||
#define D_Spannung_L2 "Spannung L2"
|
|
||||||
#define D_Spannung_L3 "Spannung L3"
|
|
||||||
#define D_METERNR "Zähler Nr"
|
|
||||||
#define D_METERSID "Service ID"
|
|
||||||
#define D_GasIN "Zählerstand" // Gas-Verbrauch
|
|
||||||
#define D_H2oIN "Zählerstand" // H2o-Verbrauch
|
|
||||||
#define D_StL1L2L3 "Ströme L1+L2+L3"
|
|
||||||
#define D_SpL1L2L3 "Spannung L1+L2+L3/3"
|
|
||||||
|
|
||||||
#else
|
|
||||||
// other languages (tbd)
|
|
||||||
#undef D_TPWRIN
|
|
||||||
#undef D_TPWROUT
|
|
||||||
#undef D_TPWRCURR
|
|
||||||
#undef D_TPWRCURR1
|
|
||||||
#undef D_TPWRCURR2
|
|
||||||
#undef D_TPWRCURR3
|
|
||||||
#undef D_Strom_L1
|
|
||||||
#undef D_Strom_L2
|
|
||||||
#undef D_Strom_L3
|
|
||||||
#undef D_Spannung_L1
|
|
||||||
#undef D_Spannung_L2
|
|
||||||
#undef D_Spannung_L3
|
|
||||||
#undef D_METERNR
|
|
||||||
#undef D_METERSID
|
|
||||||
#undef D_GasIN
|
|
||||||
#undef D_H2oIN
|
|
||||||
#undef D_StL1L2L3
|
|
||||||
#undef D_SpL1L2L3
|
|
||||||
|
|
||||||
#define D_TPWRIN "Total-In"
|
|
||||||
#define D_TPWROUT "Total-Out"
|
|
||||||
#define D_TPWRCURR "Current-In/Out"
|
|
||||||
#define D_TPWRCURR1 "Current-In p1"
|
|
||||||
#define D_TPWRCURR2 "Current-In p2"
|
|
||||||
#define D_TPWRCURR3 "Current-In p3"
|
|
||||||
#define D_Strom_L1 "Current L1"
|
|
||||||
#define D_Strom_L2 "Current L2"
|
|
||||||
#define D_Strom_L3 "Current L3"
|
|
||||||
#define D_Spannung_L1 "Voltage L1"
|
|
||||||
#define D_Spannung_L2 "Voltage L2"
|
|
||||||
#define D_Spannung_L3 "Voltage L3"
|
|
||||||
#define D_METERNR "Meter_number"
|
|
||||||
#define D_METERSID "Service ID"
|
|
||||||
#define D_GasIN "Counter" // Gas-Verbrauch
|
|
||||||
#define D_H2oIN "Counter" // H2o-Verbrauch
|
|
||||||
#define D_StL1L2L3 "Current L1+L2+L3"
|
|
||||||
#define D_SpL1L2L3 "Voltage L1+L2+L3/3"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// JSON Strings do not translate
|
// JSON Strings do not translate
|
||||||
// max 23 char
|
// max 23 char
|
||||||
#define DJ_TPWRIN "Total_in"
|
#define DJ_TPWRIN "Total_in"
|
||||||
|
|
Loading…
Reference in New Issue