MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#2954: adapt LuaOTA to the new firmware api for the timer and some other sma… (#3016) 

* #2954: adapt to the new firmware api for the timer and some other small fixes

* reduce the error msg in when not response is sent back from esp

* cleanup: remove trailing whitespaces

Co-authored-by: Adel Tayeb-Cherif <adel@evoluhome.com>
This commit is contained in:
evoluman 2020-04-26 08:58:30 -04:00 committed by Marcel Stör
parent fd26dea949
commit 99aba34460
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lua_examples/luaOTA/_doTick.lua
View File

@ -1,5 +1,4 @@
-- luacheck: globals self --if (self.timer) then self.timer:stop() end--SAFETRIM
if (self.timer) then self.timer:stop() end--SAFETRIM
-- function _doTick(self) -- function _doTick(self)
-- Upvals -- Upvals
@ -33,7 +32,7 @@ if (self.timer) then self.timer:stop() end--SAFETRIM
-- some resources that are no longer needed and set backstop timer for general -- some resources that are no longer needed and set backstop timer for general
-- timeout. This also dereferences the previous doTick cb so it can now be GCed. -- timeout. This also dereferences the previous doTick cb so it can now be GCed.
collectgarbage() collectgarbage()
self.timer:alarm(0, 30000, tmr.ALARM_SINGLE, self.startApp) self.timer:alarm(30000, tmr.ALARM_SINGLE, self.startApp)
return self:_provision(socket,rec) return self:_provision(socket,rec)
end end

2
lua_examples/luaOTA/check.lua
View File

@ -45,7 +45,7 @@ end
function self.startApp(arg) --upval: gc, self, wifi function self.startApp(arg) --upval: gc, self, wifi
gc();gc() gc();gc()
self.timer.unregister() self.timer:unregister()
self.socket = nil self.socket = nil
if not self.config.leave then wifi.setmode(wifi.NULLMODE,false) end if not self.config.leave then wifi.setmode(wifi.NULLMODE,false) end
local appMod = self.config.app or "luaOTA.default" local appMod = self.config.app or "luaOTA.default"

6
lua_examples/luaOTA/luaOTAserver.lua
View File

@ -23,7 +23,7 @@ local socket = require "socket"
local lfs = require "lfs" local lfs = require "lfs"
local md5 = require "md5" local md5 = require "md5"
local json = require "cjson" local json = require "cjson"
require "etc.strict" -- see http://www.lua.org/extras/5.1/strict.lua require "std.strict" -- see http://www.lua.org/extras/5.1/strict.lua
-- Local functions (implementation see below) ------------------------------------------ -- Local functions (implementation see below) ------------------------------------------
@ -162,6 +162,10 @@ end
---------------------------------------------------------------------- ----------------------------------------------------------------------
receive_and_parse = function(esp) receive_and_parse = function(esp)
local line = esp:receive("*l") local line = esp:receive("*l")
if (not line) then
error( "Empty response from ESP, possible cause: file signature failure", 0)
--return nil
end
local packed_cmd, sig = line:sub(1,#line-6),line:sub(-6) local packed_cmd, sig = line:sub(1,#line-6),line:sub(-6)
-- print("reply:", packed_cmd, sig) -- print("reply:", packed_cmd, sig)
local status, cmd = pcall(json.decode, packed_cmd) local status, cmd = pcall(json.decode, packed_cmd)