Add support for EZO FLO

Add support for EZO FLO sensors by Christopher Tremblay (#9697)
This commit is contained in:
Theo Arends 2020-11-01 15:15:10 +01:00
parent 8896f7af90
commit db863c4589
5 changed files with 31 additions and 27 deletions

View File

@ -135,6 +135,7 @@
| USE_HP303B | - | - | - | - | - | - | - | | USE_HP303B | - | - | - | - | - | - | - |
| USE_EZOCO2 | - | - | - | - | - | - | - | | USE_EZOCO2 | - | - | - | - | - | - | - |
| USE_EZOEC | - | - | - | - | - | - | - | | USE_EZOEC | - | - | - | - | - | - | - |
| USE_EZOFLO | - | - | - | - | - | - | - |
| USE_EZOHUM | - | - | - | - | - | - | - | | USE_EZOHUM | - | - | - | - | - | - | - |
| USE_EZOO2 | - | - | - | - | - | - | - | | USE_EZOO2 | - | - | - | - | - | - | - |
| USE_EZOORP | - | - | - | - | - | - | - | | USE_EZOORP | - | - | - | - | - | - | - |

View File

@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
- TLS in binary tasmota-zbbridge (#9635) - TLS in binary tasmota-zbbridge (#9635)
- Support for EZO O2 sensors by Christopher Tremblay (#9619) - Support for EZO O2 sensors by Christopher Tremblay (#9619)
- Support for EZO PRS sensors by Christopher Tremblay (#9659) - Support for EZO PRS sensors by Christopher Tremblay (#9659)
- Support for EZO FLO sensors by Christopher Tremblay (#9697)
- Zigbee reduce battery drain (#9642) - Zigbee reduce battery drain (#9642)
- Zigbee command ``ZbMap`` to describe Zigbee topology (#9651) - Zigbee command ``ZbMap`` to describe Zigbee topology (#9651)
- Zigbee command ``ZbOccupancy`` to configure the time-out for PIR - Zigbee command ``ZbOccupancy`` to configure the time-out for PIR

View File

@ -120,12 +120,12 @@
#define D_LWT "LWT" #define D_LWT "LWT"
#define D_LQI "LQI" // Zigbee Link Quality Index #define D_LQI "LQI" // Zigbee Link Quality Index
#define D_MODULE "Module" #define D_MODULE "Module"
#define D_MOISTURE "Moisture" #define D_MOISTURE "Vochtigheid"
#define D_MQTT "MQTT" #define D_MQTT "MQTT"
#define D_MULTI_PRESS "meervoudig" #define D_MULTI_PRESS "meervoudig"
#define D_NOISE "Lawaai" #define D_NOISE "Lawaai"
#define D_NONE "Geen" #define D_NONE "Geen"
#define D_O2 "Oxygen" #define D_O2 "Zuurstof"
#define D_OFF "Uit" #define D_OFF "Uit"
#define D_OFFLINE "Offline" #define D_OFFLINE "Offline"
#define D_OK "Ok" #define D_OK "Ok"
@ -499,12 +499,12 @@
#define D_PARTICALS_BEYOND "Stofdeeltjes" #define D_PARTICALS_BEYOND "Stofdeeltjes"
// xsns_27_apds9960.ino // xsns_27_apds9960.ino
#define D_GESTURE "Gesture" #define D_GESTURE "Gebaar"
#define D_COLOR_RED "Red" #define D_COLOR_RED "Rood"
#define D_COLOR_GREEN "Green" #define D_COLOR_GREEN "Groen"
#define D_COLOR_BLUE "Blue" #define D_COLOR_BLUE "Blauw"
#define D_CCT "CCT" #define D_CCT "CCT"
#define D_PROXIMITY "Proximity" #define D_PROXIMITY "Nabijheid"
// xsns_32_mpu6050.ino // xsns_32_mpu6050.ino
#define D_AX_AXIS "Versn. X-as" #define D_AX_AXIS "Versn. X-as"
@ -538,23 +538,23 @@
#define D_TX20_WEST "W" #define D_TX20_WEST "W"
// xsns_53_sml.ino // xsns_53_sml.ino
#define D_TPWRIN "Energy Total-In" #define D_TPWRIN "Totaal energie-In"
#define D_TPWROUT "Energy Total-Out" #define D_TPWROUT "Totaal energie-Uit"
#define D_TPWRCURR "Active Power-In/Out" #define D_TPWRCURR "Werkelijk vermogen-In/Uit"
#define D_TPWRCURR1 "Active Power-In p1" #define D_TPWRCURR1 "Werkelijk vermogen-In p1"
#define D_TPWRCURR2 "Active Power-In p2" #define D_TPWRCURR2 "Werkelijk vermogen-In p2"
#define D_TPWRCURR3 "Active Power-In p3" #define D_TPWRCURR3 "Werkelijk vermogen-In p3"
#define D_Strom_L1 "Current L1" #define D_Strom_L1 "Stroom L1"
#define D_Strom_L2 "Current L2" #define D_Strom_L2 "Stroom L2"
#define D_Strom_L3 "Current L3" #define D_Strom_L3 "Stroom L3"
#define D_Spannung_L1 "Voltage L1" #define D_Spannung_L1 "Voltage L1"
#define D_Spannung_L2 "Voltage L2" #define D_Spannung_L2 "Voltage L2"
#define D_Spannung_L3 "Voltage L3" #define D_Spannung_L3 "Voltage L3"
#define D_METERNR "Meter_number" #define D_METERNR "Meter_nummer"
#define D_METERSID "Service ID" #define D_METERSID "Service ID"
#define D_GasIN "Counter" #define D_GasIN "Teller"
#define D_H2oIN "Counter" #define D_H2oIN "Teller"
#define D_StL1L2L3 "Current L1+L2+L3" #define D_StL1L2L3 "Stroom L1+L2+L3"
#define D_SpL1L2L3 "Voltage L1+L2+L3/3" #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
@ -680,9 +680,9 @@
#define D_SENSOR_SM2135_DAT "SM2135 Dat" #define D_SENSOR_SM2135_DAT "SM2135 Dat"
#define D_SENSOR_DEEPSLEEP "DeepSleep" #define D_SENSOR_DEEPSLEEP "DeepSleep"
#define D_SENSOR_EXS_ENABLE "EXS Enable" #define D_SENSOR_EXS_ENABLE "EXS Enable"
#define D_SENSOR_CLIENT_TX "Client TX" #define D_SENSOR_CLIENT_TX "Client TX"
#define D_SENSOR_CLIENT_RX "Client RX" #define D_SENSOR_CLIENT_RX "Client RX"
#define D_SENSOR_CLIENT_RESET "Client RST" #define D_SENSOR_CLIENT_RESET "Client RST"
#define D_SENSOR_GPS_RX "GPS RX" #define D_SENSOR_GPS_RX "GPS RX"
#define D_SENSOR_GPS_TX "GPS TX" #define D_SENSOR_GPS_TX "GPS TX"
#define D_SENSOR_HM10_RX "HM10 RX" #define D_SENSOR_HM10_RX "HM10 RX"
@ -782,7 +782,7 @@
#define D_TOTAL_REACTIVE "Totaal blind" #define D_TOTAL_REACTIVE "Totaal blind"
#define D_UNIT_KWARH "kVArh" #define D_UNIT_KWARH "kVArh"
#define D_UNIT_ANGLE "Deg" #define D_UNIT_ANGLE "Deg"
#define D_TOTAL_ACTIVE "Total Active" #define D_TOTAL_ACTIVE "Totaal werkelijk"
//SOLAXX1 //SOLAXX1
#define D_PV1_VOLTAGE "PV1 spanning" #define D_PV1_VOLTAGE "PV1 spanning"

View File

@ -646,7 +646,9 @@ void ResponseAppendFeatures(void)
#if defined(USE_I2C) && defined(USE_EZOPRS) #if defined(USE_I2C) && defined(USE_EZOPRS)
feature7 |= 0x00000040; // xsns_78_ezoprs.ino feature7 |= 0x00000040; // xsns_78_ezoprs.ino
#endif #endif
// feature7 |= 0x00000080; #if defined(USE_I2C) && defined(USE_EZOFLO)
feature7 |= 0x00000080;
#endif
// feature7 |= 0x00000100; // feature7 |= 0x00000100;
// feature7 |= 0x00000200; // feature7 |= 0x00000200;

View File

@ -234,7 +234,7 @@ a_features = [[
"USE_EZOPH","USE_TTGO_WATCH","USE_ETHERNET","USE_WEBCAM" "USE_EZOPH","USE_TTGO_WATCH","USE_ETHERNET","USE_WEBCAM"
],[ ],[
"USE_EZOORP","USE_EZORTD","USE_EZOHUM","USE_EZOEC", "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) obj = json.load(fp)
def StartDecode(): 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)) # print("Decoding\n{}".format(obj))