1.0.11

config.lua

@@ -9,7 +9,7 @@ otaUrl = "47.114.185.186:11113/api/site/firmware_upgrade"
 --ota升级检查周期
 otaCheckInterval = 1200
 -- 本地数据最新版本号
-localCntVersion = "1662371022371"
+localCntVersion = "1663321109122"
 -- 心跳间隔/s
 heartbeatInterval = 600
 
@@ -22,7 +22,7 @@ lngType = "X"
 gpsLat = "0"
 latType = "X"
 --gps主动定位时间
-gpsTime = 1660789298
+gpsTime = 0
 
 
 -- 泵状态相关 
@@ -36,7 +36,7 @@ hydOilThr = 90 --液压油告警阈值
 scaleValveThr = 90--比例阀告警阈值
 elecValveThr = 90--电磁阀告警阈值
  
-lastWorkField = "444441" --上次作业风场编号
+lastWorkField = "W045" --上次作业风场编号
 fieldDisplayRadius = 20
 
 --错误日志上报地址

main.lua

@@ -18,7 +18,7 @@ nvm.set("bootNum", nvm.get("bootNum") + 1)
 require "netLed"
 
 ntp.timeSync()
-
+ 
 require "errDump"
 -- errDump.request("udp://ota.airm2m.com:9072")
 errDump.setNetworkLog(true)

modbusTT.lua

@@ -681,16 +681,17 @@ local function query0065Res()
         queryFlagReg["0065"] = "0000"
         return false
     end
-
     local cond = {
         wnum = getByte2AsciiStr(conds:sub(1, 10)),
         fnum = getByte2AsciiStr(conds:sub(11, 30)),
         fmodel = getByte2AsciiStr(conds:sub(31, 50)),
         parts = ucs2deleteZero(conds:sub(51, 70)),
-        work = ucs2deleteZero(conds:sub(71, 90))
+        work = ucs2deleteZero(conds:sub(71, 110))
     }
 
     log.info("wnum:", cond.wnum, "wnum_hex:", conds:sub(1, 10):toHex())
+
+    log.info("record cond:",json.encode(cond))
     local result, count, desc = getBaseInfo("WorkRecord", cond , "/sdcard0/"..cond.wnum .."/".. cond.fnum)
 
     queryFlagReg["0065"] = "0000"
@@ -787,6 +788,8 @@ local function query0067Res()
 
     print("aaaaaaaaaaaa")
 
+    log.info("lastWorkField",lastWorkField)
+
     if not result  then
         --无全风场列表显示上次作业风场
         -- body
@@ -1041,12 +1044,12 @@ local function query006bRes()
     local regValueHex = ""
     for k,v in pairs(result) do
         local ucs2Bytes = common.utf8ToUcs2be(v.name)
-        local nameHex = ucs2Bytes:toHex()..getAscii2StringHexBe("\0", 20-#ucs2Bytes)
+        local nameHex = ucs2Bytes:toHex()..getAscii2StringHexBe("\0", 40-#ucs2Bytes)
         regValueHex = regValueHex..nameHex
     end
 
     local j = 1
-    for i=1410, 1409 + 10*table_leng(result) do
+    for i=1410, 1409 + 20*table_leng(result) do
         local regHex = string.format("%04x", i)
         queryRespData[regHex] = regValueHex:sub(j, j+3)
         j = j+4
@@ -1086,7 +1089,7 @@ local function query006cRes(  )
     respRegAddress = "00d0"
 
     local conds = table.concat(queryCondRegValue)
-    if #conds < 160 then
+    if #conds < 180 then
         -- body
         queryFlagReg["006c"] = "0000"
         return false
@@ -1101,16 +1104,16 @@ local function query006cRes(  )
         -- PartNumber =  common.ucs2beToUtf8(conds:sub(91, 110)), --部件号      Unicode  自定义
         PartNumber =  ucs2deleteZero(conds:sub(91, 110)), --部件号      Unicode  自定义
         -- WorkPos = common.ucs2beToUtf8(conds:sub(111, 130)), --工作位置        Unicode  自定义
-        WorkPos = ucs2deleteZero(conds:sub(111, 130)), --工作位置        Unicode  自定义
-        BoltModel = getByte2AsciiStr(conds:sub(131, 140)),  --螺栓型号        string
-        BoltTotal = tonumber(conds:sub(141, 142):toHex(), 16), --螺栓总数        u16
-        BoltNumber = tonumber(conds:sub(143, 144):toHex(), 16), --当前螺栓编号       u16
-        SetTorque = tonumber(conds:sub(147,148):toHex()..conds:sub(145,146):toHex(), 16), --设定扭矩Nm     u32
-        FasteningTorque = tonumber(conds:sub(151,152):toHex()..conds:sub(149,150):toHex(), 16), --紧固扭矩Nm     u32
-        SetStress = tonumber(conds:sub(153,154):toHex(), 16), --设定压力bar    u16
-        FasteningStress = tonumber(conds:sub(155,156):toHex(), 16), --紧固压力bar    u16
-        FasteningStatus = tonumber(conds:sub(157,158):toHex(), 16), --紧固状态   u16
-        Time = tonumber(conds:sub(159,160):toHex(), 16) --紧固时间       u16
+        WorkPos = ucs2deleteZero(conds:sub(111, 150)), --工作位置        Unicode  自定义
+        BoltModel = getByte2AsciiStr(conds:sub(151, 160)),  --螺栓型号        string
+        BoltTotal = tonumber(conds:sub(161, 162):toHex(), 16), --螺栓总数        u16
+        BoltNumber = tonumber(conds:sub(163, 164):toHex(), 16), --当前螺栓编号       u16
+        SetTorque = tonumber(conds:sub(167,168):toHex()..conds:sub(165,166):toHex(), 16), --设定扭矩Nm     u32
+        FasteningTorque = tonumber(conds:sub(171,172):toHex()..conds:sub(169,170):toHex(), 16), --紧固扭矩Nm     u32
+        SetStress = tonumber(conds:sub(173,174):toHex(), 16), --设定压力bar    u16
+        FasteningStress = tonumber(conds:sub(175,176):toHex(), 16), --紧固压力bar    u16
+        FasteningStatus = tonumber(conds:sub(177,178):toHex(), 16), --紧固状态   u16
+        Time = tonumber(conds:sub(179,180):toHex(), 16) --紧固时间       u16
     }
 
     -- 查询自定义的3字段是否存在，不存在则新增一个
@@ -1136,15 +1139,18 @@ local function query006cRes(  )
         bnum = upTable.BoltTotal,
         torque = upTable.FasteningTorque
     }
