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

Added extra colors for emsp

Browse Source
This commit is contained in:
Glenn Arens
2019-03-20 15:56:21 +01:00
parent dd12ab31bc
commit 6d4f527c19
3 changed files with 139 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

214
src/ems.cpp
View File

@@ -57,8 +57,9 @@ void _process_RC35StatusMessage(uint8_t type, uint8_t * data, uint8_t length);
// Easy // Easy
void _process_EasyStatusMessage(uint8_t type, uint8_t * data, uint8_t length); void _process_EasyStatusMessage(uint8_t type, uint8_t * data, uint8_t length);
//EMS Plus //RC1010
void _process_EmsPlusStatusMessage(uint8_t type, uint8_t * data, uint8_t length); void _process_RC1010StatusMessage(uint8_t type, uint8_t * data, uint8_t length);
void _process_RC1010SetMessage(uint8_t type, uint8_t * data, uint8_t length);
//debug messages //debug messages
void _printMessage(uint8_t * telegram, uint8_t length); void _printMessage(uint8_t * telegram, uint8_t length);
@@ -69,60 +70,59 @@ void _printMessage(uint8_t * telegram, uint8_t length);
const _EMS_Type EMS_Types[] = { const _EMS_Type EMS_Types[] = {
// common // common
{EMS_MODEL_ALL, EMS_TYPE_Version, "Version", _process_Version}, {EMS_MODEL_ALL, EMS_TYPE_Version, "Version", _process_Version, false},
// Boiler commands // Boiler commands
{EMS_MODEL_UBA, EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast}, {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorFast, "UBAMonitorFast", _process_UBAMonitorFast, false},
{EMS_MODEL_UBA, EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow}, {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorSlow, "UBAMonitorSlow", _process_UBAMonitorSlow, false},
{EMS_MODEL_UBA, EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage}, {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage, false},
{EMS_MODEL_UBA, EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW}, {EMS_MODEL_UBA, EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW, false},
{EMS_MODEL_UBA, EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage}, {EMS_MODEL_UBA, EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage, false},
{EMS_MODEL_UBA, EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", NULL}, {EMS_MODEL_UBA, EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", NULL, false},
{EMS_MODEL_UBA, EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage}, {EMS_MODEL_UBA, EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage, false},
{EMS_MODEL_UBA, EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints}, {EMS_MODEL_UBA, EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints, false},
// RC10 // RC10
{EMS_MODEL_RC10, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC10, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_RC10, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set}, {EMS_MODEL_RC10, EMS_TYPE_RC10Set, "RC10Set", _process_RC10Set, false},
{EMS_MODEL_RC10, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage}, {EMS_MODEL_RC10, EMS_TYPE_RC10StatusMessage, "RC10StatusMessage", _process_RC10StatusMessage, false},
// RC20 and RC20F // RC20 and RC20F
{EMS_MODEL_RC20, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_RC20, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage, false},
{EMS_MODEL_RC20, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC20, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_RC20, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set}, {EMS_MODEL_RC20, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set, false},
{EMS_MODEL_RC20, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage}, {EMS_MODEL_RC20, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage, false},
{EMS_MODEL_RC20F, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_RC20F, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage, false},
{EMS_MODEL_RC20F, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC20F, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_RC20F, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set}, {EMS_MODEL_RC20F, EMS_TYPE_RC20Set, "RC20Set", _process_RC20Set, false},
{EMS_MODEL_RC20F, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage}, {EMS_MODEL_RC20F, EMS_TYPE_RC20StatusMessage, "RC20StatusMessage", _process_RC20StatusMessage, false},
// RC30 // RC30
{EMS_MODEL_RC30, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_RC30, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage, false},
{EMS_MODEL_RC30, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC30, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_RC30, EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set}, {EMS_MODEL_RC30, EMS_TYPE_RC30Set, "RC30Set", _process_RC30Set, false},
{EMS_MODEL_RC30, EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage}, {EMS_MODEL_RC30, EMS_TYPE_RC30StatusMessage, "RC30StatusMessage", _process_RC30StatusMessage, false},
// RC35 // RC35
{EMS_MODEL_RC35, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_RC35, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage, false},
{EMS_MODEL_RC35, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_RC35, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_RC35, EMS_TYPE_RC35Set, "RC35Set", _process_RC35Set}, {EMS_MODEL_RC35, EMS_TYPE_RC35Set, "RC35Set", _process_RC35Set, false},
{EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage, "RC35StatusMessage", _process_RC35StatusMessage}, {EMS_MODEL_RC35, EMS_TYPE_RC35StatusMessage, "RC35StatusMessage", _process_RC35StatusMessage, false},
// ES73 // ES73
{EMS_MODEL_ES73, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage}, {EMS_MODEL_ES73, EMS_TYPE_RCOutdoorTempMessage, "RCOutdoorTempMessage", _process_RCOutdoorTempMessage, false},
{EMS_MODEL_ES73, EMS_TYPE_RCTime, "RCTime", _process_RCTime}, {EMS_MODEL_ES73, EMS_TYPE_RCTime, "RCTime", _process_RCTime, false},
{EMS_MODEL_ES73, EMS_TYPE_RC35Set, "RC35Set", _process_RC35Set}, {EMS_MODEL_ES73, EMS_TYPE_RC35Set, "RC35Set", _process_RC35Set, false},
{EMS_MODEL_ES73, EMS_TYPE_RC35StatusMessage, "RC35StatusMessage", _process_RC35StatusMessage}, {EMS_MODEL_ES73, EMS_TYPE_RC35StatusMessage, "RC35StatusMessage", _process_RC35StatusMessage, false},
// Easy // Easy
{EMS_MODEL_EASY, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage}, {EMS_MODEL_EASY, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage, false},
{EMS_MODEL_BOSCHEASY, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage}, {EMS_MODEL_BOSCHEASY, EMS_TYPE_EasyStatusMessage, "EasyStatusMessage", _process_EasyStatusMessage, false},
//Ems plus //Ems plus
{EMSP_MODEL_RC10, EMSP_TYPE_EmsPlusStatusMessage, "EMSPStatusMessage", _process_EmsPlusStatusMessage} //Nefit 1010
{EMS_MODEL_RC1010, EMS_TYPE_RC1010StatusMessage, "RC1010StatusMessage", _process_RC1010StatusMessage, true},
{EMS_MODEL_RC1010, EMS_TYPE_RC1010Set, "RC1010SetMessage", _process_RC1010SetMessage, true}};
};
// calculate sizes of arrays // calculate sizes of arrays
uint8_t _EMS_Types_max = ArraySize(EMS_Types); // number of defined types uint8_t _EMS_Types_max = ArraySize(EMS_Types); // number of defined types
@@ -650,11 +650,14 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
*/ */
void _ems_processTelegram(uint8_t * telegram, uint8_t length) { void _ems_processTelegram(uint8_t * telegram, uint8_t length) {
// header // header
uint8_t src = telegram[0] & 0x7F; uint8_t src = telegram[0] & 0x7F;
uint8_t dest = telegram[1] & 0x7F; // remove 8th bit to handle both reads and writes uint8_t dest = telegram[1] & 0x7F; // remove 8th bit to handle both reads and writes
uint8_t type = telegram[2]; uint8_t type = telegram[2];
uint8_t offset = telegram[3]; uint8_t offset = telegram[3];
uint8_t * data = telegram + 4; // data block starts at position 5 uint8_t * data = &telegram[4]; // data block starts at position 4
uint8_t ptype = telegram[3];
uint8_t poffset = telegram[4];
uint8_t * pdata = &telegram[5 + poffset]; // data block starts at position 5 plus the offset
_printMessage(telegram, length); _printMessage(telegram, length);
// see if we recognize the type first by scanning our known EMS types list // see if we recognize the type first by scanning our known EMS types list
@@ -665,7 +668,7 @@ void _ems_processTelegram(uint8_t * telegram, uint8_t length) {
int i = 0; int i = 0;
while (i < _EMS_Types_max) { while (i < _EMS_Types_max) {
if (EMS_Types[i].type == type) { if ((EMS_Types[i].type == type) || (EMS_Types[i].emsplus && type >= 240 && EMS_Types[i].type == ptype)) {
typeFound = true; typeFound = true;
commonType = (EMS_Types[i].model_id == EMS_MODEL_ALL); // is it common type for everyone? commonType = (EMS_Types[i].model_id == EMS_MODEL_ALL); // is it common type for everyone?
forUs = (src == EMS_Boiler.type_id) || (src == EMS_Thermostat.type_id); // is it for us? So the src must match forUs = (src == EMS_Boiler.type_id) || (src == EMS_Thermostat.type_id); // is it for us? So the src must match
@@ -680,23 +683,34 @@ void _ems_processTelegram(uint8_t * telegram, uint8_t length) {
if ((EMS_Types[i].processType_cb) != (void *)NULL) { if ((EMS_Types[i].processType_cb) != (void *)NULL) {
// print non-verbose message // print non-verbose message
if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_BASIC) || (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_VERBOSE)) { if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_BASIC) || (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_VERBOSE)) {
myDebug("<--- %s(0x%02X) received", EMS_Types[i].typeString, type); if (EMS_Types[i].emsplus)
myDebug("<--- %s(0x%02X) received", EMS_Types[i].typeString, ptype);
else
myDebug("<--- %s(0x%02X) received", EMS_Types[i].typeString, type);
} }
// call callback function to process it // call callback function to process it
if (EMS_Types[i].emsplus && poffset == EMS_PLUS_ID_NONE)
(void)EMS_Types[i].processType_cb(ptype, pdata, length - 6 - poffset);
// as we only handle complete telegrams (not partial) check that the offset is 0 // as we only handle complete telegrams (not partial) check that the offset is 0
if (offset == EMS_ID_NONE) { else if (offset == EMS_ID_NONE && !EMS_Types[i].emsplus) {
(void)EMS_Types[i].processType_cb(type, data, length - 5); (void)EMS_Types[i].processType_cb(type, data, length - 5);
} else if (type == 255) }
(void)EMS_Types[i].processType_cb(type, telegram, length);
} }
} }
} }
void _printMessage(uint8_t * telegram, uint8_t length) { void _printMessage(uint8_t * telegram, uint8_t length) {
bool emsp = false;
uint8_t src = telegram[0] & 0x7F; uint8_t src = telegram[0] & 0x7F;
uint8_t dest = telegram[1] & 0x7F; // remove 8th bit to handle both reads and writes uint8_t dest = telegram[1] & 0x7F; // remove 8th bit to handle both reads and writes
uint8_t type = telegram[2]; uint8_t type = telegram[2];
uint8_t offset = telegram[3]; uint8_t offset = telegram[3];
uint8_t * data = telegram + 4; // data block starts at position 5 uint8_t * data = telegram + 4; // data block starts at position 5
if (type >= 240) {
type = telegram[3];
uint8_t offset = telegram[4];
data = telegram + 5;
emsp = true;
}
// print detailed telegram data // print detailed telegram data
if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_THERMOSTAT) { if (EMS_Sys_Status.emsLogging >= EMS_SYS_LOGGING_THERMOSTAT) {
char output_str[300] = {0}; // roughly EMS_MAX_TELEGRAM_LENGTH*3 + 20 char output_str[300] = {0}; // roughly EMS_MAX_TELEGRAM_LENGTH*3 + 20
@@ -707,7 +721,10 @@ void _printMessage(uint8_t * telegram, uint8_t length) {
if (src == EMS_Boiler.type_id) { if (src == EMS_Boiler.type_id) {
strlcpy(output_str, "Boiler", sizeof(output_str)); strlcpy(output_str, "Boiler", sizeof(output_str));
} else if (src == EMS_Thermostat.type_id) { } else if (src == EMS_Thermostat.type_id) {
strlcpy(output_str, "Thermostat", sizeof(output_str)); if (emsp)
strlcpy(output_str, "Thermostat+", sizeof(output_str));
else
strlcpy(output_str, "Thermostat", sizeof(output_str));
} else { } else {
strlcpy(output_str, "0x", sizeof(output_str)); strlcpy(output_str, "0x", sizeof(output_str));
strlcat(output_str, _hextoa(src, buffer), sizeof(output_str)); strlcat(output_str, _hextoa(src, buffer), sizeof(output_str));
@@ -717,21 +734,47 @@ void _printMessage(uint8_t * telegram, uint8_t length) {
// destination // destination
if (dest == EMS_ID_ME) { if (dest == EMS_ID_ME) {
strlcat(output_str, "me", sizeof(output_str)); if (emsp) {
strlcpy(color_s, COLOR_YELLOW, sizeof(color_s)); strlcat(output_str, "me", sizeof(output_str));
strlcpy(color_s, COLOR_BRIGHT_YELLOW, sizeof(color_s));
} else {
strlcat(output_str, "me", sizeof(output_str));
strlcpy(color_s, COLOR_YELLOW, sizeof(color_s));
}
} else if (dest == EMS_ID_NONE) { } else if (dest == EMS_ID_NONE) {
strlcat(output_str, "all", sizeof(output_str)); if (emsp) {
strlcpy(color_s, COLOR_GREEN, sizeof(color_s)); strlcat(output_str, "all", sizeof(output_str));
strlcpy(color_s, COLOR_BRIGHT_GREEN, sizeof(color_s));
} else {
strlcat(output_str, "all", sizeof(output_str));
strlcpy(color_s, COLOR_GREEN, sizeof(color_s));
}
} else if (dest == EMS_Boiler.type_id) { } else if (dest == EMS_Boiler.type_id) {
strlcat(output_str, "Boiler", sizeof(output_str)); if (emsp) {
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s)); strlcat(output_str, "Boiler", sizeof(output_str));
strlcpy(color_s, COLOR_BRIGHT_MAGENTA, sizeof(color_s));
} else {
strlcat(output_str, "Boiler", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
}
} else if (dest == EMS_Thermostat.type_id) { } else if (dest == EMS_Thermostat.type_id) {
strlcat(output_str, "Thermostat", sizeof(output_str)); if (emsp) {
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s)); strlcat(output_str, "Thermostat", sizeof(output_str));
strlcpy(color_s, COLOR_BRIGHT_MAGENTA, sizeof(color_s));
} else {
strlcat(output_str, "Thermostat", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
}
} else { } else {
strlcat(output_str, "0x", sizeof(output_str)); if (emsp) {
strlcat(output_str, _hextoa(dest, buffer), sizeof(output_str)); strlcat(output_str, "0x", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s)); strlcat(output_str, _hextoa(dest, buffer), sizeof(output_str));
strlcpy(color_s, COLOR_BRIGHT_MAGENTA, sizeof(color_s));
} else {
strlcat(output_str, "0x", sizeof(output_str));
strlcat(output_str, _hextoa(dest, buffer), sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
}
} }
// type // type
@@ -1050,25 +1093,21 @@ void _process_EasyStatusMessage(uint8_t type, uint8_t * data, uint8_t length) {
EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
} }
void _process_EmsPlusStatusMessage(uint8_t type, uint8_t * data, uint8_t length) { /**
if (true) { * type 0x00 - data from the Nefit RC1010 thermostat (0x18) - 24 bytes long
char str[300]; * The 1010 has a digital precision of its floats to 1 decimal places for the current temperature, so values is divided by 10
char buffer[16]; * The 1010 has a digital precision of its floats to 1 decimal places for the set temperature, so values is divided by 2
for (size_t i = 0; i < length; i++) { */
strlcat(str, _hextoa(data[i], buffer), sizeof(str)); void _process_RC1010StatusMessage(uint8_t type, uint8_t * data, uint8_t length) {
strlcat(str, " ", sizeof(str)); // add space EMS_Thermostat.curr_roomTemp = ((float)data[EMS_TYPE_RC1010StatusMessage_curr]) / (float)10;
} EMS_Thermostat.setpoint_roomTemp = ((float)data[EMS_TYPE_RC1010StatusMessage_set]) / (float)2;
myDebug(str);
} EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
if (data[EMSP_TYPE] == EMSP_TYPE_EmsPlusStatusMessage_setpoint) }
EMS_Thermostat.setpoint_roomTemp = ((float)data[6]) / (float)2; void _process_RC1010SetMessage(uint8_t type, uint8_t * data, uint8_t length) {
if (data[EMSP_TYPE] == EMSP_TYPE_EmsPlusStatusMessage_curr) EMS_Thermostat.setpoint_roomTemp = ((float)data[EMS_TYPE_RC1010Set]) / (float)2;
EMS_Thermostat.curr_roomTemp = ((float)data[7]) / (float)10; EMS_Sys_Status.emsRefreshed = true; // triggers a send the values back via MQTT
} }
/*
strlcat(output_str, ", type 0x", sizeof(output_str));
strlcat(output_str, _hextoa(type, buffer), sizeof(output_str));
*/
/** /**
* type 0xB0 - for reading the mode from the RC10 thermostat (0x17) * type 0xB0 - for reading the mode from the RC10 thermostat (0x17)
* received only after requested * received only after requested
@@ -1294,13 +1333,14 @@ void _process_RCTime(uint8_t type, uint8_t * data, uint8_t length) {
if ((EMS_Thermostat.model_id == EMS_MODEL_EASY) || (EMS_Thermostat.model_id == EMS_MODEL_BOSCHEASY)) { if ((EMS_Thermostat.model_id == EMS_MODEL_EASY) || (EMS_Thermostat.model_id == EMS_MODEL_BOSCHEASY)) {
return; // not supported return; // not supported
} }
if (length > 5) {
EMS_Thermostat.hour = data[2]; EMS_Thermostat.hour = data[2];
EMS_Thermostat.minute = data[4]; EMS_Thermostat.minute = data[4];
EMS_Thermostat.second = data[5]; EMS_Thermostat.second = data[5];
EMS_Thermostat.day = data[3]; EMS_Thermostat.day = data[3];
EMS_Thermostat.month = data[1]; EMS_Thermostat.month = data[1];
EMS_Thermostat.year = data[0]; EMS_Thermostat.year = data[0];
}
} }
/** /**

6
src/ems.h
View File

@@ -13,8 +13,9 @@
#include <Arduino.h> #include <Arduino.h>
// EMS IDs // EMS IDs
#define EMS_ID_NONE 0x00 // Fixed - used as a dest in broadcast messages and empty type IDs #define EMS_ID_NONE 0x00 // Fixed - used as a dest in broadcast messages and empty type IDs
#define EMS_ID_ME 0x0B // Fixed - our device, hardcoded as the "Service Key" #define EMS_PLUS_ID_NONE 0x01 // Fixed - used as a dest in broadcast messages and empty type IDs
#define EMS_ID_ME 0x0B // Fixed - our device, hardcoded as the "Service Key"
#define EMS_ID_DEFAULT_BOILER 0x08 #define EMS_ID_DEFAULT_BOILER 0x08
#define EMS_MIN_TELEGRAM_LENGTH 6 // minimal length for a validation telegram, including CRC #define EMS_MIN_TELEGRAM_LENGTH 6 // minimal length for a validation telegram, including CRC
@@ -235,6 +236,7 @@ typedef struct {
uint8_t type; uint8_t type;
const char typeString[50]; const char typeString[50];
EMS_processType_cb processType_cb; EMS_processType_cb processType_cb;
bool emsplus;
} _EMS_Type; } _EMS_Type;
// function definitions // function definitions

16
src/ems_devices.h
View File

@@ -83,11 +83,12 @@
#define EMS_TYPE_EasyStatusMessage 0x0A // reading values on an Easy Thermostat #define EMS_TYPE_EasyStatusMessage 0x0A // reading values on an Easy Thermostat
#define EMS_TYPE_EasyStatusMessage_setpoint 10 // setpoint temp #define EMS_TYPE_EasyStatusMessage_setpoint 10 // setpoint temp
#define EMS_TYPE_EasyStatusMessage_curr 8 // current temp #define EMS_TYPE_EasyStatusMessage_curr 8 // current temp
// Ems plus // RC1010 specific
#define EMSP_TYPE_EmsPlusStatusMessage 0xFF // reading values on an Easy Thermostat #define EMS_TYPE_RC1010StatusMessage 0x00 // is an automatic thermostat broadcast giving us temps
#define EMSP_TYPE 3 #define EMS_TYPE_RC1010StatusMessage_curr 1 // current temp
#define EMSP_TYPE_EmsPlusStatusMessage_setpoint 10 // setpoint temp #define EMS_TYPE_RC1010StatusMessage_set 3 // setpoint temp
#define EMSP_TYPE_EmsPlusStatusMessage_curr 0 // current temp #define EMS_TYPE_RC1010Set 0x03 // setpoint temp message
#define EMS_TYPE_RC1010Set_set 0 // setpoint temp
// Known EMS types // Known EMS types
typedef enum { typedef enum {
EMS_MODEL_NONE, EMS_MODEL_NONE,
@@ -107,8 +108,7 @@ typedef enum {
EMS_MODEL_BOSCHEASY, EMS_MODEL_BOSCHEASY,
EMS_MODEL_RC310, EMS_MODEL_RC310,
EMS_MODEL_CW100, EMS_MODEL_CW100,
//Ems plus EMS_MODEL_RC1010
EMSP_MODEL_RC10
} _EMS_MODEL_ID; } _EMS_MODEL_ID;
@@ -146,5 +146,5 @@ const _Thermostat_Type Thermostat_Types[] = {
{EMS_MODEL_BOSCHEASY, 206, 0x02, "Bosch Easy", EMS_THERMOSTAT_READ_YES, EMS_THERMOSTAT_WRITE_NO}, {EMS_MODEL_BOSCHEASY, 206, 0x02, "Bosch Easy", EMS_THERMOSTAT_READ_YES, EMS_THERMOSTAT_WRITE_NO},
{EMS_MODEL_RC310, 158, 0x10, "RC310", EMS_THERMOSTAT_READ_NO, EMS_THERMOSTAT_WRITE_NO}, {EMS_MODEL_RC310, 158, 0x10, "RC310", EMS_THERMOSTAT_READ_NO, EMS_THERMOSTAT_WRITE_NO},
{EMS_MODEL_CW100, 255, 0x18, "Bosch CW100", EMS_THERMOSTAT_READ_NO, EMS_THERMOSTAT_WRITE_NO}, {EMS_MODEL_CW100, 255, 0x18, "Bosch CW100", EMS_THERMOSTAT_READ_NO, EMS_THERMOSTAT_WRITE_NO},
{EMSP_MODEL_RC10, 165, 0x18, "RC10/Nefit Moduline 1010)", EMS_THERMOSTAT_READ_YES, EMS_THERMOSTAT_WRITE_NO}, {EMS_MODEL_RC1010, 165, 0x18, "RC1010/Nefit Moduline 1010)", EMS_THERMOSTAT_READ_NO, EMS_THERMOSTAT_WRITE_NO},
}; };