Skip to content

Commit 77194c6

Browse files
committed
Merge branch 'dev' into main
2 parents c2738ec + 0ca09bf commit 77194c6

18 files changed

+165
-191
lines changed

MQTTstuff.ino

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : MQTTstuff
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2021 Robert van den Breemen
77
** Modified version from (c) 2020 Willem Aandewiel
@@ -300,7 +300,13 @@ void doAutoConfigure()
300300
// DebugTf("sline[%s]\r\n", CSTR(sLine));
301301
if (splitString(sLine, ',', sTopic, sMsg))
302302
{
303-
DebugTf("sTopic[%s], sMsg[%s]\r\n", CSTR(sTopic), CSTR(sMsg));
303+
DebugTf("sTopic[%s]==>", CSTR(sTopic)); DebugFlush();
304+
sTopic.replace("%homeassistant%", CSTR(settingMQTThaprefix));
305+
Debugf("[%s]\r\n", CSTR(sTopic));DebugFlush();
306+
307+
DebugTf("sMsg[%s]==>", CSTR(sMsg)); DebugFlush();
308+
sMsg.replace("%OTGW%", CSTR(settingMQTTtopTopic));
309+
Debugf("[%s]\r\n", CSTR(sMsg)); DebugFlush();
304310
sendMQTT(CSTR(sTopic), CSTR(sMsg), (sTopic.length() + sMsg.length()+2));
305311
delay(10);
306312
} else DebugTf("Either comment or invalid config line: [%s]\r\n", CSTR(sLine));

OTGW-Core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : Header file: OTGW-Core.h
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2021 Robert van den Breemen
77
** Borrowed from OpenTherm library from:

OTGW-Core.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : OTGW-Core.ino
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2021 Robert van den Breemen
77
** Borrowed from OpenTherm library from:

OTGW-firmware.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : OTGW-firmware.h
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2021 Robert van den Breemen
77
**
@@ -40,6 +40,8 @@ void setLed(int8_t, uint8_t);
4040
//Defaults and macro definitions
4141
#define _HOSTNAME "OTGW"
4242
#define SETTINGS_FILE "/settings.ini"
43+
#define DEFAULT_TIMEZONE "Europe/Amsterdam"
44+
#define HOMEASSISTANT_PREFIX "homeassistant"
4345
#define CMSG_SIZE 512
4446
#define JSON_BUFF_MAX 1024
4547
#define CSTR(x) x.c_str()
@@ -48,6 +50,7 @@ void setLed(int8_t, uint8_t);
4850
#define CBINARY(x) (x?"1":"0")
4951
#define EVALBOOLEAN(x) (stricmp(x,"true")==0||stricmp(x,"on")==0||stricmp(x,"1")==0)
5052

53+
5154
//Global variables
5255
WiFiClient wifiClient;
5356
bool Verbose = false;
@@ -79,9 +82,10 @@ String settingMQTTbroker= "192.168.88.254";
7982
int16_t settingMQTTbrokerPort = 1883;
8083
String settingMQTTuser = "";
8184
String settingMQTTpasswd = "";
85+
String settingMQTThaprefix = HOMEASSISTANT_PREFIX;
8286
String settingMQTTtopTopic = "OTGW";
8387
bool settingNTPenable = true;
84-
String settingNTPtimezone = "Europe/Amsterdam"; //Default
88+
String settingNTPtimezone = DEFAULT_TIMEZONE;
8589
bool settingLEDblink = true;
8690

8791

OTGW-firmware.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : OTGW-firmware.ino
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2021 Robert van den Breemen
77
**

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Looking for the documentation, go here (work in progress): <br> https://github.
4646

4747
| Version | Release notes |
4848
|-|-|
49+
| 0.7.8 | Update to Homeassistant Autodiscovery. <br> Flexible Homeassistant prefix <br> Bugfix: Removed hardcoded OTGW topic. <br> Bugfix: NTP timezone discovery removed |
4950
| 0.7.7 | UI improved: Only show updates values in web UI <br> Bugifx: Serial not found error when sending commands thru MQTT fixed |
5051
| 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|
5152
| 0.7.5 | Complete set of status bits in UI and Central Heating 2 information |

data/FSexplorer.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : FSexplorer.html, part of ESP_ticker
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
** For more information visit: https://fipsok.de
66
***************************************************************************
77
*/

data/FSexplorer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
***************************************************************************
33
** Program : FSexplorer.html, part of ESP_ticker
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2020 Willem Aandewiel
77
**

data/index-new.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
***************************************************************************
33
** Program : index.css, part of OTGW-firmware
4-
** Version : v0.7.7
4+
** Version : v0.7.8
55
**
66
** Copyright (c) 2020 Robert van den Breemen
77
**

data/index.css

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
22
***************************************************************************
3-
** Program : index.css, part of ESP_ticker
4-
** Version : v0.7.7
3+
** Program : index.css
4+
** Version : v0.7.8
55
**
6-
** Copyright (c) 2020 Willem Aandewiel
6+
** Copyright (c) 2021 Robert van den Breemen
77
**
88
** TERMS OF USE: MIT License. See bottom of file.
99
***************************************************************************
@@ -294,7 +294,7 @@
294294
}
295295
.piccolumn3 {
296296
display: table-cell;
297-
width: 100px;
297+
width: 30px;
298298
margin: 5px;
299299
}
300300
.piccolumn4 {

0 commit comments

Comments
 (0)