Release:5.20灰测

4G/code/core/cmd.lua

@@ -4,6 +4,7 @@
 local log = require "log"
 local sys = require "sys"
 local uart = require "uart"
+local ril = require "ril"
 local linksocket = require "linksocket"
 
 local uartID = 1
@@ -18,14 +19,27 @@ local function toHexcode(str)
     return hex
 end
 
+-- 发送通用响应帧：55 AA mainCmd subCmd [payload] AA 55
+local function sendCmdResponse(mainCmd, subCmd, payload)
+    local frame = string.char(0x55, 0xAA, mainCmd, subCmd)
+    if payload and #payload > 0 then
+        frame = frame .. payload
+    end
+    frame = frame .. string.char(0xAA, 0x55)
+    uart.write(uartID, frame)
+    log.debug("sendCmdResponse: mainCmd=", string.format("0x%02X", mainCmd),
+              "subCmd=", string.format("0x%02X", subCmd))
+end
+
 -- 发送通用响应帧：55 AA 83 subCmd socketId status AA 55
 local function sendResponse(subCmd, socketId, status)
-    local frame = string.char(0x55, 0xAA, 0x83, subCmd, socketId, status, 0xAA, 0x55)
-    uart.write(uartID, frame)
+    sendCmdResponse(0x83, subCmd, string.char(socketId, status or 0))
     log.debug("Response: subCmd=", subCmd, "socketId=", socketId, "status=", status)
 end
 
--- 命令处理函数
+-- 命令处理函数 ---------------------------------------------------------------
+
+-- 0x01: 数据发送到指定Socket
 local function handleCmd01(subCmd, payload)
     local socketId = subCmd
     if socketId < 1 or socketId > 6 then
@@ -42,69 +56,183 @@ local function handleCmd01(subCmd, payload)
     end
 end
 
+-- 0x02: 系统重启
 local function handleCmd02()
     log.info("System restart command received")
     sys.restart()
 end
 
+-- 0x03: Socket连接/断开控制
+-- subCmd: 0x01=连接 0x02=断开
+-- payload: socket_id (1字节)
 local function handleCmd03(subCmd, payload)
-    if #payload < 1 then
-        log.error("Cmd 0x03 missing socket id")
-        return
-    end
+    if #payload < 1 then return end
     local socketId = payload:byte(1)
     if socketId < 1 or socketId > 6 then
-        log.error("Invalid socket id in cmd 0x03:", socketId)
-        sendResponse(subCmd, socketId, 1)
+        log.error("Cmd 0x03 invalid socket:", socketId)
         return
     end
 
     if subCmd == 0x01 then
-        local ok = linksocket.setKeepConnecting(socketId, true)
-        if ok then
-            sendResponse(subCmd, socketId, 3)
-        else
-            sendResponse(subCmd, socketId, 1)
-        end
+        log.info("STM32 request connect socket", socketId)
+        linksocket.connectSocket(socketId)
     elseif subCmd == 0x02 then
-        local ok = linksocket.setKeepConnecting(socketId, false)
-        if ok then
-            sendResponse(subCmd, socketId, 0)
-        else
-            sendResponse(subCmd, socketId, 1)
-        end
+        log.info("STM32 request disconnect socket", socketId)
+        linksocket.disconnectSocket(socketId)
     else
         log.error("Unknown subCmd for 0x03:", subCmd)
-        sendResponse(subCmd, socketId, 1)
     end
 end
 
--- 对外接口：处理串口接收到的原始数据
-local function process(rawData)
-    if not rawData or #rawData < 5 then
-        log.warn("Short data received, ignore")
+-- 0x04: 设置服务器地址
+-- payload: ip_len(1) + ip_str(ip_len) + port_hi(1) + port_lo(1)
+local function handleCmd04(subCmd, payload)
+    if #payload < 3 then
+        log.error("Cmd 0x04 payload too short")
+        sendCmdResponse(0x87, 0x00, string.char(1))
+        return
+    end
+    local ip_len = payload:byte(1)
+    if ip_len > 100 or #payload < (2 + ip_len + 1) then
+        log.error("Cmd 0x04 invalid ip_len")
+        sendCmdResponse(0x87, 0x00, string.char(1))
+        return
+    end
+    local ip_str = payload:sub(2, 1 + ip_len)
+    local port_hi = payload:byte(2 + ip_len)
+    local port_lo = payload:byte(3 + ip_len)
+    local port = port_hi * 256 + port_lo
+
+    log.info("Set server address:", ip_str, port)
+
+    local ok = linksocket.setServerAddress(ip_str, port)
+    if ok then
+        sendCmdResponse(0x87, 0x00, string.char(0))
+    else
+        sendCmdResponse(0x87, 0x00, string.char(1))
+    end
+end
+
+-- 0x05: 查询SIM卡信息
+-- subCmd: 0x01=ICCID 0x02=IMSI 0x03=IMEI
+local function handleCmd05(subCmd)
+    local at_cmds = {
+        [0x01] = "AT+ICCID",
+        [0x02] = "AT+CIMI",
+        [0x03] = "AT+CGSN",
+    }
+    local at_cmd = at_cmds[subCmd]
+    if not at_cmd then
+        log.error("Unknown SIM query type:", string.format("0x%02X", subCmd))
         return
     end
 
