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

fix devices scan - #326

Browse Source
This commit is contained in:
Paul
2020-02-20 00:01:05 +01:00
parent 4ae18602a2
commit 9dc0de275f
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/ems.cpp
View File

@@ -1759,9 +1759,9 @@ bool _addDevice(_EMS_DEVICE_TYPE device_type, uint8_t product_id, uint8_t device
*/
void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
// exit it length is incorrect (13 or 15 bytes long)
// or didn't come from the boiler
// or it wasn't specifically for us
// or we can't write to the EMS bus yet
if ((EMS_RxTelegram->data_length > EMS_SYS_DEVICEMAP_LENGTH) || (EMS_RxTelegram->src != EMS_ID_BOILER) || (ems_getTxDisabled())) {
if ((EMS_RxTelegram->data_length > EMS_SYS_DEVICEMAP_LENGTH) || (EMS_RxTelegram->dest != EMS_Sys_Status.emsbusid) || (ems_getTxDisabled())) {
return;
}
@@ -1772,14 +1772,15 @@ void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
for (uint8_t bit = 0; bit < 8; bit++) {
if (byte & 0x01) {
uint8_t device_id = ((data_byte + 1) * 8) + bit;
// see if we already have this device in our list
// ignore ourselves, we're not an EMS device
if ((device_id != EMS_Sys_Status.emsbusid) && (!Devices.empty())) {
// see if we already have this device in our list
if (device_id != EMS_Sys_Status.emsbusid) {
bool exists = false;
for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
if (it->device_id == device_id) {
exists = true;
break;
if (!Devices.empty()) {
for (std::list<_Detected_Device>::iterator it = Devices.begin(); it != Devices.end(); ++it) {
if (it->device_id == device_id) {
exists = true;
}
}
}
if (!exists) {
@@ -1787,9 +1788,8 @@ void _process_UBADevices(_EMS_RxTelegram * EMS_RxTelegram) {
ems_doReadCommand(EMS_TYPE_Version, device_id); // get version, but ignore ourselves
}
}
// advance 1 bit
byte = byte >> 1;
}
byte = byte >> 1; // advance 1 bit
}
}
}
@@ -2260,7 +2260,7 @@ void ems_printDevices() {
myDebug_P(PSTR("One or more devices are not recognized by EMS-ESP. Please report this in GitHub."));
}
} else {
myDebug_P(PSTR("No were devices recognized. This may be because Tx is disabled or failing."));
myDebug_P(PSTR("No devices were recognized. This may be because Tx is disabled or failing."));
}
myDebug_P(PSTR("")); // newline