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

prevent controller and boiler competing for ubamaster - #271

Browse Source
This commit is contained in:
Paul
2019-12-31 11:34:40 +01:00
parent 75b47c1609
commit 6798b59246
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/ems.cpp
View File

@@ -1729,7 +1729,8 @@ void _process_Version(_EMS_RxTelegram * EMS_RxTelegram) {
uint8_t flags = EMS_Devices[i].flags; // its a new entry, set the specifics uint8_t flags = EMS_Devices[i].flags; // its a new entry, set the specifics
if (type == EMS_DEVICE_TYPE_BOILER) { if ((type == EMS_DEVICE_TYPE_BOILER) && (device_id == EMS_ID_BOILER)) {
// with UBAMasters, there is only one device_id 0x08. To avoid https://github.com/proddy/EMS-ESP/issues/271
EMS_Boiler.device_id = device_id; EMS_Boiler.device_id = device_id;
EMS_Boiler.product_id = product_id; EMS_Boiler.product_id = product_id;
EMS_Boiler.device_flags = flags; EMS_Boiler.device_flags = flags;
@@ -2018,17 +2019,19 @@ void ems_scanDevices() {
std::list<uint8_t> Device_Ids; // create a new list std::list<uint8_t> Device_Ids; // create a new list
Device_Ids.push_back(EMS_ID_BOILER); // UBAMaster/Boilers - 0x08 Device_Ids.push_back(EMS_ID_BOILER); // UBAMaster/Boilers - 0x08
Device_Ids.push_back(EMS_ID_HP); // HeatPump - 0x38 Device_Ids.push_back(EMS_ID_HP); // HeatPump - 0x38
Device_Ids.push_back(EMS_ID_SM); // Solar Module - 0x30 Device_Ids.push_back(EMS_ID_SM); // Solar Module - 0x30
Device_Ids.push_back(0x09); // Controllers - 0x09 Device_Ids.push_back(EMS_ID_CONTROLLER); // Controllers - 0x09
Device_Ids.push_back(0x02); // Connect - 0x02 Device_Ids.push_back(EMS_ID_CONNECT1); // Connect - 0x02
Device_Ids.push_back(0x48); // Gateway - 0x48 Device_Ids.push_back(EMS_ID_CONNECT2); // Connect - 0x50
Device_Ids.push_back(0x20); // Mixing Devices - 0x20, 0x21 Device_Ids.push_back(EMS_ID_GATEWAY); // Gateway - 0x48
Device_Ids.push_back(0x21); // Mixing Devices - 0x20, 0x21 Device_Ids.push_back(EMS_ID_MIXING1); // Mixing Devices - 0x20, 0x21
Device_Ids.push_back(0x10); // Thermostats - 0x10, 0x17, 0x18 Device_Ids.push_back(EMS_ID_MIXING2); // Mixing Devices - 0x20, 0x21
Device_Ids.push_back(0x17); // Thermostats - 0x10, 0x17, 0x18 Device_Ids.push_back(EMS_ID_THERMOSTAT1); // Thermostats - 0x10, 0x17, 0x18
Device_Ids.push_back(0x18); // Thermostats - 0x10, 0x17, 0x18 Device_Ids.push_back(EMS_ID_THERMOSTAT2); // Thermostats - 0x10, 0x17, 0x18
Device_Ids.push_back(EMS_ID_THERMOSTAT3); // Thermostats - 0x10, 0x17, 0x18
Device_Ids.push_back(EMS_ID_SWITCH); // Switch - 0x11
// remove duplicates and reserved IDs (like our own device) // remove duplicates and reserved IDs (like our own device)
Device_Ids.sort(); Device_Ids.sort();
@@ -2075,22 +2078,26 @@ void ems_printDevices() {
if (!Devices.empty()) { if (!Devices.empty()) {
bool have_unknowns = false; bool have_unknowns = false;
char device_string[100]; char device_string[100];
char device_type[30];
myDebug_P(PSTR("and %d were recognized by EMS-ESP as:"), Devices.size()); myDebug_P(PSTR("and %d were recognized by EMS-ESP as:"), Devices.size());
for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) { for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
if ((it)->known) { ems_getDeviceTypeDescription(it->device_id, device_type); // get type string, e.g. "Boiler"
strlcpy(device_string, (it)->device_desc_p, sizeof(device_string));
if (it->known) {
strlcpy(device_string, it->device_desc_p, sizeof(device_string));
} else { } else {
strlcpy(device_string, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device_string)); // Unknown strlcpy(device_string, EMS_MODELTYPE_UNKNOWN_STRING, sizeof(device_string)); // Unknown
have_unknowns = true; have_unknowns = true;
} }
myDebug_P(PSTR(" %s%s%s (DeviceID:0x%02X ProductID:%d Version:%s)"), myDebug_P(PSTR(" %s: %s%s%s (DeviceID:0x%02X ProductID:%d Version:%s)"),
device_type,
COLOR_BOLD_ON, COLOR_BOLD_ON,
device_string, device_string,
COLOR_BOLD_OFF, COLOR_BOLD_OFF,
(it)->device_id, it->device_id,
(it)->product_id, it->product_id,
(it)->version); it->version);
} }
myDebug_P(PSTR("")); // newline myDebug_P(PSTR("")); // newline