Skip to content

Commit e30ccc1

Browse files
committed
Merge dev 0.10.2 maintance release
Combined Update readme for 0.10.2 maintaince release Update firmware hex files to 6.5 and 5.8 Bugfix the 0bytes on update Pic firmware, by downgrading the core to 2.7.4 Adding a little memory for use with larger settings... NTP longer FQDN fix Fix for hostname to wifi (credits to @hvxl) Removing git submodules from src tree
1 parent 87e4f7e commit e30ccc1

File tree

13 files changed

+973
-933
lines changed

13 files changed

+973
-933
lines changed

.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: release-workflow
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*.*.*"
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
- name: Build
15+
run: echo ${{ github.sha }} > Release.txt
16+
- name: Test
17+
run: cat Release.txt
18+
- name: Release
19+
uses: softprops/action-gh-release@v1
20+
if: startsWith(github.ref, 'refs/tags/')
21+
with:
22+
files: |
23+
Release.txt
24+
LICENSE

.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[submodule "Arduino/libraries/aceTime"]
2+
path = Arduino/libraries/aceTime
3+
url = https://github.com/bxparks/AceTime
4+
[submodule "Arduino/libraries/Time"]
5+
path = Arduino/libraries/Time
6+
url = https://github.com/PaulStoffregen/Time.git

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ CFLAGS = $(CFLAGS_DEFAULT)
1212
CLI := arduino-cli
1313
PLATFORM := esp8266:esp8266
1414
CFGFILE := arduino-cli.yaml
15-
ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
15+
# bug in http stream, fallback to 2.7.4
16+
# ESP8266URL := https://github.com/esp8266/Arduino/releases/download/3.0.2/package_esp8266com_index.json
17+
ESP8266URL := https://github.com/esp8266/Arduino/releases/download/2.7.4/package_esp8266com_index.json
1618
LIBRARIES := libraries/WiFiManager libraries/ArduinoJson libraries/PubSubClient libraries/TelnetStream libraries/AceTime libraries/OneWire libraries/DallasTemperature
1719
BOARDS := arduino/package_esp8266com_index.json
1820
# PORT can be overridden by the environment or on the command line. E.g.:
@@ -78,7 +80,7 @@ libraries/PubSubClient:
7880
$(CLI) lib install [email protected]
7981

8082
libraries/TelnetStream:
81-
$(CLI) lib install [email protected].2
83+
$(CLI) lib install [email protected].4
8284

8385
libraries/AceTime:
8486
$(CLI) lib install [email protected]

OTGW-firmware.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,13 @@ String settingHostname = _HOSTNAME;
111111
bool statusMQTTconnection = false;
112112
bool settingMQTTenable = true;
113113
bool settingMQTTsecure = false;
114-
String settingMQTTbroker= "192.168.88.254";
114+
String settingMQTTbroker= "homeassistant.local";
115115
int16_t settingMQTTbrokerPort = 1883;
116116
String settingMQTTuser = "";
117117
String settingMQTTpasswd = "";
118118
String settingMQTThaprefix = HOME_ASSISTANT_DISCOVERY_PREFIX;
119119
bool settingMQTTharebootdetection = true;
120-
String settingMQTTtopTopic = "otgw";
120+
String settingMQTTtopTopic = "OTGW";
121121
String settingMQTTuniqueid = ""; // Intialized in readsettings
122122
bool settingMQTTOTmessage = false;
123123
bool settingNTPenable = true;

OTGW-firmware.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ void setup() {
7575
startNTP();
7676

7777
//start with setting wifi hostname
78-
WiFi.hostname(String(settingHostname));
7978
startWiFi(CSTR(settingHostname), 240); // timeout 240 seconds
8079
blinkLED(LED1, 3, 100);
8180
setLed(LED1, OFF);

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ The features of this Nodosop OpenTherm Gateware ESP8266 based firmware are:
5454
To do:
5555
- InfluxDB client to do direct logging
5656
- Instant update of webUI using websockets
57-
- Showing log of OT messages using websockets847
57+
- Showing log of OT messages using websockets
5858

5959
Looking for the documentation, go here (work in progress): <br> https://github.com/rvdbreemen/OTGW-firmware/wiki/Documentation-of-OTGW-firmware
6060

6161
| Version | Release notes |
6262
|-|-|
63+
| 0.10.2 | Bugfix: issue #213 which caused 0 bytes after update of PIC firwmare (dropped to Adruino core 2.7.4)<br>Update to filesystem to include latest PIC firmware (6.5 and 5.8, released 12 march 2023)<br>Fix: Back to correct hostname to wifi (credits to @hvxl)<br>Fix: Adding a little memory for use with larger settings.|
6364
| 0.10.1 | Beter build processes to generate consistant quality using aruidno-cli and github actions (Thx to @hvxl and @DaveDavenport)<br>Maintaince to sourcetree, removed cruft, time.h library, submodules<br>Fix: parsing VH Status Master correctly<br>Enhancement: Stopping send time commands on detections of PS=1 mode<br>Fix: Mistake in MQTT configuration of auto discovery template for OEM fault code<br>Added wifi quality indication (so you can understand better)<br>Remove: Boardtype, as it was static in compiletime building|
6465
| 0.10.0 | Updated: Added support fox 6.x firmware (pic16f1847) (Thanks to @hvxl / Schelte Bron)<br>Added reporting of "firmware type"<br>Improved: DHCP can override NTP settings now<br>Improved: Sending SC command on the minute (00 second), after reset ESP all commands (SR 21, SR 22) are resend<br>Bugfix: bitwise not bytewise AND operation for ASF flags OEM codes<br>Readout S0 output from configurable GPIO, interupt rtn added for this, enhanced Dallas-type sensor logic (autoconfigure, code cleanup) (Thanks to @RobR) <br>Web UI improvements by @rlagerwij and @Nicole|
6566
| 0.9.5 | Improved: WebUI improved by community<br>Bugfix: Device Online status indicator for Home Assistant<br>Improved: Update of 5.x series (pic16f88) firmwares, preparing for 6.x (pic16f1847) updates.<br>Bugfix: Prevent spamming OTGW firmware website in case of rebootloop<br>Added: Unique useragent|

0 commit comments

Comments
 (0)