From 4fc6797f4e21b02ccc56df233669fa5e7d9e6ed7 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 31 Jul 2020 13:59:32 +0200 Subject: [PATCH] rename collector - #267 --- src/devices/solar.cpp | 10 +++++----- src/devices/solar.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index 2d5c55681..a8b49a9fe 100644 --- a/src/devices/solar.cpp +++ b/src/devices/solar.cpp @@ -77,7 +77,7 @@ void Solar::device_info(JsonArray & root) { } render_value_json(root, "", F("Tank Heated"), tankHeated_, nullptr, EMS_VALUE_BOOL); - render_value_json(root, "", F("Collector"), collectorOnOff_, nullptr, EMS_VALUE_BOOL); + render_value_json(root, "", F("Collector shutdown"), collectorOnOff_, nullptr, EMS_VALUE_BOOL); render_value_json(root, "", F("Energy last hour"), energyLastHour_, F_(wh), 10); render_value_json(root, "", F("Energy today"), energyToday_, F_(wh)); @@ -100,7 +100,7 @@ void Solar::show_values(uuid::console::Shell & shell) { } print_value(shell, 2, F("Tank Heated"), tankHeated_, nullptr, EMS_VALUE_BOOL); - print_value(shell, 2, F("Collector"), collectorOnOff_, nullptr, EMS_VALUE_BOOL); + print_value(shell, 2, F("Collector shutdown"), collectorOnOff_, nullptr, EMS_VALUE_BOOL); print_value(shell, 2, F("Energy last hour"), energyLastHour_, F_(wh), 10); print_value(shell, 2, F("Energy today"), energyToday_, F_(wh)); @@ -229,8 +229,8 @@ void Solar::process_SM100Status(std::shared_ptr telegram) { pumpModulation_ = 15; // set to minimum } - telegram->read_bitvalue(tankHeated_, 3, 1); // issue #422 - telegram->read_bitvalue(collectorOnOff_, 3, 0); + telegram->read_bitvalue(tankHeated_, 3, 1); // issue #422 + telegram->read_bitvalue(collectorOnOff_, 3, 0); // collector shutdown } /* @@ -266,7 +266,7 @@ void Solar::process_ISM1StatusMessage(std::shared_ptr telegram) if (Wh != 0xFFFF) { energyLastHour_ = Wh * 10; // set to *10 } - telegram->read_bitvalue(collectorOnOff_, 9, 0); // collector on/off + telegram->read_bitvalue(collectorOnOff_, 9, 0); // collector shutdown on/off telegram->read_bitvalue(tankHeated_, 9, 2); // tank full } diff --git a/src/devices/solar.h b/src/devices/solar.h index 55b3e398a..1fb9864a1 100644 --- a/src/devices/solar.h +++ b/src/devices/solar.h @@ -58,7 +58,7 @@ class Solar : public EMSdevice { uint32_t energyTotal_ = EMS_VALUE_ULONG_NOTSET; uint32_t pumpWorkMin_ = EMS_VALUE_ULONG_NOTSET; // Total solar pump operating time uint8_t tankHeated_ = EMS_VALUE_BOOL_NOTSET; - uint8_t collectorOnOff_ = EMS_VALUE_BOOL_NOTSET; + uint8_t collectorOnOff_ = EMS_VALUE_BOOL_NOTSET; // Collector shutdown on/off uint8_t availabilityFlag_ = EMS_VALUE_BOOL_NOTSET; uint8_t configFlag_ = EMS_VALUE_BOOL_NOTSET;