From 2604368cf89e24bbb80f8148592b0f6677fd5f57 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 30 Mar 2024 18:57:35 +0100 Subject: [PATCH] auto-formatting --- src/devices/mixer.h | 2 +- src/devices/solar.h | 1 - src/devices/water.h | 6 +++--- src/system.cpp | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/devices/mixer.h b/src/devices/mixer.h index 984d8ebe0..d147940ac 100644 --- a/src/devices/mixer.h +++ b/src/devices/mixer.h @@ -55,7 +55,7 @@ class Mixer : public EMSdevice { uint8_t setValveTime_; uint8_t flowTempOffset_; - uint16_t hc_ = EMS_VALUE_USHORT_NOTSET; + uint16_t hc_ = EMS_VALUE_USHORT_NOTSET; }; } // namespace emsesp diff --git a/src/devices/solar.h b/src/devices/solar.h index 4cf1945f8..af8534af3 100644 --- a/src/devices/solar.h +++ b/src/devices/solar.h @@ -188,7 +188,6 @@ class Solar : public EMSdevice { bool set_cylPriority(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); - }; } // namespace emsesp diff --git a/src/devices/water.h b/src/devices/water.h index b4cd7ee0e..fac58d54f 100644 --- a/src/devices/water.h +++ b/src/devices/water.h @@ -71,9 +71,9 @@ class Water : public EMSdevice { uint8_t wwStatus2_; // mixer - uint8_t wwStatus_; - int8_t wwDiffTemp_; - uint8_t wwRequiredTemp_; + uint8_t wwStatus_; + int8_t wwDiffTemp_; + uint8_t wwRequiredTemp_; // IPM uint16_t HydrTemp_; diff --git a/src/system.cpp b/src/system.cpp index 7064948d8..a60364103 100644 --- a/src/system.cpp +++ b/src/system.cpp @@ -1239,8 +1239,8 @@ bool System::command_info(const char * value, const int8_t id, JsonObject output node["free mem"] = getHeapMem(); node["max alloc"] = getMaxAllocMem(); node["free caps"] = heap_caps_get_free_size(MALLOC_CAP_8BIT) / 1024; // includes heap and psram - node["used app"] = EMSESP::system_.appUsed(); // kilobytes - node["free app"] = EMSESP::system_.appFree(); // kilobytes + node["used app"] = EMSESP::system_.appUsed(); // kilobytes + node["free app"] = EMSESP::system_.appFree(); // kilobytes node["partition"] = esp_ota_get_running_partition()->label; #endif node["reset reason"] = EMSESP::system_.reset_reason(0) + " / " + EMSESP::system_.reset_reason(1);