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

fix BLE

Browse Source
This commit is contained in:
Mit4el
2025-02-14 18:42:07 +03:00
parent e3d3bca68e
commit 95b9dc3d2d
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/MqttClient.h
View File

@@ -30,7 +30,7 @@ void publishWidgets();
void mqttCallback(char* topic, uint8_t* payload, size_t length); void mqttCallback(char* topic, uint8_t* payload, size_t length);
//void handleMqttStatus(bool send); //void handleMqttStatus(bool send);
void handleMqttStatus(bool send, int state == -1); void handleMqttStatus(bool send, int state = -1);
const String getStateStr(int e); const String getStateStr(int e);

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

@@ -181,7 +181,7 @@ void scanEndedCB(NimBLEScanResults results)
//#if defined (esp32c6_4mb) || defined (esp32c6_8mb) //#if defined (esp32c6_4mb) || defined (esp32c6_8mb)
//class BleScan : public IoTItem, NimBLEScanCallbacks //class BleScan : public IoTItem, NimBLEScanCallbacks
//#else //#else
class BleScan : public IoTItem, BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks class BleScan : public IoTItem, NimBLEScanCallbacks //BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks
//#endif //#endif
{ {
private: private:
@@ -205,7 +205,7 @@ public:
return spr; return spr;
} }
void onResult(BLEAdvertisedDevice *advertisedDevice) void onResult(const NimBLEAdvertisedDevice *advertisedDevice) override
{ {
JsonObject BLEdata = doc.to<JsonObject>(); JsonObject BLEdata = doc.to<JsonObject>();
String mac_adress_ = advertisedDevice->getAddress().toString().c_str(); String mac_adress_ = advertisedDevice->getAddress().toString().c_str();

13
src/modules/sensors/Ble_part1/Ble_p1.cpp
View File

@@ -181,7 +181,7 @@ void scanEndedCB(NimBLEScanResults results)
//#if defined (esp32c6_4mb) || defined (esp32c6_8mb) //#if defined (esp32c6_4mb) || defined (esp32c6_8mb)
//class BleScan : public IoTItem, NimBLEScanCallbacks //class BleScan : public IoTItem, NimBLEScanCallbacks
//#else //#else
class BleScan : public IoTItem, BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks class BleScan : public IoTItem, NimBLEScanCallbacks//BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks
//#endif //#endif
{ {
private: private:
@@ -205,13 +205,13 @@ public:
return spr; return spr;
} }
void onResult(BLEAdvertisedDevice *advertisedDevice) void onResult(const NimBLEAdvertisedDevice *advertisedDevice) override
{ {
JsonObject BLEdata = doc.to<JsonObject>(); JsonObject BLEdata = doc.to<JsonObject>();
String mac_adress_ = advertisedDevice->getAddress().toString().c_str(); String mac_adress_ = advertisedDevice->getAddress().toString().c_str();
mac_adress_.toUpperCase(); mac_adress_.toUpperCase();
BLEdata["id"] = (char *)mac_adress_.c_str(); BLEdata["id"] = (char *)mac_adress_.c_str();
//SerialPrint("i", F("BLE"), "FOUND "+ mac_adress_);
if (advertisedDevice->haveName()) if (advertisedDevice->haveName())
{ {
BLEdata["name"] = (char *)advertisedDevice->getName().c_str(); BLEdata["name"] = (char *)advertisedDevice->getName().c_str();
@@ -304,6 +304,7 @@ public:
BleScan(String parameters) : IoTItem(parameters) BleScan(String parameters) : IoTItem(parameters)
{ {
_scanDuration = jsonReadInt(parameters, "scanDuration"); _scanDuration = jsonReadInt(parameters, "scanDuration");
_scanDuration = _scanDuration * 1000;
_filter = jsonReadStr(parameters, "filter"); _filter = jsonReadStr(parameters, "filter");
jsonRead(parameters, "debug", _debug); jsonRead(parameters, "debug", _debug);
@@ -342,13 +343,13 @@ public:
//======================================================================================================= //=======================================================================================================
void *getAPI_Ble(String subtype, String param) void *getAPI_Ble_part1(String subtype, String param)
{ {
if (subtype == F("BleScan")) if (subtype == F("BleScan_p1"))
{ {
return new BleScan(param); return new BleScan(param);
} }
else if (subtype == F("BleSens")) else if (subtype == F("BleSens_p1"))
{ {
return new BleSens(param); return new BleSens(param);
} }

11
src/modules/sensors/Ble_part2/Ble_p2.cpp
View File

@@ -181,7 +181,7 @@ void scanEndedCB(NimBLEScanResults results)
//#if defined (esp32c6_4mb) || defined (esp32c6_8mb) //#if defined (esp32c6_4mb) || defined (esp32c6_8mb)
//class BleScan : public IoTItem, NimBLEScanCallbacks //class BleScan : public IoTItem, NimBLEScanCallbacks
//#else //#else
class BleScan : public IoTItem, BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks class BleScan : public IoTItem, NimBLEScanCallbacks //BLEAdvertisedDeviceCallbacks //NimBLEScanCallbacks
//#endif //#endif
{ {
private: private:
@@ -205,7 +205,7 @@ public:
return spr; return spr;
} }
void onResult(BLEAdvertisedDevice *advertisedDevice) void onResult(const NimBLEAdvertisedDevice *advertisedDevice) override
{ {
JsonObject BLEdata = doc.to<JsonObject>(); JsonObject BLEdata = doc.to<JsonObject>();
String mac_adress_ = advertisedDevice->getAddress().toString().c_str(); String mac_adress_ = advertisedDevice->getAddress().toString().c_str();
@@ -304,6 +304,7 @@ public:
BleScan(String parameters) : IoTItem(parameters) BleScan(String parameters) : IoTItem(parameters)
{ {
_scanDuration = jsonReadInt(parameters, "scanDuration"); _scanDuration = jsonReadInt(parameters, "scanDuration");
_scanDuration = _scanDuration * 1000;
_filter = jsonReadStr(parameters, "filter"); _filter = jsonReadStr(parameters, "filter");
jsonRead(parameters, "debug", _debug); jsonRead(parameters, "debug", _debug);
@@ -342,13 +343,13 @@ public:
//======================================================================================================= //=======================================================================================================
void *getAPI_Ble(String subtype, String param) void *getAPI_Ble_part2(String subtype, String param)
{ {
if (subtype == F("BleScan")) if (subtype == F("BleScan_p2"))
{ {
return new BleScan(param); return new BleScan(param);
} }
else if (subtype == F("BleSens")) else if (subtype == F("BleSens_p2"))
{ {
return new BleSens(param); return new BleSens(param);
} }