Ver código fonte

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

alienwalker 6 meses atrás
pai
commit
76ae88f4fa

+ 1 - 1
module/Air8000/demo/ble/peripheral/ble_server_main.lua

@@ -45,7 +45,7 @@ local att_db = {
         ble.NOTIFY | ble.READ | ble.WRITE
     }, { -- Characteristic 2 (Write)
         string.fromHex(config.char_uuid2),
-        ble.WRITE
+        ble.WRITE | ble.WRITE_CMD -- ble.WRITE_CMD表示支持Write Without Response写入
     }, { -- Characteristic 3 (Read)
         string.fromHex(config.char_uuid3),
         ble.READ

+ 3 - 3
module/Air8000/project/整机开发板出厂工程/user/talk.lua

@@ -210,9 +210,9 @@ local function analyze_v1(cmd, topic, obj)
     if cmd == "8002" then
         if obj and obj["result"] == SUCC then   --收到设备列表更新应答,才能认为相关网络服务准备好了
             g_dev_list = obj["dev_list"]
-            -- for i=1,#g_dev_list do
-            --     log.info(g_dev_list[i]["id"],g_dev_list[i]["name"])
-            -- end
+            for i=1,#g_dev_list do
+                log.info(g_dev_list[i]["id"],g_dev_list[i]["name"])
+            end
             g_state = SP_T_IDLE
             sys.sendMsg(AIRTALK_TASK_NAME, MSG_AUTH_IND, true)  --完整登录流程结束
         else

+ 1 - 1
module/Air8101/demo/ble/peripheral/ble_server_main.lua

@@ -45,7 +45,7 @@ local att_db = {
         ble.NOTIFY | ble.READ | ble.WRITE
     }, { -- Characteristic 2 (Write)
         string.fromHex(config.char_uuid2),
-        ble.WRITE
+        ble.WRITE | ble.WRITE_CMD -- ble.WRITE_CMD表示支持Write Without Response写入
     }, { -- Characteristic 3 (Read)
         string.fromHex(config.char_uuid3),
         ble.READ