|
|
@@ -18,6 +18,11 @@ local function netCB(msg)
|
|
|
log.info("未处理消息", msg[1], msg[2], msg[3], msg[4])
|
|
|
end
|
|
|
|
|
|
+LED = gpio.setup(27, 0)
|
|
|
+GPIO1 = gpio.setup(1, 0)
|
|
|
+GPIO24 = gpio.setup(24, 0)
|
|
|
+HTTP_200_EMTRY = "HTTP/1.0 200 OK\r\nServer: LuatOS\r\nConnection: close\r\nContent-Length: 0\r\n\r\n"
|
|
|
+
|
|
|
-- 演示task
|
|
|
function ipv6test()
|
|
|
-- 仅EC618系列支持, 例如Air780E/Air600E/Air780UG/Air700E
|
|
|
@@ -57,11 +62,11 @@ function ipv6test()
|
|
|
local txqueue = {}
|
|
|
sysplus.taskInitEx(ipv6task, taskName, netCB, taskName, txqueue, topic)
|
|
|
while 1 do
|
|
|
- local result, tp, data = sys.waitUntil(topic, 30000)
|
|
|
+ local result, tp, data = sys.waitUntil(topic, 60000)
|
|
|
if not result then
|
|
|
-- 等很久了,没数据上传/下发, 发个日期心跳包吧
|
|
|
- table.insert(txqueue, string.char(0))
|
|
|
- sys_send(taskName, socket.EVENT, 0)
|
|
|
+ --table.insert(txqueue, string.char(0))
|
|
|
+ --sys_send(taskName, socket.EVENT, 0)
|
|
|
elseif tp == "uplink" then
|
|
|
-- 上行数据, 主动上报的数据,那就发送呀
|
|
|
table.insert(txqueue, data)
|
|
|
@@ -69,7 +74,55 @@ function ipv6test()
|
|
|
elseif tp == "downlink" then
|
|
|
-- 下行数据,接收的数据, 从ipv6task来的
|
|
|
-- 其他代码可以通过 sys.publish()
|
|
|
- log.info("socket", "收到下发的数据了", #data)
|
|
|
+ log.info("socket", "收到下发的数据了", #data, data)
|
|
|
+ -- 下面是模拟一个http服务, 因为httpsrv库还没好,先用着吧
|
|
|
+ if data:startsWith("GET / ") then
|
|
|
+ local httpresp = "HTTP/1.0 200 OK\r\n"
|
|
|
+ httpresp = httpresp .. "Server: LuatOS\r\nContent-Type: text/html\r\nConnection: close\r\n"
|
|
|
+ local fdata = io.readFile("/luadb/index.html")
|
|
|
+ httpresp = httpresp .. string.format("Content-Length: %d\r\n\r\n", #fdata)
|
|
|
+ httpresp = httpresp .. fdata
|
|
|
+ table.insert(txqueue, httpresp)
|
|
|
+ table.insert(txqueue, "close")
|
|
|
+ sys_send(taskName, socket.EVENT, 0)
|
|
|
+ elseif data:startsWith("GET /led/") then
|
|
|
+ if data:startsWith("GET /led/1") then
|
|
|
+ log.info("led", "亮起")
|
|
|
+ LED(1)
|
|
|
+ else
|
|
|
+ log.info("led", "熄灭")
|
|
|
+ LED(0)
|
|
|
+ end
|
|
|
+ table.insert(txqueue, HTTP_200_EMTRY)
|
|
|
+ table.insert(txqueue, "close")
|
|
|
+ sys_send(taskName, socket.EVENT, 0)
|
|
|
+ elseif data:startsWith("GET /gpio24/") then
|
|
|
+ if data:startsWith("GET /gpio24/1") then
|
|
|
+ log.info("gpio24", "亮起")
|
|
|
+ GPIO24(1)
|
|
|
+ else
|
|
|
+ log.info("gpio24", "熄灭")
|
|
|
+ GPIO24(0)
|
|
|
+ end
|
|
|
+ table.insert(txqueue, HTTP_200_EMTRY)
|
|
|
+ table.insert(txqueue, "close")
|
|
|
+ sys_send(taskName, socket.EVENT, 0)
|
|
|
+ elseif data:startsWith("GET /gpio1/") then
|
|
|
+ if data:startsWith("GET /gpio1/1") then
|
|
|
+ log.info("gpio1", "亮起")
|
|
|
+ GPIO1(1)
|
|
|
+ else
|
|
|
+ log.info("gpio1", "熄灭")
|
|
|
+ GPIO1(0)
|
|
|
+ end
|
|
|
+ table.insert(txqueue, HTTP_200_EMTRY)
|
|
|
+ table.insert(txqueue, "close")
|
|
|
+ sys_send(taskName, socket.EVENT, 0)
|
|
|
+ elseif data:startsWith("GET ") or data:startsWith("POST ") or data:startsWith("HEAD ") then
|
|
|
+ table.insert(txqueue, HTTP_200_EMTRY)
|
|
|
+ table.insert(txqueue, "close")
|
|
|
+ sys_send(taskName, socket.EVENT, 0)
|
|
|
+ end
|
|
|
end
|
|
|
end
|
|
|
end
|
|
|
@@ -82,6 +135,7 @@ function ipv6task(d1Name, txqueue, rxtopic)
|
|
|
|
|
|
|
|
|
local rx_buff = zbuff.create(1024)
|
|
|
+ local tx_buff = zbuff.create(4 * 1024)
|
|
|
local netc = socket.create(nil, d1Name)
|
|
|
socket.config(netc, 14000)
|
|
|
log.info("任务id", d1Name)
|
|
|
@@ -102,11 +156,11 @@ function ipv6task(d1Name, txqueue, rxtopic)
|
|
|
-- log.info("socket", "调用rx接收数据")
|
|
|
local succ, param = socket.rx(netc, rx_buff)
|
|
|
if not succ then
|
|
|
- log.info("服务器断开了", succ, param, ip, port)
|
|
|
+ log.info("客户端断开了", succ, param, ip, port)
|
|
|
break
|
|
|
end
|
|
|
if rx_buff:used() > 0 then
|
|
|
- log.info("socket", "收到服务器数据，长度", rx_buff:used())
|
|
|
+ log.info("socket", "收到客户端数据，长度", rx_buff:used())
|
|
|
local data = rx_buff:query() -- 获取数据
|
|
|
sys.publish(rxtopic, "downlink", data)
|
|
|
rx_buff:del()
|
|
|
@@ -116,26 +170,39 @@ function ipv6task(d1Name, txqueue, rxtopic)
|
|
|
log.info("libnet", "wait", result, param, param2)
|
|
|
if not result then
|
|
|
-- 网络异常了
|
|
|
- log.info("socket", "服务器断开了", result, param)
|
|
|
+ log.info("socket", "客户端断开了", result, param)
|
|
|
break
|
|
|
elseif #txqueue > 0 then
|
|
|
+ local force_close = false
|
|
|
while #txqueue > 0 do
|
|
|
local data = table.remove(txqueue, 1)
|
|
|
if not data then
|
|
|
break
|
|
|
end
|
|
|
- result,param = libnet.tx(d1Name, 15000, netc,data)
|
|
|
+ log.info("socket", "上行数据长度", #data)
|
|
|
+ if data == "close" then
|
|
|
+ --sys.wait(1000)
|
|
|
+ force_close = true
|
|
|
+ break
|
|
|
+ end
|
|
|
+ tx_buff:del()
|
|
|
+ tx_buff:copy(nil, data)
|
|
|
+ result,param = libnet.tx(d1Name, 15000, netc, tx_buff)
|
|
|
log.info("libnet", "发送数据的结果", result, param)
|
|
|
if not result then
|
|
|
log.info("socket", "数据发送异常", result, param)
|
|
|
break
|
|
|
end
|
|
|
end
|
|
|
+ if force_close then
|
|
|
+ break
|
|
|
+ end
|
|
|
end
|
|
|
end
|
|
|
+ log.info("socket", "连接已断开,继续下一个循环")
|
|
|
libnet.close(d1Name, 5000, netc)
|
|
|
-- log.info(rtos.meminfo("sys"))
|
|
|
- sys.wait(5000)
|
|
|
+ sys.wait(50)
|
|
|
end
|
|
|
end
|
|
|
|
Wendal Chen