-    log.info("CMD raw data:", toHexcode(rawData))
+    ril.request(at_cmd, nil, function(cmd, result, respdata, interdata)
+        -- interdata才是实际的AT命令响应数据，result只是布尔值表示成功/失败
+        local response = interdata or ""
+        -- 去除可能的空白字符
+        response = response:gsub("^[\r\n]+", ""):gsub("[\r\n]+$", "")
 
-    if rawData:byte(1) == 0x55 and rawData:byte(2) == 0xAA
-       and rawData:byte(-2) == 0xAA and rawData:byte(-1) == 0x55 then
-        local mainCmd = rawData:byte(3)
-        local subCmd = rawData:byte(4)
-        local payload = rawData:sub(5, -3)
-
-        if mainCmd == 0x01 then
-            handleCmd01(subCmd, payload)
-        elseif mainCmd == 0x02 then
-            handleCmd02()
-        elseif mainCmd == 0x03 then
-            handleCmd03(subCmd, payload)
-        else
-            log.warn("Unknown main command:", mainCmd)
+        local value = ""
+        if subCmd == 0x01 then
+            value = string.match(response, "%+ICCID:%s*(%S+)") or string.match(response, "ICCID:%s*(%S+)") or response:match("^(%S+)") or ""
+        elseif subCmd == 0x02 then
+            value = string.match(response, "%+CIMI:%s*(%S+)") or string.match(response, "CIMI:%s*(%S+)") or response:match("^(%S+)") or ""
+        elseif subCmd == 0x03 then
+            value = string.match(response, "%+CGSN:%s*(%S+)") or string.match(response, "CGSN:%s*(%S+)") or response:match("^(%S+)") or ""
+        end
+
+        value = value or ""
+        log.info("SIM query result type=", string.format("0x%02X", subCmd), "value=", value)
+
+        local data = string.char(#value) .. value
+        sendCmdResponse(0x84, subCmd, data)
+    end)
+end
+
+-- 0x06: 查询信号强度（CSQ）
+local function handleCmd06()
+    ril.request("AT+CSQ", nil, function(cmd, result)
+        local csq = 0
+        local ber = 99
+        -- result可能是布尔值，需要确保是字符串才能进行模式匹配
+        if result and type(result) == "string" then
+            local c, b = string.match(result, "CSQ:%s*(%d+),%s*(%d+)")
+            if c then csq = tonumber(c) or 0 end
+            if b then ber = tonumber(b) or 99 end
+        end
+        log.info("Signal query: CSQ=", csq, "BER=", ber)
+        sendCmdResponse(0x85, 0x01, string.char(csq, ber))
+    end)
+end
+
+-- 0x07: 查询链路状态
+local function handleCmd07()
+    local status = linksocket.getLinkStatus()
+    if status then
+        local payload = ""
+        for i = 1, 6 do
+            payload = payload .. string.char(status[i] and 1 or 0)
+        end
+        sendCmdResponse(0x86, 0x01, payload)
+        log.info("Link status sent, 6 sockets")
+    end
+end
+
+local frameBuffer = ""
+
+-- 对外接口：处理串口接收到的原始数据
+local function process(rawData)
+    if not rawData or #rawData < 1 then
+        return
+    end
+
+    frameBuffer = frameBuffer .. rawData
+
+    while true do
+        if #frameBuffer < 7 then break end
+
+        if frameBuffer:byte(1) == 0x55 and frameBuffer:byte(2) == 0xAA then
+            local tail = frameBuffer:find(string.char(0xAA, 0x55), 5, true)
+            if not tail then break end
+            tail = tail + 1
+
+            local frame = frameBuffer:sub(1, tail)
+            frameBuffer = frameBuffer:sub(tail + 1)
+
+            log.info("CMD raw data:", toHexcode(frame))
+
+            local mainCmd = frame:byte(3)
+            local subCmd = frame:byte(4)
+            local payload = frame:sub(5, -3)
+
+            if mainCmd == 0x01 then
+                 handleCmd01(subCmd, payload)
+            elseif mainCmd == 0x02 then
+                handleCmd02()
+            elseif mainCmd == 0x03 then
+                handleCmd03(subCmd, payload)
+            elseif mainCmd == 0x04 then
+                handleCmd04(subCmd, payload)
+            elseif mainCmd == 0x05 then
+                handleCmd05(subCmd)
+            elseif mainCmd == 0x06 then
+                handleCmd06()
+            elseif mainCmd == 0x07 then
+                handleCmd07()
+            else
+                log.warn("Unknown main command:", string.format("0x%02X", mainCmd))
+            end
+        else
+            local skip = frameBuffer:find(string.char(0x55, 0xAA), 2, true)
+            if skip then
+                log.warn("Skipped", skip - 1, "bytes before frame header")
+                frameBuffer = frameBuffer:sub(skip)
+            else
+                frameBuffer = ""
+                break
+            end
         end
-    else
-        log.warn("Invalid frame header/footer")
     end
 end
 
@@ -112,4 +240,4 @@ end
 local M = {
     process = process,
 }
-return M
+return M

4G/code/core/linksocket.lua

@@ -1,159 +1,263 @@
 -- linksocket.lua
--- 功能：管理多个 TCP Socket 连接，支持手动连接/断开，自动重连，数据收发
+-- 功能：管理多个 TCP Socket
+-- 行为：接收到连接命令后尝试连接一次
+--       连接失败 → 主动上报失败 (0x83 03)
+--       连接成功 → 主动上报成功 (0x83 01)
+--       中途掉线 → 主动上报断开 (0x83 02)，停止，等待新连接命令
 
 local log = require "log"
 local sys = require "sys"
 local socket = require "socket"
--- 服务器配置
-local SERVER_IP = "129.211.170.245"
-local SERVER_PORT = 9002
+local sim = require "sim"
+
+-- 云快充
+-- local server_config = {
+--     ip = "121.43.69.62",
+--     port = 8767
+-- }
+-- 百瑞
+
+local server_config = {
+    ip = "129.211.170.245",
+    port = 9002
+}
+-- 国网
+-- local server_config = {
+--     ip = "121.199.29.175",
+--     port = 1883
+-- }
+
+
 local MAX_CLIENTS = 6
 
--- 客户端状态表
 local clients = {}
-local keepConnecting = {}
+local connectRequested = {}  -- 收到连接命令的标志
+local disconnectRequested = {} -- 收到断开命令的标志
 local recvCallback = nil
 
--- 初始化所有socket槽位
 for i = 1, MAX_CLIENTS do
-    clients[i] = {
-        id = i,
-        socket = nil,
-        connected = false
-    }
-    keepConnecting[i] = false
+    clients[i] = { id = i, socket = nil, connected = false }
+    connectRequested[i] = false
+    disconnectRequested[i] = false
 end
 
--- 发送连接状态响应
-local function sendConnStatus(subCmd, socketId, status)
-    local uart = require "uart"
-    local frame = string.char(0x55, 0xAA, 0x83, subCmd, socketId, status, 0xAA, 0x55)
-    uart.write(1, frame)
-    log.debug("Socket", socketId, "status response, subCmd=", subCmd, "status=", status)
+local uart
+local function getUart()
+    if not uart then uart = require "uart" end
+    return uart
 end
 
--- 设置是否保持连接
-local function setKeepConnecting(id, keep)
-    if id < 1 or id > MAX_CLIENTS then
-        return false
-    end
-    keepConnecting[id] = keep
-    if not keep and clients[id].connected and clients[id].socket then
+-- 发送状态通知到 STM32
+-- subCmd: 0x01=已连接 0x02=已断开 0x03=连接失败
+local function sendStatus(subCmd, socketId, status)
+    local frame = string.char(0x55, 0xAA, 0x83, subCmd, socketId, status or 0, 0xAA, 0x55)
+    getUart().write(1, frame)
+    log.info("Socket", socketId,
+        subCmd == 0x01 and "connected" or
+        subCmd == 0x02 and "disconnected" or "connect_failed",
+        "status=", status or 0)
+end
+
+-- 关闭单个socket
+local function closeSocket(id)
+    if clients[id].socket then
         clients[id].socket:close()
         clients[id].socket = nil
-        clients[id].connected = false
-        sendConnStatus(0x02, id, 0)
+    end
+    clients[id].connected = false
+    connectRequested[id] = false
+    disconnectRequested[id] = false
+end
+
+-- ── 外部接口 ──────────────────────────────────────────
+
+-- STM32 要求连接
+local function connectSocket(id)
+    if id < 1 or id > MAX_CLIENTS then
+        log.error("connectSocket: invalid id", id)
+        return false
+    end
+    if clients[id].connected then
+        log.info("Socket", id, "already connected")
+        sendStatus(0x01, id, 0)
+        return true
+    end
+    connectRequested[id] = true
+    disconnectRequested[id] = false
+    return true
+end
+
+-- STM32 要求断开
+local function disconnectSocket(id)
+    if id < 1 or id > MAX_CLIENTS then
+        log.error("disconnectSocket: invalid id", id)
+        return false
+    end
+    connectRequested[id] = false
+    disconnectRequested[id] = true
+    if clients[id].connected then
+        closeSocket(id)
+        sendStatus(0x02, id, 0)
     end
     return true
 end
 
--- 发送数据到指定socket
+-- 发送数据
 local function sendToSocket(id, data)
-    if id < 1 or id > MAX_CLIENTS then
-        log.error("sendToSocket: invalid id", id)
-        return false
-    end
+    if id < 1 or id > MAX_CLIENTS then return false end
     if clients[id].connected and clients[id].socket then
         clients[id].socket:asyncSend(data)
-        log.info("Send to socket", id, "len=", #data)
         return true
-    else
-        log.warn("Socket", id, "not connected, cannot send")
-        return false
     end
+    return false
 end
 
--- 注册数据接收回调
 local function setRecvCallback(cb)
     recvCallback = cb
 end
 
--- 为每个socket创建常驻任务
+local function setServerAddress(ip, port)
+    if not ip or #ip == 0 or not port or port <= 0 or port > 65535 then
+        return false
+    end
+    log.info("setServerAddress:", ip, port)
+    server_config.ip = ip
+    server_config.port = port
+    for id = 1, MAX_CLIENTS do
+        if clients[id].connected then
+            closeSocket(id)
+            sendStatus(0x02, id, 0)
+        end
+    end
+    return true
+end
+
+local function getLinkStatus()
+    local status = {}
+    for i = 1, MAX_CLIENTS do
+        status[i] = clients[i].connected
+    end
+    return status
+end
+
+-- ── 每个Socket的控制任务 ─────────────────────────────
 for id = 1, MAX_CLIENTS do
     sys.taskInit(function()
         local socketId = id
-        log.debug("Socket", socketId, "control task started")
-
         while true do
-            while not keepConnecting[socketId] do
-                sys.wait(1000)
+            -- 等待连接命令
+            while not connectRequested[socketId] do
+                sys.wait(500)
             end
 
-            while keepConnecting[socketId] do
-                while not socket.isReady() do
-                    if not keepConnecting[socketId] then break end
+            -- 用 do..break 代替 goto，确保失败/断开都回到外层循环顶部
+            repeat
+                disconnectRequested[socketId] = false
+
+                -- 等待网络就绪且SIM卡正常
+                while not socket.isReady() or not sim.getStatus() do
+                    if disconnectRequested[socketId] then break end
+                    local simStatus = sim.getStatus()
+                    if not simStatus then
+                        log.warn("Socket", socketId, "waiting for SIM card, status:", simStatus)
+                    end
                     sys.wait(1000)
                 end
-                if not keepConnecting[socketId] then break end
-
-                local sock = socket.tcp()
-                log.debug("Socket", socketId, "connecting to", SERVER_IP, SERVER_PORT)
-                local connected = false
-                while not connected and keepConnecting[socketId] do
-                    connected = sock:connect(SERVER_IP, SERVER_PORT)
-                    if not connected then
-                        log.warn("Socket", socketId, "connect failed, retry in 3s")
-                        sys.wait(3000)
-                    end
+                if disconnectRequested[socketId] then
+                    connectRequested[socketId] = false
+                    break
                 end
-
-                if not keepConnecting[socketId] then
-                    if sock then sock:close() end
+                -- 再次检查SIM卡状态，防止等待期间SIM卡被拔出
+                if not sim.getStatus() then
+                    connectRequested[socketId] = false
+                    sendStatus(0x03, socketId, 2)
+                    log.warn("Socket", socketId, "connect failed: SIM card not ready")
                     break
                 end
 
+                -- 尝试连接（只试一次）
+                local sock = socket.tcp()
+                log.info("Socket", socketId, "connecting to",
+                         server_config.ip, server_config.port)
+
+                local ok = sock:connect(server_config.ip, server_config.port)
+                if disconnectRequested[socketId] or not ok then
+                    if sock then sock:close() end
+                    connectRequested[socketId] = false
+                    sendStatus(0x03, socketId, 1)
+                    log.warn("Socket", socketId, "connect failed")
+                    break
+                end
+
+                -- 连接成功
                 clients[socketId].socket = sock
                 clients[socketId].connected = true
+                connectRequested[socketId] = false
+                sendStatus(0x01, socketId, 0)
                 log.info("Socket", socketId, "connected")
-                sendConnStatus(0x01, socketId, 0)
 
-                while keepConnecting[socketId] and clients[socketId].connected do
-                    local ok = sock:asyncSelect(60, "recv")
-                    if not ok then
+                -- 监控连接，直到掉线或收到断开命令
+                while clients[socketId].connected
+                  and not disconnectRequested[socketId] do
+                    -- 检查SIM卡状态，如果SIM卡被拔出则断开连接
+                    if not sim.getStatus() then
+                        log.warn("Socket", socketId, "SIM card removed, disconnecting")
+                        break
+                    end
+                    local alive = sock:asyncSelect(60, "recv")
+                    if not alive then
                         log.warn("Socket", socketId, "connection lost")
                         break
                     end
                     sys.wait(100)
                 end
+            until true
 
-                if clients[socketId].socket then
-                    clients[socketId].socket:close()
-                    clients[socketId].socket = nil
-                end
-                clients[socketId].connected = false
-
-                if not keepConnecting[socketId] then
-                    sendConnStatus(0x02, socketId, 0)
-                    break
-                else
-                    log.info("Socket", socketId, "will reconnect after 3s")
-                    sys.wait(3000)
-                end
+            -- 如果还在连接状态说明出了循环 = 掉线或断开
+            if clients[socketId].connected then
+                closeSocket(socketId)
+                sendStatus(0x02, socketId, 0)
+                log.info("Socket", socketId,
+                         "disconnected, waiting reconnect cmd")
             end
         end
     end)
 end
 
--- 订阅底层Socket接收事件
+-- 监听SIM卡状态变化，SIM卡被拔出时断开所有连接
+sys.subscribe("SIM_IND", function(para)
+    log.info("SIM_IND received:", para)
+    -- SIM卡未就绪（被拔出或异常）
+    if para ~= "RDY" then
+        for id = 1, MAX_CLIENTS do
+            if clients[id].connected then
+                log.warn("SIM card removed, disconnecting socket", id)
+                closeSocket(id)
+                sendStatus(0x02, id, 3)  -- 状态码3表示SIM卡异常导致断开
+            end
+        end
+    end
+end)
+
+-- 数据接收
 sys.subscribe("SOCKET_RECV", function(socketId)
     for i, client in ipairs(clients) do
         if client.socket and client.socket.id == socketId and client.connected then
             local data = client.socket:asyncRecv()
-            if data and #data > 0 then
-                log.info("Socket", client.id, "received data len=", #data)
-                if recvCallback then
-                    recvCallback(client.id, data)
-                end
+            if data and #data > 0 and recvCallback then
+                recvCallback(client.id, data)
             end
             break
         end
     end
 end)
 
--- 模块接口
 local M = {
-    setKeepConnecting = setKeepConnecting,
+    connectSocket = connectSocket,
+    disconnectSocket = disconnectSocket,
     sendToSocket = sendToSocket,
     setRecvCallback = setRecvCallback,
+    setServerAddress = setServerAddress,
+    getLinkStatus = getLinkStatus,
 }
-return M
+return M