Merge branch 'master' of https://gitee.com/openLuat/LuatOS

components/bluetooth/luat_bluetooth.h

@@ -118,22 +118,16 @@ typedef enum{
     LUAT_BLE_EVENT_WRITE,       // BLE写数据
     LUAT_BLE_EVENT_READ,        // BLE读数据
 
-    LUAT_BLE_EVENT_WLAN_CONFIG_SUCCESS,
-    LUAT_BLE_EVENT_WLAN_CONFIG_FAILED,
-
 } luat_ble_event_t;
 
 
 typedef struct luat_bluetooth luat_bluetooth_t;
 
 typedef struct{
-    uint8_t ssid[32];
-    uint8_t password[64];
-    uint8_t ssid_len;
-    uint8_t password_len;
-    uint8_t security;
-    void* userdata;
-}luat_ble_wlan_config_info_t;
+    uint8_t conn_idx;       /**< The index of the connection */
+    uint8_t peer_addr_type; /**< Peer address type */
+    uint8_t peer_addr[6];   /**< Peer BT address */
+} luat_ble_device_info_t;
 typedef struct{
     uint8_t conn_idx;       /**< The index of the connection */
     uint16_t prf_id;        /**< The id of the profile */
@@ -155,6 +149,7 @@ typedef struct{
 typedef struct{
     uint32_t conn_idx;
     union {
+        luat_ble_device_info_t luat_ble_device_info;
         luat_ble_write_req_t write_req;
         luat_ble_read_req_t read_req;
     };
@@ -165,8 +160,6 @@ typedef struct {
     int len;
 }luat_ble_adv_data_t;
 
-typedef void (*luat_ble_wlan_config_cb_t)(luat_bluetooth_t* luat_bluetooth, luat_ble_event_t ble_event, luat_ble_wlan_config_info_t* wlan_config);
-
 typedef void (*luat_ble_cb_t)(luat_bluetooth_t* luat_bluetooth, luat_ble_event_t ble_event, luat_ble_param_t* ble_param);
 
 typedef struct{
@@ -208,7 +201,6 @@ typedef struct {
 typedef struct {
     luat_ble_actv_state state;
     luat_ble_cb_t cb;
-    luat_ble_wlan_config_cb_t wlan_config_cb;
     int lua_cb;
     void* userdata;
 }luat_ble_t;

components/bluetooth/luat_lib_bluetooth.c

@@ -83,8 +83,6 @@ static int luatos_ble_callback(lua_State *L, void* ptr){
 }
 
 static void luat_ble_cb(luat_bluetooth_t* luat_bluetooth, luat_ble_event_t ble_event, luat_ble_param_t* ble_param){
-    luat_ble_wlan_config_info_t* config_info = (luat_ble_wlan_config_info_t*)luat_bluetooth->luat_ble->userdata;
-    luat_ble_wlan_config_cb_t luat_ble_wlan_config_cb = luat_bluetooth->luat_ble->wlan_config_cb;
     // LLOGD("ble event: %d", ble_event);
     luat_ble_param_t* luat_ble_param = NULL;
     if (ble_param){
@@ -144,10 +142,6 @@ static int l_ble_gatt_create(lua_State* L) {
             memcpy(luat_ble_gatt_cfg.uuid, data, len);
         }
         lua_pop(L, 1);
-
-        for (size_t i = 0; i < 16; i++){
-            LLOGD("luat_ble_gatt_cfg.uuid[%d]:%02X", i, luat_ble_gatt_cfg.uuid[i]);
-        }
         
         lua_pushstring(L, "att_db");
         if (LUA_TTABLE == lua_gettable(L, m)){
@@ -334,6 +328,24 @@ static const rotable_Reg_t reg_bluetooth[] = {
     {"adv_start",                   ROREG_FUNC(l_ble_advertising_start)},
     {"adv_stop",                    ROREG_FUNC(l_ble_advertising_stop)},
 
+    // BLE_EVENT
+    {"EVENT_NONE",                  ROREG_INT(LUAT_BLE_EVENT_NONE)},
+    {"EVENT_INIT",                  ROREG_INT(LUAT_BLE_EVENT_INIT)},
+    {"EVENT_DEINIT",                ROREG_INT(LUAT_BLE_EVENT_DEINIT)},
+    {"EVENT_ADV_INIT",                ROREG_INT(LUAT_BLE_EVENT_ADV_INIT)},
+    {"EVENT_ADV_START",            ROREG_INT(LUAT_BLE_EVENT_ADV_START)},
+    {"EVENT_ADV_STOP",                ROREG_INT(LUAT_BLE_EVENT_ADV_STOP)},
+    {"EVENT_ADV_DEINIT",            ROREG_INT(LUAT_BLE_EVENT_ADV_DEINIT)},
+    {"EVENT_SCAN_INIT",           ROREG_INT(LUAT_BLE_EVENT_SCAN_INIT)},
+    {"EVENT_SCAN_START",            ROREG_INT(LUAT_BLE_EVENT_SCAN_START)},
+    {"EVENT_SCAN_STOP",             ROREG_INT(LUAT_BLE_EVENT_SCAN_STOP)},
+    {"EVENT_SCAN_DEINIT",                  ROREG_INT(LUAT_BLE_EVENT_SCAN_DEINIT)},
+    {"EVENT_CONN",                  ROREG_INT(LUAT_BLE_EVENT_CONN)},
+    {"EVENT_DISCONN",               ROREG_INT(LUAT_BLE_EVENT_DISCONN)},
+    {"EVENT_WRITE",                   ROREG_INT(LUAT_BLE_EVENT_WRITE)},
+    {"EVENT_READ",                ROREG_INT(LUAT_BLE_EVENT_READ)},
+    
+
 
 
     // ADV_ADDR_MODE