github/OTGW-firmware
1
Fork 0
mirror of https://github.com/rvdbreemen/OTGW-firmware synced 2024-11-16 04:33:49 +01:00
Code Releases Activity

Correcting OT specificatio

Browse Source 
- Tcollector = Tsolarcollector
- Tstorage = Tsolarstorage
- Texhaust = s16 not f88

Change to code bases and MQTT messages accordingly.
This commit is contained in:
Robert van den Breemen 2021-04-05 00:21:50 +02:00
parent 6031d2f82e
commit 2efb048b23
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OTGW-Core.h
View File

@ -52,8 +52,8 @@ typedef struct {
float Tdhw = 0.0 ; // f8.8 DHW temperature (°C)
float Toutside = 0.0 ; // f8.8 Outside temperature (°C)
float Tret = 0.0 ; // f8.8 Return water temperature (°C)
float Tstorage = 0.0 ; // f8.8 Solar storage temperature (°C)
int16_t Tcollector = 0.0 ; // s16 Solar collector temperature (°C)
float Tsolarstorage = 0.0 ; // f8.8 Solar storage temperature (°C)
int16_t Tsolarcollector = 0.0 ; // s16 Solar collector temperature (°C)
float TflowCH2 = 0.0 ; // f8.8 Flow water temperature CH2 circuit (°C)
float Tdhw2 = 0.0 ; // f8.8 Domestic hot water temperature 2 (°C)
int16_t Texhaust = 0; // s16 Boiler exhaust temperature (°C)
@ -186,8 +186,8 @@ enum OpenThermMessageID {
OT_Tdhw, // f8.8 DHW temperature (°C)
OT_Toutside, // f8.8 Outside temperature (°C)
OT_Tret, // f8.8 Return water temperature (°C)
OT_Tstorage, // f8.8 Solar storage temperature (°C)
OT_Tcollector, // s16 Solar collector temperature (°C)
OT_Tsolarstorage, // f8.8 Solar storage temperature (°C)
OT_Tsolarcollector, // s16 Solar collector temperature (°C)
OT_TflowCH2, // f8.8 Flow water temperature CH2 circuit (°C)
OT_Tdhw2, // f8.8 Domestic hot water temperature 2 (°C)
OT_Texhaust, // s16 Boiler exhaust temperature (°C)
@ -290,8 +290,8 @@ enum OpenThermMessageID {
{ 26, OT_READ , ot_f88, "Tdhw", "DHW temperature", "°C" },
{ 27, OT_READ , ot_f88, "Toutside", "Outside temperature", "°C" },
{ 28, OT_READ , ot_f88, "Tret", "Return water temperature", "°C" },
{ 29, OT_READ , ot_f88, "Tstorage", "Solar storage temperature", "°C" },
{ 30, OT_READ , ot_s16, "Tcollector", "Solar collector temperature", "°C" },
{ 29, OT_READ , ot_f88, "Tshehehelarstorage", "Solar storage temperature", "°C" },
{ 30, OT_READ , ot_s16, "Tsolarcollector", "Solar collector temperature", "°C" },
{ 31, OT_READ , ot_f88, "TflowCH2", "Flow water temperature CH2 circuit", "°C" },
{ 32, OT_READ , ot_f88, "Tdhw2", "Domestic hot water temperature 2", "°C" },
{ 33, OT_READ , ot_s16, "Texhaust", "Boiler exhaust temperature", "°C" },

8
OTGW-Core.ino
View File

@ -1013,8 +1013,8 @@ void processOTGW(const char *buf, int len){
case OT_Tdhw: OTdataObject.Tdhw = print_f88(); break;
case OT_Toutside: OTdataObject.Toutside = print_f88(); break;
case OT_Tret: OTdataObject.Tret = print_f88(); break;
case OT_Tstorage: OTdataObject.Tstorage = print_f88(); break;
case OT_Tcollector: OTdataObject.Tcollector = print_s16(); break;
case OT_Tsolarstorage: OTdataObject.Tsolarstorage = print_f88(); break;
case OT_Tsolarcollector: OTdataObject.Tsolarcollector = print_s16(); break;
case OT_TflowCH2: OTdataObject.TflowCH2 = print_f88(); break;
case OT_Tdhw2: OTdataObject.Tdhw2 = print_f88(); break;
case OT_Texhaust: OTdataObject.Texhaust = print_s16(); break;
@ -1220,8 +1220,8 @@ String getOTGWValue(int msgid)
case OT_Tdhw: return String(OTdataObject.Tdhw); break;
case OT_Toutside: return String(OTdataObject.Toutside); break;
case OT_Tret: return String(OTdataObject.Tret); break;
case OT_Tstorage: return String(OTdataObject.Tstorage); break;
case OT_Tcollector: return String(OTdataObject.Tcollector); break;
case OT_Tsolarstorage: return String(OTdataObject.Tsolarstorage); break;
case OT_Tsolarcollector: return String(OTdataObject.Tsolarcollector); break;
case OT_TflowCH2: return String(OTdataObject.TflowCH2); break;
case OT_Tdhw2: return String(OTdataObject.Tdhw2); break;
case OT_Texhaust: return String(OTdataObject.Texhaust); break;

6
data/mqttha.cfg
View File

@ -75,11 +75,11 @@
%homeassistant%/sensor/%node_id%/Tdhw/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tdhw", "device_class": "temperature", "name": "%hostname%_DHW_temperature", "stat_t": "%mqtt_pub_topic%/Tdhw", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Toutside/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Toutside", "device_class": "temperature", "name": "%hostname%_Outside_Temperature", "stat_t": "%mqtt_pub_topic%/Toutside", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Tret/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tret", "device_class": "temperature", "name": "%hostname%_Return_water_temperature", "stat_t": "%mqtt_pub_topic%/Tret", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Tstorage/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tstorage", "device_class": "temperature", "name": "%hostname%_Solar_storage_temperature", "stat_t": "%mqtt_pub_topic%/Tstorage", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Tcollector/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tcollector", "device_class": "temperature", "name": "%hostname%_Solar_collector_temperature", "stat_t": "%mqtt_pub_topic%/Tcollector", "unit_of_measurement": "°C", "value_template": "{{ value / 256 }}" }
%homeassistant%/sensor/%node_id%/Tsolarstorage/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tsolarstorage", "device_class": "temperature", "name": "%hostname%_Solar_storage_temperature", "stat_t": "%mqtt_pub_topic%/Tsolarstorage", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Tsolarcollector/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tsolarcollector", "device_class": "temperature", "name": "%hostname%_Solar_collector_temperature", "stat_t": "%mqtt_pub_topic%/Tsolarcollector", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/TflowCH2/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-TflowCH2", "device_class": "temperature", "name": "%hostname%_Flow_water_temperature_CH2 cir.", "stat_t": "%mqtt_pub_topic%/TflowCH2", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Tdhw2/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Tdhw2", "device_class": "temperature", "name": "%hostname%_Domestic_hot_water_temperature_2", "stat_t": "%mqtt_pub_topic%/Tdhw2", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/Texhaust/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Texhaust", "device_class": "temperature", "name": "%hostname%_Boiler_exhaust_temperature", "stat_t": "%mqtt_pub_topic%/Texhaust", "unit_of_measurement": "°C", "value_template": "{{ value / 256 }}" }
%homeassistant%/sensor/%node_id%/Texhaust/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-Texhaust", "device_class": "temperature", "name": "%hostname%_Boiler_exhaust_temperature", "stat_t": "%mqtt_pub_topic%/Texhaust", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/TdhwSet/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-TdhwSet", "device_class": "temperature", "name": "%hostname%_DHW_setpoint", "stat_t": "%mqtt_pub_topic%/TdhwSet", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/MaxTSet/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-MaxTSet", "device_class": "temperature", "name": "%hostname%_Max_CH_water_setpoint", "stat_t": "%mqtt_pub_topic%/MaxTSet", "unit_of_measurement": "°C", "value_template": "{{ value }}" }
%homeassistant%/sensor/%node_id%/CoolingControl/config , {"avty_t": "%mqtt_pub_topic%", "dev": {"identifiers": "%node_id%", "manufacturer": "Schelte Bron", "model": "otgw-nodo", "name": "OpenTherm Gateway (%hostname%)", "sw_version": "%version%"}, "uniq_id": "%node_id%-CoolingControl", "name": "%hostname%_Cooling_control_signal", "stat_t": "%mqtt_pub_topic%/CoolingControl", "unit_of_measurement": "%", "value_template": "{{ value }}" }

18
version.h
View File

@ -2,15 +2,15 @@
#define _VERSION_MAJOR 0
#define _VERSION_MINOR 8
#define _VERSION_PATCH 3
#define _VERSION_BUILD 973
#define _VERSION_GITHASH "7fa7264"
#define _VERSION_BUILD 976
#define _VERSION_GITHASH "6031d2f"
#define _VERSION_PRERELEASE beta
#define _VERSION_DATE "03-04-2021"
#define _VERSION_TIME "19:53:36"
#define _VERSION_DATE "05-04-2021"
#define _VERSION_TIME "00:21:00"
#define _SEMVER_CORE "0.8.3"
#define _SEMVER_BUILD "0.8.3+973"
#define _SEMVER_GITHASH "0.8.3+7fa7264"
#define _SEMVER_FULL "0.8.3-beta+7fa7264"
#define _SEMVER_NOBUILD "0.8.3-beta (03-04-2021)"
#define _VERSION "0.8.3-beta+7fa7264 (03-04-2021)"
#define _SEMVER_BUILD "0.8.3+976"
#define _SEMVER_GITHASH "0.8.3+6031d2f"
#define _SEMVER_FULL "0.8.3-beta+6031d2f"
#define _SEMVER_NOBUILD "0.8.3-beta (05-04-2021)"
#define _VERSION "0.8.3-beta+6031d2f (05-04-2021)"
//The version information is created automatically, more information here: https://github.com/rvdbreemen/autoinc-semver