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

auto-formatting

Browse Source
This commit is contained in:
proddy
2024-03-30 18:57:35 +01:00
parent 9822aa6e13
commit 2604368cf8
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/mixer.h
View File

@@ -55,7 +55,7 @@ class Mixer : public EMSdevice {
uint8_t setValveTime_; uint8_t setValveTime_;
uint8_t flowTempOffset_; uint8_t flowTempOffset_;
uint16_t hc_ = EMS_VALUE_USHORT_NOTSET; uint16_t hc_ = EMS_VALUE_USHORT_NOTSET;
}; };
} // namespace emsesp } // namespace emsesp

1
src/devices/solar.h
View File

@@ -188,7 +188,6 @@ class Solar : public EMSdevice {
bool set_cylPriority(const char * value, const int8_t id); bool set_cylPriority(const char * value, const int8_t id);
bool set_heatAssist(const char * value, const int8_t id); bool set_heatAssist(const char * value, const int8_t id);
bool set_diffControl(const char * value, const int8_t id); bool set_diffControl(const char * value, const int8_t id);
}; };
} // namespace emsesp } // namespace emsesp

6
src/devices/water.h
View File

@@ -71,9 +71,9 @@ class Water : public EMSdevice {
uint8_t wwStatus2_; uint8_t wwStatus2_;
// mixer // mixer
uint8_t wwStatus_; uint8_t wwStatus_;
int8_t wwDiffTemp_; int8_t wwDiffTemp_;
uint8_t wwRequiredTemp_; uint8_t wwRequiredTemp_;
// IPM // IPM
uint16_t HydrTemp_; uint16_t HydrTemp_;

4
src/system.cpp
View File

@@ -1239,8 +1239,8 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output
node["free mem"] = getHeapMem(); node["free mem"] = getHeapMem();
node["max alloc"] = getMaxAllocMem(); node["max alloc"] = getMaxAllocMem();
node["free caps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram node["free caps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram
node["used app"] = EMSESP::system_.appUsed(); // kilobytes node["used app"] = EMSESP::system_.appUsed(); // kilobytes
node["free app"] = EMSESP::system_.appFree(); // kilobytes node["free app"] = EMSESP::system_.appFree(); // kilobytes
node["partition"] = esp_ota_get_running_partition()->label; node["partition"] = esp_ota_get_running_partition()->label;
#endif #endif
node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1); node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);