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

components/network/adapter/luat_lib_socket.c

@@ -174,9 +174,8 @@ static int l_socket_gc(lua_State *L)
 param1为申请的network_ctrl
 param2为具体的消息，只能是socket.RESET, socket.LINK, socket.ON_LINE, socket.TX_OK, socket.RX_NEW, socket.CLOSE等等
 param3为消息对应的参数
-@return some 成功返回network_ctrl，失败返回nil
-@usage
-local netc = socket.create(socket.ETH0, socket_cb_fun)	--以太网网卡上申请一个network_ctrl,通过socket_cb_fun回调相关消息
+@return userdata 成功返回network_ctrl，失败返回nil
+@usage local netc = socket.create(socket.ETH0, socket_cb_fun)	--以太网网卡上申请一个network_ctrl,通过socket_cb_fun回调相关消息
 local netc = socket.create(socket.ETH0, "IOT_TASK")	--以太网网卡上申请一个network_ctrl,通过sendMsg方式通知taskName为"IOT_TASK"回调相关消息
 
 */

demo/libgnss/main.lua

@@ -11,34 +11,21 @@ local sys = require("sys")
 require("sysplus")
 
 local gps_uart_id = 2
--- uart.on(gps_uart_id, "recv", function(id, len)
---     while 1 do
---         local data = uart.read(id, 1024)
---         if data and #data > 0 then
---             log.info("GPS", data)
---         else
---             break
---         end
---     end
--- end)
-libgnss.clear()
+libgnss.clear() -- 清空数据,兼初始化
 
 sys.taskInit(function()
     -- Air780EG工程样品的GPS的默认波特率是9600, 量产版是115200,以下是临时代码
-    if rtos.bsp():startsWith("EC618") then
-        uart.setup(gps_uart_id, 9600)
-        log.info("GPS", "start")
-        pm.power(pm.GPS, true)
-        pm.power(pm.GPS_ANT, true)
-        sys.wait(100)
-        uart.write(gps_uart_id, "$CFGPRT,,h0,115200,,\r\n")
-        sys.wait(50)
-    end
-    -- 下列是正式代码
+    log.info("GPS", "start")
+    pm.power(pm.GPS, true)
     uart.setup(gps_uart_id, 115200)
-    libgnss.bind(gps_uart_id)
-    -- 调试日志
+    libgnss.bind(gps_uart_id) -- 绑定uart,底层自动处理GNSS数据
+    sys.wait(200) -- GPNSS芯片启动需要时间
+    -- 调试日志,可选
     libgnss.debug(true)
+    -- 增加显示的语句
+    uart.write(gps_uart_id, "$CFGMSG,0,1,1\r\n") -- GLL
+    sys.wait(10)
+    uart.write(gps_uart_id, "$CFGMSG,0,5,1\r\n") -- VTG
     -- 定位成功后,使用GNSS时间设置RTC, 暂不可用
     -- libgnss.rtcAuto(true)
     -- 读取之前的位置信息
@@ -49,33 +36,40 @@ sys.taskInit(function()
     end
     sys.wait(100)
     if http then
-        while 1 do
-            local code, headers, body = http.request("GET", "http://download.openluat.com/9501-xingli/HXXT_GPS_BDS_AGNSS_DATA.dat").wait()
-            log.info("gnss", "AGNSS", code, body and #body or 0)
-            if code == 200 and body and #body > 1024 then
-                for offset=1,#body,1024 do
-                    log.info("gnss", "AGNSS", "write >>>")
-                    uart.write(gps_uart_id, body:sub(offset, 1024))
-                    sys.wait(20)
-                end 
-                break
-            end
-            sys.wait(60*1000)
-        end
+        -- TODO AGNSS 未调通
+        -- while 1 do
+        --     local code, headers, body = http.request("GET", "http://download.openluat.com/9501-xingli/HXXT_GPS_BDS_AGNSS_DATA.dat").wait()
+        --     -- local code, headers, body = http.request("GET", "http://nutzam.com/6228.bin").wait()
+        --     log.info("gnss", "AGNSS", code, body and #body or 0)
+        --     if code == 200 and body and #body > 1024 then
+        --         for offset=1,#body,1024 do
+        --             log.info("gnss", "AGNSS", "write >>>")
+        --             uart.write(gps_uart_id, body:sub(offset, 1024))
+        --             sys.wait(5)
+        --         end
+        --         io.writeFile("/6228.bin", body)
+        --         break
+        --     end
+        --     sys.wait(60*1000)
+        -- end
     end
 end)
 
 sys.timerLoopStart(function()
     -- 6228CI, 查询产品信息, 可选
     -- uart.write(gps_uart_id, "$PDTINFO,*62\r\n")
-    uart.write(gps_uart_id, "$AIDINFO\r\n")
+    -- uart.write(gps_uart_id, "$AIDINFO\r\n")
+    -- uart.write(gps_uart_id, "$CFGSYS\r\n")
+    -- uart.write(gps_uart_id, "$CFGMSG,6,4\r\n")
     log.info("RMC", json.encode(libgnss.getRmc(2) or {}))
-    log.info("GGA", json.encode(libgnss.getGga(2) or {}))
-    log.info("GLL", json.encode(libgnss.getGll(2) or {}))
-    log.info("GSA", json.encode(libgnss.getGsa(2) or {}))
-    log.info("GSV", json.encode(libgnss.getGsv(2) or {}))
-    log.info("VTG", json.encode(libgnss.getVtg(2) or {}))
-    log.info("date", os.date())
+    -- log.info("GGA", json.encode(libgnss.getGga(2) or {}))
+    -- log.info("GLL", json.encode(libgnss.getGll(2) or {}))
+    -- log.info("GSA", json.encode(libgnss.getGsa(2) or {}))
+    -- log.info("GSV", json.encode(libgnss.getGsv(2) or {}))
+    -- log.info("VTG", json.encode(libgnss.getVtg(2) or {}))
+    -- log.info("date", os.date())
+    log.info("sys", rtos.meminfo("sys"))
+    log.info("lua", rtos.meminfo("lua"))
 end, 5000)
 
 -- 订阅GNSS状态编码
@@ -105,82 +99,54 @@ sys.subscribe("NTP_UPDATE", function()
     end
 end)
 
--- NTP任务
--- 实现ntp校准时间
--- 通过回调的方式进行演示
-local function netCB(netc, event, param)
-	if event == socket.LINK and param == 0 then
-		sys.publish("NTP_ENABLE_LINK")
-	elseif event == socket.ON_LINE and param == 0 then
-		socket.tx(netc, "\xE3\x00\x06\xEC" .. string.rep("\x00", 44))
-		socket.wait(netc)	-- 这样才会有接收消息的回调
-	elseif event == socket.EVENT and param == 0 then
-		local rbuf = zbuff.create(512)
-		socket.rx(netc, rbuf)
-		if rbuf:used() >= 48 then
-			local tamp = rbuf:query(40,4,true) 
-			if tamp - 0x83aa7e80 > 0 then
-				rtc.set(tamp - 0x83aa7e80)
-			else
-				--2036年后，当前ntp协议会回滚
-				log.info("ntp", "时间戳回滚")
-				rtc.set(0x7C558180 + tamp)
-			end
-			log.info("date", os.date())
-			sys.publish("NTP_UPDATE")
-            sys.publish("NTP_FINISH")
-			rbuf:resize(4)
-		end
-	end
+if socket and socket.sntp then
+    sys.subscribe("IP_READY", function()
+    socket.sntp()
+    end)
 end
 
-local function ntpTask()
-	local server = {
-		"ntp1.aliyun.com",
-		"ntp2.aliyun.com",
-		"ntp3.aliyun.com",
-		"ntp4.aliyun.com",
-		"ntp5.aliyun.com",
-		"ntp6.aliyun.com",
-		"ntp7.aliyun.com",
-		"194.109.22.18",
-		"210.72.145.44",}
-	local msg
-	local netc = socket.create(nil, netCB)
-	socket.debug(netc, true)
-	socket.config(netc, nil, true)	-- 配置成UDP，自动分配本地端口
-	local isError, result = socket.linkup(netc)
-	if isError then
-		log.info("unkown error")
-		return false
-	end
-	if not result then
-		result, msg = sys.waitUntil("NTP_ENABLE_LINK")
-	else
-		log.info("already online")
-	end
-	for k,v in pairs(server) do
-		log.info("尝试", v)
-		isError, result = socket.connect(netc, v, 123)
-		if isError then
-			log.info("unkown error")
-		else
-			result, msg = sys.waitUntil("NTP_FINISH", 5000)
-			if result then
-				log.info("ntp", "完成")
-				socket.close(netc)
-				socket.release(netc)
-				return
-			end
-		end
-		socket.close(netc)
-	end
-	log.info("ntp 失败")
-	socket.release(netc)
-	return
-end
+-- 定期重启GPS, 测试AGNSS
+-- sys.taskInit(function()
+--     while 1 do
+--         sys.wait(120 * 1000)
+--         log.info("GPS", "stop")
+--         pm.power(pm.GPS, false)
+--         pm.power(pm.GPS_ANT, false)
+--         sys.wait(500)
+--         log.info("GPS", "start")
+--         pm.power(pm.GPS, true)
+--         pm.power(pm.GPS_ANT, true)
+--         sys.wait(300) -- 输出产品日志大概是150ms左右,这里延时一下
+--         -- 写入时间
+--         local date = os.date("!*t")
+--         if date["year"] > 2021 then
+--             local str = string.format("$AIDTIME,%d,%d,%d,%d,%d,%d,000", 
+--                              date["year"], date["month"], date["day"], date["hour"], date["min"], date["sec"])
+--             log.info("gnss", str)
+--             uart.write(gps_uart_id, str .. "\r\n")
+--         end
+--         -- 读取并写入辅助坐标
+--         local gnssloc = io.readFile("/gnssloc")
+--         if gnssloc then
+--             uart.write(gps_uart_id, "$AIDPOS," .. gnssloc .. "\r\n")
+--             gnssloc = nil
+--         end
+--         -- 写入星历
+--         local body = io.readFile("/6228.bin")
+--         if body then
+--             for offset=1,#body,1024 do
+--                 log.info("gnss", "AGNSS", "write >>>")
+--                 uart.write(gps_uart_id, body:sub(offset, 1024))
+--                 sys.wait(5)
+--             end
+--         end
+--         log.info("AGNSS", "write complete")
+--         -- 查询一下辅助定位成功没
+--         sys.wait(300)
+--         uart.write(gps_uart_id, "$AIDINFO\r\n")
+--     end
 
-sys.taskInit(ntpTask)
+-- end)
 
 -- 用户代码已结束---------------------------------------------
 -- 结尾总是这一句