-
+    
+    log.info("local record", json.encode(localRecord))
 
     local result,count, desc =  updateBaseInfo("WorkRecord", localRecord, "/sdcard0/"..localRecord.wnum .."/".. localRecord.fnum)
 
     if not result or desc:sub(1, 29) == "this data not found where id=" then
         -- body
+        log.info("xxxxxxxxxxxx")
         result, desc =  saveBaseInfo("WorkRecord", localRecord, "/sdcard0/"..localRecord.wnum .."/".. localRecord.fnum )
     end
 
+    log.info("local result", result)
     queryFlagReg["006c"] = "0000"
 
     if not result then
@@ -1176,17 +1182,17 @@ local function query006dRes()
         -- PartNumber =  common.ucs2beToUtf8(conds:sub(91, 110)), --部件号      Unicode  自定义
         PartNumber =  ucs2deleteZero(conds:sub(91, 110)), --部件号      Unicode  自定义
         -- WorkPos = common.ucs2beToUtf8(conds:sub(111, 130)), --工作位置        Unicode  自定义
-        WorkPos = ucs2deleteZero(conds:sub(111, 130)), --工作位置        Unicode  自定义
-        BoltModel = getByte2AsciiStr(conds:sub(131, 140)),  --螺栓型号        string
-        BoltTotal = tonumber(conds:sub(141, 142):toHex(), 16), --螺栓总数        u16
-        BoltNumber = tonumber(conds:sub(143, 144):toHex(), 16), --当前螺栓编号       u16
-        SetTorque = tonumber(conds:sub(147,148):toHex()..conds:sub(145,146):toHex(), 16), --设定扭矩Nm     u32
-        FasteningTorque = tonumber(conds:sub(151,152):toHex()..conds:sub(149,150):toHex(), 16), --紧固扭矩Nm     u32
-        SetStress = tonumber(conds:sub(153,154):toHex(), 16), --设定压力bar    u16
-        FasteningStress = tonumber(conds:sub(155,156):toHex(), 16), --紧固压力bar    u16
-        FasteningStatus = tonumber(conds:sub(157,158):toHex(), 16), --紧固状态   u16
-        Time = tonumber(conds:sub(159,160):toHex(), 16), --紧固时间       u16
-        WrenchAngle = tonumber(conds:sub(161,162):toHex(), 16) --扳手转动角度      u16
+        WorkPos = ucs2deleteZero(conds:sub(111, 150)), --工作位置        Unicode  自定义
+        BoltModel = getByte2AsciiStr(conds:sub(151, 160)),  --螺栓型号        string
+        BoltTotal = tonumber(conds:sub(161, 162):toHex(), 16), --螺栓总数        u16
+        BoltNumber = tonumber(conds:sub(163, 164):toHex(), 16), --当前螺栓编号       u16
+        SetTorque = tonumber(conds:sub(167,168):toHex()..conds:sub(165,166):toHex(), 16), --设定扭矩Nm     u32
+        FasteningTorque = tonumber(conds:sub(171,172):toHex()..conds:sub(169,170):toHex(), 16), --紧固扭矩Nm     u32
+        SetStress = tonumber(conds:sub(173,174):toHex(), 16), --设定压力bar    u16
+        FasteningStress = tonumber(conds:sub(175,176):toHex(), 16), --紧固压力bar    u16
+        FasteningStatus = tonumber(conds:sub(177,178):toHex(), 16), --紧固状态   u16
+        Time = tonumber(conds:sub(179,180):toHex(), 16), --紧固时间       u16
+        WrenchAngle = tonumber(conds:sub(181,182):toHex(), 16) --扳手转动角度      u16
     }
 
     -- 查询自定义的3字段是否存在，不存在则新增一个
