change: nimble库切换成主库的通用实现

app/port/luat_ble_server_api.c

@@ -1,638 +0,0 @@
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <assert.h>
-
-#include "wm_bt_config.h"
-
-// #if (WM_NIMBLE_INCLUDED == CFG_ON)
-
-#include "wm_bt_app.h"
-#include "wm_bt_util.h"
-#include "host/ble_hs.h"
-#include "wm_ble_gap.h"
-#include "wm_ble_uart_if.h"
-
-int tls_ble_server_api_init(tls_ble_output_func_ptr output_func_ptr);
-int tls_ble_server_api_deinit();
-uint32_t tls_ble_server_api_get_mtu();
-int tls_ble_server_api_send_msg(uint8_t *data, int data_len);
-
-#include "luat_base.h"
-#include "luat_msgbus.h"
-#include "luat_malloc.h"
-
-#define LUAT_LOG_TAG "ble"
-#include "luat_log.h"
-
-typedef struct ble_write_msg {
-    // uint16_t conn_handle,
-    // uint16_t attr_handle,
-    ble_uuid_t* uuid;
-    uint16_t len;
-    char buff[1];
-}ble_write_msg_t;
-
-/*
- * GLOBAL VARIABLE DEFINITIONS
- ****************************************************************************************
- */
-
-typedef enum{
-    BLE_SERVER_MODE_IDLE     = 0x00,
-    BLE_SERVER_MODE_ADVERTISING = 0x01,
-    BLE_SERVER_MODE_CONNECTED,
-    BLE_SERVER_MODE_INDICATING,
-    BLE_SERVER_MODE_EXITING
-} ble_server_state_t;
-
-static uint8_t g_ble_prof_connected = 0;
-static uint8_t g_ble_indicate_enable = 0;
-static tls_ble_output_func_ptr g_ble_uart_output_fptr = NULL;
-static int g_mtu = 20;
-static uint8_t g_ind_data[255];
-static volatile uint8_t g_send_pending = 0;
-static volatile ble_server_state_t g_ble_server_state = BLE_SERVER_MODE_IDLE;
-
-
-/* ble attr write/notify handle */
-uint16_t g_ble_attr_indicate_handle;
-uint16_t g_ble_attr_write_handle;
-uint16_t g_ble_attr_notify_handle;
-uint16_t g_ble_conn_handle ;
-
-#define WM_GATT_SVC_UUID      0xFFF0
-#define WM_GATT_INDICATE_UUID 0xFFF1
-#define WM_GATT_WRITE_UUID    0xFFF2
-#define WM_GATT_NOTIFY_UUID    0xFFF3
-
-
-static int
-gatt_svr_chr_access_func(uint16_t conn_handle, uint16_t attr_handle,
-                               struct ble_gatt_access_ctxt *ctxt, void *arg);
-
-
-/*
- * LOCAL FUNCTION DECLARATIONS
- ****************************************************************************************
- */
-
-static int
-gatt_svr_chr_write_func(uint16_t conn_handle, uint16_t attr_handle,
-                              struct ble_gatt_access_ctxt *ctxt, void *arg);
-
-
-static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
-    {
-        /* Service: uart */
-        .type = BLE_GATT_SVC_TYPE_PRIMARY,
-        .uuid = BLE_UUID16_DECLARE(WM_GATT_SVC_UUID),
-        .characteristics = (struct ble_gatt_chr_def[]) { {
-                .uuid = BLE_UUID16_DECLARE(WM_GATT_WRITE_UUID),
-                .val_handle = &g_ble_attr_write_handle,
-                .access_cb = gatt_svr_chr_access_func,
-                .flags = BLE_GATT_CHR_F_WRITE,
-            },{
-                .uuid = BLE_UUID16_DECLARE(WM_GATT_INDICATE_UUID),
-                .val_handle = &g_ble_attr_indicate_handle,
-                .access_cb = gatt_svr_chr_access_func,
-                .flags = BLE_GATT_CHR_F_INDICATE | BLE_GATT_CHR_F_READ,
-            },{
-            // 暂不支持NOTIFY
-            //     .uuid = BLE_UUID16_DECLARE(WM_GATT_NOTIFY_UUID),
-            //     .val_handle = &g_ble_attr_notify_handle,
-            //     .access_cb = gatt_svr_chr_access_func,
-            //     .flags = BLE_GATT_CHR_F_NOTIFY | BLE_GATT_CHR_F_READ,
-            // },{
-              0, /* No more characteristics in this service */
-            } 
-         },
-    },
-
-    {
-        0, /* No more services */
-    },
-};
-
-int wm_ble_server_api_adv(bool enable)
-{
-    int rc;
-    
-    if(enable)
-    {
-        struct ble_hs_adv_fields fields;
-        const char *name;
-        
-        /**
-         *  Set the advertisement data included in our advertisements:
-         *     o Flags (indicates advertisement type and other general info).
-         *     o Device name.
-         *     o user specific field (winner micro).
-         */
-        
-        memset(&fields, 0, sizeof fields);
-        
-        /* Advertise two flags:
-         *     o Discoverability in forthcoming advertisement (general)
-         *     o BLE-only (BR/EDR unsupported).
-         */
-        fields.flags = BLE_HS_ADV_F_DISC_GEN |
-                       BLE_HS_ADV_F_BREDR_UNSUP;
-        
-        
-        name = ble_svc_gap_device_name();
-        fields.name = (uint8_t *)name;
-        fields.name_len = strlen(name);
-        fields.name_is_complete = 1;
-        
-        fields.uuids16 = (ble_uuid16_t[]){
-            BLE_UUID16_INIT(0xFFF0)
-        };
-        fields.num_uuids16 = 1;
-        fields.uuids16_is_complete = 1;
-
-        
-        rc = ble_gap_adv_set_fields(&fields);
-        if (rc != 0) {
-            TLS_BT_APPL_TRACE_ERROR("error setting advertisement data; rc=%d\r\n", rc);
-            return rc;
-        }
-        
-        /* As own address type we use hard-coded value, because we generate
-              NRPA and by definition it's random */
-        rc = tls_nimble_gap_adv(WM_BLE_ADV_IND, 0);
-        assert(rc == 0);
-
-    }else
-    {
-        rc = tls_nimble_gap_adv(WM_BLE_ADV_STOP, 0);
-    }
-
-    return rc;
-}
-/*
- * LOCAL FUNCTION DEFINITIONS
- ****************************************************************************************
- */
-
-static int l_ble_chr_write_cb(lua_State* L, void* ptr) {
-    ble_write_msg_t* wmsg = (ble_write_msg_t*)ptr;
-    rtos_msg_t* msg = (rtos_msg_t*)lua_topointer(L, -1);
-    lua_getglobal(L, "sys_pub");
-    if (lua_isfunction(L, -1)) {
-        lua_pushstring(L, "BLE_GATT_WRITE_CHR");
-        lua_newtable(L);
-        lua_pushlstring(L, wmsg->buff, wmsg->len);
-        lua_call(L, 3, 0);
-    }
-    luat_heap_free(wmsg);
-    return 0;
-}
-
-static int
-gatt_svr_chr_access_func(uint16_t conn_handle, uint16_t attr_handle,
-                               struct ble_gatt_access_ctxt *ctxt, void *arg)
-{
-    int i = 0;
-    struct os_mbuf *om = ctxt->om;
-    ble_write_msg_t* wmsg;
-    rtos_msg_t msg = {0};
-    LLOGD("gatt_svr_chr_access_func %d %d %d", conn_handle, attr_handle, ctxt->op);
-    switch (ctxt->op) {
-        case BLE_GATT_ACCESS_OP_WRITE_CHR:
-              while(om) {
-                  wmsg = (ble_write_msg_t*)(luat_heap_malloc(sizeof(ble_write_msg_t) + om->om_len - 1));
-                  if (wmsg != NULL) {
-                      wmsg->len = om->om_len;
-                      msg.handler = l_ble_chr_write_cb;
-                      msg.ptr = wmsg;
-                      msg.arg1 = conn_handle;
-                      msg.arg2 = attr_handle;
-                      memcpy(wmsg->buff, om->om_data, om->om_len);
-                      luat_msgbus_put(&msg, 0);
-                  }
-                //   if(g_ble_uart_output_fptr)
-                //   {
-                //     g_ble_uart_output_fptr((uint8_t *)om->om_data, om->om_len);
-                    
-                //   }else
-                //   {
-                //      print_bytes(om->om_data, om->om_len); 
-                //   }
-                  om = SLIST_NEXT(om, om_next);
-              }
-              return 0;
-        case BLE_GATT_ACCESS_OP_READ_CHR:
-            return 0;
-        default:
-            assert(0);
-            return BLE_ATT_ERR_UNLIKELY;
-    }
-}
-
-int
-wm_ble_server_gatt_svr_init(void)
-{
-    int rc;
-
-    rc = ble_gatts_count_cfg(gatt_svr_svcs);
-    if (rc != 0) {
-        goto err;
-    }
-
-    rc = ble_gatts_add_svcs(gatt_svr_svcs);
-    if (rc != 0) {
-        return rc;
-    }
-
-err:
-    return rc;
-}
-
-
-// static uint8_t ss = 0x00;
-
-static int indication_sent_cb(lua_State *L, void* ptr) {
-    rtos_msg_t* msg = (rtos_msg_t*)lua_topointer(L, -1);
-    lua_getglobal(L, "sys_pub");
-    if (lua_isfunction(L, -1)) {
-        lua_pushstring(L, "BLE_IND_SENT");
-        lua_pushinteger(L, msg->arg1);
-        lua_pushinteger(L, msg->arg2);
-        lua_call(L, 3, 0);
-    }
-    return 0;
-}
-
-static void ble_server_indication_sent_cb(int conn_id, int status)
-{
-	int len = 0;
-    tls_bt_status_t ret;
-
-    g_send_pending = 0;
-    LLOGD("indication_sent_cb %d %d", conn_id, status);
-    // if(!g_ble_indicate_enable)
-    // {
-    //     TLS_BT_APPL_TRACE_DEBUG("Indicate disabled... when trying to send...\r\n");
-    //     return;
-    // }
-
-    rtos_msg_t msg = {0};
-    msg.handler = indication_sent_cb;
-    msg.arg1 = conn_id;
-    msg.arg2 = status;
-    luat_msgbus_put(&msg, 0);
-
-    // if(g_ble_uart_output_fptr == NULL)
-    // {
-    //     memset(g_ind_data, ss, sizeof(g_ind_data));
-    //     ss++;
-    //     if(ss > 0xFE) ss = 0x00;
-    // 	tls_ble_server_api_send_msg(g_ind_data, g_mtu); 
-
-    // }
-}
-
-static void wm_ble_server_start_indicate(void *arg)
-{
-    int len;
-    int rc;
-    uint8_t *tmp_ptr = NULL;
-    tls_bt_status_t status;
-    
-    /*No uart ble interface*/
-    if(g_ble_uart_output_fptr == NULL)
-    {
-	    rc = tls_ble_server_api_send_msg(g_ind_data, g_mtu);
-        TLS_BT_APPL_TRACE_DEBUG("Indicating sending...rc=%d\r\n", rc);
-    }
-    // else
-    // {
-    //     /*check and send*/
-    //     len = tls_ble_uart_buffer_size();
-    //     len = MIN(len, g_mtu);
-
-    //     if(len)
-    //     {
-    //         tls_ble_uart_buffer_peek(g_ind_data, len);
-    //         status = tls_ble_server_api_send_msg(g_ind_data, g_mtu);
-    //         if(status == TLS_BT_STATUS_SUCCESS)
-    //         {
-    //             tls_ble_uart_buffer_delete(len);
-    //         }else
-    //         {
-    //            TLS_BT_APPL_TRACE_DEBUG("Server send failed(%d), retry...\r\n", status); 
-    //            tls_bt_async_proc_func(wm_ble_server_start_indicate,(void*)g_ble_indicate_enable,1000);
-    //         }
-    //     }
-    // }    
-}
-static void conn_param_update_cb(uint16_t conn_handle, int status, void *arg)
-{
-	LLOGD("conn param update complete; conn_handle=%d status=%d", conn_handle, status);
-}
-
-static void wm_ble_server_conn_param_update_slave()
-{
-	int rc;
-	struct ble_l2cap_sig_update_params params;
-
-	params.itvl_min = 0x0006;
-	params.itvl_max = 0x0006;
-	params.slave_latency = 0;
-	params.timeout_multiplier = 0x07d0;
-
-	rc = ble_l2cap_sig_update(g_ble_conn_handle, &params,
-		conn_param_update_cb, NULL);
-	assert(rc == 0);
-}
-
-static int luat_ble_gap_evt(lua_State *L, void* ptr) {
-    rtos_msg_t* msg = (rtos_msg_t*)lua_topointer(L, -1);
-    lua_getglobal(L, "sys_pub");
-    if (lua_isfunction(L, -1)) {
-        lua_pushstring(L, "BLE_GAP_EVT");
-        lua_pushinteger(L, msg->arg1);
-        lua_pushinteger(L, msg->arg2);
-        lua_call(L, 3, 0);
-    }
-    return 0;
-}
-
-static int ble_gap_evt_cb(struct ble_gap_event *event, void *arg)
-{
-    int rc;
-    struct ble_gap_conn_desc desc;
-
-    rtos_msg_t msg = {0};
-    msg.handler = luat_ble_gap_evt;
-    msg.arg1 = event->type;
-    
-    switch(event->type)
-    {
-        case BLE_GAP_EVENT_CONNECT:
-            g_ble_prof_connected = 1;
-            g_send_pending = 0;
-            msg.arg2 = event->connect.status;
-            LLOGD("connected status=%d handle=%d,g_ble_attr_indicate_handle=%d",event->connect.status, g_ble_conn_handle, g_ble_attr_indicate_handle );
-            if (event->connect.status == 0) {
-                g_ble_server_state = BLE_SERVER_MODE_CONNECTED;
-                       //re set this flag, to prevent stop adv, but connected evt reported when deinit this demo
-                g_ble_conn_handle = event->connect.conn_handle;
-                rc = ble_gap_conn_find(event->connect.conn_handle, &desc);
-                assert(rc == 0);
-                print_conn_desc(&desc);
-
-#if MYNEWT_VAL(BLEPRPH_LE_PHY_SUPPORT)
-                phy_conn_changed(event->connect.conn_handle);
-#endif
-            }
-            //TLS_BT_APPL_TRACE_DEBUG("\r\n");
-
-            if (event->connect.status != 0) {
-                /* Connection failed; resume advertising. */
-                tls_nimble_gap_adv(WM_BLE_ADV_IND, 0);
-            }
-            luat_msgbus_put(&msg, 0);
-            break;
-        case BLE_GAP_EVENT_DISCONNECT:
-            g_ble_prof_connected = 0;
-            g_ble_indicate_enable = 0;
-            g_send_pending = 0;
-            LLOGD("disconnect reason=%d,state=%d", event->disconnect.reason,g_ble_server_state);
-            if(g_ble_server_state == BLE_SERVER_MODE_EXITING)
-            {
-                if(g_ble_uart_output_fptr)
-                {
-                    g_ble_uart_output_fptr = NULL;
-                }
-                
-                g_ble_server_state = BLE_SERVER_MODE_IDLE;
-            }else
-            {
-                rc = tls_nimble_gap_adv(WM_BLE_ADV_IND, 0);
-                if(!rc)
-                {
-                  g_ble_server_state = BLE_SERVER_MODE_ADVERTISING;  
-                }
-            }
-            #if 0
-            if(event->disconnect.reason == 534)
-            {
-                //hci error code:  0x16 + 0x200 = 534; //local host terminate the connection;
-            }else
-            {
-                tls_nimble_gap_adv(WM_BLE_ADV_IND, 0);
-            }
-            #endif
-            luat_msgbus_put(&msg, 0);
-            break;
-        case BLE_GAP_EVENT_NOTIFY_TX:
-            if(event->notify_tx.status == BLE_HS_EDONE)
-            {
-                ble_server_indication_sent_cb(event->notify_tx.attr_handle, event->notify_tx.status);
-            }else
-            {
-                /*Application will handle other cases*/
-            }
-            msg.arg2 = event->notify_tx.status;
-            luat_msgbus_put(&msg, 0);
-            break;
-        case BLE_GAP_EVENT_SUBSCRIBE:
-            LLOGD("subscribe indicate(%d,%d)", event->subscribe.prev_indicate,event->subscribe.cur_indicate );
-            LLOGD("subscribe notify(%d,%d)", event->subscribe.prev_notify,event->subscribe.cur_notify );
-            g_ble_indicate_enable = event->subscribe.cur_indicate;
-            // if(g_ble_indicate_enable)
-            // {
-            //     g_ble_server_state = BLE_SERVER_MODE_INDICATING;
-            //     /*To reach the max passthrough,  in ble_uart mode, I conifg the min connection_interval*/
-            //     if(g_ble_uart_output_fptr)
-            //     {
-            //         tls_bt_async_proc_func(wm_ble_server_conn_param_update_slave, NULL, 30);
-            //     }
-            //     tls_bt_async_proc_func(wm_ble_server_start_indicate,(void*)g_ble_indicate_enable, 30);
-            // }else
-            // {
-            //     if(g_ble_server_state != BLE_SERVER_MODE_EXITING)
-            //     {
-            //         g_ble_server_state = BLE_SERVER_MODE_CONNECTED;
-            //     }
-            // }
-            msg.arg2 = event->subscribe.cur_indicate;
-            luat_msgbus_put(&msg, 0);
-            break;
-        case BLE_GAP_EVENT_MTU:
-            LLOGD("wm ble dm mtu changed to(%d)", event->mtu.value);
-            /*nimBLE config prefered ATT_MTU is 256. here 256-12 = 244. */
-            /* preamble(1)+access address(4)+pdu(2~257)+crc*/
-            /* ATT_MTU(247):pdu= pdu_header(2)+l2cap_len(2)+l2cap_chn(2)+mic(4)*/
-            /* GATT MTU(244): ATT_MTU +opcode+chn*/
-            g_mtu = min(event->mtu.value - 12, 244);
-            msg.arg2 = event->mtu.value;
-            luat_msgbus_put(&msg, 0);
-            break;
-        case BLE_GAP_EVENT_REPEAT_PAIRING:
-            /* We already have a bond with the peer, but it is attempting to
-             * establish a new secure link.  This app sacrifices security for
-             * convenience: just throw away the old bond and accept the new link.
-             */
-            /* Delete the old bond. */
-            rc = ble_gap_conn_find(event->repeat_pairing.conn_handle, &desc);
-            assert(rc == 0);
-            ble_store_util_delete_peer(&desc.peer_id_addr);
-            
-            LLOGD("!!!BLE_GAP_EVENT_REPEAT_PAIRING");
-            return BLE_GAP_REPEAT_PAIRING_RETRY;
-        
-        case BLE_GAP_EVENT_PASSKEY_ACTION:
-            LLOGD(">>>BLE_GAP_EVENT_REPEAT_PAIRING");
-            return 0;
-
-            
-        default:
-            break;
-    }
-
-    return 0;
-}
-
-/*
- * EXPORTED FUNCTION DEFINITIONS
- ****************************************************************************************
- */
-
-int tls_ble_server_api_init(tls_ble_output_func_ptr output_func_ptr)
-{
-    int rc = BLE_HS_EAPP;
-
-    if(bt_adapter_state == WM_BT_STATE_OFF)
-    {
-        TLS_BT_APPL_TRACE_ERROR("%s failed rc=%s\r\n", __FUNCTION__, tls_bt_rc_2_str(BLE_HS_EDISABLED));
-        return BLE_HS_EDISABLED;
-    }
-    
-    TLS_BT_APPL_TRACE_DEBUG("%s, state=%d\r\n", __FUNCTION__, g_ble_server_state);
-    
-    if(g_ble_server_state == BLE_SERVER_MODE_IDLE)
-    {
-        g_ble_prof_connected = 0;
-        
-        //step 0: reset other services. Note 
-        rc = ble_gatts_reset();
-        if(rc != 0)
-        {
-            TLS_BT_APPL_TRACE_ERROR("tls_ble_server_api_init failed rc=%d\r\n", rc);
-            return rc;
-        }
-
-        //step 1: config/adding  the services
-        rc = wm_ble_server_gatt_svr_init();
-
-		if(rc == 0)
-		{	
-		    tls_ble_register_gap_evt(WM_BLE_GAP_EVENT_CONNECT|WM_BLE_GAP_EVENT_DISCONNECT|WM_BLE_GAP_EVENT_NOTIFY_TX|WM_BLE_GAP_EVENT_SUBSCRIBE|WM_BLE_GAP_EVENT_MTU|WM_BLE_GAP_EVENT_REPEAT_PAIRING, ble_gap_evt_cb);
-			TLS_BT_APPL_TRACE_DEBUG("### wm_ble_server_api_init \r\n");
-            
-            g_ble_uart_output_fptr = output_func_ptr;
-            /*step 2: start the service*/
-            rc = ble_gatts_start();
-            assert(rc == 0);
-            
-            /*step 3: start advertisement*/
-            rc = wm_ble_server_api_adv(true); 
-            
-            if(rc == 0)
-            {
-                g_ble_server_state = BLE_SERVER_MODE_ADVERTISING;
-            }
-		}else
-		{
-			TLS_BT_APPL_TRACE_ERROR("### wm_ble_server_api_init failed(rc=%d)\r\n", rc);
-		}
-    }
-    else
-    {
-    	TLS_BT_APPL_TRACE_WARNING("wm_ble_server_api_init registered\r\n");
-        rc = BLE_HS_EALREADY;
-    }
-	
-	return rc;
-}
-int tls_ble_server_api_deinit()
-{
-   int rc = BLE_HS_EAPP;
-
-    if(bt_adapter_state == WM_BT_STATE_OFF)
-    {
-        TLS_BT_APPL_TRACE_ERROR("%s failed rc=%s\r\n", __FUNCTION__, tls_bt_rc_2_str(BLE_HS_EDISABLED));
-        return BLE_HS_EDISABLED;
-    }
-
-   TLS_BT_APPL_TRACE_DEBUG("%s, state=%d\r\n", __FUNCTION__, g_ble_server_state);
-   
-   if(g_ble_server_state == BLE_SERVER_MODE_CONNECTED || g_ble_server_state == BLE_SERVER_MODE_INDICATING)
-   {
-        g_ble_indicate_enable = 0;
-        
-        rc = ble_gap_terminate(g_ble_conn_handle, BLE_ERR_REM_USER_CONN_TERM);
-        if(rc == 0)
-        {
-           g_ble_server_state = BLE_SERVER_MODE_EXITING; 
-        }
-   }else if(g_ble_server_state == BLE_SERVER_MODE_ADVERTISING)
-   {
-        rc = tls_nimble_gap_adv(WM_BLE_ADV_STOP, 0);
-        if(rc == 0)
-        {
-            if(g_ble_uart_output_fptr)
-            {
-                g_ble_uart_output_fptr = NULL;
-            }
-            g_send_pending = 0;
-            g_ble_server_state = BLE_SERVER_MODE_IDLE;
-        }
-   }else if(g_ble_server_state == BLE_SERVER_MODE_IDLE)
-   {
-        rc = 0;
-   }else
-   {
-        rc = BLE_HS_EALREADY;
-   }
-
-   return rc;
-}
-uint32_t tls_ble_server_api_get_mtu()
-{
-    return g_mtu;
-}
-int tls_ble_server_api_send_msg(uint8_t *data, int data_len)
-{
-    int rc;
-    struct os_mbuf *om;
-    
-    //TLS_BT_APPL_TRACE_DEBUG("### %s len=%d\r\n", __FUNCTION__, data_len);
-
-    if(g_send_pending) return BLE_HS_EBUSY;
-
-    if(data_len<=0 || data == NULL)
-    {
-        return BLE_HS_EINVAL;
-    }
-    
-    om = ble_hs_mbuf_from_flat(data, data_len);
-    if (!om) {
-        return BLE_HS_ENOMEM;
-    }
-    
-    rc = ble_gattc_indicate_custom(g_ble_conn_handle,g_ble_attr_indicate_handle, om);
-    // rc = ble_gattc_notify_custom(g_ble_conn_handle,g_ble_attr_notify_handle, om);
-    if(rc == 0)
-    {
-        g_send_pending = 1;
-    }
-    return rc;
-}
-
-// #endif
-
-

