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

Bump version to v2022.01.1

This commit is contained in:
Theo Arends 2021-12-31 18:23:35 +01:00
parent 454ff81599
commit 4c8c8572c5
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -3,7 +3,11 @@ All notable changes to this project will be documented in this file.
## [Unreleased] - Development ## [Unreleased] - Development
## [10.1.0.3] ## [2022.01.1]
### Changed
- Versioning from SemVer to CalVer
## [10.1.0.3] 20211231
### Added ### Added
- Command ``SSerialConfig <serialconfig>`` to change Serial Bridge configuration - Command ``SSerialConfig <serialconfig>`` to change Serial Bridge configuration

2
RELEASENOTES.md
View File

@ -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. [Complete list](BUILDS.md) of available feature and sensors.
## Changelog v10.1.0.3 ## Changelog v2022.01.1
### Added ### Added
- Command ``SSerialConfig <serialconfig>`` to change Serial Bridge configuration - Command ``SSerialConfig <serialconfig>`` to change Serial Bridge configuration
- PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993) - PWM Dimmer two button support [#13993](https://github.com/arendst/Tasmota/issues/13993)

5
tasmota/tasmota.ino
View File

@ -400,10 +400,11 @@ void setup(void) {
memcpy_P(TasmotaGlobal.version, VERSION_MARKER, 1); // Dummy for compiler saving VERSION_MARKER 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 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 6.3.0.10 if (VERSION & 0xff) { // Development or patched version 2022.01.10
snprintf_P(TasmotaGlobal.version, sizeof(TasmotaGlobal.version), PSTR("%s.%d"), TasmotaGlobal.version, VERSION & 0xff); 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 // 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) snprintf_P(TasmotaGlobal.image_name, sizeof(TasmotaGlobal.image_name), PSTR("(%s)"), PSTR(CODE_IMAGE_STR)); // Results in (85cff52-tasmota) or (release-tasmota)

3
tasmota/tasmota_version.h
View File

@ -20,6 +20,7 @@
#ifndef _TASMOTA_VERSION_H_ #ifndef _TASMOTA_VERSION_H_
#define _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_ #endif // _TASMOTA_VERSION_H_