From 8ae5c07302789bb278a606162667d4e781b4b358 Mon Sep 17 00:00:00 2001
From: Mit4el <mit4bmw@gmail.com>
Date: Mon, 13 Nov 2023 23:36:40 +0300
Subject: [PATCH] bugfix Ble

---
 src/modules/sensors/Ble/Ble.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/sensors/Ble/Ble.cpp b/src/modules/sensors/Ble/Ble.cpp
index 45b3658d..0d433c8e 100644
--- a/src/modules/sensors/Ble/Ble.cpp
+++ b/src/modules/sensors/Ble/Ble.cpp
@@ -80,12 +80,6 @@ public:
           setNewWidgetAttributes();
         }
       }
-      else
-      {
-        value.isDecimal = 0;
-        value.valS = "";
-        regEvent(value.valS, _id);
-      }
     }
   }
   char *TimeToString(unsigned long t)
@@ -240,6 +234,14 @@ public:
 
     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("servicedata");
       BLEdata.remove("type");
@@ -249,8 +251,6 @@ public:
       BLEdata.remove("track");
       BLEdata.remove("id");
 
-      String mac_address = BLEdata["MAC"].as<const char *>();
-      mac_address.replace(":", "");
       // дописываем время прихода пакета данных
       BLEdata["last"] = millis();
       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