app/port/luat_lib_nimble.c

@@ -1,143 +0,0 @@
-#include "luat_base.h"
-#include "luat_msgbus.h"
-#include "luat_malloc.h"
-#include "luat_spi.h"
-
-#include "luat_nimble.h"
-
-#define LUAT_LOG_TAG "nimble"
-#include "luat_log.h"
-
-static int l_nimble_init(lua_State* L) {
-    int rc = 0;
-    char* name = NULL;
-    if(lua_isstring(L, 1)) {
-        name = lua_tostring(L, 1);
-    }
-    rc = luat_nimble_init(0xFF,name);
-    if (rc) {
-        lua_pushboolean(L, 0);
-        lua_pushinteger(L, rc);
-        return 2;
-    }
-    else {
-        lua_pushboolean(L, 1);
-        return 1;
-    }
-}
-
-static int l_nimble_deinit(lua_State* L) {
-    int rc = 0;
-    rc = luat_nimble_deinit();
-    if (rc) {
-        lua_pushboolean(L, 0);
-        lua_pushinteger(L, rc);
-        return 2;
-    }
-    else {
-        lua_pushboolean(L, 1);
-        return 1;
-    }
-}
-
-static int l_nimble_debug(lua_State* L) {
-    int level;
-    if (lua_gettop(L) > 0)
-        level = luat_nimble_trace_level(luaL_checkinteger(L, 1));
-    else
-        level = luat_nimble_trace_level(-1);
-    lua_pushinteger(L, level);
-    return 1;
-}
-
-static int l_nimble_server_init(lua_State* L) {
-    test_server_api_init();
-    return 0;
-}
-
-
-static int l_nimble_server_deinit(lua_State* L) {
-    test_server_api_deinit();
-    return 0;
-}
-
-#include "wm_bt_config.h"
-#include "wm_params.h"
-#include "wm_param.h"
-#include "wm_ble.h"
-
-int tls_nimble_gap_adv(wm_ble_adv_type_t type, int duration);
-
-static int l_nimble_gap_adv(lua_State* L) {
-    wm_ble_adv_type_t type = luaL_checkinteger(L, 1);
-    int duration = luaL_optinteger(L, 2, 0);
-
-    int ret = tls_nimble_gap_adv(type, duration);
-    lua_pushboolean(L, ret == 0 ? 1 : 0);
-    lua_pushinteger(L, ret);
-    return 2;
-}
-
-static int l_nimble_send_msg(lua_State *L) {
-    int conn_id = luaL_checkinteger(L, 1);
-    int handle_id = luaL_checkinteger(L, 2);
-    size_t len;
-    const char* data = luaL_checklstring(L, 3, &len);
-    int ret = tls_ble_server_api_send_msg(data, len);
-
-    lua_pushboolean(L, ret == 0 ? 1 : 0);
-    lua_pushinteger(L, ret);
-    return 2;
-}
-
-int
-ble_ibeacon_set_adv_data(void *uuid128, uint16_t major,
-                         uint16_t minor, int8_t measured_power);
-
-static int l_ibeacon_set_adv_data(lua_State *L) {
-    uint8_t buff[16];
-    size_t len = 0;
-    const char* data = luaL_checklstring(L, 1, &len);
-    memset(buff, 0, 16);
-    memcpy(buff, data, len > 16 ? 16 : len);
-    uint16_t major = luaL_optinteger(L, 2, 2);
-    uint16_t minor = luaL_optinteger(L, 3, 10);
-    int8_t measured_power = luaL_optinteger(L, 4, 0);
-
-    int ret = ble_ibeacon_set_adv_data(buff, major, minor, measured_power);
-    lua_pushboolean(L, ret == 0 ? 1 : 0);
-    lua_pushinteger(L, ret);
-    return 2;
-}
-
-static int l_gap_adv_start(lua_State *L) {
-    return 0;
-}
-
-static int l_gap_adv_stop(lua_State *L) {
-    return 0;
-}
-
-#include "rotable.h"
-static const rotable_Reg reg_nimble[] =
-{
-	{ "init",           l_nimble_init,      0},
-    { "deinit",         l_nimble_deinit,      0},
-    { "debug",          l_nimble_debug,     0},
-    { "server_init",    l_nimble_server_init,      0},
-    { "server_deinit",  l_nimble_server_deinit,     0},
-    { "gap_adv",        l_nimble_gap_adv,      0},
-    { "send_msg",       l_nimble_send_msg,     0},
-
-    // for ibeacon
-    { "ibeacon_set_adv_data", l_ibeacon_set_adv_data, 0},
-    // { "gap_adv_start", l_gap_adv_start, 0},
-    // { "gap_adv_stop", l_gap_adv_stop, 0},
-	{ NULL,             NULL ,              0}
-};
-
-LUAMOD_API int luaopen_nimble( lua_State *L ) {
-    luat_newlib(L, reg_nimble);
-    return 1;
-}
-

