update:fota交互接口规范化

demo/soc_fota/EC618/iot_fota.lua

@@ -14,7 +14,7 @@ local function otaTask()
     -- 如果确定只下载脚本，可以下载到文件系统里
     -- fota.init("/update.bin", 0, nil)
     -- os.remove("/update.bin")
-    local isError, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
+    local succ, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
     local tbuff = zbuff.create(512)
     local rbuff = zbuff.create(2048)
     local netc = socket.create(nil, taskName)
@@ -46,16 +46,15 @@ local function otaTask()
         rbuff:del()
         findhead = false
         while result do
-            isError, param, ip, port = socket.rx(netc, rbuff)
-            if isError then
-                log.info("服务器断开了", isError, param, ip, port)
+            succ, param, ip, port = socket.rx(netc, rbuff)
+            if not succ then
+                log.info("服务器断开了", succ, param, ip, port)
                 break
             end
             if rbuff:used() > 0 then
                 if findhead then
-                    isError,fotaDone,nCache = fota.run(rbuff)
-                    
-                    if not isError then
+                    succ,fotaDone,nCache = fota.run(rbuff)
+                    if succ then
                         total = total + rbuff:used()
                     else
                         log.error("fota写入异常，请至少在1秒后重试")
@@ -63,12 +62,12 @@ local function otaTask()
                         done = true
                         break
                     end
-                    log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                    log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                     rbuff:del()
                     if fotaDone then
                         log.info("下载完成")
                         while true do
-                            isError,fotaDone  = fota.isDone()
+                            succ,fotaDone  = fota.isDone()
                             if fotaDone then
                                 fota.finish(true)
                                 log.info("FOTA完成")
@@ -110,8 +109,8 @@ local function otaTask()
                         end
                         --未处理的body数据
                         rbuff:del(0, d2)
-                        isError,fotaDone,nCache = fota.run(rbuff)
-                        if not isError then
+                        succ,fotaDone,nCache = fota.run(rbuff)
+                        if succ then
                             total = total + rbuff:used()
                         else
                             log.error("fota写入异常，请至少在1秒后重试")
@@ -119,7 +118,7 @@ local function otaTask()
                             done = true
                             break
                         end
-                        log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                        log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                         rbuff:del()
                     else
                         break

demo/soc_fota/EC618/main.lua

@@ -1,7 +1,7 @@
 
 -- LuaTools需要PROJECT和VERSION这两个信息
-PROJECT = "my_test"
-VERSION = "1.1"
+PROJECT = "fota_test"
+VERSION = "1.2"
 PRODUCT_KEY = "s1uUnY6KA06ifIjcutm5oNbG3MZf5aUv" --换成自己的
 -- sys库是标配
 _G.sys = require("sys")

demo/soc_fota/EC618/soc_fota.lua

@@ -5,9 +5,9 @@ local rbuff = zbuff.create(16384)
 local function uartRx(id, len)
     uart.rx(id, rbuff)
     if rbuff:used() > 0 then 
-        local isError,fotaDone,nCache = fota.run(rbuff)
+        local succ,fotaDone,nCache = fota.run(rbuff)
         
-        if not isError then
+        if succ then
             
         else
             log.error("fota写入异常，请至少在1秒后重试")
@@ -15,7 +15,7 @@ local function uartRx(id, len)
             return
         end
         rbuff:del()
-        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
         if fotaDone then
             log.info("下载完成")
             sys.publish("downloadOK")
@@ -35,7 +35,7 @@ local function otaTask()
     uart.write(3,"ready")
     sys.waitUntil("downloadOK")                       
     while true do
-        local isError,fotaDone  = fota.isDone()
+        local succ,fotaDone  = fota.isDone()
         if fotaDone then
             fota.finish(true)
             log.info("FOTA完成")
@@ -68,7 +68,7 @@ end
 
 local function otaTask()
     fota.init()
-    local isError, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
+    local succ, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
     local tbuff = zbuff.create(512)
     local rbuff = zbuff.create(4096)
     local netc = socket.create(nil, taskName)
@@ -98,16 +98,15 @@ local function otaTask()
         rbuff:del()
         findhead = false
         while result do
-            isError, param, ip, port = socket.rx(netc, rbuff)
-            if isError then
-                log.info("服务器断开了", isError, param, ip, port)
+            succ, param, ip, port = socket.rx(netc, rbuff)
+            if not succ then
+                log.info("服务器断开了", succ, param, ip, port)
                 break
             end
             if rbuff:used() > 0 then
                 if findhead then
-                    isError,fotaDone,nCache = fota.run(rbuff)
-                    
-                    if not isError then
+                    succ,fotaDone,nCache = fota.run(rbuff)
+                    if succ then
                         total = total + rbuff:used()
                     else
                         log.error("fota写入异常，请至少在1秒后重试")
@@ -115,12 +114,12 @@ local function otaTask()
                         done = true
                         break
                     end
