mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a notifiaction queue

This commit is contained in:
Christian Baars 2022-06-09 21:00:00 +02:00
parent ac4ed0d664
commit 23e94c1aca
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasmota/include/xsns_62_esp32_mi.h
View File

@ -157,6 +157,11 @@ struct MI32connectionContextBerry_t{
bool response; bool response;
}; };
struct MI32notificationBuffer_t{
uint8_t buffer[256];
uint16_t returnCharUUID;
};
struct { struct {
// uint32_t period; // set manually in addition to TELE-period, is set to TELE-period after start // uint32_t period; // set manually in addition to TELE-period, is set to TELE-period after start
TaskHandle_t ScanTask = nullptr; TaskHandle_t ScanTask = nullptr;

37
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
View File

@ -60,6 +60,7 @@
#include <NimBLEDevice.h> #include <NimBLEDevice.h>
#include <vector> #include <vector>
#include <queue>
#include <t_bearssl.h> #include <t_bearssl.h>
@ -164,6 +165,7 @@ class MI32AdvCallbacks: public NimBLEAdvertisedDeviceCallbacks {
static MI32AdvCallbacks MI32ScanCallbacks; static MI32AdvCallbacks MI32ScanCallbacks;
static MI32SensorCallback MI32SensorCB; static MI32SensorCallback MI32SensorCB;
static NimBLEClient* MI32Client; static NimBLEClient* MI32Client;
static std::queue<MI32notificationBuffer_t> MI32NotificationQueue;
/*********************************************************************************************\ /*********************************************************************************************\
* BLE callback functions * BLE callback functions
@ -175,16 +177,17 @@ void MI32scanEndedCB(NimBLEScanResults results){
} }
void MI32notifyCB(NimBLERemoteCharacteristic* pRemoteCharacteristic, uint8_t* pData, size_t length, bool isNotify){ void MI32notifyCB(NimBLERemoteCharacteristic* pRemoteCharacteristic, uint8_t* pData, size_t length, bool isNotify){
if(MI32.mode.triggerBerryConnCB) return; //discard data, if we did not pass the old to Berry yet if(isNotify){
if(isNotify){ MI32notificationBuffer_t _buf;
MI32.infoMsg = MI32_GOT_NOTIFICATION; _buf.buffer[0] = (uint8_t)length;
MI32.conCtx->buffer[0] = (uint8_t)length; memcpy(_buf.buffer+1, pData, length);
memcpy(MI32.conCtx->buffer + 1, pData, length); _buf.returnCharUUID = pRemoteCharacteristic->getUUID().getNative()->u16.value;
MI32.conCtx->returnCharUUID = pRemoteCharacteristic->getUUID().getNative()->u16.value; MI32NotificationQueue.push(_buf);
MI32.conCtx->operation = 103; MI32.mode.readingDone = 1;
MI32.mode.triggerBerryConnCB = 1; MI32.mode.triggerBerryConnCB = 1;
MI32.mode.readingDone = 1; MI32.infoMsg = MI32_GOT_NOTIFICATION;
} return; // do not discard data
}
} }
/*********************************************************************************************\ /*********************************************************************************************\
* Helper functions * Helper functions
@ -1141,6 +1144,7 @@ bool MI32ConnectActiveSensor(){ // only use inside a task !!
bool MI32StartConnectionTask(){ bool MI32StartConnectionTask(){
if(MI32.conCtx == nullptr) return false; if(MI32.conCtx == nullptr) return false;
if(MI32.conCtx->buffer == nullptr) return false; if(MI32.conCtx->buffer == nullptr) return false;
MI32NotificationQueue = {};
MI32.mode.willConnect = 1; MI32.mode.willConnect = 1;
MI32Scan->stop(); MI32Scan->stop();
MI32suspendScanTask(); MI32suspendScanTask();
@ -1178,7 +1182,8 @@ void MI32ConnectionTask(void *pvParameters){
timer++; timer++;
vTaskDelay(10/ portTICK_PERIOD_MS); vTaskDelay(10/ portTICK_PERIOD_MS);
} }
MI32Client->discoverAttributes(); // solves connection problems on i.e. yeelight dimmer // TODO: make next line optional
// MI32Client->discoverAttributes(); // solves connection problems on i.e. yeelight dimmer
NimBLERemoteService* pSvc = nullptr; NimBLERemoteService* pSvc = nullptr;
NimBLERemoteCharacteristic* pChr = nullptr; NimBLERemoteCharacteristic* pChr = nullptr;
@ -1672,7 +1677,15 @@ void MI32Every50mSecond(){
} }
MI32.mode.triggerBerryAdvCB = 0; MI32.mode.triggerBerryAdvCB = 0;
} }
if(MI32.mode.triggerBerryConnCB == 1){ if(MI32.mode.triggerBerryConnCB || !MI32NotificationQueue.empty()){
if(!MI32NotificationQueue.empty()){
MI32notificationBuffer_t _buf = MI32NotificationQueue.front();
MI32NotificationQueue.pop();
memcpy(MI32.conCtx->buffer,_buf.buffer,_buf.buffer[0]+1);
MI32.conCtx->returnCharUUID = _buf.returnCharUUID;
MI32.conCtx->operation = 103;
MI32.conCtx->error = 0;
}
if(MI32.beConnCB != nullptr){ if(MI32.beConnCB != nullptr){
void (*func_ptr)(int, int, int) = (void (*)(int, int, int))MI32.beConnCB; void (*func_ptr)(int, int, int) = (void (*)(int, int, int))MI32.beConnCB;
char _message[32]; char _message[32];