app/port/luat_nimble.c

@@ -1,261 +0,0 @@
-#include "luat_base.h"
-#include "luat_nimble.h"
-#include "luat_msgbus.h"
-
-#include <string.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <assert.h>
-
-#include "wm_bt_config.h"
-#include "wm_regs.h"
-
-#include "wm_bt.h"
-#include "wm_bt_util.h"
-#include "host/ble_hs.h"
-#include "host/util/util.h"
-#include "nimble/nimble_port.h"
-#include "transport/uart/ble_hci_uart.h"
-#include "nimble/tls_nimble.h"
-
-#include "wm_ble_gap.h"
-#include "wm_ble_uart_if.h"
-
-#define LUAT_LOG_TAG "ble"
-#include "luat_log.h"
-
-int tls_ble_server_api_init(tls_ble_output_func_ptr output_func_ptr);
-int tls_ble_server_api_deinit();
-uint32_t tls_ble_server_api_get_mtu();
-int tls_ble_server_api_send_msg(uint8_t *data, int data_len);
-
-
-static bool ble_system_state_on = false;
-extern volatile tls_bt_state_t bt_adapter_state;
-
-extern tls_bt_log_level_t tls_appl_trace_level;
-
-int tls_bt_util_init(void);
-
-int luat_nimble_trace_level(int level) {
-    if (level >= 0 && level <= 6) {
-        tls_appl_trace_level = (tls_bt_log_level_t)level;
-    }
-    return tls_appl_trace_level;
-}
-
-static void xxx_ble_income(uint8_t *p_data, uint32_t length) {
-    printf("ble income len=%d ", length);
-    for (size_t i = 0; i < length; i++)
-    {
-        printf("%02X ", p_data[i]);
-    }
-    printf("\n");
-}
-
-static int luat_ble_state_changed_handler(lua_State* L, void* ptr) {
-    rtos_msg_t* msg = (rtos_msg_t*)lua_topointer(L, -1);
-    lua_getglobal(L, "sys_pub");
-    if (lua_isfunction(L, -1)) {
-        lua_pushstring(L, "BLE_STATE_INC");
-        lua_pushinteger(L, msg->arg1);
-        lua_call(L, 2, 0);
-    }
-    return 0;
-}
-
-void test_server_api_init() {
-    tls_ble_server_api_init(xxx_ble_income);
-}
-
-void test_server_api_deinit() {
-    tls_ble_server_api_deinit();
-}
-
-static void app_adapter_state_changed_callback(tls_bt_state_t status)
-{
-	LLOGD("adapter status = %s\r\n", status==WM_BT_STATE_ON?"bt_state_on":"bt_state_off");
-
-    bt_adapter_state = status;
-
-    rtos_msg_t msg = {0};
-    msg.handler = luat_ble_state_changed_handler;
-    msg.arg1 = status;
-    luat_msgbus_put(&msg, 0);
-
-
-	// #if (TLS_CONFIG_BLE == CFG_ON)
-
-    // if(status == WM_BT_STATE_ON)
-    // {
-    // 	TLS_BT_APPL_TRACE_VERBOSE("init base application\r\n");
-
-	// 	//at here , user run their own applications;
-    //     #if 1
-    //     //tls_ble_wifi_cfg_init();
-    //     tls_ble_server_demo_api_init(xxx_ble_income);
-    //     //tls_ble_client_demo_api_init(NULL);
-    //     //tls_ble_server_demo_hid_init();
-    //     //tls_ble_server_hid_uart_init();
-    //     //tls_ble_client_multi_conn_demo_api_init();
-    //     #endif
-
-    // }else
-    // {
-    //     TLS_BT_APPL_TRACE_VERBOSE("deinit base application\r\n");
-
-    //     //here, user may free their application;
-    //     #if 1
-    //     // tls_ble_wifi_cfg_deinit(2);
-    //     tls_ble_server_demo_api_deinit();
-    //     // tls_ble_client_demo_api_deinit();
-    //     // tls_ble_client_multi_conn_demo_api_deinit();
-    //     #endif
-    // }
-
-    // #endif
-
-}
-
-
-static void
-on_sync(void)
-{
-    //int rc;
-    /* Make sure we have proper identity address set (public preferred) */
-    //rc = ble_hs_util_ensure_addr(1);
-    //assert(rc == 0);
-
-    app_adapter_state_changed_callback(WM_BT_STATE_ON);
-}
-static void
-on_reset(int reason)
-{
-    TLS_BT_APPL_TRACE_DEBUG("Resetting state; reason=%d\r\n", reason);
-    app_adapter_state_changed_callback(WM_BT_STATE_OFF);
-}
-static void
-on_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg)
-{
-
-    char buf[BLE_UUID_STR_LEN];
-
-    switch (ctxt->op) {
-        case BLE_GATT_REGISTER_OP_SVC:
-            TLS_BT_APPL_TRACE_DEBUG("service,uuid16 %s handle=%d (%04X)\r\n",ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf),ctxt->svc.handle, ctxt->svc.handle);
-            break;
-
-        case BLE_GATT_REGISTER_OP_CHR:
-            TLS_BT_APPL_TRACE_DEBUG("charact,uuid16 %s arg %d def_handle=%d (%04X) val_handle=%d (%04X)\r\n",
-                ble_uuid_to_str(ctxt->chr.chr_def->uuid, buf),
-                (int)ctxt->chr.chr_def->arg,
-                ctxt->chr.def_handle, ctxt->chr.def_handle,
-                ctxt->chr.val_handle, ctxt->chr.val_handle);
-            break;
-
-        case BLE_GATT_REGISTER_OP_DSC:
-            TLS_BT_APPL_TRACE_DEBUG("descrip, uuid16 %s arg %d handle=%d (%04X)\r\n",
-                ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf),
-                (int)ctxt->dsc.dsc_def->arg,
-                ctxt->dsc.handle, ctxt->dsc.handle);
-            break;
-    }
-
-    return;
-
-}
-
-
-int
-luat_nimble_init(uint8_t uart_idx, char* name)
-{
-    if(ble_system_state_on)
-    {
-        return BLE_HS_EALREADY;
-    }
-    tls_reg_write32(HR_CLK_BBP_CLT_CTRL, 0x7F);
-
-    memset(&ble_hs_cfg, 0, sizeof(ble_hs_cfg));
-
-    /** Security manager settings. */
-    ble_hs_cfg.sm_io_cap = MYNEWT_VAL(BLE_SM_IO_CAP),
-    ble_hs_cfg.sm_oob_data_flag = MYNEWT_VAL(BLE_SM_OOB_DATA_FLAG),
-    ble_hs_cfg.sm_bonding = MYNEWT_VAL(BLE_SM_BONDING),
-    ble_hs_cfg.sm_mitm = MYNEWT_VAL(BLE_SM_MITM),
-    ble_hs_cfg.sm_sc = MYNEWT_VAL(BLE_SM_SC),
-    ble_hs_cfg.sm_keypress = MYNEWT_VAL(BLE_SM_KEYPRESS),
-    ble_hs_cfg.sm_our_key_dist = MYNEWT_VAL(BLE_SM_OUR_KEY_DIST),
-    ble_hs_cfg.sm_their_key_dist = MYNEWT_VAL(BLE_SM_THEIR_KEY_DIST),
-
-    ble_hs_cfg.sync_cb = on_sync;
-    ble_hs_cfg.reset_cb = on_reset;
-    ble_hs_cfg.shutdown_cb = on_reset; /*same callback as on_reset */
-    ble_hs_cfg.gatts_register_cb = on_svr_register_cb;
-    ble_hs_cfg.store_status_cb = ble_store_util_status_rr;
-
-    /* Initialize all packages. */
-    nimble_port_init();
-
-
-
-    /*Application levels code entry*/
-    tls_ble_gap_init(name);
-    tls_bt_util_init();
-
-    /*Initialize the vuart interface and enable controller*/
-    ble_hci_vuart_init(uart_idx);
-
-    /* As the last thing, process events from default event queue. */
-    tls_nimble_start();
-
-    ble_system_state_on = true;
-
-    return 0;
-}
-
-
-int
-luat_nimble_deinit(void)
-{
-    int rc = 0;
-
-    if(!ble_system_state_on)
-    {
-        return BLE_HS_EALREADY;
-    }
-    /*Stop hs system*/
-    rc = nimble_port_stop();
-    assert(rc == 0);
-
-    /*Stop controller and free vuart resource */
-    rc = ble_hci_vuart_deinit();
-    assert(rc == 0);
-
-    /*Free hs system resource*/
-    nimble_port_deinit();
-
-    /*Free task stack ptr and free hs task*/
-    tls_nimble_stop();
-
-    /*Application levels resource cleanup*/
-    tls_ble_gap_deinit();
-    tls_bt_util_deinit();
-
-    ble_system_state_on = false;
-
-    return rc;
-}
-
-
-//----------------------------------------
-// 设置广播数据
-int luat_nimble_gap_adv_set_fields() {
-    return -1;
-}
-//----------------------------------------
-
-
-// 发送数据
-int luat_nimble_server_send(int id, char* data, size_t len) {
-    return tls_ble_server_api_send_msg((u8*)data, len);
-}