-                    log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                    log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                     rbuff:del()
                     if fotaDone then
                         log.info("下载完成")
                         while true do
-                            isError,fotaDone  = fota.isDone()
+                            succ,fotaDone  = fota.isDone()
                             if fotaDone then
                                 fota.finish(true)
                                 log.info("FOTA完成")
@@ -162,8 +161,8 @@ local function otaTask()
                         end
                         --未处理的body数据
                         rbuff:del(0, d2)
-                        isError,fotaDone,nCache = fota.run(rbuff)
-                        if not isError then
+                        succ,fotaDone,nCache = fota.run(rbuff)
+                        if succ then
                             total = total + rbuff:used()
                         else
                             log.error("fota写入异常，请至少在1秒后重试")
@@ -171,7 +170,7 @@ local function otaTask()
                             done = true
                             break
                         end
-                        log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                        log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                         rbuff:del()
                     else
                         break

demo/socket/Air105/dtu_demo.lua

@@ -36,9 +36,9 @@ local function dtuTask(uart_id, ip, port)
 			libnet.tx(d1Name, 0, netc, "helloworld")
 		end
 		while result do
-			is_err, param, _, _ = socket.rx(netc, rx_buff)
-			if is_err then
-				log.info("服务器断开了", is_err, param, ip, port)
+			succ, param, _, _ = socket.rx(netc, rx_buff)
+			if not succ then
+				log.info("服务器断开了", succ, param, ip, port)
 				break
 			end
 			if rx_buff:used() > 0 then

demo/socket/Air105/ota_demo.lua

@@ -6,9 +6,9 @@ local rbuff = zbuff.create(16384)
 local function uartRx(id, len)
     uart.rx(id, rbuff)
     if rbuff:used() > 0 then 
-        local isError,fotaDone,nCache = fota.run(rbuff)
+        local succ,fotaDone,nCache = fota.run(rbuff)
         
-        if not isError then
+        if succ then
             
         else
             log.error("fota写入异常，请至少在1秒后重试")
@@ -16,7 +16,7 @@ local function uartRx(id, len)
             return
         end
         rbuff:del()
-        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
         if fotaDone then
             log.info("下载完成")
             sys.publish("downloadOK")
@@ -36,7 +36,7 @@ local function otaTask()
     uart.write(3,"ready")
     sys.waitUntil("downloadOK")                       
     while true do
-        local isError,fotaDone  = fota.isDone()
+        local succ,fotaDone  = fota.isDone()
         if fotaDone then
             fota.finish(true)
             log.info("FOTA完成")
@@ -68,7 +68,7 @@ local function otaTask()
     -- 如果确定只下载脚本，可以下载到文件系统里
     -- fota.init("/update.bin", 0, nil)
     -- os.remove("/update.bin")
-    local isError, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
+    local succ, param, ip, port, total, findhead, filelen, rcvCache,d1,d2,statusCode,retry,rspHead,rcvChunked,done,fotaDone,nCache
     local tbuff = zbuff.create(512)
     local rbuff = zbuff.create(2048)
     local netc = socket.create(socket.ETH0, taskName)
@@ -103,16 +103,16 @@ local function otaTask()
         rbuff:del()
         findhead = false
         while result do
-            isError, param, ip, port = socket.rx(netc, rbuff)
-            if isError then
-                log.info("服务器断开了", isError, param, ip, port)
+            succ, param, ip, port = socket.rx(netc, rbuff)
+            if not succ then
+                log.info("服务器断开了", succ, param, ip, port)
                 break
             end
             if rbuff:used() > 0 then
                 if findhead then
-                    isError,fotaDone,nCache = fota.run(rbuff)
+                    succ,fotaDone,nCache = fota.run(rbuff)
                     
-                    if not isError then
+                    if succ then
                         total = total + rbuff:used()
                     else
                         log.error("fota写入异常，请至少在1秒后重试")
@@ -121,11 +121,11 @@ local function otaTask()
                         break
                     end
                     rbuff:del()
-                    -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                    -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                     if fotaDone then
                         log.info("下载完成")
                         while true do
-                            isError,fotaDone  = fota.isDone()
+                            succ,fotaDone  = fota.isDone()
                             if fotaDone then
                                 fota.finish(true)
                                 log.info("FOTA完成")
@@ -167,8 +167,8 @@ local function otaTask()
                         end
                         --未处理的body数据
                         rbuff:del(0, d2)
-                        isError,fotaDone,nCache = fota.run(rbuff)
-                        if not isError then
+                        succ,fotaDone,nCache = fota.run(rbuff)
+                        if not succ then
                             total = total + rbuff:used()
                         else
                             log.error("fota写入异常，请至少在1秒后重试")
@@ -177,7 +177,7 @@ local function otaTask()
                             break
                         end
                         rbuff:del()
-                        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", isError, done, "总共", filelen)
+                        -- log.info("收到服务器数据，长度", rbuff:used(), "fota结果", succ, done, "总共", filelen)
                     else
                         break
                     end

