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

small fix settings

Browse Source
This commit is contained in:
Yurii
2023-11-22 23:07:02 +03:00
parent 44fdff61bd
commit c556c38cbc
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/HaHelper.h
View File

@@ -257,28 +257,6 @@ public:
return publish(getTopic("number", "heating_hysteresis").c_str(), doc); return publish(getTopic("number", "heating_hysteresis").c_str(), doc);
} }
bool publishNumberHeatingMaxModulation(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc;
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_heating_max_modulation");
doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_heating_max_modulation");
doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("%");
doc[FPSTR(HA_NAME)] = F("Max modulation");
doc[FPSTR(HA_ICON)] = F("mdi:speedometer");
doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/settings");
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.maxModulation|int(1) }}");
doc[FPSTR(HA_COMMAND_TOPIC)] = devicePrefix + F("/settings/set");
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"maxModulation\" : {{ value }}}}");
doc[FPSTR(HA_MIN)] = 1;
doc[FPSTR(HA_MAX)] = 100;
doc[FPSTR(HA_STEP)] = 1;
doc[FPSTR(HA_MODE)] = "box";
return publish(getTopic("number", "heating_max_modulation").c_str(), doc);
}
bool publishSensorHeatingSetpoint(bool enabledByDefault = true) { bool publishSensorHeatingSetpoint(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc; StaticJsonDocument<1536> doc;
doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = devicePrefix + F("/status"); doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = devicePrefix + F("/status");
@@ -377,6 +355,28 @@ public:
return publish(getTopic("number", "heating_max_temp").c_str(), doc); return publish(getTopic("number", "heating_max_temp").c_str(), doc);
} }
bool publishNumberHeatingMaxModulation(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc;
doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
doc[FPSTR(HA_UNIQUE_ID)] = devicePrefix + F("_heating_max_modulation");
doc[FPSTR(HA_OBJECT_ID)] = devicePrefix + F("_heating_max_modulation");
doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
doc[FPSTR(HA_DEVICE_CLASS)] = F("power_factor");
doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("%");
doc[FPSTR(HA_NAME)] = F("Max modulation");
doc[FPSTR(HA_ICON)] = F("mdi:speedometer");
doc[FPSTR(HA_STATE_TOPIC)] = devicePrefix + F("/settings");
doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.heating.maxModulation|int(1) }}");
doc[FPSTR(HA_COMMAND_TOPIC)] = devicePrefix + F("/settings/set");
doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"maxModulation\" : {{ value }}}}");
doc[FPSTR(HA_MIN)] = 1;
doc[FPSTR(HA_MAX)] = 100;
doc[FPSTR(HA_STEP)] = 1;
doc[FPSTR(HA_MODE)] = "box";
return publish(getTopic("number", "heating_max_modulation").c_str(), doc);
}
bool publishSwitchDHW(bool enabledByDefault = true) { bool publishSwitchDHW(bool enabledByDefault = true) {
StaticJsonDocument<1536> doc; StaticJsonDocument<1536> doc;

2
src/MqttTask.h
View File

@@ -394,12 +394,12 @@ protected:
haHelper.publishSwitchHeatingTurbo(); haHelper.publishSwitchHeatingTurbo();
//haHelper.publishNumberHeatingTarget(false); //haHelper.publishNumberHeatingTarget(false);
haHelper.publishNumberHeatingHysteresis(); haHelper.publishNumberHeatingHysteresis();
haHelper.publishNumberHeatingMaxModulation(false);
haHelper.publishSensorHeatingSetpoint(false); haHelper.publishSensorHeatingSetpoint(false);
haHelper.publishSensorCurrentHeatingMinTemp(false); haHelper.publishSensorCurrentHeatingMinTemp(false);
haHelper.publishSensorCurrentHeatingMaxTemp(false); haHelper.publishSensorCurrentHeatingMaxTemp(false);
haHelper.publishNumberHeatingMinTemp(false); haHelper.publishNumberHeatingMinTemp(false);
haHelper.publishNumberHeatingMaxTemp(false); haHelper.publishNumberHeatingMaxTemp(false);
haHelper.publishNumberHeatingMaxModulation(false);
// pid // pid
haHelper.publishSwitchPID(); haHelper.publishSwitchPID();

2
src/Settings.h
View File

@@ -32,9 +32,9 @@ struct Settings {
bool turbo = false; bool turbo = false;
float target = 40.0f; float target = 40.0f;
float hysteresis = 0.5f; float hysteresis = 0.5f;
byte maxModulation = 100;
byte minTemp = 20.0f; byte minTemp = 20.0f;
byte maxTemp = 90.0f; byte maxTemp = 90.0f;
byte maxModulation = 100;
} heating; } heating;
struct { struct {