From 4c8c8572c52ce5819558274a3c6165121b66a1d0 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 31 Dec 2021 18:23:35 +0100 Subject: [PATCH] Bump version to v2022.01.1 --- CHANGELOG.md | 6 +++++- RELEASENOTES.md | 2 +- tasmota/tasmota.ino | 5 +++-- tasmota/tasmota_version.h | 3 ++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6788a4cde..f9ff2ca21 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 -## [10.1.0.3] +## [2022.01.1] +### Changed +- Versioning from SemVer to CalVer + +## [10.1.0.3] 20211231 ### Added - Command ``SSerialConfig `` to change Serial Bridge configuration diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a6d1d1856..3d67c5d44 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 v10.1.0.3 +## Changelog v2022.01.1 ### Added - Command ``SSerialConfig `` to change Serial Bridge configuration - PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993) diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index 6ebe7d7d2..591b8b4f4 100644 --- a/tasmota/tasmota.ino +++ b/tasmota/tasmota.ino @@ -400,10 +400,11 @@ 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("%d%d.%02d"), VERSION >> 24 & 0xff, VERSION >> 16 & 0xff, VERSION >> 8 & 0xff); // Release version 2022.01 + if (VERSION & 0xff) { // Development or patched version 2022.01.10 snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%s.%d"), TasmotaGlobal.version, VERSION & 0xff); } + // Thehackbox inserts "release" or "commit number" before compiling using sed -i -e 's/PSTR("(%s)")/PSTR("(85cff52-%s)")/g' tasmota.ino snprintf_P(TasmotaGlobal.image_name, sizeof(TasmotaGlobal.image_name), PSTR("(%s)"), PSTR(CODE_IMAGE_STR)); // Results in (85cff52-tasmota) or (release-tasmota) diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 1666cc661..a77505a66 100644 --- a/tasmota/tasmota_version.h +++ b/tasmota/tasmota_version.h @@ -20,6 +20,7 @@ #ifndef _TASMOTA_VERSION_H_ #define _TASMOTA_VERSION_H_ -const uint32_t VERSION = 0x0A010003; +//const uint32_t VERSION = 0x0A010003; +const uint32_t VERSION = 0x14160101; // 2022.1.1 #endif // _TASMOTA_VERSION_H_