iotmanager/IoTManager
1
0
Fork 0
mirror of https://github.com/IoTManagerProject/IoTManager.git synced 2026-03-30 11:59:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

bugfix Ble

Browse Source
This commit is contained in:
Mit4el
2023-11-13 23:36:40 +03:00
parent 8cd131bda2
commit 8ae5c07302
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/modules/sensors/Ble/Ble.cpp
View File

@@ -80,12 +80,6 @@ public:
setNewWidgetAttributes(); setNewWidgetAttributes();
} }
} }
else
{
value.isDecimal = 0;
value.valS = "";
regEvent(value.valS, _id);
}
} }
} }
char *TimeToString(unsigned long t) char *TimeToString(unsigned long t)
@@ -240,6 +234,14 @@ public:
if (decoder.decodeBLEJson(BLEdata)) if (decoder.decodeBLEJson(BLEdata))
{ {
String mac_address = BLEdata["MAC"].as<const char *>();
if (mac_address == "")
{
BLEdata["MAC"] = BLEdata["id"];
mac_address = BLEdata["id"].as<const char *>();
}
mac_address.replace(":", "");
BLEdata.remove("manufacturerdata"); BLEdata.remove("manufacturerdata");
BLEdata.remove("servicedata"); BLEdata.remove("servicedata");
BLEdata.remove("type"); BLEdata.remove("type");
@@ -249,8 +251,6 @@ public:
BLEdata.remove("track"); BLEdata.remove("track");
BLEdata.remove("id"); BLEdata.remove("id");
String mac_address = BLEdata["MAC"].as<const char *>();
mac_address.replace(":", "");
// дописываем время прихода пакета данных // дописываем время прихода пакета данных
BLEdata["last"] = millis(); BLEdata["last"] = millis();
if (_debug) if (_debug)
@@ -267,7 +267,7 @@ public:
//} //}
} }
SerialPrint("i", F("BLE"), "found: " + mac_address); SerialPrint("i", F("BLE"), "found: " + String(BLEdata["MAC"].as<const char *>()));
} }
// Перебираем все зарегистрированные сенсоры BleSens // Перебираем все зарегистрированные сенсоры BleSens