From 8a47634d75093c290f2c1d72024a4ee24a65d84d Mon Sep 17 00:00:00 2001 From: Robert van den Breemen Date: Sat, 27 Apr 2024 18:42:12 +0200 Subject: [PATCH 1/6] Updating header with copyright year --- Debug.h | 2 +- MQTTstuff.ino | 2 +- OTGW-Core.h | 2 +- OTGW-Core.ino | 2 +- OTGW-firmware.h | 2 +- OTGW-firmware.ino | 2 +- data/FSexplorer.html | 2 +- data/index.css | 2 +- data/index.js | 2 +- helperStuff.ino | 2 +- jsonStuff.ino | 2 +- networkStuff.h | 4 ++-- outputs_ext.ino | 2 +- restAPI.ino | 2 +- s0PulseCount.ino | 2 +- sensors_ext.ino | 2 +- settingStuff.ino | 2 +- theme/OTGW_Dark_Theme/index.css | 2 +- theme/OTGW_Dark_Theme/index.js | 2 +- version.h | 20 ++++++++++---------- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Debug.h b/Debug.h index 59998244..1eda377b 100644 --- a/Debug.h +++ b/Debug.h @@ -2,7 +2,7 @@ *************************************************************************** ** Program : Debug.h ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Met dank aan Willem Aandewiel en Erik ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/MQTTstuff.ino b/MQTTstuff.ino index 6c2fa4c5..a2312af2 100644 --- a/MQTTstuff.ino +++ b/MQTTstuff.ino @@ -3,7 +3,7 @@ ** Program : MQTTstuff ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Modified version from (c) 2020 Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/OTGW-Core.h b/OTGW-Core.h index e404a20a..4ef6fc46 100644 --- a/OTGW-Core.h +++ b/OTGW-Core.h @@ -3,7 +3,7 @@ ** Program : Header file: OTGW-Core.h ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Borrowed from OpenTherm library from: ** https://github.com/jpraus/arduino-opentherm ** diff --git a/OTGW-Core.ino b/OTGW-Core.ino index ef77842a..05054cf8 100644 --- a/OTGW-Core.ino +++ b/OTGW-Core.ino @@ -3,7 +3,7 @@ ** Program : OTGW-Core.ino ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Borrowed from OpenTherm library from: ** https://github.com/jpraus/arduino-opentherm ** diff --git a/OTGW-firmware.h b/OTGW-firmware.h index 37b52703..8d7d8027 100644 --- a/OTGW-firmware.h +++ b/OTGW-firmware.h @@ -3,7 +3,7 @@ ** Program : OTGW-firmware.h ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/OTGW-firmware.ino b/OTGW-firmware.ino index 3a628fb8..a2ea879c 100644 --- a/OTGW-firmware.ino +++ b/OTGW-firmware.ino @@ -3,7 +3,7 @@ ** Program : OTGW-firmware.ino ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/data/FSexplorer.html b/data/FSexplorer.html index 2fa3c992..c70e20a9 100644 --- a/data/FSexplorer.html +++ b/data/FSexplorer.html @@ -3,7 +3,7 @@ ** Program : FSexplorer.html ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/data/index.css b/data/index.css index ac1da6be..1be5e4dc 100644 --- a/data/index.css +++ b/data/index.css @@ -3,7 +3,7 @@ ** Program : index.css ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/data/index.js b/data/index.js index 261ad5f6..8f263bb7 100644 --- a/data/index.js +++ b/data/index.js @@ -3,7 +3,7 @@ ** Program : index.js, part of OTGW-firmware project ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/helperStuff.ino b/helperStuff.ino index 577a0144..95018b96 100644 --- a/helperStuff.ino +++ b/helperStuff.ino @@ -3,7 +3,7 @@ ** Program : helperStuff ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/jsonStuff.ino b/jsonStuff.ino index ad8083fb..847a0207 100644 --- a/jsonStuff.ino +++ b/jsonStuff.ino @@ -3,7 +3,7 @@ ** Program : jsonStuff ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/networkStuff.h b/networkStuff.h index 939e457c..390a204f 100644 --- a/networkStuff.h +++ b/networkStuff.h @@ -4,9 +4,9 @@ ** ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/outputs_ext.ino b/outputs_ext.ino index f7300978..44bace80 100644 --- a/outputs_ext.ino +++ b/outputs_ext.ino @@ -2,7 +2,7 @@ ** Program : output_ext.ino ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Contributed by Sjorsjuhmaniac ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/restAPI.ino b/restAPI.ino index 3e812f7c..339678ee 100644 --- a/restAPI.ino +++ b/restAPI.ino @@ -3,7 +3,7 @@ ** Program : restAPI ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/s0PulseCount.ino b/s0PulseCount.ino index f9185916..007738db 100644 --- a/s0PulseCount.ino +++ b/s0PulseCount.ino @@ -3,7 +3,7 @@ ** Program : s0PulseCount ** Version : v0.10.3 ** - ** Copyright (c) 2021-2023 Rob Roos / Robert van Breemen + ** Copyright (c) 2021-2024 Rob Roos / Robert van Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/sensors_ext.ino b/sensors_ext.ino index 24460535..6d462b1f 100644 --- a/sensors_ext.ino +++ b/sensors_ext.ino @@ -2,7 +2,7 @@ ** Program : output_ext.ino ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** Contributed by Sjorsjuhmaniac ** Modified by Rob Roos to enable MQ autoconfigure and cleanup ** diff --git a/settingStuff.ino b/settingStuff.ino index cce2d0fc..30b63e90 100644 --- a/settingStuff.ino +++ b/settingStuff.ino @@ -3,7 +3,7 @@ ** Program : settingsStuff ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** based on Framework ESP8266 from Willem Aandewiel ** ** TERMS OF USE: MIT License. See bottom of file. diff --git a/theme/OTGW_Dark_Theme/index.css b/theme/OTGW_Dark_Theme/index.css index d2ca6271..6a4ceec3 100644 --- a/theme/OTGW_Dark_Theme/index.css +++ b/theme/OTGW_Dark_Theme/index.css @@ -3,7 +3,7 @@ ** Program : index.css ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/theme/OTGW_Dark_Theme/index.js b/theme/OTGW_Dark_Theme/index.js index ccbcc3ed..165dd3ef 100644 --- a/theme/OTGW_Dark_Theme/index.js +++ b/theme/OTGW_Dark_Theme/index.js @@ -3,7 +3,7 @@ ** Program : index.js, part of OTGW-firmware project ** Version : v0.10.3 ** -** Copyright (c) 2021-2023 Robert van den Breemen +** Copyright (c) 2021-2024 Robert van den Breemen ** ** TERMS OF USE: MIT License. See bottom of file. *************************************************************************** diff --git a/version.h b/version.h index 6c527f7b..919b98b3 100644 --- a/version.h +++ b/version.h @@ -2,15 +2,15 @@ #define _VERSION_MAJOR 0 #define _VERSION_MINOR 10 #define _VERSION_PATCH 4 -#define _VERSION_BUILD 2112 -#define _VERSION_GITHASH "1c8485a" +#define _VERSION_BUILD 2113 +#define _VERSION_GITHASH "3c99988" #define _VERSION_PRERELEASE beta -#define _VERSION_DATE "13-04-2024" -#define _VERSION_TIME "13:40:09" -#define _SEMVER_CORE "0.10.3" -#define _SEMVER_BUILD "0.10.3+2112" -#define _SEMVER_GITHASH "0.10.3+1c8485a" -#define _SEMVER_FULL "0.10.3-beta+1c8485a" -#define _SEMVER_NOBUILD "0.10.3-beta (13-04-2024)" -#define _VERSION "0.10.3-beta+1c8485a (13-04-2024)" +#define _VERSION_DATE "27-04-2024" +#define _VERSION_TIME "18:39:39" +#define _SEMVER_CORE "0.10.4" +#define _SEMVER_BUILD "0.10.4+2113" +#define _SEMVER_GITHASH "0.10.4+3c99988" +#define _SEMVER_FULL "0.10.4-beta+3c99988" +#define _SEMVER_NOBUILD "0.10.4-beta (27-04-2024)" +#define _VERSION "0.10.4-beta+3c99988 (27-04-2024)" //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver From 8ebde1e7b6d23e30f7cea85a60cc99442a89d47c Mon Sep 17 00:00:00 2001 From: Robert van den Breemen Date: Sat, 27 Apr 2024 21:34:38 +0200 Subject: [PATCH 2/6] fix: MQTT no longer in the clear in the UI --- restAPI.ino | 2 +- settingStuff.ino | 6 +++++- version.h | 14 +++++++------- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/restAPI.ino b/restAPI.ino index 339678ee..1fa90f2f 100644 --- a/restAPI.ino +++ b/restAPI.ino @@ -432,7 +432,7 @@ void sendDeviceSettings() sendJsonSettingObj("mqttbroker", CSTR(settingMQTTbroker), "s", 32); sendJsonSettingObj("mqttbrokerport", settingMQTTbrokerPort, "i", 0, 65535); sendJsonSettingObj("mqttuser", CSTR(settingMQTTuser), "s", 32); - sendJsonSettingObj("mqttpasswd", CSTR(settingMQTTpasswd), "p", 100); + sendJsonSettingObj("mqttpasswd", "notthepassword", "p", 100); sendJsonSettingObj("mqtttoptopic", CSTR(settingMQTTtopTopic), "s", 15); sendJsonSettingObj("mqtthaprefix", CSTR(settingMQTThaprefix), "s", 20); sendJsonSettingObj("mqttharebootdetection", settingMQTTharebootdetection, "b"); diff --git a/settingStuff.ino b/settingStuff.ino index 30b63e90..1357651c 100644 --- a/settingStuff.ino +++ b/settingStuff.ino @@ -203,7 +203,11 @@ void updateSetting(const char *field, const char *newValue) if (strcasecmp(field, "MQTTbroker")==0) settingMQTTbroker = String(newValue); if (strcasecmp(field, "MQTTbrokerPort")==0) settingMQTTbrokerPort = atoi(newValue); if (strcasecmp(field, "MQTTuser")==0) settingMQTTuser = String(newValue); - if (strcasecmp(field, "MQTTpasswd")==0) settingMQTTpasswd = String(newValue); + if (strcasecmp(field, "MQTTpasswd")==0){ + if ( newValue && strcasecmp(newValue, "notthepassword") != 0 ){ + settingMQTTpasswd = String(newValue); + } + } if (strcasecmp(field, "MQTTtoptopic")==0) { settingMQTTtopTopic = String(newValue); if (settingMQTTtopTopic.length()==0) { diff --git a/version.h b/version.h index 919b98b3..b08c25ad 100644 --- a/version.h +++ b/version.h @@ -2,15 +2,15 @@ #define _VERSION_MAJOR 0 #define _VERSION_MINOR 10 #define _VERSION_PATCH 4 -#define _VERSION_BUILD 2113 -#define _VERSION_GITHASH "3c99988" +#define _VERSION_BUILD 2117 +#define _VERSION_GITHASH "8a47634" #define _VERSION_PRERELEASE beta #define _VERSION_DATE "27-04-2024" -#define _VERSION_TIME "18:39:39" +#define _VERSION_TIME "21:30:37" #define _SEMVER_CORE "0.10.4" -#define _SEMVER_BUILD "0.10.4+2113" -#define _SEMVER_GITHASH "0.10.4+3c99988" -#define _SEMVER_FULL "0.10.4-beta+3c99988" +#define _SEMVER_BUILD "0.10.4+2117" +#define _SEMVER_GITHASH "0.10.4+8a47634" +#define _SEMVER_FULL "0.10.4-beta+8a47634" #define _SEMVER_NOBUILD "0.10.4-beta (27-04-2024)" -#define _VERSION "0.10.4-beta+3c99988 (27-04-2024)" +#define _VERSION "0.10.4-beta+8a47634 (27-04-2024)" //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver From 38f921ba3871385b8d79d2a0449209ac91a4a21c Mon Sep 17 00:00:00 2001 From: Robert van den Breemen Date: Sun, 5 May 2024 20:44:16 +0200 Subject: [PATCH 3/6] Update file headers during development. --- FSexplorer.ino | 2 +- MQTTstuff.ino | 2 +- OTGW-Core.h | 2 +- OTGW-Core.ino | 2 +- OTGW-firmware.h | 2 +- OTGW-firmware.ino | 2 +- data/FSexplorer.css | 2 +- data/FSexplorer.html | 2 +- data/index.css | 2 +- data/index.js | 2 +- data/mqttha.cfg | 10 ++++++++++ helperStuff.ino | 2 +- jsonStuff.ino | 2 +- networkStuff.h | 2 +- outputs_ext.ino | 2 +- restAPI.ino | 2 +- s0PulseCount.ino | 2 +- sensors_ext.ino | 2 +- settingStuff.ino | 2 +- theme/OTGW_Dark_Theme/index.css | 2 +- theme/OTGW_Dark_Theme/index.js | 2 +- version.h | 18 +++++++++--------- 22 files changed, 39 insertions(+), 29 deletions(-) diff --git a/FSexplorer.ino b/FSexplorer.ino index 1977c919..6ea021b9 100644 --- a/FSexplorer.ino +++ b/FSexplorer.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : FSexplorer -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Mostly stolen from https://www.arduinoforum.de/User-Fips ** For more information visit: https://fipsok.de diff --git a/MQTTstuff.ino b/MQTTstuff.ino index a2312af2..4980e2d4 100644 --- a/MQTTstuff.ino +++ b/MQTTstuff.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : MQTTstuff -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Copyright (c) 2021-2024 Robert van den Breemen ** Modified version from (c) 2020 Willem Aandewiel diff --git a/OTGW-Core.h b/OTGW-Core.h index 4ef6fc46..cf9ebcb4 100644 --- a/OTGW-Core.h +++ b/OTGW-Core.h @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : Header file: OTGW-Core.h -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Copyright (c) 2021-2024 Robert van den Breemen ** Borrowed from OpenTherm library from: diff --git a/OTGW-Core.ino b/OTGW-Core.ino index 05054cf8..8b73173e 100644 --- a/OTGW-Core.ino +++ b/OTGW-Core.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : OTGW-Core.ino -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Copyright (c) 2021-2024 Robert van den Breemen ** Borrowed from OpenTherm library from: diff --git a/OTGW-firmware.h b/OTGW-firmware.h index 8d7d8027..6b85af20 100644 --- a/OTGW-firmware.h +++ b/OTGW-firmware.h @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : OTGW-firmware.h -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Copyright (c) 2021-2024 Robert van den Breemen ** diff --git a/OTGW-firmware.ino b/OTGW-firmware.ino index a2ea879c..d26d35db 100644 --- a/OTGW-firmware.ino +++ b/OTGW-firmware.ino @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : OTGW-firmware.ino -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** ** Copyright (c) 2021-2024 Robert van den Breemen ** diff --git a/data/FSexplorer.css b/data/FSexplorer.css index b86fd1f6..cad764c5 100644 --- a/data/FSexplorer.css +++ b/data/FSexplorer.css @@ -1,7 +1,7 @@ /* *************************************************************************** ** Program : FSexplorer.html -** Version : v0.10.3 +** Version : v0.10.4-beta-beta-beta ** For more information visit: https://fipsok.de *************************************************************************** */ diff --git a/data/FSexplorer.html b/data/FSexplorer.html index c70e20a9..6e3a0ba7 100644 --- a/data/FSexplorer.html +++ b/data/FSexplorer.html @@ -1,7 +1,7 @@