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
2023-01-22 13:27:37 +01:00
parent 5acdb4dc31
commit ec357b71f1
4 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/console.cpp
View File

@@ -694,7 +694,8 @@ void Console::load_system_commands(unsigned int context) {
std::vector<int8_t> data; // led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode std::vector<int8_t> data; // led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode
std::string board_profile = Helpers::toUpper(arguments.front()); std::string board_profile = Helpers::toUpper(arguments.front());
if (!EMSESP::system_.load_board_profile(data, board_profile)) { 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; return;
} }
EMSESP::webSettingsService.update( EMSESP::webSettingsService.update(

8
src/devices/heatsource.h
View File

@@ -48,10 +48,10 @@ class Heatsource : public EMSdevice {
// uint8_t valveBypass_; // VR2 position unknown // uint8_t valveBypass_; // VR2 position unknown
// uint8_t heatSource_; // OEV // uint8_t heatSource_; // OEV
uint8_t burner_; // bit 5, offset 1, 54E uint8_t burner_; // bit 5, offset 1, 54E
uint8_t aPump_; // bit 0, offset 1, 54E uint8_t aPump_; // bit 0, offset 1, 54E
uint8_t heatRequest_; // offset 2, percent uint8_t heatRequest_; // offset 2, percent
uint8_t blockRemain_; // offset 24, 550 min uint8_t blockRemain_; // offset 24, 550 min
uint8_t blockRemainWw_; // offset 25, 550 min uint8_t blockRemainWw_; // offset 25, 550 min
// Settings: // Settings:

27
src/devices/thermostat.cpp
View File

@@ -3571,28 +3571,11 @@ void Thermostat::register_device_values() {
MAKE_CF_CB(set_tempDiffBoiler), MAKE_CF_CB(set_tempDiffBoiler),
1, 1,
99); 99);
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &pvEnableWw_, DeviceValueType::BOOL, FL_(pvEnableWw), DeviceValueUOM::NONE, MAKE_CF_CB(set_pvEnableWw));
&pvEnableWw_, register_device_value(
DeviceValueType::BOOL, DeviceValueTAG::TAG_DEVICE_DATA, &pvRaiseHeat_, DeviceValueType::INT, FL_(pvRaiseHeat), DeviceValueUOM::K, MAKE_CF_CB(set_pvRaiseHeat), 0, 5);
FL_(pvEnableWw), register_device_value(
DeviceValueUOM::NONE, DeviceValueTAG::TAG_DEVICE_DATA, &pvLowerCool_, DeviceValueType::INT, FL_(pvLowerCool), DeviceValueUOM::K, MAKE_CF_CB(set_pvLowerCool), -5, 0);
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; break;
case EMS_DEVICE_FLAG_RC10: case EMS_DEVICE_FLAG_RC10:
register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,

1
src/devices/thermostat.h
View File

@@ -501,7 +501,6 @@ class Thermostat : public EMSdevice {
bool set_pvEnableWw(const char * value, const int8_t id); bool set_pvEnableWw(const char * value, const int8_t id);
bool set_pvRaiseHeat(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); bool set_pvLowerCool(const char * value, const int8_t id);
}; };
} // namespace emsesp } // namespace emsesp