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

formatting

Browse Source
This commit is contained in:
proddy
2025-03-10 21:46:55 +01:00
parent 1c415a9715
commit cd8b1add54
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mock-api/rest_server.ts
View File

@@ -269,10 +269,10 @@ function updateMask(entity: any, de: any, dd: any) {
const old_custom_name = dd.nodes[dd_objIndex].cn; const old_custom_name = dd.nodes[dd_objIndex].cn;
console.log( console.log(
'comparing names, old (' + 'comparing names, old (' +
old_custom_name + old_custom_name +
') with new (' + ') with new (' +
new_custom_name + new_custom_name +
')' ')'
); );
if (old_custom_name !== new_custom_name) { if (old_custom_name !== new_custom_name) {
changed = true; changed = true;
@@ -367,15 +367,15 @@ function check_upgrade(version: string) {
const stable_version = version.split(',')[1]; const stable_version = version.split(',')[1];
console.log( console.log(
'latest dev version: ' + 'latest dev version: ' +
dev_version + dev_version +
', latest stable version: ' + ', latest stable version: ' +
stable_version stable_version
); );
console.log( console.log(
'Version upgrade check from version ' + 'Version upgrade check from version ' +
THIS_VERSION + THIS_VERSION +
', upgradable: ' + ', upgradable: ' +
VERSION_IS_UPGRADEABLE VERSION_IS_UPGRADEABLE
); );
data = { data = {
emsesp_version: THIS_VERSION, emsesp_version: THIS_VERSION,

13
src/devices/thermostat.cpp
View File

@@ -1166,7 +1166,7 @@ void Thermostat::process_RC300Set(std::shared_ptr<const Telegram> telegram) {
has_enumupdate(telegram, hc->reducemode, 5, 1); // 1-outdoor temp threshold, 2-room temp threshold, 3-reduced mode has_enumupdate(telegram, hc->reducemode, 5, 1); // 1-outdoor temp threshold, 2-room temp threshold, 3-reduced mode
has_update(telegram, hc->reducetemp, 9); has_update(telegram, hc->reducetemp, 9);
has_update(telegram, hc->noreducetemp, 12); has_update(telegram, hc->noreducetemp, 12);
has_update(telegram, hc->cooltemp, 17); // see https://github.com/emsesp/EMS-ESP32/issues/590 and 2456 has_update(telegram, hc->cooltemp, 17); // see https://github.com/emsesp/EMS-ESP32/issues/590 and 2456
has_enumupdate(telegram, hc->switchProgMode, 19, 1); // 1-level, 2-absolute has_enumupdate(telegram, hc->switchProgMode, 19, 1); // 1-level, 2-absolute
has_update(telegram, hc->redThreshold, 20); has_update(telegram, hc->redThreshold, 20);
has_update(telegram, hc->boost, 23); has_update(telegram, hc->boost, 23);
@@ -4685,15 +4685,8 @@ void Thermostat::register_device_values_hc(std::shared_ptr<Thermostat::HeatingCi
MAKE_CF_CB(set_tempautotemp), MAKE_CF_CB(set_tempautotemp),
-1, -1,
30); 30);
register_device_value(tag, register_device_value(
&hc->cooltemp, tag, &hc->cooltemp, DeviceValueType::INT8, DeviceValueNumOp::DV_NUMOP_DIV2, FL_(cooltemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_cooltemp), -1, 30);
DeviceValueType::INT8,
DeviceValueNumOp::DV_NUMOP_DIV2,
FL_(cooltemp),
DeviceValueUOM::DEGREES,
MAKE_CF_CB(set_cooltemp),
-1,
30);
register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT8, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup)); register_device_value(tag, &hc->fastHeatup, DeviceValueType::UINT8, FL_(fastheatup), DeviceValueUOM::PERCENT, MAKE_CF_CB(set_fastheatup));
register_device_value(tag, register_device_value(tag,
&hc->switchonoptimization, &hc->switchonoptimization,