Update to version 0.10.3 on file headers

rvdbreemen · Apr 17, 2024 · 32d9a1d · 32d9a1d
1 parent e334c42
commit 32d9a1d
Show file tree

Hide file tree

Showing 22 changed files with 29 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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