From 32d9a1d46550624ad8758ee4381205ca4de298cb Mon Sep 17 00:00:00 2001
From: Robert van den Breemen <robert@vandenbreemen.net>
Date: Wed, 17 Apr 2024 06:52:21 +0200
Subject: [PATCH] Update to version 0.10.3 on file headers

---
 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 +-
 helperStuff.ino                 |  2 +-
 jsonStuff.ino                   |  2 +-
 networkStuff.h                  |  2 +-
 outputs_ext.ino                 |  2 +-
 outputs_ext.ino.tmp             | 99 ---------------------------------
 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                       | 32 +++--------
 22 files changed, 29 insertions(+), 142 deletions(-)
 delete mode 100644 outputs_ext.ino.tmp

diff --git a/FSexplorer.ino b/FSexplorer.ino
index 4ba11fa..1977c91 100644
--- a/FSexplorer.ino
+++ b/FSexplorer.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program : FSexplorer
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  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 45be66b..6c2fa4c 100644
--- a/MQTTstuff.ino
+++ b/MQTTstuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : MQTTstuff
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **      Modified version from (c) 2020 Willem Aandewiel
diff --git a/OTGW-Core.h b/OTGW-Core.h
index e9485cc..e404a20 100644
--- a/OTGW-Core.h
+++ b/OTGW-Core.h
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : Header file: OTGW-Core.h 
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 
diff --git a/OTGW-Core.ino b/OTGW-Core.ino
index c79a496..ef77842 100644
--- a/OTGW-Core.ino
+++ b/OTGW-Core.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-Core.ino
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 
diff --git a/OTGW-firmware.h b/OTGW-firmware.h
index cb6f8bd..37b5270 100644
--- a/OTGW-firmware.h
+++ b/OTGW-firmware.h
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-firmware.h
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/OTGW-firmware.ino b/OTGW-firmware.ino
index 37a27b3..3a628fb 100644
--- a/OTGW-firmware.ino
+++ b/OTGW-firmware.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-firmware.ino
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/data/FSexplorer.css b/data/FSexplorer.css
index cc5292f..b86fd1f 100644
--- a/data/FSexplorer.css
+++ b/data/FSexplorer.css
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : FSexplorer.html
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **  For more information visit: https://fipsok.de
 ***************************************************************************  
 */
