jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow Berry fast_loop for BLE module (#20281)

Browse Source
This commit is contained in:
Christian Baars 2023-12-21 20:28:08 +01:00 committed by GitHub
parent e5abd47c86
commit 0e87096bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libesp32/berry_tasmota/src/be_MI32_lib.c
View File

@ -46,6 +46,9 @@ module MI32 (scope: global) {
extern int be_BLE_init(bvm *vm); extern int be_BLE_init(bvm *vm);
extern void be_BLE_loop(void);
BE_FUNC_CTYPE_DECLARE(be_BLE_loop, "", "");
extern void be_BLE_reg_conn_cb(void* function, uint8_t *buffer); extern void be_BLE_reg_conn_cb(void* function, uint8_t *buffer);
BE_FUNC_CTYPE_DECLARE(be_BLE_reg_conn_cb, "", "cc"); BE_FUNC_CTYPE_DECLARE(be_BLE_reg_conn_cb, "", "cc");
@ -79,6 +82,7 @@ BE_FUNC_CTYPE_DECLARE(be_BLE_adv_block, "", "@(bytes)~[i]");
/* @const_object_info_begin /* @const_object_info_begin
module BLE (scope: global) { module BLE (scope: global) {
init, func(be_BLE_init) init, func(be_BLE_init)
loop, ctype_func(be_BLE_loop)
conn_cb, ctype_func(be_BLE_reg_conn_cb) conn_cb, ctype_func(be_BLE_reg_conn_cb)
set_svc, ctype_func(be_BLE_set_service) set_svc, ctype_func(be_BLE_set_service)
run, ctype_func(be_BLE_run) run, ctype_func(be_BLE_run)

5
tasmota/tasmota_xdrv_driver/xdrv_52_3_berry_MI32.ino
View File

@ -76,6 +76,7 @@ extern "C" {
** BLE - generic BLE functions ** BLE - generic BLE functions
********************************************************************/ ********************************************************************/
extern bool MI32checkBLEinitialization(); extern bool MI32checkBLEinitialization();
extern void MI32BerryLoop();
extern void MI32setBerryAdvCB(void* function, uint8_t *buffer); extern void MI32setBerryAdvCB(void* function, uint8_t *buffer);
extern void MI32setBerryConnCB(void* function, uint8_t *buffer); extern void MI32setBerryConnCB(void* function, uint8_t *buffer);
extern void MI32setBerryServerCB(void* function, uint8_t *buffer); extern void MI32setBerryServerCB(void* function, uint8_t *buffer);
@ -95,6 +96,10 @@ extern "C" {
be_return_nil(vm); be_return_nil(vm);
} }
void be_BLE_loop(void){
MI32BerryLoop();
}
void be_BLE_reg_conn_cb(void* function, uint8_t *buffer); void be_BLE_reg_conn_cb(void* function, uint8_t *buffer);
void be_BLE_reg_conn_cb(void* function, uint8_t *buffer){ void be_BLE_reg_conn_cb(void* function, uint8_t *buffer){
MI32setBerryConnCB(function,buffer); MI32setBerryConnCB(function,buffer);

30
tasmota/tasmota_xsns_sensor/xsns_62_esp32_mi.ino
View File

@ -707,6 +707,10 @@ extern "C" {
return (MI32.mode.init && Settings->flag5.mi32_enable); return (MI32.mode.init && Settings->flag5.mi32_enable);
} }
void MI32BerryLoop(){
MI32BLELoop();
}
bool MI32runBerryServer(uint16_t operation, bool response){ bool MI32runBerryServer(uint16_t operation, bool response){
MI32.conCtx->operation = operation; MI32.conCtx->operation = operation;
MI32.conCtx->response = response; MI32.conCtx->response = response;
@ -1861,15 +1865,10 @@ void MI32ParseResponse(char *buf, uint16_t bufsize, uint8_t addr[6], int RSSI) {
} }
/** /**
* @brief Launch functions from Core 1 to make race conditions less likely * Called automatically every 50 milliseconds or can be triggered from Berry with BLE.loop() - useful from fast_loop
* */
*/ void MI32BLELoop()
{
void MI32Every50mSecond(){
if(MI32.mode.shallTriggerTele){
MI32.mode.shallTriggerTele = 0;
MI32triggerTele();
}
if(MI32.mode.triggerBerryAdvCB == 1){ if(MI32.mode.triggerBerryAdvCB == 1){
if(MI32.beAdvCB != nullptr){ if(MI32.beAdvCB != nullptr){
// AddLogBuffer(LOG_LEVEL_DEBUG,MI32.beAdvBuf,40); // AddLogBuffer(LOG_LEVEL_DEBUG,MI32.beAdvBuf,40);
@ -1945,14 +1944,25 @@ void MI32Every50mSecond(){
} }
} }
} }
if(MI32.infoMsg > 0){ if(MI32.infoMsg > 0){
char _message[32]; char _message[32];
GetTextIndexed(_message, sizeof(_message), MI32.infoMsg-1, kMI32_BLEInfoMsg); GetTextIndexed(_message, sizeof(_message), MI32.infoMsg-1, kMI32_BLEInfoMsg);
AddLog(LOG_LEVEL_DEBUG,PSTR("M32: %s"),_message); AddLog(LOG_LEVEL_DEBUG,PSTR("M32: %s"),_message);
MI32.infoMsg = 0; MI32.infoMsg = 0;
} }
}
/**
* @brief Launch functions from Core 1 to make race conditions less likely
*
*/
void MI32Every50mSecond(){
if(MI32.mode.shallTriggerTele){
MI32.mode.shallTriggerTele = 0;
MI32triggerTele();
}
MI32BLELoop();
} }
/** /**