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

shortname to wwVacations/wwHoliday to avoid conflict

Browse Source
This commit is contained in:
MichaelDvP
2022-06-20 21:38:12 +02:00
parent 0e5cb2df8e
commit bf18718b9a
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/devices/thermostat.cpp
View File

@@ -3554,14 +3554,14 @@ void Thermostat::register_device_values() {
&wwHoliday_, &wwHoliday_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(holidays), FL_(wwHolidays),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwHoliday)); MAKE_CF_CB(set_wwHoliday));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
&wwVacation_, &wwVacation_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(vacations), FL_(wwVacations),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwVacation)); MAKE_CF_CB(set_wwVacation));
break; break;
@@ -3680,14 +3680,14 @@ void Thermostat::register_device_values() {
&wwHoliday_, &wwHoliday_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(holidays), FL_(wwHolidays),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwHoliday)); MAKE_CF_CB(set_wwHoliday));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
&wwVacation_, &wwVacation_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(vacations), FL_(wwVacations),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwVacation)); MAKE_CF_CB(set_wwVacation));
break; break;
@@ -3805,14 +3805,14 @@ void Thermostat::register_device_values() {
&wwHoliday_, &wwHoliday_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(holidays), FL_(wwHolidays),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwHoliday)); MAKE_CF_CB(set_wwHoliday));
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA_WW,
&wwVacation_, &wwVacation_,
DeviceValueType::STRING, DeviceValueType::STRING,
FL_(tpl_holidays), FL_(tpl_holidays),
FL_(vacations), FL_(wwVacations),
DeviceValueUOM::NONE, DeviceValueUOM::NONE,
MAKE_CF_CB(set_wwVacation)); MAKE_CF_CB(set_wwVacation));
break; break;

2
src/locale_DE.h
View File

@@ -650,6 +650,8 @@ MAKE_PSTR_LIST(summersetmode, F("summersetmode"), F("Einstellung Sommerbetrieb")
MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("Wärmepumpe Betriebsmodus")) MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("Wärmepumpe Betriebsmodus"))
MAKE_PSTR_LIST(controlmode, F("controlmode"), F("Kontrollmodus")) MAKE_PSTR_LIST(controlmode, F("controlmode"), F("Kontrollmodus"))
MAKE_PSTR_LIST(control, F("control"), F("Fernsteuerung")) MAKE_PSTR_LIST(control, F("control"), F("Fernsteuerung"))
MAKE_PSTR_LIST(wwHolidays, F("wwholidays"), F("holiday dates"))
MAKE_PSTR_LIST(wwVacations, F("wwvacations"), F("vacation dates"))
MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates")) MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates"))
MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates")) MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates"))
MAKE_PSTR_LIST(program, F("program"), F("Programm")) MAKE_PSTR_LIST(program, F("program"), F("Programm"))

2
src/locale_EN.h
View File

@@ -650,6 +650,8 @@ MAKE_PSTR_LIST(summersetmode, F("summersetmode"), F("set summer mode"))
MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("heatpump operating mode")) MAKE_PSTR_LIST(hpoperatingmode, F("hpoperatingmode"), F("heatpump operating mode"))
MAKE_PSTR_LIST(controlmode, F("controlmode"), F("control mode")) MAKE_PSTR_LIST(controlmode, F("controlmode"), F("control mode"))
MAKE_PSTR_LIST(control, F("control"), F("control device")) MAKE_PSTR_LIST(control, F("control"), F("control device"))
MAKE_PSTR_LIST(wwHolidays, F("wwholidays"), F("holiday dates"))
MAKE_PSTR_LIST(wwVacations, F("wwvacations"), F("vacation dates"))
MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates")) MAKE_PSTR_LIST(holidays, F("holidays"), F("holiday dates"))
MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates")) MAKE_PSTR_LIST(vacations, F("vacations"), F("vacation dates"))
MAKE_PSTR_LIST(program, F("program"), F("program")) MAKE_PSTR_LIST(program, F("program"), F("program"))