Skip to content

Fix incorrect OTmap[6].type #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix incorrect OTmap[6].type #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c99988
Merge pull request #244 from rvdbreemen/main
rvdbreemen Apr 17, 2024
8a47634
Updating header with copyright year
rvdbreemen Apr 27, 2024
8ebde1e
fix: MQTT no longer in the clear in the UI
rvdbreemen Apr 27, 2024
38f921b
Update file headers during development.
rvdbreemen May 5, 2024
5459bbb
Fixed the update script.
rvdbreemen May 5, 2024
c419f69
Update version to alpha
rvdbreemen May 5, 2024
c02dc1e
Fix incorrect OTmap[6].type
Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Debug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
***************************************************************************
** Program : Debug.h
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Met dank aan Willem Aandewiel en Erik
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
2 changes: 1 addition & 1 deletion FSexplorer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : FSexplorer
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Mostly stolen from https://www.arduinoforum.de/User-Fips
** For more information visit: https://fipsok.de
Expand Down
4 changes: 2 additions & 2 deletions MQTTstuff.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : MQTTstuff
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Modified version from (c) 2020 Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
6 changes: 3 additions & 3 deletions OTGW-Core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : Header file: OTGW-Core.h
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Borrowed from OpenTherm library from:
** https://github.com/jpraus/arduino-opentherm
**
Expand Down Expand Up @@ -318,7 +318,7 @@ enum OpenThermMessageID {
{ 3, OT_READ , ot_flag8u8, "SlaveConfigMemberIDcode", "Slave Config / Member ID", "" },
{ 4, OT_RW , ot_u8u8, "Command", "Command-Code", "" },
{ 5, OT_READ , ot_flag8u8, "ASFflags", "Application-specific fault", "" },
{ 6, OT_READ , ot_flag8u8, "RBPflags", "Remote-parameter flags", "" },
{ 6, OT_READ , ot_flag8flag8, "RBPflags", "Remote-parameter flags", "" },
{ 7, OT_WRITE , ot_f88, "CoolingControl", "Cooling control signal", "%" },
{ 8, OT_WRITE , ot_f88, "TsetCH2", "Control setpoint for 2e CH circuit", "°C" },
{ 9, OT_READ , ot_f88, "TrOverride", "Remote override room setpoint", "°C" },
Expand Down
4 changes: 2 additions & 2 deletions OTGW-Core.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : OTGW-Core.ino
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Borrowed from OpenTherm library from:
** https://github.com/jpraus/arduino-opentherm
**
Expand Down
4 changes: 2 additions & 2 deletions OTGW-firmware.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : OTGW-firmware.h
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions OTGW-firmware.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : OTGW-firmware.ino
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion data/FSexplorer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
***************************************************************************
** Program : FSexplorer.html
** Version : v0.10.3
** Version : v0.10.4-alpha
** For more information visit: https://fipsok.de
***************************************************************************
*/
Expand Down
4 changes: 2 additions & 2 deletions data/FSexplorer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<!--
***************************************************************************
** Program : FSexplorer.html
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions data/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : index.css
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions data/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : index.js, part of OTGW-firmware project
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
10 changes: 10 additions & 0 deletions data/mqttha.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@

//*************************************************************************
// Program : mqttha.cfg, part of OTGW-firmware project
// Version : v0.10.4-alpha
//
// Copyright (c) 2021-2024 Robert van den Breemen
//
// TERMS OF USE: MIT License. See bottom of file.
//*************************************************************************
//
// device
// "action_template": "{% if value == 'ON' %}heating{% else %}idle{% endif %}"
// "action_topic": "%mqtt_pub_topic%/ch_enable"
Expand Down
4 changes: 2 additions & 2 deletions helperStuff.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : helperStuff
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
4 changes: 2 additions & 2 deletions jsonStuff.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : jsonStuff
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
6 changes: 3 additions & 3 deletions networkStuff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
***************************************************************************
** Program : networkStuff.h
**
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
4 changes: 2 additions & 2 deletions outputs_ext.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*********
** Program : output_ext.ino
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Contributed by Sjorsjuhmaniac
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
6 changes: 3 additions & 3 deletions restAPI.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : restAPI
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down Expand Up @@ -432,7 +432,7 @@ void sendDeviceSettings()
sendJsonSettingObj("mqttbroker", CSTR(settingMQTTbroker), "s", 32);
sendJsonSettingObj("mqttbrokerport", settingMQTTbrokerPort, "i", 0, 65535);
sendJsonSettingObj("mqttuser", CSTR(settingMQTTuser), "s", 32);
sendJsonSettingObj("mqttpasswd", CSTR(settingMQTTpasswd), "p", 100);
sendJsonSettingObj("mqttpasswd", "notthepassword", "p", 100);
sendJsonSettingObj("mqtttoptopic", CSTR(settingMQTTtopTopic), "s", 15);
sendJsonSettingObj("mqtthaprefix", CSTR(settingMQTThaprefix), "s", 20);
sendJsonSettingObj("mqttharebootdetection", settingMQTTharebootdetection, "b");
Expand Down
4 changes: 2 additions & 2 deletions s0PulseCount.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : s0PulseCount
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Rob Roos / Robert van Breemen
** Copyright (c) 2021-2024 Rob Roos / Robert van Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down
4 changes: 2 additions & 2 deletions sensors_ext.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
** Program : output_ext.ino
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** Contributed by Sjorsjuhmaniac
** Modified by Rob Roos to enable MQ autoconfigure and cleanup
**
Expand Down
10 changes: 7 additions & 3 deletions settingStuff.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : settingsStuff
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
** based on Framework ESP8266 from Willem Aandewiel
**
** TERMS OF USE: MIT License. See bottom of file.
Expand Down Expand Up @@ -203,7 +203,11 @@ void updateSetting(const char *field, const char *newValue)
if (strcasecmp(field, "MQTTbroker")==0) settingMQTTbroker = String(newValue);
if (strcasecmp(field, "MQTTbrokerPort")==0) settingMQTTbrokerPort = atoi(newValue);
if (strcasecmp(field, "MQTTuser")==0) settingMQTTuser = String(newValue);
if (strcasecmp(field, "MQTTpasswd")==0) settingMQTTpasswd = String(newValue);
if (strcasecmp(field, "MQTTpasswd")==0){
if ( newValue && strcasecmp(newValue, "notthepassword") != 0 ){
settingMQTTpasswd = String(newValue);
}
}
if (strcasecmp(field, "MQTTtoptopic")==0) {
settingMQTTtopTopic = String(newValue);
if (settingMQTTtopTopic.length()==0) {
Expand Down
4 changes: 2 additions & 2 deletions theme/OTGW_Dark_Theme/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : index.css
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
4 changes: 2 additions & 2 deletions theme/OTGW_Dark_Theme/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
***************************************************************************
** Program : index.js, part of OTGW-firmware project
** Version : v0.10.3
** Version : v0.10.4-alpha
**
** Copyright (c) 2021-2023 Robert van den Breemen
** Copyright (c) 2021-2024 Robert van den Breemen
**
** TERMS OF USE: MIT License. See bottom of file.
***************************************************************************
Expand Down
22 changes: 11 additions & 11 deletions version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
#define _VERSION_MAJOR 0
#define _VERSION_MINOR 10
#define _VERSION_PATCH 4
#define _VERSION_BUILD 2112
#define _VERSION_GITHASH "1c8485a"
#define _VERSION_PRERELEASE beta
#define _VERSION_DATE "13-04-2024"
#define _VERSION_TIME "13:40:09"
#define _SEMVER_CORE "0.10.3"
#define _SEMVER_BUILD "0.10.3+2112"
#define _SEMVER_GITHASH "0.10.3+1c8485a"
#define _SEMVER_FULL "0.10.3-beta+1c8485a"
#define _SEMVER_NOBUILD "0.10.3-beta (13-04-2024)"
#define _VERSION "0.10.3-beta+1c8485a (13-04-2024)"
#define _VERSION_BUILD 2121
#define _VERSION_GITHASH "5459bbb"
#define _VERSION_PRERELEASE alpha
#define _VERSION_DATE "05-05-2024"
#define _VERSION_TIME "21:55:11"
#define _SEMVER_CORE "0.10.4"
#define _SEMVER_BUILD "0.10.4+2121"
#define _SEMVER_GITHASH "0.10.4+5459bbb"
#define _SEMVER_FULL "0.10.4-beta+5459bbb"
#define _SEMVER_NOBUILD "0.10.4-beta (05-05-2024)"
#define _VERSION "0.10.4-beta+5459bbb (05-05-2024)"
//The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver