andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow mode "off" to be set from home assistant + remove non available "auto" mode from home assistant

Browse Source
This commit is contained in:
Koen Schaper
2021-11-14 11:11:37 +01:00
parent 09addcb975
commit 9c5c27152c
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/devices/thermostat.cpp
View File

@@ -359,7 +359,7 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
// now create the HA topics to send to MQTT for each sensor // now create the HA topics to send to MQTT for each sensor
if (Mqtt::ha_enabled()) { if (Mqtt::ha_enabled()) {
publish_ha_config_hc(hc_num); publish_ha_config_hc(new_hc);
} }
// set the flag saying we want its data during the next auto fetch // set the flag saying we want its data during the next auto fetch
@@ -383,7 +383,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(std::sha
// publish config topic for HA MQTT Discovery for each of the heating circuit // publish config topic for HA MQTT Discovery for each of the heating circuit
// e.g. homeassistant/climate/ems-esp/thermostat_hc1/config // e.g. homeassistant/climate/ems-esp/thermostat_hc1/config
void Thermostat::publish_ha_config_hc(uint8_t hc_num) { void Thermostat::publish_ha_config_hc(std::shared_ptr<Thermostat::HeatingCircuit> hc) {
uint8_t hc_num = hc->hc_num();
StaticJsonDocument<EMSESP_JSON_SIZE_HA_CONFIG> doc; StaticJsonDocument<EMSESP_JSON_SIZE_HA_CONFIG> doc;
char str1[20]; char str1[20];
@@ -436,7 +437,9 @@ void Thermostat::publish_ha_config_hc(uint8_t hc_num) {
// the HA climate component only responds to auto, heat and off // the HA climate component only responds to auto, heat and off
JsonArray modes = doc.createNestedArray("modes"); JsonArray modes = doc.createNestedArray("modes");
modes.add("auto"); if (hc->get_model() != EMSdevice::EMS_DEVICE_FLAG_RC10){
modes.add("auto");
}
modes.add("heat"); modes.add("heat");
modes.add("off"); modes.add("off");
@@ -499,7 +502,7 @@ uint8_t Thermostat::HeatingCircuit::get_mode() const {
} else if (mode == 1) { } else if (mode == 1) {
return HeatingCircuit::Mode::NIGHT; return HeatingCircuit::Mode::NIGHT;
} else if (mode == 0) { } else if (mode == 0) {
return HeatingCircuit::Mode::NOFROST; return HeatingCircuit::Mode::OFF;
} }
} else if (model == EMSdevice::EMS_DEVICE_FLAG_RC20) { } else if (model == EMSdevice::EMS_DEVICE_FLAG_RC20) {
if (mode == 0) { if (mode == 0) {
@@ -658,7 +661,7 @@ void Thermostat::process_RC10Monitor(std::shared_ptr<const Telegram> telegram) {
} }
uint8_t mode = 1 << hc->mode; uint8_t mode = 1 << hc->mode;
has_update(telegram->read_value(mode, 0)); // 1: nofrost, 2: night, 4: day has_update(telegram->read_value(mode, 0)); // 1: off, 2: night, 4: day
hc->mode = mode >> 1; // for enum 0, 1, 2 hc->mode = mode >> 1; // for enum 0, 1, 2
has_update(telegram->read_value(hc->setpoint_roomTemp, 1, 1)); // is * 2, force as single byte has_update(telegram->read_value(hc->setpoint_roomTemp, 1, 1)); // is * 2, force as single byte
has_update(telegram->read_value(hc->curr_roomTemp, 2)); // is * 10 has_update(telegram->read_value(hc->curr_roomTemp, 2)); // is * 10
@@ -694,7 +697,7 @@ void Thermostat::process_RC10Set_2(std::shared_ptr<const Telegram> telegram) {
// return; // return;
// } // }
// uint8_t mode = 1 << hc->mode; // uint8_t mode = 1 << hc->mode;
// has_update(telegram->read_value(mode, 0)); // 1: nofrost, 2: night, 4: day // has_update(telegram->read_value(mode, 0)); // 1: off, 2: night, 4: day
// hc->mode = mode >> 1; // for enum 0, 1, 2 // hc->mode = mode >> 1; // for enum 0, 1, 2
} }
@@ -1902,7 +1905,7 @@ bool Thermostat::set_mode_n(const uint8_t mode, const uint8_t hc_num) {
offset = 0; offset = 0;
validate_typeid = 0xB1; validate_typeid = 0xB1;
set_typeid = 0xB2; set_typeid = 0xB2;
if (mode == HeatingCircuit::Mode::NOFROST) { if (mode == HeatingCircuit::Mode::OFF) {
set_mode_value = 1; set_mode_value = 1;
} else if (mode == HeatingCircuit::Mode::NIGHT) { } else if (mode == HeatingCircuit::Mode::NIGHT) {
set_mode_value = 2; set_mode_value = 2;
@@ -2225,13 +2228,6 @@ bool Thermostat::set_temperature(const float temperature, const uint8_t mode, co
case HeatingCircuit::Mode::DAY: case HeatingCircuit::Mode::DAY:
offset = 4; offset = 4;
break; break;
case HeatingCircuit::Mode::AUTO:
if (hc->get_mode() == HeatingCircuit::Mode::NIGHT) {
offset = 3;
} else {
offset = 4;
}
break;
} }
} else if (model == EMS_DEVICE_FLAG_RC20) { } else if (model == EMS_DEVICE_FLAG_RC20) {

2
src/devices/thermostat.h
View File

@@ -276,7 +276,7 @@ class Thermostat : public EMSdevice {
std::shared_ptr<Thermostat::HeatingCircuit> heating_circuit(std::shared_ptr<const Telegram> telegram); std::shared_ptr<Thermostat::HeatingCircuit> heating_circuit(std::shared_ptr<const Telegram> telegram);
std::shared_ptr<Thermostat::HeatingCircuit> heating_circuit(const uint8_t hc_num); std::shared_ptr<Thermostat::HeatingCircuit> heating_circuit(const uint8_t hc_num);
void publish_ha_config_hc(uint8_t hc_num); void publish_ha_config_hc(std::shared_ptr<Thermostat::HeatingCircuit> hc);
void register_device_values_hc(std::shared_ptr<Thermostat::HeatingCircuit> hc); void register_device_values_hc(std::shared_ptr<Thermostat::HeatingCircuit> hc);
bool thermostat_ha_cmd(const char * message, uint8_t hc_num); bool thermostat_ha_cmd(const char * message, uint8_t hc_num);

2
src/locale_EN.h
View File

@@ -339,7 +339,7 @@ MAKE_PSTR_LIST(enum_mode2, F_(off), F_(manual), F_(auto)) // RC20
MAKE_PSTR_LIST(enum_mode3, F_(night), F_(day), F_(auto)) // RC35, RC30 MAKE_PSTR_LIST(enum_mode3, F_(night), F_(day), F_(auto)) // RC35, RC30
MAKE_PSTR_LIST(enum_mode4, F_(nofrost), F_(eco), F_(heat), F_(auto)) // JUNKERS MAKE_PSTR_LIST(enum_mode4, F_(nofrost), F_(eco), F_(heat), F_(auto)) // JUNKERS
MAKE_PSTR_LIST(enum_mode5, F_(auto), F_(off)) // CRF MAKE_PSTR_LIST(enum_mode5, F_(auto), F_(off)) // CRF
MAKE_PSTR_LIST(enum_mode6, F_(nofrost), F_(night), F_(day)) // RC10 MAKE_PSTR_LIST(enum_mode6, F_(off), F_(night), F_(day)) // RC10
MAKE_PSTR_LIST(enum_hamode, F_(off), F_(heat), F_(auto), F_(heat), F_(off), F_(heat), F_(auto), F_(auto), F_(auto), F_(auto)) MAKE_PSTR_LIST(enum_hamode, F_(off), F_(heat), F_(auto), F_(heat), F_(off), F_(heat), F_(auto), F_(auto), F_(auto), F_(auto))