diff --git a/data/FSexplorer.html b/data/FSexplorer.html
index 270023b..2fa3c99 100644
--- a/data/FSexplorer.html
+++ b/data/FSexplorer.html
@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : FSexplorer.html
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/data/index.css b/data/index.css
index fb7aa02..ac1da6b 100644
--- a/data/index.css
+++ b/data/index.css
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : index.css
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/data/index.js b/data/index.js
index 5423ef3..261ad5f 100644
--- a/data/index.js
+++ b/data/index.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : index.js, part of OTGW-firmware project
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/helperStuff.ino b/helperStuff.ino
index b3efd13..577a014 100644
--- a/helperStuff.ino
+++ b/helperStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : helperStuff
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **     based on Framework ESP8266 from Willem Aandewiel
diff --git a/jsonStuff.ino b/jsonStuff.ino
index f55ca31..ad8083f 100644
--- a/jsonStuff.ino
+++ b/jsonStuff.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : jsonStuff
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **     based on Framework ESP8266 from Willem Aandewiel
diff --git a/networkStuff.h b/networkStuff.h
index 21d1a53..939e457 100644
--- a/networkStuff.h
+++ b/networkStuff.h
@@ -2,7 +2,7 @@
 ***************************************************************************  
 **  Program : networkStuff.h
 **
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/outputs_ext.ino b/outputs_ext.ino
index 414d2e1..f730097 100644
--- a/outputs_ext.ino
+++ b/outputs_ext.ino
@@ -1,6 +1,6 @@
 /*********
 **  Program  : output_ext.ino
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **  Contributed by Sjorsjuhmaniac
diff --git a/outputs_ext.ino.tmp b/outputs_ext.ino.tmp
deleted file mode 100644
index 414d2e1..0000000
--- a/outputs_ext.ino.tmp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*********
-**  Program  : output_ext.ino
-**  Version  : v0.10.2
-**
-**  Copyright (c) 2021-2023 Robert van den Breemen
-**  Contributed by Sjorsjuhmaniac
-**
-**  TERMS OF USE: MIT License. See bottom of file.   
-*********/
-
-
-// adds support to activiate a digital output
-// 
-void setOutputState(bool set_HIGH);
-
-
-void initOutputs() {
-  DebugTf(PSTR("inside initOutputsO%d...\r\n"), 1);
-
-  if (!settingGPIOOUTPUTSenabled) return;
-
-  DebugTf(PSTR("init GPIO Output on GPIO%d...\r\n"), settingGPIOOUTPUTSpin);
-
-  pinMode(settingGPIOOUTPUTSpin, OUTPUT);
-  setOutputState(OFF);
-
-  // set the LED with the ledState of the variable:
-  // digitalWrite(ledPin, ledState);
-}
-
-// still need to hook into processOTGW
-void setOutputState(uint8_t status = ON){
-  (status == ON) ? setOutputState(true) : setOutputState(false);
-}
-
-void setOutputState(bool set_HIGH = true){
-  if(!settingGPIOOUTPUTSenabled) return;
-  digitalWrite(settingGPIOOUTPUTSpin,set_HIGH?HIGH:LOW);
-  DebugTf(PSTR("Output GPIO%d set to %d"), settingGPIOOUTPUTSpin, digitalRead(settingGPIOOUTPUTSpin));
-}
-
-void evalOutputs(){
-  if(!settingGPIOOUTPUTSenabled) return;
-  // master HB
-  // bit: [clear/0, set/1]
-  //  0: CH enable [ CH is disabled, CH is enabled]
-  //  1: DHW enable [ DHW is disabled, DHW is enabled]
-  //  2: Cooling enable [ Cooling is disabled, Cooling is enabled]]
-  //  3: OTC active [OTC not active, OTC is active]
-  //  4: CH2 enable [CH2 is disabled, CH2 is enabled]
-  //  5: reserved
-  //  6: reserved
-  //  7: reserved
-
-  // slave LB
-  //  0: fault indication [ no fault, fault ]
-  //  1: CH mode [CH not active, CH active]
-  //  2: DHW mode [ DHW not active, DHW active]
-  //  3: Flame status [ flame off, flame on ]
-  //  4: Cooling status [ cooling mode not active, cooling mode active ]
-  //  5: CH2 mode [CH2 not active, CH2 active]
-  //  6: diagnostic indication [no diagnostics, diagnostic event]
-  //  7: reserved
-  if (!settingMyDEBUG) return;
-  settingMyDEBUG = false;
-  DebugTf(PSTR("current gpio output state: %d \r\n"), digitalRead(settingGPIOOUTPUTSpin));
-  DebugFlush();
-
-  bool bitState = (OTcurrentSystemState.Statusflags & (2^settingGPIOOUTPUTStriggerBit));
-  DebugTf(PSTR("bitState: bit: %d , state %d \r\n"), settingGPIOOUTPUTStriggerBit, bitState);
-
-  setOutputState(bitState);
-
-  DebugTf(PSTR("end void: current gpio output state: %d \r\n"), digitalRead(settingGPIOOUTPUTSpin));
-}
-
-/***************************************************************************
-*
-* Permission is hereby granted, free of charge, to any person obtaining a
-* copy of this software and associated documentation files (the
-* "Software"), to deal in the Software without restriction, including
-* without limitation the rights to use, copy, modify, merge, publish,
-* distribute, sublicense, and/or sell copies of the Software, and to permit
-* persons to whom the Software is furnished to do so, subject to the
-* following conditions:
-*
-* The above copyright notice and this permission notice shall be included
-* in all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
-* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-* 
-****************************************************************************
-*/
diff --git a/restAPI.ino b/restAPI.ino
index c2943df..3e812f7 100644
--- a/restAPI.ino
+++ b/restAPI.ino
@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : restAPI
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **     based on Framework ESP8266 from Willem Aandewiel
diff --git a/s0PulseCount.ino b/s0PulseCount.ino
index c20a2ab..f918591 100644
--- a/s0PulseCount.ino
+++ b/s0PulseCount.ino
@@ -1,7 +1,7 @@
 /* 
  ***************************************************************************  
  **  Program  : s0PulseCount
- **  Version  : v0.10.2
+ **  Version  : v0.10.3
  **
  **  Copyright (c) 2021-2023 Rob Roos / Robert van Breemen
  **     based on Framework ESP8266 from Willem Aandewiel
diff --git a/sensors_ext.ino b/sensors_ext.ino
index 09b4b4a..2446053 100644
--- a/sensors_ext.ino
+++ b/sensors_ext.ino
@@ -1,6 +1,6 @@
 /*
 **  Program  : output_ext.ino
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **  Contributed by Sjorsjuhmaniac
diff --git a/settingStuff.ino b/settingStuff.ino
index cee2536..cce2d0f 100644
--- a/settingStuff.ino
+++ b/settingStuff.ino
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : settingsStuff
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **     based on Framework ESP8266 from Willem Aandewiel
diff --git a/theme/OTGW_Dark_Theme/index.css b/theme/OTGW_Dark_Theme/index.css
index 77e1595..d2ca627 100644
--- a/theme/OTGW_Dark_Theme/index.css
+++ b/theme/OTGW_Dark_Theme/index.css
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : index.css
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/theme/OTGW_Dark_Theme/index.js b/theme/OTGW_Dark_Theme/index.js
index c517292..ccbcc3e 100644
--- a/theme/OTGW_Dark_Theme/index.js
+++ b/theme/OTGW_Dark_Theme/index.js
@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : index.js, part of OTGW-firmware project
-**  Version  : v0.10.2
+**  Version  : v0.10.3
 **
 **  Copyright (c) 2021-2023 Robert van den Breemen
 **
diff --git a/version.h b/version.h
index 6e2daa8..904092e 100644
--- a/version.h
+++ b/version.h
@@ -2,29 +2,15 @@
 #define _VERSION_MAJOR 0
 #define _VERSION_MINOR 10  
 #define _VERSION_PATCH 3
-<<<<<<< HEAD
-#define _VERSION_BUILD 2114
-#define _VERSION_GITHASH "b6bf90e"
+#define _VERSION_BUILD 2118
+#define _VERSION_GITHASH "e334c42"
 //#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
-#define _VERSION_DATE "14-04-2024"
-#define _VERSION_TIME "23:30:44"
+#define _VERSION_DATE "17-04-2024"
+#define _VERSION_TIME "06:51:42"
 #define _SEMVER_CORE "0.10.3"
-#define _SEMVER_BUILD "0.10.3+2114"
-#define _SEMVER_GITHASH "0.10.3+b6bf90e"
-#define _SEMVER_FULL "0.10.3+b6bf90e"
-#define _SEMVER_NOBUILD "0.10.3 (14-04-2024)"
-#define _VERSION "0.10.3+b6bf90e (14-04-2024)"
-=======
-#define _VERSION_BUILD 2117
-#define _VERSION_GITHASH "019a3ca"
-//#define _VERSION_PRERELEASE beta  //uncomment to define prerelease labels: alpha - beta - rc
-#define _VERSION_DATE "15-04-2024"
-#define _VERSION_TIME "23:21:15"
-#define _SEMVER_CORE "0.10.3"
-#define _SEMVER_BUILD "0.10.3+2117"
-#define _SEMVER_GITHASH "0.10.3+019a3ca"
-#define _SEMVER_FULL "0.10.3+019a3ca"
-#define _SEMVER_NOBUILD "0.10.3 (15-04-2024)"
-#define _VERSION "0.10.3+019a3ca (15-04-2024)"
->>>>>>> parent of 3e0aeac (before update 0.10.3)
+#define _SEMVER_BUILD "0.10.3+2118"
+#define _SEMVER_GITHASH "0.10.3+e334c42"
+#define _SEMVER_FULL "0.10.3+e334c42"
+#define _SEMVER_NOBUILD "0.10.3 (17-04-2024)"
+#define _VERSION "0.10.3+e334c42 (17-04-2024)"
 //The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver