From 582c32f5b9582940ee6bb53a68270f527ca18134 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 24 Oct 2020 12:41:08 +0200 Subject: [PATCH] Add support for EZO EC sensor Add support for EZO EC sensors by Christopher Tremblay (#9613) --- BUILDS.md | 7 ++++--- CHANGELOG.md | 1 + RELEASENOTES.md | 2 +- tasmota/support_features.ino | 6 ++++-- tasmota/tasmota_configurations.h | 1 + tasmota/xdrv_81_webcam.ino | 5 ----- tools/decode-status.py | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/BUILDS.md b/BUILDS.md index aed8361da..00be02c3d 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -131,10 +131,11 @@ | USE_VEML7700 | - | - | - | - | - | - | - | | USE_MCP9808 | - | - | - | - | - | - | - | | USE_HP303B | - | - | - | - | - | - | - | -| USE_EZOPH | - | - | - | - | - | - | - | -| USE_EZOORP | - | - | - | - | - | - | - | -| USE_EZORTD | - | - | - | - | - | - | - | +| USE_EZOEC | - | - | - | - | - | - | - | | USE_EZOHUM | - | - | - | - | - | - | - | +| USE_EZOORP | - | - | - | - | - | - | - | +| USE_EZOPH | - | - | - | - | - | - | - | +| USE_EZORTD | - | - | - | - | - | - | - | | | | | | | | | | | Feature or Sensor | minimal | lite | tasmota | knx | sensors | ir | display | Remarks | USE_SPI | - | - | - | - | - | - | x | diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b4279acf..53bd16e86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. - Support for EZO Ph and ORP sensors by Christopher Tremblay (#9567) - Support for EZO RTD sensors by Christopher Tremblay (#9585) - Support for EZO HUM sensors by Christopher Tremblay (#9599) +- Support for EZO EC sensors by Christopher Tremblay (#9613) - On ZigbeeBridge support for glowing led when permit join is active (#9581) - Support for PWM Dimmer multi-press and ledmask (#9584) - Support for fixed output Hi or Lo GPIO selection diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 3dc27f6bb..929e8259a 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -72,7 +72,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota - Support for analog buttons indexed within standard button range - Support for Vietnamese language translations by Tâm.NT - Support for timers in case of no-sunset permanent day by cybermaus (#9543) -- Support for EZO Ph, ORP, RTD and HUM sensors by Christopher Tremblay (#9567, #9585, #9599) +- Support for EZO EC, HUM, ORP, Ph and RTD sensors by Christopher Tremblay - Support for fixed output Hi or Lo GPIO selection - ESP32 support for Wireless-Tag WT32-ETH01 (#9496) - ESP32 MI32 Beacon support, RSSI at TELEPERIOD, refactoring (#9609) diff --git a/tasmota/support_features.ino b/tasmota/support_features.ino index 1d5150226..3ed654ebf 100644 --- a/tasmota/support_features.ino +++ b/tasmota/support_features.ino @@ -637,9 +637,11 @@ void GetFeatures(void) feature7 |= 0x00000002; // xsns_78_ezortd.ino #endif #if defined(USE_I2C) && defined(USE_EZOHUM) - feature7 |= 0x00000004; // xsns_78_exohum.ino + feature7 |= 0x00000004; // xsns_78_ezohum.ino +#endif +#if defined(USE_I2C) && defined(USE_EZOEC) + feature7 |= 0x00000008; // xsns_78_ezoec.ino #endif -// feature7 |= 0x00000008; // feature7 |= 0x00000010; // feature7 |= 0x00000020; diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index 37f6d107f..358defe4e 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -131,6 +131,7 @@ //#define USE_EZOORP // [I2cDriver55] Enable support for EZO's ORP sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code) //#define USE_EZORTD // [I2cDriver55] Enable support for EZO's RTD sensor (+0k2 code) - Shared EZO code required for any EZO device (+1k2 code) //#define USE_EZOHUM // [I2cDriver55] Enable support for EZO's HUM sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code) +//#define USE_EZOEC // [I2cDriver55] Enable support for EZO's EC sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code) #define USE_MHZ19 // Add support for MH-Z19 CO2 sensor (+2k code) #define USE_SENSEAIR // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code) diff --git a/tasmota/xdrv_81_webcam.ino b/tasmota/xdrv_81_webcam.ino index 0b3c35193..d10bca647 100755 --- a/tasmota/xdrv_81_webcam.ino +++ b/tasmota/xdrv_81_webcam.ino @@ -818,11 +818,6 @@ uint32_t WcSetStreamserver(uint32_t flag) { CamServer->on("/cam.mjpeg", HandleWebcamMjpeg); CamServer->on("/cam.jpg", HandleWebcamMjpeg); CamServer->on("/stream", HandleWebcamMjpeg); - -// WebServer_on(PSTR("/"), HandleWebcamRoot); -// WebServer_on(PSTR("/cam.mjpeg"), HandleWebcamMjpeg); -// WebServer_on(PSTR("/cam.jpg"), HandleWebcamMjpeg); -// WebServer_on(PSTR("/stream"), HandleWebcamMjpeg); AddLog_P2(LOG_LEVEL_DEBUG, PSTR("CAM: Stream init")); CamServer->begin(); } diff --git a/tools/decode-status.py b/tools/decode-status.py index 6498a98d4..6826f3afc 100755 --- a/tools/decode-status.py +++ b/tools/decode-status.py @@ -232,7 +232,7 @@ a_features = [[ "USE_MLX90640","USE_VL53L1X","USE_MIEL_HVAC","USE_WE517", "USE_EZOPH","USE_TTGO_WATCH","USE_ETHERNET","USE_WEBCAM" ],[ - "USE_EZOORP","USE_EZORTD","USE_EZOHUM","", + "USE_EZOORP","USE_EZORTD","USE_EZOHUM","USE_EZOEC", "","","","", "","","","", "","","","", @@ -267,7 +267,7 @@ else: obj = json.load(fp) def StartDecode(): - print ("\n*** decode-status.py v20201023 by Theo Arends and Jacek Ziolkowski ***") + print ("\n*** decode-status.py v20201024 by Theo Arends and Jacek Ziolkowski ***") # print("Decoding\n{}".format(obj))