h2zero
5dac1a7035
* Add immediate parameter to BLE connection commands.
When sending a command to read/write a characteristic on a BLE server this adds a new parameter to cause the action to be
performed immediately. This will stop the scan in progress to perform the actions queued.
Example use:
```
mosquitto_pub -t home/OpenMQTTGateway/commands/MQTTtoBT/config -m '{
"ble_write_address":"AA:BB:CC:DD:EE:FF",
"ble_write_service":"cba20d00-224d-11e6-9fb8-0002a5d5c51b",
"ble_write_char":"cba20002-224d-11e6-9fb8-0002a5d5c51b",
"ble_write_value":"TEST",
"value_type":"STRING",
"ttl":4,
"immediate":true }'
```
Stop BLE processing when immeditate command sent.
* Use a shorter connection timeout.
* Update docs.
* Remove MQTT spam for connection retrys
* Prevent crashing when the normal connection process occurs at the same time as an immediate action.
* Use a semaphore to protect BLE device vector.
62 lines
1.7 KiB
C++
62 lines
1.7 KiB
C++
#ifndef zBLEConnect_h
|
|
#define zBLEConnect_h
|
|
|
|
#ifdef ESP32
|
|
# include "ArduinoJson.h"
|
|
# include "NimBLEDevice.h"
|
|
# include "config_BT.h"
|
|
|
|
extern void pubBT(JsonObject& data);
|
|
|
|
class zBLEConnect {
|
|
public:
|
|
NimBLEClient* m_pClient;
|
|
TaskHandle_t m_taskHandle = nullptr;
|
|
zBLEConnect(NimBLEAddress& addr) {
|
|
m_pClient = NimBLEDevice::createClient(addr);
|
|
m_pClient->setConnectTimeout(5);
|
|
}
|
|
virtual ~zBLEConnect() { NimBLEDevice::deleteClient(m_pClient); }
|
|
virtual bool writeData(BLEAction* action);
|
|
virtual bool readData(BLEAction* action);
|
|
virtual bool processActions(std::vector<BLEAction>& actions);
|
|
virtual void publishData() {}
|
|
virtual NimBLERemoteCharacteristic* getCharacteristic(const NimBLEUUID& service, const NimBLEUUID& characteristic);
|
|
};
|
|
|
|
class LYWSD03MMC_connect : public zBLEConnect {
|
|
void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
|
|
|
|
public:
|
|
LYWSD03MMC_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
|
|
void publishData() override;
|
|
};
|
|
|
|
class DT24_connect : public zBLEConnect {
|
|
std::vector<uint8_t> m_data;
|
|
void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
|
|
|
|
public:
|
|
DT24_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
|
|
void publishData() override;
|
|
};
|
|
|
|
class GENERIC_connect : public zBLEConnect {
|
|
std::vector<uint8_t> m_data;
|
|
|
|
public:
|
|
GENERIC_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
|
|
};
|
|
|
|
class HHCCJCY01HHCC_connect : public zBLEConnect {
|
|
std::vector<uint8_t> m_data;
|
|
void notifyCB(NimBLERemoteCharacteristic* pChar, uint8_t* pData, size_t length, bool isNotify);
|
|
|
|
public:
|
|
HHCCJCY01HHCC_connect(NimBLEAddress& addr) : zBLEConnect(addr) {}
|
|
void publishData() override;
|
|
};
|
|
|
|
#endif //ESP32
|
|
#endif //zBLEConnect_h
|