From 3c6fd0c83a5a0793ce915cb5b637223176463f47 Mon Sep 17 00:00:00 2001 From: pswid <78219494+pswid@users.noreply.github.com> Date: Fri, 3 Dec 2021 08:58:19 +0100 Subject: [PATCH 1/3] Update boiler.cpp --- src/devices/boiler.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 35a1fdbef..b519967e6 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -815,10 +815,11 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr telegram) { // 0xC2 void Boiler::process_UBAErrorMessage2(std::shared_ptr telegram) { - // not sure why this test is in , so removing - // if (telegram->offset > 0 || telegram->message_length < 14) { - // return; - // } + // for decoding "last error code" we need telegram starting with offset 0 + if (telegram->offset != 0 || telegram->message_length < 14) { + return; + } + char code[4]; uint16_t codeNo; char start_time[17]; From 69976c2cafd98d56cea196586bd3f5f7240e9fe2 Mon Sep 17 00:00:00 2001 From: pswid <78219494+pswid@users.noreply.github.com> Date: Fri, 3 Dec 2021 09:02:36 +0100 Subject: [PATCH 2/3] Update CHANGELOG_LATEST.md --- CHANGELOG_LATEST.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 1ebf139d2..1e0d3f44d 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -5,6 +5,7 @@ ## Added ## Fixed +- lastcode broke MQTT JSON structure [#228] ## Changed From 92da61376b081fa7d3d01c4ce2642175154d0d8a Mon Sep 17 00:00:00 2001 From: pswid <78219494+pswid@users.noreply.github.com> Date: Fri, 3 Dec 2021 09:04:39 +0100 Subject: [PATCH 3/3] Update boiler.cpp --- src/devices/boiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index b519967e6..c942f5009 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -816,7 +816,7 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr telegram) { // 0xC2 void Boiler::process_UBAErrorMessage2(std::shared_ptr telegram) { // for decoding "last error code" we need telegram starting with offset 0 - if (telegram->offset != 0 || telegram->message_length < 14) { + if (telegram->offset != 0 || telegram->message_length < 20) { return; }