Minor fixes

mongoose-os-libs · Nov 12, 2021 · 58d409c · 58d409c
1 parent e2c45be
commit 58d409c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/include/esp32/esp32_bt_gap.h b/include/esp32/esp32_bt_gap.h
@@ -25,8 +25,8 @@
 extern "C" {
 #endif
 
-#define MGOS_BT_GAP_DEFAULT_SCAN_WINDOW_MS 50
-#define MGOS_BT_GAP_DEFAULT_SCAN_INTERVAL_MS 100
+#define MGOS_BT_GAP_DEFAULT_SCAN_WINDOW_MS 123
+#define MGOS_BT_GAP_DEFAULT_SCAN_INTERVAL_MS 154
 #define MGOS_BT_GAP_DEFAULT_SCAN_DURATION_MS 5000
 
 #define MGOS_BT_GAP_MAX_SCAN_RSP_DATA_LEN 31

diff --git a/include/mgos_bt.h b/include/mgos_bt.h
@@ -74,7 +74,7 @@ int mgos_bt_uuid_cmp(const struct mgos_bt_uuid *a,
 void mgos_bt_uuid128_from_bytes(const uint8_t *bytes, bool reverse,
                                 struct mgos_bt_uuid *uuid);
 
-void mgos_event_trigger_schedule(int ev, const void *ev_data, size_t data_len);
+void mgos_event_trigger_schedule(int ev, void *ev_data, size_t data_len);
 
 #ifdef __cplusplus
 }

diff --git a/src/esp32/esp32_bt_gap.c b/src/esp32/esp32_bt_gap.c
@@ -212,6 +212,7 @@ static int mgos_bt_scan_event_fn(struct ble_gap_event *ev, void *arg) {
             ev->disc.length_data));
       if (!ctx->active) {
         if (ev->disc.event_type == BLE_HCI_ADV_RPT_EVTYPE_ADV_IND) {
+          //mg_strfree(&arg.adv_data);
           mgos_event_trigger_schedule(MGOS_BT_GAP_EVENT_SCAN_RESULT, &arg, sizeof(arg));
         }
         break;

diff --git a/src/mgos_bt.c b/src/mgos_bt.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mgos.h"
 #include "mgos_bt_gap.h"
 #include "mgos_bt_gattc.h"
 #include "mgos_system.h"
@@ -164,10 +165,7 @@ struct mgos_event_info {
   int ev;
 };
 
-static void trigger_cb(void *arg) {
-  struct mgos_event_info *ei = arg;
-  void *ev_data = ei + 1;
-  mgos_event_trigger(ei->ev, ev_data);
+static void free_evt(struct mgos_event_info *ei, void *ev_data) {
   if (ei->ev == MGOS_BT_GATTC_EV_READ_RESULT) {
     struct mgos_bt_gattc_read_result *p = ev_data;
     mg_strfree(&p->data);
@@ -182,11 +180,18 @@ static void trigger_cb(void *arg) {
   free(ei);
 }
 
-void mgos_event_trigger_schedule(int ev, const void *ev_data, size_t data_len) {
+static void trigger_cb(void *arg) {
+  struct mgos_event_info *ei = arg;
+  void *ev_data = ei + 1;
+  mgos_event_trigger(ei->ev, ev_data);
+  free_evt(ei, ev_data);
+}
+
+void mgos_event_trigger_schedule(int ev, void *ev_data, size_t data_len) {
   struct mgos_event_info *ei = malloc(sizeof(*ei) + data_len);
   ei->ev = ev;
   memcpy(ei + 1, ev_data, data_len);
   if (!mgos_invoke_cb(trigger_cb, ei, false /* from_isr */)) {
-    free(ei);
+    free_evt(ei, ev_data);
   }
 }