From 7ffaae48feff1a40a654d4cf98665c5d9d83ff5b Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 4 May 2019 13:33:43 +0200 Subject: [PATCH] fix sys pressure --- src/ems-esp.cpp | 4 ++-- src/test_data.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp index 0f2749bd4..db8924930 100644 --- a/src/ems-esp.cpp +++ b/src/ems-esp.cpp @@ -601,13 +601,13 @@ void publishValues(bool force) { rootBoiler["outdoorTemp"] = (double)EMS_Boiler.extTemp / 10; if (abs(EMS_Boiler.wWCurTmp) < EMS_VALUE_SHORT_NOTSET) rootBoiler["wWCurTmp"] = (double)EMS_Boiler.wWCurTmp / 10; - if (abs(EMS_Boiler.wWCurFlow) < EMS_VALUE_SHORT_NOTSET) + if (abs(EMS_Boiler.wWCurFlow) != EMS_VALUE_INT_NOTSET) rootBoiler["wWCurFlow"] = (double)EMS_Boiler.wWCurFlow / 10; if (abs(EMS_Boiler.curFlowTemp) < EMS_VALUE_SHORT_NOTSET) rootBoiler["curFlowTemp"] = (double)EMS_Boiler.curFlowTemp / 10; if (abs(EMS_Boiler.retTemp) < EMS_VALUE_SHORT_NOTSET) rootBoiler["retTemp"] = (double)EMS_Boiler.retTemp / 10; - if (abs(EMS_Boiler.sysPress) < EMS_VALUE_SHORT_NOTSET) + if (abs(EMS_Boiler.sysPress) != EMS_VALUE_INT_NOTSET) rootBoiler["sysPress"] = (double)EMS_Boiler.sysPress / 10; if (abs(EMS_Boiler.boilTemp) < EMS_VALUE_SHORT_NOTSET) rootBoiler["boilTemp"] = (double)EMS_Boiler.boilTemp / 10; diff --git a/src/test_data.h b/src/test_data.h index 053664a57..62e191d28 100644 --- a/src/test_data.h +++ b/src/test_data.h @@ -44,7 +44,8 @@ static const char * TEST_DATA[] = { "30 00 FF 00 02 62 00 E7 01 AE 80 00 80 00 80 00 80 00 80 00 80 00 80 00 80 00 80 00 80 00", // test 39 - SM100 "30 00 FF 00 02 62 00 E4", // test 40 - SM100 "10 48 F7 00 FF 01 A5 DF FF F7 7F 1F", // test 41 - gateway - "30 00 FF 09 02 64 1E" // test 42 - SM100 + "30 00 FF 09 02 64 1E", // test 42 - SM100 + "08 00 18 00 05 03 30 00 00 00 00 04 40 80 00 02 17 80 00 00 00 FF 30 48 00 CB 00 00 00" // test 43 - sys pressure };