From e57bc0731f156c5671a161b370c2332c2a3df181 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 6 Jul 2020 20:46:17 +0200 Subject: [PATCH] include collector on/off and tank full for ISM1 - Missing values for Junkers ISM1 #422 --- src/devices/solar.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index 63a770e98..af01bf061 100644 --- a/src/devices/solar.cpp +++ b/src/devices/solar.cpp @@ -239,13 +239,18 @@ void Solar::process_SM100Energy(std::shared_ptr telegram) { void Solar::process_ISM1StatusMessage(std::shared_ptr telegram) { telegram->read_value(collectorTemp_, 4); // Collector Temperature telegram->read_value(bottomTemp_, 6); // Temperature Bottom of Solar Boiler + uint16_t Wh = 0xFFFF; telegram->read_value(Wh, 2); // Solar Energy produced in last hour only ushort, is not * 10 if (Wh != 0xFFFF) { energyLastHour_ = Wh * 10; // set to *10 } + telegram->read_bitvalue(pump_, 8, 0); // Solar pump on (1) or off (0) telegram->read_value(pumpWorkMin_, 10, 3); // force to 3 bytes + + telegram->read_bitvalue(collectorOnOff_, 9, 0); // collector on/off + telegram->read_bitvalue(tankHeated_, 9, 2); // tank full } /*