From 0c6c7077fcd1ce717b24b2f3dfb608ea067e7b31 Mon Sep 17 00:00:00 2001 From: chain01 <15863338830@163.com> Date: Thu, 18 Mar 2021 13:26:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E7=9A=84tcp=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/irtu.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/irtu.cfg b/user/irtu.cfg index b413557..a7f929f 100644 --- a/user/irtu.cfg +++ b/user/irtu.cfg @@ -1 +1 @@ -return '{"flow":"","passon":1,"source":"web","warn":{"adc1":{},"adc0":{},"gpio":{},"vbatt":{}},"netReadTime":0,"convert":0,"upprot":["","","","","","",""],"apn":["","",""],"pins":{},"plate":0,"fota":1,"gps":{"pio":{},"fun":{}},"conf":[["tcp","0x00",300,"io.yyia.top","7777",1,"","","",""],{},{},{},{},{},{}],"uartReadTime":"25","preset":{"number":"","delay":"","smsword":""},"uconf":[[1,"115200",8,2,0,""],[2,"115200",8,2,0,""],{},[129,0,0,2,0]],"nolog":"1","reg":0,"cmds":[{},{}],"pwrmod":"normal","param_ver":0,"dwprot":["","","","","","",""],"password":""}' \ No newline at end of file +return '{"flow":"","passon":1,"source":"web","warn":{"adc1":{},"adc0":{},"gpio":{},"vbatt":{}},"netReadTime":0,"convert":0,"upprot":["","","","","","",""],"apn":["","",""],"pins":{},"plate":0,"fota":1,"gps":{"pio":{},"fun":{}},"conf":[{},{},{},{},{},{},{}],"uartReadTime":"25","preset":{"number":"","delay":"","smsword":""},"uconf":[[1,"115200",8,2,0,""],[2,"115200",8,2,0,""],{},[129,0,0,2,0]],"nolog":"1","reg":0,"cmds":[{},{}],"pwrmod":"normal","param_ver":0,"dwprot":["","","","","","",""],"password":""}' \ No newline at end of file -- Gitee From 9b2c9a1fc66e180971145f25eef2600699eafcc6 Mon Sep 17 00:00:00 2001 From: chain01 <15863338830@163.com> Date: Thu, 18 Mar 2021 13:27:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1.3=E7=89=88=E6=9C=AC=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib_RDA8910/sim.lua | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/lib_RDA8910/sim.lua b/lib_RDA8910/sim.lua index fba1246..a8a731e 100644 --- a/lib_RDA8910/sim.lua +++ b/lib_RDA8910/sim.lua @@ -92,19 +92,21 @@ intermediate:AT命令的应答中的中间信息 返回值:无 ]] local function rsp(cmd, success, response, intermediate) - if cmd == "AT+CCID" then - iccid = intermediate - elseif cmd == "AT+ICCID" then - iccid = string.match(intermediate, "%+ICCID: (.+)") - elseif cmd == "AT+CIMI" then - imsi = intermediate - --产生一个内部消息IMSI_READY,通知已经读取imsi - sys.publish("IMSI_READY") - elseif cmd == "AT+CNUM" then - if success then - if intermediate then sNumber = intermediate:match("%+CNUM:%s*\".-\",\"[%+]*(%d+)\",") end - else - sys.timerStart(ril.request, 5000, "AT+CNUM") + if intermediate then + if cmd == "AT+CCID" then + iccid = intermediate + elseif cmd == "AT+ICCID" then + iccid = string.match(intermediate, "%+ICCID: (.+)") + elseif cmd == "AT+CIMI" then + imsi = intermediate + --产生一个内部消息IMSI_READY,通知已经读取imsi + sys.publish("IMSI_READY") + elseif cmd == "AT+CNUM" then + if success then + sNumber = intermediate:match("%+CNUM:%s*\".-\",\"[%+]*(%d+)\",") + else + sys.timerStart(ril.request, 5000, "AT+CNUM") + end end end end -- Gitee From 44171bddf1539a9ffa9f9daa9a6ae676d519405e Mon Sep 17 00:00:00 2001 From: chain01 <15863338830@163.com> Date: Thu, 18 Mar 2021 13:28:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=8B=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- user/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/main.lua b/user/main.lua index a1db05e..62b4429 100644 --- a/user/main.lua +++ b/user/main.lua @@ -3,7 +3,7 @@ --VERSION:ascii string类型,如果使用Luat物联云平台固件升级的功能,必须按照"X.X.X"定义,X表示1位数字;否则可随便定义 PROJECT = "iRTU" -- PROJECT = "DTU-AIR720-MODUL" -VERSION = "1.9.3" +VERSION = "1.9.4" PRODUCT_KEY = "DPVrZXiffhEUBeHOUwOKTlESam3aXvnR" -- PRODUCT_KEY = "YoR8ob2ELJOczNrVOZZTtAcmLAf6eyYw" --用户DTU-AIR720-MODUL 更新KEY -- Gitee