From a96218fc1cb0aa0dbc14e88e778a830f2be3c9a5 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sun, 25 Oct 2020 14:46:13 +0100 Subject: [PATCH] v9.0.0.3 - Add TLS in binary tasmota-zbbridge (#9620) - Add support for EZO CO2 sensors by Christopher Tremblay (#9619) --- BUILDS.md | 1 + CHANGELOG.md | 7 ++++++- RELEASENOTES.md | 5 +++-- tasmota/my_user_config.h | 4 ---- tasmota/tasmota_configurations.h | 32 +++++++++++++------------------- tasmota/tasmota_version.h | 2 +- tasmota/xsns_78_ezo.ino | 6 +++++- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/BUILDS.md b/BUILDS.md index 00be02c3d..e29ba5f5b 100644 --- a/BUILDS.md +++ b/BUILDS.md @@ -131,6 +131,7 @@ | USE_VEML7700 | - | - | - | - | - | - | - | | USE_MCP9808 | - | - | - | - | - | - | - | | USE_HP303B | - | - | - | - | - | - | - | +| USE_EZOCO2 | - | - | - | - | - | - | - | | USE_EZOEC | - | - | - | - | - | - | - | | USE_EZOHUM | - | - | - | - | - | - | - | | USE_EZOORP | - | - | - | - | - | - | - | diff --git a/CHANGELOG.md b/CHANGELOG.md index b99347572..6a8ef98d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [9.0.0.2] +## [9.0.0.3] +### Added +- TLS in binary tasmota-zbbridge (#9620) + +## [9.0.0.2] - 20201025 ### Added - Support for Vietnamese language translations by Tâm.NT - Support for timers in case of no-sunset permanent day by cybermaus (#9543) @@ -15,6 +19,7 @@ All notable changes to this project will be documented in this file. - 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) +- Support for EZO CO2 sensors by Christopher Tremblay (#9619) - 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 be34664ec..58c6117f2 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -57,7 +57,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v9.0.0.2 +## Changelog v9.0.0.3 ### Added - Command ``NoDelay`` for immediate backlog command execution by Erik Montnemery (#9544) - Command ``SwitchMode 15`` sending only MQTT message on switch change (#9593) @@ -73,8 +73,9 @@ 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 EC, HUM, ORP, Ph and RTD sensors by Christopher Tremblay +- Support for EZO CO2, EC, HUM, ORP, Ph and RTD sensors by Christopher Tremblay - Support for fixed output Hi or Lo GPIO selection +- TLS in binary tasmota-zbbridge (#9620) - ESP32 support for Wireless-Tag WT32-ETH01 (#9496) - ESP32 MI32 Beacon support, RSSI at TELEPERIOD, refactoring (#9609) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index aedd2024d..34b479e0e 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -569,10 +569,6 @@ // #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_EZOCO2 // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code) - #if defined(USE_EZOPH) || defined(USE_EZOORP) || defined(USE_EZORTD) || defined(USE_EZOHUM) || defined(USE_EZOEC) || defined(USE_EZOCO2) - #define USE_EZO - #endif - // #define USE_DISPLAY // Add I2C Display Support (+2k code) #define USE_DISPLAY_MODES1TO5 // Enable display mode 1 to 5 in addition to mode 0 #define USE_DISPLAY_LCD // [DisplayModel 1] [I2cDriver3] Enable Lcd display (I2C addresses 0x27 and 0x3F) (+6k code) diff --git a/tasmota/tasmota_configurations.h b/tasmota/tasmota_configurations.h index cf59e8a1d..95fdcbea0 100644 --- a/tasmota/tasmota_configurations.h +++ b/tasmota/tasmota_configurations.h @@ -134,10 +134,6 @@ //#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_EZOCO2 // [I2cDriver55] Enable support for EZO's CO2 sensor (+0k3 code) - Shared EZO code required for any EZO device (+1k2 code) - #if defined(USE_EZOPH) || defined(USE_EZOORP) || defined(USE_EZORTD) || defined(USE_EZOHUM) || defined(USE_EZOEC) || defined(USE_EZOCO2) - #define USE_EZO - #endif - #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) #ifndef CO2_LOW @@ -443,14 +439,22 @@ #define SERIAL_LOG_LEVEL LOG_LEVEL_NONE // [SerialLog] (LOG_LEVEL_NONE, LOG_LEVEL_ERROR, LOG_LEVEL_INFO, LOG_LEVEL_DEBUG, LOG_LEVEL_DEBUG_MORE) #undef USE_ARDUINO_OTA // Disable support for Arduino OTA -#define USE_DOMOTICZ // Disable Domoticz +#define USE_DOMOTICZ // Enable Domoticz #undef USE_HOME_ASSISTANT // Disable Home Assistant -#undef USE_MQTT_TLS // Disable TLS support won't work as the MQTTHost is not set + +// -- MQTT - TLS - AWS IoT ------------------------ +#define USE_MQTT_TLS // Use TLS for MQTT connection (+34.5k code, +7.0k mem and +4.8k additional during connection handshake) + #define USE_MQTT_TLS_CA_CERT // Force full CA validation instead of fingerprints, slower, but simpler to use. (+2.2k code, +1.9k mem during connection handshake) + // This includes the LetsEncrypt CA in tasmota_ca.ino for verifying server certificates + #define USE_MQTT_TLS_FORCE_EC_CIPHER // Force Elliptic Curve cipher (higher security) required by some servers (automatically enabled with USE_MQTT_AWS_IOT) (+11.4k code, +0.4k mem) + #define USE_MQTT_AWS_IOT_LIGHT // Enable MQTT for AWS IoT in light mode, with user/password instead of private certificate +#define USE_TLS // flag indicates we need to include TLS code + #undef USE_KNX // Disable KNX IP Protocol Support //#undef USE_WEBSERVER // Disable Webserver //#undef USE_WEBSEND_RESPONSE // Disable command WebSend response message (+1k code) -#define USE_EMULATION // Disable Wemo or Hue emulation -#define USE_EMULATION_HUE // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common) +#define USE_EMULATION // Enable Hue emulation +#define USE_EMULATION_HUE // Enable Hue Bridge emulation for Alexa (+14k code, +2k mem common) #undef USE_EMULATION_WEMO // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common) #undef USE_CUSTOM // Disable Custom features #undef USE_DISCOVERY // Disable Discovery services for both MQTT and web server @@ -553,26 +557,16 @@ #undef DEBUG_THEO // Disable debug code #undef USE_DEBUG_DRIVER // Disable debug code -// -- MQTT - TLS - AWS IoT ------------------------ -#define USE_MQTT_TLS // Use TLS for MQTT connection (+34.5k code, +7.0k mem and +4.8k additional during connection handshake) - #define USE_MQTT_TLS_CA_CERT // Force full CA validation instead of fingerprints, slower, but simpler to use. (+2.2k code, +1.9k mem during connection handshake) - // This includes the LetsEncrypt CA in tasmota_ca.ino for verifying server certificates - #define USE_MQTT_TLS_FORCE_EC_CIPHER // Force Elliptic Curve cipher (higher security) required by some servers (automatically enabled with USE_MQTT_AWS_IOT) (+11.4k code, +0.4k mem) - #define USE_MQTT_AWS_IOT_LIGHT // Enable MQTT for AWS IoT in light mode, with user/password instead of private certificate -#define USE_TLS // flag indicates we need to include TLS code - #define USE_ZIGBEE #undef USE_ZIGBEE_ZNP #define USE_ZIGBEE_EZSP #define USE_TCP_BRIDGE - #define USE_ZIGBEE_CHANNEL 11 // Zigbee Channel (11-26) + #define USE_ZIGBEE_CHANNEL 11 // Zigbee Channel (11-26) #define USE_ZIGBEE_COALESCE_ATTR_TIMER 350 // timer to coalesce attribute values (in ms) - #endif // SONOFF_ZIGBEEBRIDGE ****************************************************************** - /*********************************************************************************************\ * [tasmota-lite.bin] * Provide an image without sensors diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 1ab1e1de1..846e5579f 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,7 +20,7 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x09000002; +const uint32_t VERSION = 0x09000003; // Lowest compatible version const uint32_t VERSION_COMPATIBLE = 0x07010006; diff --git a/tasmota/xsns_78_ezo.ino b/tasmota/xsns_78_ezo.ino index 72d22cf6f..783d86538 100644 --- a/tasmota/xsns_78_ezo.ino +++ b/tasmota/xsns_78_ezo.ino @@ -17,6 +17,10 @@ along with this program. If not, see . */ #ifdef USE_I2C + +#if defined(USE_EZOPH) || defined(USE_EZOORP) || defined(USE_EZORTD) || defined(USE_EZOHUM) || defined(USE_EZOEC) || defined(USE_EZOCO2) + #define USE_EZO +#endif #if defined(USE_EZO) #define D_EZO_DELAY 300 // Minimum delay for any instruction @@ -100,7 +104,7 @@ protected: } uint8_t valid; - uint8_t addr; + uint8_t addr; uint32_t lastRead; };