diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b9e6b888..70e4ec1a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,18 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [13.1.0.3] +## [13.1.0.4] +### Added + +### Breaking Changed + +### Changed + +### Fixed + +### Removed + +## [13.1.0.3] 20211003 ### Added - Support for Shelly PlusPMMini, Plus1Mini and Plus1PMMini - Matter support for Virtual Devices controllable via Rules or Berry (#19520) @@ -13,8 +24,6 @@ All notable changes to this project will be documented in this file. - Support for non-persistent ``WebButton17`` to ``WebButton32`` (#19580) - Command ``Mi32Name`` (#19619) -### Breaking Changed - ### Changed - ESP32 Framework (Arduino Core) from v2.0.12 to v2.0.13 - ESP32 LVGL library from v8.3.9 to v8.3.10 (no functional change) @@ -29,8 +38,6 @@ All notable changes to this project will be documented in this file. - Compile error with new email lib (#19608) - ESP32 Arduino Core v2 wifi client flush (#19642) -### Removed - ## [13.1.0.2] 20230914 ### Added - Support for HDMI CEC protocol (#19434) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index f42b8514f..cacae4fae 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -110,7 +110,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v13.1.0.3 +## Changelog v13.1.0.4 ### Added - Experimental support for ESP32-C2 and ESP32-C6 using Arduino core v3 - Commands to allow setting of timeprop parameters [#19310](https://github.com/arendst/Tasmota/issues/19310) diff --git a/tasmota/include/tasmota_version.h b/tasmota/include/tasmota_version.h index 967c3b1d0..03e7b654f 100644 --- a/tasmota/include/tasmota_version.h +++ b/tasmota/include/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x0D010003; // 13.1.0.3 +const uint32_t TASMOTA_VERSION = 0x0D010004; // 13.1.0.4 #endif // _TASMOTA_VERSION_H_ diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index f648bda3b..39a48aff1 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -601,9 +601,9 @@ void setup(void) { memcpy_P(TasmotaGlobal.version, VERSION_MARKER, 1); // Dummy for compiler saving VERSION_MARKER - snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%d.%d.%d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff); // Release version 6.3.0 - if (VERSION & 0xff) { // Development or patched version 6.3.0.10 - snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%s.%d"), TasmotaGlobal.version, VERSION & 0xff); + snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%d.%d.%d"), TASMOTA_VERSION >> 24 & 0xff, TASMOTA_VERSION >> 16 & 0xff, TASMOTA_VERSION >> 8 & 0xff); // Release version 6.3.0 + if (TASMOTA_VERSION & 0xff) { // Development or patched version 6.3.0.10 + snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%s.%d"), TasmotaGlobal.version, TASMOTA_VERSION & 0xff); } // Thehackbox inserts "release" or "commit number" before compiling using sed -i -e 's/PSTR("(%s)")/PSTR("(85cff52-%s)")/g' tasmota.ino diff --git a/tasmota/tasmota_support/settings.ino b/tasmota/tasmota_support/settings.ino index 61bf2c58f..196bf2364 100644 --- a/tasmota/tasmota_support/settings.ino +++ b/tasmota/tasmota_support/settings.ino @@ -937,7 +937,7 @@ void SettingsDefaultSet1(void) { Settings->cfg_holder = (uint16_t)CFG_HOLDER; Settings->cfg_size = sizeof(TSettings); // Settings->save_flag = 0; - Settings->version = VERSION; + Settings->version = TASMOTA_VERSION; // Settings->bootcount = 0; // Settings->cfg_crc = 0; } @@ -1467,7 +1467,7 @@ void SettingsEnableAllI2cDrivers(void) { /********************************************************************************************/ void SettingsDelta(void) { - if (Settings->version != VERSION) { // Fix version dependent changes + if (Settings->version != TASMOTA_VERSION) { // Fix version dependent changes #ifdef ESP8266 #ifndef UPGRADE_V8_MIN @@ -1763,7 +1763,7 @@ void SettingsDelta(void) { Settings->battery_level_percent = 101; } - Settings->version = VERSION; + Settings->version = TASMOTA_VERSION; SettingsSave(1); } diff --git a/tasmota/tasmota_support/support.ino b/tasmota/tasmota_support/support.ino index 967113554..0b737f213 100755 --- a/tasmota/tasmota_support/support.ino +++ b/tasmota/tasmota_support/support.ino @@ -727,7 +727,7 @@ bool NewerVersion(char* version_str) { char version_dup[strlen(version_str) +1]; strncpy(version_dup, version_str, sizeof(version_dup)); // Duplicate the version_str as strtok_r will modify it. // Loop through the version string, splitting on '.' seperators. - for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) { + for (char *str = strtok_r(version_dup, ".", &str_ptr); str && i < sizeof(TASMOTA_VERSION); str = strtok_r(nullptr, ".", &str_ptr), i++) { int field = atoi(str); // The fields in a version string can only range from 0-255. if ((field < 0) || (field > 255)) { @@ -744,17 +744,17 @@ bool NewerVersion(char* version_str) { } // A version string should have 2-4 fields. e.g. 1.2, 1.2.3, or 1.2.3a (= 1.2.3.1). // If not, then don't consider it a valid version string. - if ((i < 2) || (i > sizeof(VERSION))) { + if ((i < 2) || (i > sizeof(TASMOTA_VERSION))) { return false; } // Keep shifting the parsed version until we hit the maximum number of tokens. // VERSION stores the major number of the version in the most significant byte of the uint32_t. - while (i < sizeof(VERSION)) { + while (i < sizeof(TASMOTA_VERSION)) { version <<= 8; i++; } // Now we should have a fully constructed version number in uint32_t form. - return (version > VERSION); + return (version > TASMOTA_VERSION); } int32_t UpdateDevicesPresent(int32_t change) {