From db863c4589a9aecbd66409cf83aceeed7efb762b Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 1 Nov 2020 15:15:10 +0100 Subject: [PATCH] Add support for EZO FLO Add support for EZO FLO sensors by Christopher Tremblay (#9697) --- BUILDS.md | 1 + CHANGELOG.md | 1 + tasmota/language/nl_NL.h | 48 ++++++++++++++++++------------------ tasmota/support_features.ino | 4 ++- tools/decode-status.py | 4 +-- 5 files changed, 31 insertions(+), 27 deletions(-) diff --git a/BUILDS.md b/BUILDS.md index af109a5fb..6242714e1 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -135,6 +135,7 @@ | USE_HP303B | - | - | - | - | - | - | - | | USE_EZOCO2 | - | - | - | - | - | - | - | | USE_EZOEC | - | - | - | - | - | - | - | +| USE_EZOFLO | - | - | - | - | - | - | - | | USE_EZOHUM | - | - | - | - | - | - | - | | USE_EZOO2 | - | - | - | - | - | - | - | | USE_EZOORP | - | - | - | - | - | - | - | diff --git a/CHANGELOG.md b/CHANGELOG.md index 46721cc27..342474af9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. - TLS in binary tasmota-zbbridge (#9635) - Support for EZO O2 sensors by Christopher Tremblay (#9619) - Support for EZO PRS sensors by Christopher Tremblay (#9659) +- Support for EZO FLO sensors by Christopher Tremblay (#9697) - Zigbee reduce battery drain (#9642) - Zigbee command ``ZbMap`` to describe Zigbee topology (#9651) - Zigbee command ``ZbOccupancy`` to configure the time-out for PIR diff --git a/tasmota/language/nl_NL.h b/tasmota/language/nl_NL.h index dcbd187fc..24e02a07f 100644 --- a/tasmota/language/nl_NL.h +++ b/tasmota/language/nl_NL.h @@ -120,12 +120,12 @@ #define D_LWT "LWT" #define D_LQI "LQI" // Zigbee Link Quality Index #define D_MODULE "Module" -#define D_MOISTURE "Moisture" +#define D_MOISTURE "Vochtigheid" #define D_MQTT "MQTT" #define D_MULTI_PRESS "meervoudig" #define D_NOISE "Lawaai" #define D_NONE "Geen" -#define D_O2 "Oxygen" +#define D_O2 "Zuurstof" #define D_OFF "Uit" #define D_OFFLINE "Offline" #define D_OK "Ok" @@ -499,12 +499,12 @@ #define D_PARTICALS_BEYOND "Stofdeeltjes" // xsns_27_apds9960.ino -#define D_GESTURE "Gesture" -#define D_COLOR_RED "Red" -#define D_COLOR_GREEN "Green" -#define D_COLOR_BLUE "Blue" +#define D_GESTURE "Gebaar" +#define D_COLOR_RED "Rood" +#define D_COLOR_GREEN "Groen" +#define D_COLOR_BLUE "Blauw" #define D_CCT "CCT" -#define D_PROXIMITY "Proximity" +#define D_PROXIMITY "Nabijheid" // xsns_32_mpu6050.ino #define D_AX_AXIS "Versn. X-as" @@ -538,23 +538,23 @@ #define D_TX20_WEST "W" // xsns_53_sml.ino -#define D_TPWRIN "Energy Total-In" -#define D_TPWROUT "Energy Total-Out" -#define D_TPWRCURR "Active Power-In/Out" -#define D_TPWRCURR1 "Active Power-In p1" -#define D_TPWRCURR2 "Active Power-In p2" -#define D_TPWRCURR3 "Active Power-In p3" -#define D_Strom_L1 "Current L1" -#define D_Strom_L2 "Current L2" -#define D_Strom_L3 "Current L3" +#define D_TPWRIN "Totaal energie-In" +#define D_TPWROUT "Totaal energie-Uit" +#define D_TPWRCURR "Werkelijk vermogen-In/Uit" +#define D_TPWRCURR1 "Werkelijk vermogen-In p1" +#define D_TPWRCURR2 "Werkelijk vermogen-In p2" +#define D_TPWRCURR3 "Werkelijk vermogen-In p3" +#define D_Strom_L1 "Stroom L1" +#define D_Strom_L2 "Stroom L2" +#define D_Strom_L3 "Stroom 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_METERNR "Meter_nummer" #define D_METERSID "Service ID" -#define D_GasIN "Counter" -#define D_H2oIN "Counter" -#define D_StL1L2L3 "Current L1+L2+L3" +#define D_GasIN "Teller" +#define D_H2oIN "Teller" +#define D_StL1L2L3 "Stroom 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 @@ -680,9 +680,9 @@ #define D_SENSOR_SM2135_DAT "SM2135 Dat" #define D_SENSOR_DEEPSLEEP "DeepSleep" #define D_SENSOR_EXS_ENABLE "EXS Enable" -#define D_SENSOR_CLIENT_TX "Client TX" -#define D_SENSOR_CLIENT_RX "Client RX" -#define D_SENSOR_CLIENT_RESET "Client RST" +#define D_SENSOR_CLIENT_TX "Client TX" +#define D_SENSOR_CLIENT_RX "Client RX" +#define D_SENSOR_CLIENT_RESET "Client RST" #define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_HM10_RX "HM10 RX" @@ -782,7 +782,7 @@ #define D_TOTAL_REACTIVE "Totaal blind" #define D_UNIT_KWARH "kVArh" #define D_UNIT_ANGLE "Deg" -#define D_TOTAL_ACTIVE "Total Active" +#define D_TOTAL_ACTIVE "Totaal werkelijk" //SOLAXX1 #define D_PV1_VOLTAGE "PV1 spanning" diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino index 62a5c012a..4181a7f77 100644 --- a/tasmota/support_features.ino +++ b/tasmota/support_features.ino @@ -646,7 +646,9 @@ void ResponseAppendFeatures(void) #if defined(USE_I2C) && defined(USE_EZOPRS) feature7 |= 0x00000040; // xsns_78_ezoprs.ino #endif -// feature7 |= 0x00000080; +#if defined(USE_I2C) && defined(USE_EZOFLO) + feature7 |= 0x00000080; +#endif // feature7 |= 0x00000100; // feature7 |= 0x00000200; diff --git a/tools/decode-status.py b/tools/decode-status.py index 3ead528c2..453832a27 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -234,7 +234,7 @@ a_features = [[ "USE_EZOPH","USE_TTGO_WATCH","USE_ETHERNET","USE_WEBCAM" ],[ "USE_EZOORP","USE_EZORTD","USE_EZOHUM","USE_EZOEC", - "USE_EZOCO2","USE_EZOO2","USE_EZOPRS","", + "USE_EZOCO2","USE_EZOO2","USE_EZOPRS","USE_EZOFLO", "","","","", "","","","", "","","","", @@ -268,7 +268,7 @@ else: obj = json.load(fp) def StartDecode(): - print ("\n*** decode-status.py v20201029 by Theo Arends and Jacek Ziolkowski ***") + print ("\n*** decode-status.py v20201101 by Theo Arends and Jacek Ziolkowski ***") # print("Decoding\n{}".format(obj))