app/port/luat_nimble.h

@@ -1,18 +0,0 @@
-
-#ifndef LUAT_NUMBLE_H
-#define LUAT_NUMBLE_H
-#include "luat_base.h"
-#include "luat_msgbus.h"
-
-int luat_nimble_trace_level(int level);
-
-int luat_nimble_init(uint8_t uart_idx, char* name);
-int luat_nimble_deinit();
-
-void test_server_api_init();
-void test_server_api_deinit();
-
-int luat_nimble_server_send(int id, char* data, size_t len);
-
-#endif
-

app/port/luat_nimble_air101.c

@@ -0,0 +1,58 @@
+#include "luat_base.h"
+#include "luat_msgbus.h"
+#include "luat_nimble.h"
+
+#include "wm_bt_config.h"
+#include "wm_regs.h"
+
+#include "wm_bt.h"
+#include "wm_bt_util.h"
+#include "host/ble_hs.h"
+#include "host/util/util.h"
+#include "nimble/nimble_port.h"
+#include "transport/uart/ble_hci_uart.h"
+#include "nimble/tls_nimble.h"
+
+#include "wm_ble_gap.h"
+#include "wm_ble_uart_if.h"
+
+#include "syscfg/syscfg.h"
+
+#define LUAT_LOG_TAG "nimble"
+#include "luat_log.h"
+
+int luat_nimble_deinit() {
+    LLOGE("deinit not support yet");
+    return -1;
+}
+
+int luat_nimble_trace_level(int level) {
+    return 0;
+}
+
+int luat_nimble_init_server(uint8_t uart_idx, char* name, int mode);
+
+int luat_nimble_init(uint8_t uart_idx, char* name, int mode) {
+
+    int ret = 0;
+    tls_reg_write32(HR_CLK_BBP_CLT_CTRL, 0x7F);
+
+    ble_hs_cfg.sm_io_cap = MYNEWT_VAL(BLE_SM_IO_CAP),
+    ble_hs_cfg.sm_oob_data_flag = MYNEWT_VAL(BLE_SM_OOB_DATA_FLAG),
+    ble_hs_cfg.sm_bonding = MYNEWT_VAL(BLE_SM_BONDING),
+    ble_hs_cfg.sm_mitm = MYNEWT_VAL(BLE_SM_MITM),
+    ble_hs_cfg.sm_sc = MYNEWT_VAL(BLE_SM_SC),
+    ble_hs_cfg.sm_keypress = MYNEWT_VAL(BLE_SM_KEYPRESS),
+    ble_hs_cfg.sm_our_key_dist = MYNEWT_VAL(BLE_SM_OUR_KEY_DIST),
+    ble_hs_cfg.sm_their_key_dist = MYNEWT_VAL(BLE_SM_THEIR_KEY_DIST);
+
+    ret = luat_nimble_init_server(uart_idx, name, mode);
+    if (ret == 0) {
+        /*Initialize the vuart interface and enable controller*/
+        ble_hci_vuart_init(0xFF);
+
+        /* As the last thing, process events from default event queue. */
+        tls_nimble_start();
+    }
+    return 0;
+}

xmake.lua

@@ -413,8 +413,15 @@ target("air10x")
     add_files(luatos.."components/mempool/tlsf3/*.c")
     
     add_includedirs(luatos.."components/serialization/protobuf")
+    add_includedirs("src/bt/blehost/nimble/host/services/gap/include")
+    add_includedirs("src/bt/blehost/nimble/host/services/gatt/include")
     add_files(luatos.."components/serialization/protobuf/*.c")
 
+    
+    
+    add_includedirs(luatos.."components/nimble/inc")
+    add_files(luatos.."components/nimble/src/*.c")
+
 	after_build(function(target)
         sdk_dir = target:toolchains()[1]:sdkdir().."/"
         os.exec(sdk_dir .. "bin/csky-elfabiv2-objcopy -O binary $(buildir)/out/"..TARGET_NAME..".elf $(buildir)/out/"..TARGET_NAME..".bin")