Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #556 from iranl/fix-version-math

Browse Source 
Fix version math
This commit is contained in:
iranl
2024-12-05 22:09:28 +01:00
committed by GitHub
parent c4f9644c97 3b3eb2902c
commit a27eb661e7
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/config_version.py
View File

@@ -7,7 +7,7 @@ parser.add_argument('ota_type', type=str)
args = parser.parse_args()
regex = r"\#define NUKI_HUB_VERSION \"(.*)\""
regex2 = r"\#define NUKI_HUB_VERSION_INT \(uint32_t\)\"(.*)\""
regex2 = r"\#define NUKI_HUB_VERSION_INT \(uint32_t\)(.*)"
version = "unknown"
with open('src/Config.h', 'r') as file:
@@ -37,7 +37,7 @@ content_new = ""
with open ('src/Config.h', 'r' ) as readfile:
file_content = readfile.read()
content_new = re.sub(regex, "#define NUKI_HUB_VERSION \"" + str(version) + "-" + args.ota_type + str(number) + "\"", file_content, flags = re.M)
content_new = re.sub(regex2, "#define NUKI_HUB_VERSION_INT (uint32_t)\"" + str(version_int) + "\"", content_new, flags = re.M)
content_new = re.sub(regex2, "#define NUKI_HUB_VERSION_INT (uint32_t)" + str(version_int), content_new, flags = re.M)
with open('src/Config.h', 'w') as writefile:
writefile.write(content_new)

2
src/Config.h
View File

@@ -3,7 +3,7 @@
#include "sdkconfig.h"
#define NUKI_HUB_VERSION "9.03"
#define NUKI_HUB_VERSION_INT (uint32_t)"903"
#define NUKI_HUB_VERSION_INT (uint32_t)903
#define NUKI_HUB_BUILD "unknownbuildnr"
#define NUKI_HUB_DATE "2024-12-03"

2
src/PreferencesKeys.h
View File

@@ -217,7 +217,7 @@ inline void initPreferences(Preferences* preferences)
Log->println(lastConfigVer);
Log->print("Current config version: ");
if(lastConfigVer >= NUKI_HUB_VERSION_INT) return;
if(lastConfigVer >= NUKI_HUB_VERSION_INT && lastConfigVer < 20000) return;
if (lastConfigVer < 834)
{