Merge branch 'dev' into main

Author: rvdbreemen

MQTTstuff.ino

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : MQTTstuff
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **      Modified version from (c) 2020 Willem Aandewiel
@@ -300,7 +300,13 @@ void doAutoConfigure()
           // DebugTf("sline[%s]\r\n", CSTR(sLine));
           if (splitString(sLine, ',', sTopic, sMsg))
           {
-            DebugTf("sTopic[%s], sMsg[%s]\r\n", CSTR(sTopic), CSTR(sMsg));
+            DebugTf("sTopic[%s]==>", CSTR(sTopic)); DebugFlush();
+            sTopic.replace("%homeassistant%", CSTR(settingMQTThaprefix));  
+            Debugf("[%s]\r\n", CSTR(sTopic));DebugFlush();
+            
+            DebugTf("sMsg[%s]==>", CSTR(sMsg)); DebugFlush();
+            sMsg.replace("%OTGW%", CSTR(settingMQTTtopTopic));
+            Debugf("[%s]\r\n", CSTR(sMsg)); DebugFlush();
             sendMQTT(CSTR(sTopic), CSTR(sMsg), (sTopic.length() + sMsg.length()+2));
             delay(10);
           } else DebugTf("Either comment or invalid config line: [%s]\r\n", CSTR(sLine));

OTGW-Core.h

@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : Header file: OTGW-Core.h 
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 

OTGW-Core.ino

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-Core.ino
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **  Borrowed from OpenTherm library from: 

OTGW-firmware.h

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-firmware.h
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **
@@ -40,6 +40,8 @@ void setLed(int8_t, uint8_t);
 //Defaults and macro definitions
 #define _HOSTNAME       "OTGW"
 #define SETTINGS_FILE   "/settings.ini"
+#define DEFAULT_TIMEZONE "Europe/Amsterdam"
+#define HOMEASSISTANT_PREFIX "homeassistant"
 #define CMSG_SIZE 512
 #define JSON_BUFF_MAX   1024
 #define CSTR(x) x.c_str()
@@ -48,6 +50,7 @@ void setLed(int8_t, uint8_t);
 #define CBINARY(x) (x?"1":"0")
 #define EVALBOOLEAN(x) (stricmp(x,"true")==0||stricmp(x,"on")==0||stricmp(x,"1")==0)
 
+
 //Global variables
 WiFiClient  wifiClient;
 bool        Verbose = false;
@@ -79,9 +82,10 @@ String    settingMQTTbroker= "192.168.88.254";
 int16_t   settingMQTTbrokerPort = 1883; 
 String    settingMQTTuser = "";
 String    settingMQTTpasswd = "";
+String    settingMQTThaprefix = HOMEASSISTANT_PREFIX;
 String    settingMQTTtopTopic = "OTGW";
 bool      settingNTPenable = true;
-String    settingNTPtimezone = "Europe/Amsterdam"; //Default
+String    settingNTPtimezone = DEFAULT_TIMEZONE;
 bool      settingLEDblink = true;
 
 

OTGW-firmware.ino

@@ -1,7 +1,7 @@
 /* 
 ***************************************************************************  
 **  Program  : OTGW-firmware.ino
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2021 Robert van den Breemen
 **

README.md

@@ -46,6 +46,7 @@ Looking for the documentation, go here (work in progress):  <br> https://github.
 
 | Version | Release notes |
 |-|-|
+| 0.7.8 | Update to Homeassistant Autodiscovery. <br> Flexible Homeassistant prefix <br> Bugfix: Removed hardcoded OTGW topic. <br> Bugfix: NTP timezone discovery removed | 
 | 0.7.7 | UI improved: Only show updates values in web UI <br> Bugifx: Serial not found error when sending commands thru MQTT fixed |
 | 0.7.6 | PIC firmware integration done. <br> New setting: NTP configurable <br> New setting: heartbeat led on/off <br> Update to REST API to include epoch of last update to message|
 | 0.7.5 | Complete set of status bits in UI and Central Heating 2 information |

data/FSexplorer.css

@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : FSexplorer.html, part of ESP_ticker
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **  For more information visit: https://fipsok.de
 ***************************************************************************  
 */

data/FSexplorer.html

@@ -1,7 +1,7 @@
 <!--
 ***************************************************************************  
 **  Program  : FSexplorer.html, part of ESP_ticker
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2020 Willem Aandewiel
 **

data/index-new.css

@@ -1,7 +1,7 @@
 /*
 ***************************************************************************  
 **  Program  : index.css, part of OTGW-firmware
-**  Version  : v0.7.7
+**  Version  : v0.7.8
 **
 **  Copyright (c) 2020 Robert van den Breemen
 **

data/index.css

@@ -1,9 +1,9 @@
 /*
 ***************************************************************************  
-**  Program  : index.css, part of ESP_ticker
-**  Version  : v0.7.7
+**  Program  : index.css
+**  Version  : v0.7.8
 **
-**  Copyright (c) 2020 Willem Aandewiel
+**  Copyright (c) 2021 Robert van den Breemen
 **
 **  TERMS OF USE: MIT License. See bottom of file.                                                            
 ***************************************************************************      
@@ -294,7 +294,7 @@
 }
 .piccolumn3 {
   display: table-cell;
-  width: 100px;
+  width: 30px;
   margin: 5px;
 }
 .piccolumn4 {