From c50fa27af00752bebf16597b47c482c9e43ea7e6 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Sat, 5 Feb 2022 15:36:29 +0100 Subject: [PATCH] Revert versioning Change from Calendar Versioning (CalVer) back to Semantic Versioning (SemVer) for better major change indication and future support --- CHANGELOG.md | 16 ++++++++++++---- RELEASENOTES.md | 3 +-- tasmota/settings.ino | 2 +- tasmota/tasmota.ino | 4 ++-- tasmota/tasmota_version.h | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae935ce79..8b5ad650e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,15 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development -## [2022.1.4] +## [10.1.0.8] +### Added + +### Changed +- From Calendar Versioning (CalVer) back to Semantic Versioning (SemVer) for better major change indication and future support + +### Fixed + +## [2022.1.4 = 10.1.0.7] 20220205 ### Added - Rule variables %timer1% to %timer16% (#14619) @@ -13,7 +21,7 @@ All notable changes to this project will be documented in this file. ### Fixed - SR04 sensor driver regression from 2022.01.2 -## [2022.01.3] +## [2022.01.3 = 10.1.0.6] 20220204 ### Added - Command ``WebTime ,`` to show part of date and/or time in web gui based on "2017-03-07T11:08:02-07:00" - ESP32 disable serial console when 3 (ESP32) or 2 (Other models) serial interfaces are requested (#14487) @@ -41,7 +49,7 @@ All notable changes to this project will be documented in this file. ### Fixed - OneWire-Stickbreaker (DS18x20) library support for ESP32S2 (#14338) -## [2022.01.2] 20220116 +## [2022.01.2 = 10.1.0.5] 20220116 ### Added - Tasmota favicon to webbrowser tab (#14322) - Commands for ESP32 ethernet configuration ``EthIpAddress``, ``EthGateway``, ``EthSubnetmask``, ``EthDnsServer1`` and ``EthDnsServer2`` (#14385) @@ -50,7 +58,7 @@ All notable changes to this project will be documented in this file. ### Changed - IRremoteESP8266 library from v2.8.0 to v2.8.1 -## [2022.01.1] 20220107 +## [2022.01.1 = 10.1.0.4] 20220107 ### Added - Experimental ADE7953 (Shelly EM) reset on restart (#14261) - Command ``SspmMap 2,1,..`` to map Sonoff SPM scanned module to physical module (#14281) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 9dbf1ea82..bd387615f 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -100,7 +100,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo [Complete list](BUILDS.md) of available feature and sensors. -## Changelog v2022.1.4 +## Changelog v10.1.0.8 ### Added - Command ``Json {}`` to enable input of any command as JSON tokens [#14568](https://github.com/arendst/Tasmota/issues/14568) - Command ``SetOption44 1..100`` to set base tolerance percentage for matching incoming IR messages (default 25, max 100) [#14555](https://github.com/arendst/Tasmota/issues/14555) @@ -149,7 +149,6 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo - ESP8266Audio library from v1.9.2 to v1.9.5 - ESP8266SAM library from v1.0 to v1.0.1 - BME68x-Sensor-API library from v3.5.9 to v4.4.7 -- From Semantic Versioning (SemVer) to Calendar Versioning (CalVer) - SR04 driver to support US-100 - Mitsubishi HVAC temperature resolution [#13936](https://github.com/arendst/Tasmota/issues/13936) - Remove restriction of topic must differ from mqttclient [#14019](https://github.com/arendst/Tasmota/issues/14019) diff --git a/tasmota/settings.ino b/tasmota/settings.ino index 173b438b3..6b357384c 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -1488,7 +1488,7 @@ void SettingsDelta(void) { if (Settings->version < 0x0A010003) { Settings->sserial_config = Settings->serial_config; } - if (Settings->version < 0x14160103) { + if (Settings->version < 0x0A010006) { Settings->web_time_start = 0; Settings->web_time_end = 0; } diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index 3a67f6c7e..643135b26 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -414,8 +414,8 @@ 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 2022.1 - if (VERSION & 0xff) { // Development or patched version 2022.1.10 + 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); } diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index a9fe49cef..6a6388472 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,6 +20,6 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x14160104; // 2022.1.4 +const uint32_t VERSION = 0x0A010008; // 10.1.0.8 #endif // _TASMOTA_VERSION_H_