andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 00:39:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

auto formatting

Browse Source
This commit is contained in:
proddy
2020-11-27 20:53:05 +01:00
parent 2deb84e3e1
commit cbb0953f44
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/boiler.cpp
View File

@@ -792,17 +792,17 @@ bool Boiler::export_values_main(JsonObject & json, const bool textformat) {
json["nrgSuppTotal"] = nrgSuppTotal_; json["nrgSuppTotal"] = nrgSuppTotal_;
} }
// Total energy heating // Total energy heating
if (Helpers::hasValue(nrgSuppHeating_)) { if (Helpers::hasValue(nrgSuppHeating_)) {
json["nrgSuppHeating"] = nrgSuppHeating_; json["nrgSuppHeating"] = nrgSuppHeating_;
} }
// Total energy warm water // Total energy warm water
if (Helpers::hasValue(nrgSuppWw_)) { if (Helpers::hasValue(nrgSuppWw_)) {
json["nrgSuppWw"] = nrgSuppWw_; json["nrgSuppWw"] = nrgSuppWw_;
} }
// Total energy cooling // Total energy cooling
if (Helpers::hasValue(nrgSuppCooling_)) { if (Helpers::hasValue(nrgSuppCooling_)) {
json["nrgSuppCooling"] = 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 // check if tap water is active, bits 1 and 4 must be set
b = ((boilerState_ & 0x0A) == 0x0A); b = ((boilerState_ & 0x0A) == 0x0A);
val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF; val = b ? EMS_VALUE_BOOL_ON : EMS_VALUE_BOOL_OFF;
if (tapwaterActive_ != val || force ) { if (tapwaterActive_ != val || force) {
tapwaterActive_ = val; tapwaterActive_ = val;
char s[7]; char s[7];
Mqtt::publish(F("tapwater_active"), Helpers::render_boolean(s, b)); Mqtt::publish(F("tapwater_active"), Helpers::render_boolean(s, b));

18
src/devices/boiler.h
View File

@@ -56,15 +56,15 @@ class Boiler : public EMSdevice {
bool mqtt_ha_config_ = false; // HA MQTT Discovery bool mqtt_ha_config_ = false; // HA MQTT Discovery
bool mqtt_ha_config_ww_ = 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_UBAParameterWW = 0x33;
static constexpr uint8_t EMS_TYPE_UBAFunctionTest = 0x1D; static constexpr uint8_t EMS_TYPE_UBAFunctionTest = 0x1D;
static constexpr uint8_t EMS_TYPE_UBAFlags = 0x35; static constexpr uint8_t EMS_TYPE_UBAFlags = 0x35;
static constexpr uint8_t EMS_TYPE_UBASetPoints = 0x1A; static constexpr uint8_t EMS_TYPE_UBASetPoints = 0x1A;
static constexpr uint8_t EMS_TYPE_UBAParameters = 0x16; static constexpr uint8_t EMS_TYPE_UBAParameters = 0x16;
static constexpr uint8_t EMS_TYPE_UBAParametersPlus = 0xE6; static constexpr uint8_t EMS_TYPE_UBAParametersPlus = 0xE6;
static constexpr uint8_t EMS_TYPE_UBAParameterWWPlus = 0xEA; static constexpr uint8_t EMS_TYPE_UBAParameterWWPlus = 0xEA;
static constexpr uint16_t EMS_TYPE_UBAInfomration = 0x495; static constexpr uint16_t EMS_TYPE_UBAInfomration = 0x495;
static constexpr uint16_t EMS_TYPE_UBAEnergySupplied = 0x494; 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 static constexpr uint8_t EMS_BOILER_SELFLOWTEMP_HEATING = 20; // was originally 70, changed to 30 for issue #193, then to 20 with issue #344