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

changed some values from ushort to short and notset-value to -32000

Browse Source
This commit is contained in:
MichaelDvP
2020-01-01 14:00:29 +01:00
parent 9c9d41b644
commit 0b6c1715d5
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ems.cpp
View File

@@ -1244,7 +1244,6 @@ void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
if (hc != 0) { if (hc != 0) {
return; // invalid type return; // invalid type
} }
//hc++;
EMS_Mixing.hc[hc].active = true; EMS_Mixing.hc[hc].active = true;
_setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMStatusMessage_flow_temp); _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMStatusMessage_flow_temp);

6
src/ems.h
View File

@@ -27,7 +27,7 @@
#define EMS_VALUE_BOOL_ON2 0xFF // boolean true, EMS sometimes uses 0xFF for TRUE #define EMS_VALUE_BOOL_ON2 0xFF // boolean true, EMS sometimes uses 0xFF for TRUE
#define EMS_VALUE_BOOL_OFF 0x00 // boolean false #define EMS_VALUE_BOOL_OFF 0x00 // boolean false
#define EMS_VALUE_INT_NOTSET 0xFF // for 8-bit unsigned ints/bytes #define EMS_VALUE_INT_NOTSET 0xFF // for 8-bit unsigned ints/bytes
#define EMS_VALUE_SHORT_NOTSET -32000 //-32768 // for 2-byte signed shorts #define EMS_VALUE_SHORT_NOTSET -32000 // was -32768 for 2-byte signed shorts
#define EMS_VALUE_USHORT_NOTSET 0x8000 // for 2-byte unsigned shorts #define EMS_VALUE_USHORT_NOTSET 0x8000 // for 2-byte unsigned shorts
#define EMS_VALUE_LONG_NOTSET 0xFFFFFF // for 3-byte longs #define EMS_VALUE_LONG_NOTSET 0xFFFFFF // for 3-byte longs
#define EMS_VALUE_BOOL_NOTSET 0xFE // random number that's not 0, 1 or FF #define EMS_VALUE_BOOL_NOTSET 0xFE // random number that's not 0, 1 or FF
@@ -282,7 +282,7 @@ typedef struct {
uint32_t burnStarts; // # burner starts uint32_t burnStarts; // # burner starts
uint32_t burnWorkMin; // Total burner operating time uint32_t burnWorkMin; // Total burner operating time
uint32_t heatWorkMin; // Total heat operating time uint32_t heatWorkMin; // Total heat operating time
int16_t switchTemp; // Switch temperature int16_t switchTemp; // Switch temperature
// UBAMonitorWWMessage // UBAMonitorWWMessage
uint16_t wWCurTmp; // Warm Water current temperature uint16_t wWCurTmp; // Warm Water current temperature
@@ -322,7 +322,7 @@ typedef struct {
typedef struct { typedef struct {
uint8_t hc; // heating circuit 1, 2, 3 or 4 uint8_t hc; // heating circuit 1, 2, 3 or 4
bool active; // true if there is data for this HC bool active; // true if there is data for this HC
int16_t flowTemp; int16_t flowTemp;
uint8_t pumpMod; uint8_t pumpMod;
uint8_t valveStatus; uint8_t valveStatus;
uint8_t flowSetTemp; uint8_t flowSetTemp;