demo/socket/Air105/server_demo.lua

@@ -10,7 +10,7 @@ local function serTask(port)
 	local tx_buff = zbuff.create(1024)
 	local rx_buff = zbuff.create(1024)
 	local netc 
-	local result, param, is_err, rIP, rPort
+	local result, param, succ, rIP, rPort
 	netc = socket.create(socket.ETH0, dName)
 	--socket.debug(netc, true)
 	socket.config(netc, port)
@@ -27,9 +27,9 @@ local function serTask(port)
             end
 		end
 		while result do
-			is_err, param, rIP, rPort = socket.rx(netc, rx_buff)
-			if is_err then
-				log.info("客户端断开了", is_err, param, ip, port)
+			succ, param, rIP, rPort = socket.rx(netc, rx_buff)
+			if not succ then
+				log.info("客户端断开了", succ, param, ip, port)
 				break
 			end
 			if rx_buff:used() > 0 then
@@ -70,7 +70,7 @@ local function UDPTask(port)
 	local rx_buff = zbuff.create(1024)
 	local remote_ip = zbuff.create(18)
 	local netc 
-	local result, param, is_err, rIP, rPort
+	local result, param, succ, rIP, rPort
 	netc = socket.create(socket.ETH0, dName)
 	socket.debug(netc, true)
 	socket.config(netc, port, true)
@@ -88,9 +88,9 @@ local function UDPTask(port)
 				log.info("客户端断开了", result, param)
 				break
 			end
-			is_err, param, rIP, rPort = socket.rx(netc, rx_buff)
-			if is_err then
-				log.info("客户端断开了", is_err, paramt)
+			succ, param, rIP, rPort = socket.rx(netc, rx_buff)
+			if not succ then
+				log.info("客户端断开了", succ, paramt)
 				break
 			end
 			if rx_buff:used() > 0 then

demo/socket/EC618/socket_demo.lua

@@ -37,9 +37,9 @@ local function dtuTask(uart_id, ip, port)
 			libnet.tx(d1Name, 0, netc, "helloworld")
 		end
 		while result do
-			is_err, param, _, _ = socket.rx(netc, rx_buff)
-			if is_err then
-				log.info("服务器断开了", is_err, param, ip, port)
+			succ, param, _, _ = socket.rx(netc, rx_buff)
+			if not succ then
+				log.info("服务器断开了", succ, param, ip, port)
 				break
 			end
 			if rx_buff:used() > 0 then

luat/modules/luat_lib_fota.c

@@ -68,11 +68,11 @@ static int l_fota_wait(lua_State* L)
 写入fota数据
 @api fota.fotaRun(buff)
 @zbuff/string fota数据，尽量用zbuff，如果传入的是zbuff，写入成功后，自动清空zbuff内的数据
-@return boolean 有异常返回true
+@return boolean 有异常返回false，无异常返回true
 @return boolean 接收到最后一块返回true
 @return int 还未写入的数据量，超过64K必须做等待
 @usage
-local isError, isDone, cache = fota.fotaRun(buf) -- 写入fota流程
+local result, isDone, cache = fota.fotaRun(buf) -- 写入fota流程
 */
 static int l_fota_write(lua_State* L)
 {
@@ -91,17 +91,17 @@ static int l_fota_write(lua_State* L)
     }
     if (result > 0)
     {
-    	lua_pushboolean(L, 0);
+    	lua_pushboolean(L, 1);
     	lua_pushboolean(L, 0);
     }
     else if (result == 0)
     {
-    	lua_pushboolean(L, 0);
+    	lua_pushboolean(L, 1);
     	lua_pushboolean(L, 1);
     }
     else
     {
-    	lua_pushboolean(L, 1);
+    	lua_pushboolean(L, 0);
     	lua_pushboolean(L, 1);
     }
     lua_pushinteger(L, result);
@@ -111,28 +111,27 @@ static int l_fota_write(lua_State* L)
 /**
 等待底层fota流程完成
 @api fota.fotaDone()
-@boolean 是否完整走完流程，true 表示正确走完流程了
-@return boolean 有异常返回true
+@return boolean 有异常返回false，无异常返回true
 @return boolean 写入到最后一块返回true
 @usage
-local isError, isDone = mcu.fotaDone()
+local result, isDone = mcu.fotaDone()
 */
 static int l_fota_done(lua_State* L)
 {
 	int result = luat_fota_done();
     if (result > 0)
     {
-    	lua_pushboolean(L, 0);
+    	lua_pushboolean(L, 1);
     	lua_pushboolean(L, 0);
     }
     else if (result == 0)
     {
-    	lua_pushboolean(L, 0);
+    	lua_pushboolean(L, 1);
     	lua_pushboolean(L, 1);
     }
     else
     {
-    	lua_pushboolean(L, 1);
+    	lua_pushboolean(L, 0);
     	lua_pushboolean(L, 1);
     }
 	return 2;