Explorar el Código

fix:修改Air8000 的配网demo,修改如下问题:
1. 去掉LWIP_GP 相关处理逻辑,配网和4G 无关
2. 判断是否配网成功错误
3. 打印wifi sta 链接成功判断条件错误,配网需要sta 的 IP_READY 成功才算完成

梁健 hace 10 meses
padre
commit
9380892832

+ 9 - 12
module/Air8000/demo/wlan/SoftAP/main.lua

@@ -9,23 +9,16 @@ dnsproxy = require("dnsproxy")
 dhcpsrv = require("dhcpsrv")
 httpplus = require("httpplus")
 
--- 初始化LED灯, 这里演示控制Air8000核心板蓝灯,其他开发板请查看硬件原理图自行修改
+-- 初始化LED灯, 这里演示控制Air8000核心板蓝灯,其他开发板请查看硬件原理图自行修改(如果使用整机开发板可以用GPIO146)
 local LEDA = gpio.setup(20, 0, gpio.PULLUP)
 
+
 function create_ap()
     log.info("执行AP创建操作", "luatos8888")
     wlan.createAP("luatos8888", "12345678")
     sys.wait(1000)
     netdrv.ipv4(socket.LWIP_AP, "192.168.4.1", "255.255.255.0", "0.0.0.0")
-    dnsproxy.setup(socket.LWIP_AP, socket.LWIP_GP)
     dhcpsrv.create({adapter=socket.LWIP_AP})
-    while 1 do
-        if netdrv.ready(socket.LWIP_GP) then
-            netdrv.napt(socket.LWIP_GP)
-            break
-        end
-        sys.wait(1000)
-    end
 end
 
 function wifi_networking()
@@ -57,7 +50,8 @@ function handle_http_request(fd, method, uri, headers, body)
         end
         return 400, {}, "ok"
     elseif uri == "/connok" then
-        return 200, {["Content-Type"]="application/json"}, json.encode({ip=socket.localIP()})
+        log.info("connok", json.encode({ip=socket.localIP(2)}))
+        return 200, {["Content-Type"]="application/json"}, json.encode({ip=socket.localIP(2)})
     end
     return 404, {}, "Not Found" .. uri
 end
@@ -74,8 +68,11 @@ function scan_done_handle()
     log.info("scan", "aplist", json.encode(_G.scan_result))
 end
 
-function ip_ready_handle()
-    log.info("wlan", "已联网", "通知服务器")
+function ip_ready_handle(ip, adapter)
+    log.info("ip_ready_handle",ip, adapter)
+    if adapter == 2 then
+        log.info("wifi sta 链接成功")
+    end
 end
 
 function test_scan()

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

@@ -295,7 +295,7 @@ local function draw()
   elseif cur_fun == "selftest" then
     draw_selftest()
   elseif cur_fun == "modbusTCP" then
-    draw_modbusTCP()
+    draw_modbusTCP()xx
   elseif cur_fun == "modbusRTU" then
     draw_modbusRTU()
   elseif cur_fun == "CAN" then