From cbb0953f44631b62dfa3376bf087f2c951fa6c5a Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 27 Nov 2020 20:53:05 +0100 Subject: [PATCH] auto formatting --- src/devices/boiler.cpp | 8 ++++---- src/devices/boiler.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 79e049399..5d5d09dc3 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -792,17 +792,17 @@ bool Boiler::export_values_main(JsonObject & json, const bool textformat) { json["nrgSuppTotal"] = nrgSuppTotal_; } - // Total energy heating + // Total energy heating if (Helpers::hasValue(nrgSuppHeating_)) { json["nrgSuppHeating"] = nrgSuppHeating_; } - // Total energy warm water + // Total energy warm water if (Helpers::hasValue(nrgSuppWw_)) { json["nrgSuppWw"] = nrgSuppWw_; } - // Total energy cooling + // Total energy cooling if (Helpers::hasValue(nrgSuppCooling_)) { json["nrgSuppCooling"] = nrgSuppCooling_; } @@ -876,7 +876,7 @@ void Boiler::check_active(const bool force) { // check if tap water is active, bits 1 and 4 must be set b = ((boilerState_ & 0x0A) == 0x0A); val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF; - if (tapwaterActive_ != val || force ) { + if (tapwaterActive_ != val || force) { tapwaterActive_ = val; char s[7]; Mqtt::publish(F("tapwater_active"), Helpers::render_boolean(s, b)); diff --git a/src/devices/boiler.h b/src/devices/boiler.h index 919190fd1..4b838a7ea 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -56,15 +56,15 @@ class Boiler : public EMSdevice { bool mqtt_ha_config_ = false; // HA MQTT Discovery bool mqtt_ha_config_ww_ = false; // HA MQTT Discovery - static constexpr uint8_t EMS_TYPE_UBAParameterWW = 0x33; - static constexpr uint8_t EMS_TYPE_UBAFunctionTest = 0x1D; - static constexpr uint8_t EMS_TYPE_UBAFlags = 0x35; - static constexpr uint8_t EMS_TYPE_UBASetPoints = 0x1A; - static constexpr uint8_t EMS_TYPE_UBAParameters = 0x16; - static constexpr uint8_t EMS_TYPE_UBAParametersPlus = 0xE6; - static constexpr uint8_t EMS_TYPE_UBAParameterWWPlus = 0xEA; - static constexpr uint16_t EMS_TYPE_UBAInfomration = 0x495; - static constexpr uint16_t EMS_TYPE_UBAEnergySupplied = 0x494; + static constexpr uint8_t EMS_TYPE_UBAParameterWW = 0x33; + static constexpr uint8_t EMS_TYPE_UBAFunctionTest = 0x1D; + static constexpr uint8_t EMS_TYPE_UBAFlags = 0x35; + static constexpr uint8_t EMS_TYPE_UBASetPoints = 0x1A; + static constexpr uint8_t EMS_TYPE_UBAParameters = 0x16; + static constexpr uint8_t EMS_TYPE_UBAParametersPlus = 0xE6; + static constexpr uint8_t EMS_TYPE_UBAParameterWWPlus = 0xEA; + static constexpr uint16_t EMS_TYPE_UBAInfomration = 0x495; + static constexpr uint16_t EMS_TYPE_UBAEnergySupplied = 0x494; static constexpr uint8_t EMS_BOILER_SELFLOWTEMP_HEATING = 20; // was originally 70, changed to 30 for issue #193, then to 20 with issue #344