MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIx the advertising start

This commit is contained in:
Philip Gladstone 2021-10-21 00:51:16 +00:00
parent 28cb8981b2
commit 96993eff16
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/modules/ble.c
View File

@ -48,7 +48,7 @@
#define PERROR() printf("pcall failed: %s\n", lua_tostring(L, -1)) #define PERROR() printf("pcall failed: %s\n", lua_tostring(L, -1))
static volatile bool synced = false; static volatile enum { IDLE, SYNCED, READY_TO_ADVERTISE, ADVERTISING } synced;
static int lble_start_advertising(); static int lble_start_advertising();
static int lble_gap_event(struct ble_gap_event *event, void *arg); static int lble_gap_event(struct ble_gap_event *event, void *arg);
@ -190,8 +190,6 @@ static int
lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) { lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_access_ctxt *ctxt, void *arg) {
// Actually the only thing we care about is the arg and the ctxt // Actually the only thing we care about is the arg and the ctxt
MODLOG_DFLT(INFO, "access_cb called with op %d\n", ctxt->op);
size_t task_block_size = sizeof(task_block_t); size_t task_block_size = sizeof(task_block_t);
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
@ -218,8 +216,6 @@ lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
} }
} }
MODLOG_DFLT(INFO, "ABout to task_post\n");
if (!task_post(TASK_PRIORITY_HIGH, task_handle, (task_param_t) task_block)) { if (!task_post(TASK_PRIORITY_HIGH, task_handle, (task_param_t) task_block)) {
free(task_block); free(task_block);
return BLE_ATT_ERR_UNLIKELY; return BLE_ATT_ERR_UNLIKELY;
@ -228,8 +224,6 @@ lble_access_cb(uint16_t conn_handle, uint16_t attr_handle, struct ble_gatt_acces
response_message_t message; response_message_t message;
while (1) { while (1) {
MODLOG_DFLT(INFO, "About to receive\n");
if (xQueueReceive(response_queue, &message, (TickType_t) (10000/portTICK_PERIOD_MS) ) != pdPASS) { if (xQueueReceive(response_queue, &message, (TickType_t) (10000/portTICK_PERIOD_MS) ) != pdPASS) {
free(task_block); free(task_block);
return BLE_ATT_ERR_UNLIKELY; return BLE_ATT_ERR_UNLIKELY;
@ -829,10 +823,12 @@ lble_on_sync(void)
rc = ble_hs_util_ensure_addr(0); rc = ble_hs_util_ensure_addr(0);
assert(rc == 0); assert(rc == 0);
if (!synced) { if (synced == READY_TO_ADVERTISE) {
synced = true;
} else {
lble_start_advertising(); lble_start_advertising();
synced = ADVERTISING;
}
if (synced == IDLE) {
synced = SYNCED;
} }
} }
@ -908,7 +904,7 @@ static int lble_init(lua_State *L) {
memcpy(gadget_mfg, mfg, len); memcpy(gadget_mfg, mfg, len);
} }
synced = false; synced = IDLE;
lble_init_stack(L); lble_init_stack(L);
@ -925,7 +921,7 @@ static int lble_init(lua_State *L) {
bool seen1800 = false; bool seen1800 = false;
// See if we already have the 1800 service registered // See if we already have the 1800 service registered
for (struct ble_gatt_svc_def *svcs = gatt_svr_svcs; svcs->type; svcs++) { for (const struct ble_gatt_svc_def *svcs = gatt_svr_svcs; svcs->type; svcs++) {
if (!ble_uuid_cmp(svcs->uuid, BLE_UUID16_DECLARE(0x1800))) { if (!ble_uuid_cmp(svcs->uuid, BLE_UUID16_DECLARE(0x1800))) {
seen1800 = true; seen1800 = true;
} }
@ -941,14 +937,15 @@ static int lble_init(lua_State *L) {
printf("about to call gatts_start\n"); printf("about to call gatts_start\n");
ble_gatts_start(); ble_gatts_start();
if (synced) {
lble_start_advertising();
} else {
synced = true;
}
inited = RUNNING; inited = RUNNING;
if (synced == SYNCED) {
lble_start_advertising();
synced = ADVERTISING;
} else {
synced = READY_TO_ADVERTISE;
}
return 0; return 0;
} }