diff --git a/CHANGELOG.md b/CHANGELOG.md index 77f5a41ee..6565e5765 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,15 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - Development +## [2022.1.4] +### Added + +### Changed +- Version display from 2022.01.3 to 2022.1.4 + +### Fixed + + ## [2022.01.3] ### Added - Command ``WebTime ,`` to show part of date and/or time in web gui based on "2017-03-07T11:08:02-07:00" diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 0d3d0c028..48f99a5d7 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.01.3 +## Changelog v2022.1.4 ### 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) diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino index d46e3cf4e..3a67f6c7e 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.%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("%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("%s.%d"), TasmotaGlobal.version, VERSION & 0xff); } diff --git a/tasmota/tasmota_version.h b/tasmota/tasmota_version.h index 3fe44c0a5..a9fe49cef 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 = 0x14160103; // 2022.01.3 +const uint32_t VERSION = 0x14160104; // 2022.1.4 #endif // _TASMOTA_VERSION_H_