@@ -1212,15 +1218,16 @@ local function query006dRes()
         bnum = upTable.BoltTotal,
         torque = upTable.FasteningTorque
     }
-
+    log.info("local record", json.encode(localRecord))
 
     local result,count, desc =  updateBaseInfo("WorkRecord", localRecord, "/sdcard0/"..localRecord.wnum )
 
     if not result and desc:sub(1, 29) == "this data not found where id=" then
         -- body
+        log.info("oooooooooooooooo")
         result, desc =  saveBaseInfo("WorkRecord", localRecord, "/sdcard0/"..localRecord.wnum  )
     end
-
+    log.info("local result", result)
     queryFlagReg["006d"] = "0000"
     if not result then
         -- body
@@ -1333,6 +1340,8 @@ local function query0070Res()
         logModuel.debug_log("查询任务具体详情失败,count:"..count..",desc:"..desc,",cond_pnum="..cond)
         return false
     end
+
+    
     -- local result = {
     --     {id=123, pnum="plan-01" ,
     --     info="测试任务描述1", wnum="field001",
@@ -1351,7 +1360,7 @@ local function query0070Res()
         getAscii2StringHexBe(singleRes.fnum, 20),
         getAscii2StringHexBe(singleRes.fmodel, 20),
         parts:toHex()..getAscii2StringHexBe("\0", 20-#parts),
-        work:toHex()..getAscii2StringHexBe("\0", 20-#work),
+        work:toHex()..getAscii2StringHexBe("\0", 40-#work),
         getAscii2StringHexBe(singleRes.bm, 20),
         string.format("%04x", singleRes.bn),
         string.format("%04x", singleRes.tm),
@@ -1360,10 +1369,11 @@ local function query0070Res()
         torque:sub(3, 4):toHex() .. torque:sub(1, 2):toHex()
     }
 
+
     local resValueHex = table.concat(resT)
     local j = 1
     
-    for i=1400,1481 do
+    for i=1400,1491 do
         local regHex = string.format("%04x", i)
         queryRespData[regHex] = string.sub(resValueHex, j, j+3)
         j = j+4
@@ -1585,6 +1595,7 @@ end)
 sys.timerLoopStart(checkPumbHeartbeatExtra,600000)
 
 
+
 local heartbeatInterval = nvm.get("heartbeatInterval") or 600 
 -- 定时心跳测试
 sys.taskInit(function()
@@ -1592,7 +1603,7 @@ sys.taskInit(function()
     while true do
         if socket.isReady() then    --连上网再开始运行
 
-            sys.waitUntil("pub_gps_location_success_msg", 120*1000)
+            -- sys.waitUntil("pub_gps_location_success_msg", 120*1000)
 
             local heartBeatData = getHeartbeatContent()
             log.info("pblish heartbeat msg!!!")

powerManage.lua

@@ -22,6 +22,7 @@ function closePDs(  )
     -- body
     uart.close(1) --关闭串口1
     pins.setup(pio.P0_18, 1) --断电GPS
+    pins.setup(pio.P0_13, 1) --断电485
 end
 
 
@@ -43,6 +44,13 @@ end
 local function powerTaskFnc(  )
     -- body
     sys.wait(10000)
+
+    if socket.isReady() then
+        -- body
+        local heartBeatData =modbusTT.getHeartbeatContent()
+        sys.publish("LOCAL_PUB_MSG", json.encode({["topic"]="SHEGCL/IntelligenTool/Heart",["data"]=heartBeatData}))
+    end
+
     power24Flag = setGpio11Fnc()
     log.info("当前24V电平:", power24Flag)
 
@@ -51,22 +59,13 @@ local function powerTaskFnc(  )
         setRestartClock()
         return
     end
-
+    pins.setup(pio.P0_13, 0) --485上电
     sys.waitUntil("24V_POWER_DOWN")
     power24Flag = setGpio11Fnc()
     log.info("当前24V电平:", power24Flag)
 
     
-    log.info("alarm test start")
-    local t = os.date("*t")
-    misc.setClock({year=t.year,month=t.month,day=t.day,hour=t.hour,min=t.min,sec=t.sec})
-    sys.wait(2000)
-    local onTimet = os.date("*t",os.time() + 600)  --下次要开机的时间为1800秒后
-    log.info("alarm restart time", 600) 
-    rtos.set_alarm(1,onTimet.year,onTimet.month,onTimet.day,onTimet.hour,onTimet.min,onTimet.sec)   --设定闹铃
-    --如果要测试关机闹钟，打开下面这2行代码
-    sys.wait(200000)
-    rtos.poweroff()
+    setRestartClock()
 end
 
 adc.open(BAT_ADC_ID)