diff --git a/src/console.cpp b/src/console.cpp index 97931863b..a72b5a8bd 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -694,7 +694,8 @@ void Console::load_system_commands(unsigned int context) { std::vector data; // led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode std::string board_profile = Helpers::toUpper(arguments.front()); if (!EMSESP::system_.load_board_profile(data, board_profile)) { - shell.println("Invalid board profile (S32, E32, MH-ET, NODEMCU, OLIMEX, OLIMEXPOE, C3MINI, S2MINI, S3MINI, CUSTOM)"); + shell.println( + "Invalid board profile (S32, E32, MH-ET, NODEMCU, OLIMEX, OLIMEXPOE, C3MINI, S2MINI, S3MINI, CUSTOM)"); return; } EMSESP::webSettingsService.update( diff --git a/src/devices/heatsource.h b/src/devices/heatsource.h index 3b9a3a9fe..91b062e59 100644 --- a/src/devices/heatsource.h +++ b/src/devices/heatsource.h @@ -48,10 +48,10 @@ class Heatsource : public EMSdevice { // uint8_t valveBypass_; // VR2 position unknown // uint8_t heatSource_; // OEV - uint8_t burner_; // bit 5, offset 1, 54E - uint8_t aPump_; // bit 0, offset 1, 54E - uint8_t heatRequest_; // offset 2, percent - uint8_t blockRemain_; // offset 24, 550 min + uint8_t burner_; // bit 5, offset 1, 54E + uint8_t aPump_; // bit 0, offset 1, 54E + uint8_t heatRequest_; // offset 2, percent + uint8_t blockRemain_; // offset 24, 550 min uint8_t blockRemainWw_; // offset 25, 550 min // Settings: diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index d929ea12e..5dfbd5e12 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -3571,28 +3571,11 @@ void Thermostat::register_device_values() { MAKE_CF_CB(set_tempDiffBoiler), 1, 99); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, - &pvEnableWw_, - DeviceValueType::BOOL, - FL_(pvEnableWw), - DeviceValueUOM::NONE, - MAKE_CF_CB(set_pvEnableWw)); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, - &pvRaiseHeat_, - DeviceValueType::INT, - FL_(pvRaiseHeat), - DeviceValueUOM::K, - MAKE_CF_CB(set_pvRaiseHeat), - 0, - 5); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, - &pvLowerCool_, - DeviceValueType::INT, - FL_(pvLowerCool), - DeviceValueUOM::K, - MAKE_CF_CB(set_pvLowerCool), - -5, - 0); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &pvEnableWw_, DeviceValueType::BOOL, FL_(pvEnableWw), DeviceValueUOM::NONE, MAKE_CF_CB(set_pvEnableWw)); + register_device_value( + DeviceValueTAG::TAG_DEVICE_DATA, &pvRaiseHeat_, DeviceValueType::INT, FL_(pvRaiseHeat), DeviceValueUOM::K, MAKE_CF_CB(set_pvRaiseHeat), 0, 5); + register_device_value( + DeviceValueTAG::TAG_DEVICE_DATA, &pvLowerCool_, DeviceValueType::INT, FL_(pvLowerCool), DeviceValueUOM::K, MAKE_CF_CB(set_pvLowerCool), -5, 0); break; case EMS_DEVICE_FLAG_RC10: register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h index 3b7217393..60ace2707 100644 --- a/src/devices/thermostat.h +++ b/src/devices/thermostat.h @@ -501,7 +501,6 @@ class Thermostat : public EMSdevice { bool set_pvEnableWw(const char * value, const int8_t id); bool set_pvRaiseHeat(const char * value, const int8_t id); bool set_pvLowerCool(const char * value, const int8_t id); - }; } // namespace emsesp