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

Merge branch 'dev' of https://github.com/proddy/EMS-ESP-Boiler into dev

Browse Source 
* 'dev' of https://github.com/proddy/EMS-ESP-Boiler:
  heatpump minor changes
This commit is contained in:
Susis Strolch
2019-05-27 10:53:07 +02:00
parent 5479313e53 1bea0d9f62
commit 078f89ce7e
4 changed files with 40 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/ems.cpp
View File

@@ -828,6 +828,8 @@ void _printMessage(_EMS_RxTelegram * EMS_RxTelegram) {
strlcpy(output_str, "Thermostat", sizeof(output_str));
} else if (src == EMS_ID_SM) {
strlcpy(output_str, "SM", sizeof(output_str));
} else if (src == EMS_ID_HP) {
strlcpy(output_str, "HP", sizeof(output_str));
} else if (src == EMS_ID_GATEWAY) {
strlcpy(output_str, "Gateway", sizeof(output_str));
} else {
@@ -850,6 +852,9 @@ void _printMessage(_EMS_RxTelegram * EMS_RxTelegram) {
} else if (dest == EMS_ID_SM) {
strlcat(output_str, "SM", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
} else if (dest == EMS_ID_HP) {
strlcat(output_str, "HP", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
} else if (dest == EMS_ID_GATEWAY) {
strlcat(output_str, "Gateway", sizeof(output_str));
strlcpy(color_s, COLOR_MAGENTA, sizeof(color_s));
@@ -914,13 +919,6 @@ void _ems_processTelegram(_EMS_RxTelegram * EMS_RxTelegram) {
typeFound = true;
break;
}
/*
if ((EMS_Types[i].model_id == EMS_MODEL_ALL) || ((src == EMS_Boiler.device_id) || (src == EMS_Thermostat.device_id) || (src == EMS_ID_SM))) {
typeFound = true;
break;
}
*/
}
i++;
}
@@ -1687,6 +1685,9 @@ void ems_discoverModels() {
// solar module
ems_doReadCommand(EMS_TYPE_Version, EMS_ID_SM); // check if there is Solar Module available
// heatpump module
ems_doReadCommand(EMS_TYPE_Version, EMS_ID_HP); // check if there is HeatPump Module available
// thermostat
// if it hasn't been set, auto discover it
if (EMS_Thermostat.device_id == EMS_ID_NONE) {
@@ -1799,7 +1800,7 @@ void ems_getBoilerValues() {
*/
void ems_getOtherValues() {
if (EMS_Other.SM) {
ems_doReadCommand(EMS_TYPE_SM10Monitor, EMS_ID_SM); // fetch all from SM10Monitor, e.g. 0B B0 97 00 16
ems_doReadCommand(EMS_TYPE_SM10Monitor, EMS_ID_SM); // fetch all from SM10Monitor
}
}

1
src/ems_devices.h
View File

@@ -178,6 +178,7 @@ const _Other_Type Other_Types[] = {
{EMS_MODEL_OTHER, 73, EMS_ID_SM, "SM10 Solar Module"},
{EMS_MODEL_OTHER, 163, EMS_ID_SM, "SM100 Solar Module"},
{EMS_MODEL_OTHER, 171, 0x02, "EMS-OT OpenTherm converter"},
{EMS_MODEL_OTHER, 252, EMS_ID_HP, "HeatPump Module"}, // warning, fake product id!
{EMS_MODEL_OTHER, 189, EMS_ID_GATEWAY, "Web Gateway KM200"}
};