mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

v9.0.0.3 

- Add TLS in binary tasmota-zbbridge (#9620)
- Add support for EZO CO2 sensors by Christopher Tremblay (#9619)
This commit is contained in:
Theo Arends 2020-10-25 14:46:13 +01:00
parent 37e68db05a
commit a96218fc1c
7 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUILDS.md
View File

@ -131,6 +131,7 @@
| USE_VEML7700 | - | - | - | - | - | - | - | | USE_VEML7700 | - | - | - | - | - | - | - |
| USE_MCP9808 | - | - | - | - | - | - | - | | USE_MCP9808 | - | - | - | - | - | - | - |
| USE_HP303B | - | - | - | - | - | - | - | | USE_HP303B | - | - | - | - | - | - | - |
| USE_EZOCO2 | - | - | - | - | - | - | - |
| USE_EZOEC | - | - | - | - | - | - | - | | USE_EZOEC | - | - | - | - | - | - | - |
| USE_EZOHUM | - | - | - | - | - | - | - | | USE_EZOHUM | - | - | - | - | - | - | - |
| USE_EZOORP | - | - | - | - | - | - | - | | USE_EZOORP | - | - | - | - | - | - | - |

7
CHANGELOG.md
View File

@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file.
## [Unreleased] - Development ## [Unreleased] - Development
## [9.0.0.2] ## [9.0.0.3]
### Added
- TLS in binary tasmota-zbbridge (#9620)
## [9.0.0.2] - 20201025
### Added ### Added
- Support for Vietnamese language translations by Tâm.NT - Support for Vietnamese language translations by Tâm.NT
- Support for timers in case of no-sunset permanent day by cybermaus (#9543) - 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 RTD sensors by Christopher Tremblay (#9585)
- Support for EZO HUM sensors by Christopher Tremblay (#9599) - Support for EZO HUM sensors by Christopher Tremblay (#9599)
- Support for EZO EC sensors by Christopher Tremblay (#9613) - 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) - On ZigbeeBridge support for glowing led when permit join is active (#9581)
- Support for PWM Dimmer multi-press and ledmask (#9584) - Support for PWM Dimmer multi-press and ledmask (#9584)
- Support for fixed output Hi or Lo GPIO selection - Support for fixed output Hi or Lo GPIO selection

5
RELEASENOTES.md
View File

@ -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. [Complete list](BUILDS.md) of available feature and sensors.
## Changelog v9.0.0.2 ## Changelog v9.0.0.3
### Added ### Added
- Command ``NoDelay`` for immediate backlog command execution by Erik Montnemery (#9544) - Command ``NoDelay`` for immediate backlog command execution by Erik Montnemery (#9544)
- Command ``SwitchMode 15`` sending only MQTT message on switch change (#9593) - 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 analog buttons indexed within standard button range
- Support for Vietnamese language translations by Tâm.NT - Support for Vietnamese language translations by Tâm.NT
- Support for timers in case of no-sunset permanent day by cybermaus (#9543) - 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 - Support for fixed output Hi or Lo GPIO selection
- TLS in binary tasmota-zbbridge (#9620)
- ESP32 support for Wireless-Tag WT32-ETH01 (#9496) - ESP32 support for Wireless-Tag WT32-ETH01 (#9496)
- ESP32 MI32 Beacon support, RSSI at TELEPERIOD, refactoring (#9609) - ESP32 MI32 Beacon support, RSSI at TELEPERIOD, refactoring (#9609)

4
tasmota/my_user_config.h
View File

@ -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_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) // #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 // Add I2C Display Support (+2k code)
#define USE_DISPLAY_MODES1TO5 // Enable display mode 1 to 5 in addition to mode 0 #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) #define USE_DISPLAY_LCD // [DisplayModel 1] [I2cDriver3] Enable Lcd display (I2C addresses 0x27 and 0x3F) (+6k code)

32
tasmota/tasmota_configurations.h
View File

@ -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_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) //#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_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) #define USE_SENSEAIR // Add support for SenseAir K30, K70 and S8 CO2 sensor (+2k3 code)
#ifndef CO2_LOW #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) #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 #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_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_KNX // Disable KNX IP Protocol Support
//#undef USE_WEBSERVER // Disable Webserver //#undef USE_WEBSERVER // Disable Webserver
//#undef USE_WEBSEND_RESPONSE // Disable command WebSend response message (+1k code) //#undef USE_WEBSEND_RESPONSE // Disable command WebSend response message (+1k code)
#define USE_EMULATION // Disable Wemo or Hue emulation #define USE_EMULATION // Enable Hue emulation
#define USE_EMULATION_HUE // Disable Hue Bridge emulation for Alexa (+14k code, +2k mem common) #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_EMULATION_WEMO // Disable Belkin WeMo emulation for Alexa (+6k code, +2k mem common)
#undef USE_CUSTOM // Disable Custom features #undef USE_CUSTOM // Disable Custom features
#undef USE_DISCOVERY // Disable Discovery services for both MQTT and web server #undef USE_DISCOVERY // Disable Discovery services for both MQTT and web server
@ -553,26 +557,16 @@
#undef DEBUG_THEO // Disable debug code #undef DEBUG_THEO // Disable debug code
#undef USE_DEBUG_DRIVER // 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 #define USE_ZIGBEE
#undef USE_ZIGBEE_ZNP #undef USE_ZIGBEE_ZNP
#define USE_ZIGBEE_EZSP #define USE_ZIGBEE_EZSP
#define USE_TCP_BRIDGE #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) #define USE_ZIGBEE_COALESCE_ATTR_TIMER 350 // timer to coalesce attribute values (in ms)
#endif // SONOFF_ZIGBEEBRIDGE ****************************************************************** #endif // SONOFF_ZIGBEEBRIDGE ******************************************************************
/*********************************************************************************************\ /*********************************************************************************************\
* [tasmota-lite.bin] * [tasmota-lite.bin]
* Provide an image without sensors * Provide an image without sensors

2
tasmota/tasmota_version.h
View File

@ -20,7 +20,7 @@
#ifndef _TASMOTA_VERSION_H_ #ifndef _TASMOTA_VERSION_H_
#define _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_
const uint32_t VERSION = 0x09000002; const uint32_t VERSION = 0x09000003;
// Lowest compatible version // Lowest compatible version
const uint32_t VERSION_COMPATIBLE = 0x07010006; const uint32_t VERSION_COMPATIBLE = 0x07010006;

6
tasmota/xsns_78_ezo.ino
View File

@ -17,6 +17,10 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef USE_I2C #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) #if defined(USE_EZO)
#define D_EZO_DELAY 300 // Minimum delay for any instruction #define D_EZO_DELAY 300 // Minimum delay for any instruction
@ -100,7 +104,7 @@ protected:
} }
uint8_t valid; uint8_t valid;
uint8_t addr; uint8_t addr;
uint32_t lastRead; uint32_t lastRead;
}; };