jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-12 11:14:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

states.faultCode moved to sensors.faultCode, states.rssi moved to sensors.rssi, states.uptime moved to sensors.uptime

Browse Source
This commit is contained in:
Yurii
2023-11-23 05:11:58 +03:00
parent b268ff4007
commit 70e577e29f
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/HaHelper.h
View File

@@ -864,13 +864,14 @@ public:
doc[FPSTR(HA_NAME)] = F("Fault code"); doc[FPSTR(HA_NAME)] = F("Fault code");
doc[FPSTR(HA_ICON)] = F("mdi:chat-alert-outline"); doc[FPSTR(HA_ICON)] = F("mdi:chat-alert-outline");
doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state"); doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state");
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ \"E%02d\"|format(value_json.states.faultCode) }}"); doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ \"E%02d\"|format(value_json.sensors.faultCode) }}");
return publish(getTopic("sensor", "fault_code").c_str(), doc); return publish(getTopic("sensor", "fault_code").c_str(), doc);
} }
bool publishSensorRssi(bool enabledByDefault = true) { bool publishSensorRssi(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc; StaticJsonDocument<1536> doc;
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = devicePrefix + F("/status");
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault; doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_rssi"); doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_rssi");
doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_rssi"); doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_rssi");
@@ -881,13 +882,14 @@ public:
doc[FPSTR(HA_NAME)] = F("RSSI"); doc[FPSTR(HA_NAME)] = F("RSSI");
doc[FPSTR(HA_ICON)] = F("mdi:signal"); doc[FPSTR(HA_ICON)] = F("mdi:signal");
doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state"); doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state");
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.states.rssi|float(0)|round(1) }}"); doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.sensors.rssi|float(0)|round(1) }}");
return publish(getTopic("sensor", "rssi").c_str(), doc); return publish(getTopic("sensor", "rssi").c_str(), doc);
} }
bool publishSensorUptime(bool enabledByDefault = true) { bool publishSensorUptime(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc; StaticJsonDocument<1536> doc;
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = devicePrefix + F("/status");
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault; doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_uptime"); doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_uptime");
doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_uptime"); doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_uptime");
@@ -898,7 +900,7 @@ public:
doc[FPSTR(HA_NAME)] = F("Uptime"); doc[FPSTR(HA_NAME)] = F("Uptime");
doc[FPSTR(HA_ICON)] = F("mdi:clock-start"); doc[FPSTR(HA_ICON)] = F("mdi:clock-start");
doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state"); doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/state");
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.states.uptime|int(0) }}"); doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.sensors.uptime|int(0) }}");
return publish(getTopic("sensor", "uptime").c_str(), doc); return publish(getTopic("sensor", "uptime").c_str(), doc);
} }

2
src/MainTask.h
View File

@@ -54,7 +54,7 @@ protected:
if (WiFi.status() == WL_CONNECTED) { if (WiFi.status() == WL_CONNECTED) {
//timeClient.update(); //timeClient.update();
vars.states.rssi = WiFi.RSSI(); vars.sensors.rssi = WiFi.RSSI();
if (!tMqtt->isEnabled() && strlen(settings.mqtt.server) > 0) { if (!tMqtt->isEnabled() && strlen(settings.mqtt.server) > 0) {
tMqtt->enable(); tMqtt->enable();

6
src/MqttTask.h
View File

@@ -595,13 +595,13 @@ protected:
doc["states"]["flame"] = vars.states.flame; doc["states"]["flame"] = vars.states.flame;
doc["states"]["fault"] = vars.states.fault; doc["states"]["fault"] = vars.states.fault;
doc["states"]["diagnostic"] = vars.states.diagnostic; doc["states"]["diagnostic"] = vars.states.diagnostic;
doc["states"]["faultCode"] = vars.states.faultCode;
doc["states"]["rssi"] = vars.states.rssi;
doc["states"]["uptime"] = (unsigned long) (millis() / 1000);
doc["sensors"]["modulation"] = vars.sensors.modulation; doc["sensors"]["modulation"] = vars.sensors.modulation;
doc["sensors"]["pressure"] = vars.sensors.pressure; doc["sensors"]["pressure"] = vars.sensors.pressure;
doc["sensors"]["dhwFlowRate"] = vars.sensors.dhwFlowRate; doc["sensors"]["dhwFlowRate"] = vars.sensors.dhwFlowRate;
doc["sensors"]["faultCode"] = vars.sensors.faultCode;
doc["sensors"]["rssi"] = vars.sensors.rssi;
doc["sensors"]["uptime"] = (unsigned long) (millis() / 1000);
doc["temperatures"]["indoor"] = vars.temperatures.indoor; doc["temperatures"]["indoor"] = vars.temperatures.indoor;
doc["temperatures"]["outdoor"] = vars.temperatures.outdoor; doc["temperatures"]["outdoor"] = vars.temperatures.outdoor;

2
src/OpenThermTask.h
View File

@@ -528,7 +528,7 @@ protected:
return false; return false;
} }
vars.states.faultCode = response & 0xFF; vars.sensors.faultCode = response & 0xFF;
return true; return true;
} }

4
src/Settings.h
View File

@@ -94,14 +94,14 @@ struct Variables {
bool flame = false; bool flame = false;
bool fault = false; bool fault = false;
bool diagnostic = false; bool diagnostic = false;
byte faultCode = 0;
int8_t rssi = 0;
} states; } states;
struct { struct {
float modulation = 0.0f; float modulation = 0.0f;
float pressure = 0.0f; float pressure = 0.0f;
float dhwFlowRate = 0.0f; float dhwFlowRate = 0.0f;
byte faultCode = 0;
int8_t rssi = 0;
} sensors; } sensors;
struct { struct {