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

fix sys pressure

Browse Source
This commit is contained in:
proddy
2019-05-04 13:33:43 +02:00
parent c8272faece
commit 7ffaae48fe
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ems-esp.cpp
View File

@@ -601,13 +601,13 @@ void publishValues(bool force) {
rootBoiler["outdoorTemp"] = (double)EMS_Boiler.extTemp / 10; rootBoiler["outdoorTemp"] = (double)EMS_Boiler.extTemp / 10;
if (abs(EMS_Boiler.wWCurTmp) < EMS_VALUE_SHORT_NOTSET) if (abs(EMS_Boiler.wWCurTmp) < EMS_VALUE_SHORT_NOTSET)
rootBoiler["wWCurTmp"] = (double)EMS_Boiler.wWCurTmp / 10; 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; rootBoiler["wWCurFlow"] = (double)EMS_Boiler.wWCurFlow / 10;
if (abs(EMS_Boiler.curFlowTemp) < EMS_VALUE_SHORT_NOTSET) if (abs(EMS_Boiler.curFlowTemp) < EMS_VALUE_SHORT_NOTSET)
rootBoiler["curFlowTemp"] = (double)EMS_Boiler.curFlowTemp / 10; rootBoiler["curFlowTemp"] = (double)EMS_Boiler.curFlowTemp / 10;
if (abs(EMS_Boiler.retTemp) < EMS_VALUE_SHORT_NOTSET) if (abs(EMS_Boiler.retTemp) < EMS_VALUE_SHORT_NOTSET)
rootBoiler["retTemp"] = (double)EMS_Boiler.retTemp / 10; 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; rootBoiler["sysPress"] = (double)EMS_Boiler.sysPress / 10;
if (abs(EMS_Boiler.boilTemp) < EMS_VALUE_SHORT_NOTSET) if (abs(EMS_Boiler.boilTemp) < EMS_VALUE_SHORT_NOTSET)
rootBoiler["boilTemp"] = (double)EMS_Boiler.boilTemp / 10; rootBoiler["boilTemp"] = (double)EMS_Boiler.boilTemp / 10;

3
src/test_data.h
View File

@@ -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 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 "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 "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
}; };