Refactorisé encore une fois ma procédure de wifi_init, pour la simplifier quand il ne trouve pas de AP WIFI ;-)

This commit is contained in:
Christian Zufferey
2020-02-16 13:50:15 +01:00
parent 1ff624e99a
commit faaac5ae05
2 changed files with 35 additions and 27 deletions

View File

@@ -1,10 +1,10 @@
-- Scripts à charger après le boot pour démarrer son projet
print("\n boot.lua zf200203.1423 \n")
print("\n boot.lua zf200216.1332 \n")
function boot()
verbose = true
print("booooooooooot...")
print("On lance le boot...")
print(node.heap()) collectgarbage() print(node.heap())
--f="0_htu21d.lua" if file.exists(f) then dofile(f) end

View File

@@ -1,63 +1,71 @@
-- Petit script pour initaliser la couche WIFI
function wifi_init()
print("\n wifi_init.lua zf200203.1414 \n")
print("\n wifi_init.lua zf200216.1348 \n")
f= "secrets_wifi.lua" if file.exists(f) then dofile(f) end
f= "secrets_project.lua" if file.exists(f) then dofile(f) end
function wifi_init_end()
wifi_init1:unregister() i=nil
tmr_wifi_init1:unregister() i=nil
f= "wifi_info.lua" if file.exists(f) then dofile(f) end
f=nil secrets_wifi=nil cli_pwd=nil cli_ssid=nil
wifi_init1=nil wifi_init=nil
tmr_wifi_init1=nil wifi_init=nil
print(node.heap()) collectgarbage() print(node.heap())
-- f= "telnet_srv2.lua" if file.exists(f) then dofile(f) end
f= "web_srv2.lua" if file.exists(f) then dofile(f) end
print(node.heap()) collectgarbage() print(node.heap())
zdelay=1 if reset_reason=="seconde_chance" then zdelay=20 end
wifi_init3=tmr.create()
wifi_init3:alarm(zdelay*1000, tmr.ALARM_SINGLE, function()
tmr_wifi_init3=tmr.create()
tmr_wifi_init3:alarm(zdelay*1000, tmr.ALARM_SINGLE, function()
f= "boot.lua" if file.exists(f) then dofile(f) end
wifi_init3:unregister() wifi_init3=nil wifi_init_end=nil
tmr_wifi_init3:unregister() tmr_wifi_init3=nil wifi_init_end=nil
reset_reason=nil zdelay=nil
end)
end
if file.exists("_setup_wifi_") then
file.remove("_setup_wifi_")
print("setup wifi...")
file.remove("_setup_wifi_")
wifi.sta.config{ssid="", pwd=""} wifi.sta.connect()
if zLED == nil then zLED = 4 end
gpio.write(zLED, gpio.HIGH) gpio.mode(zLED, gpio.OUTPUT)
tmr_wifi_init4=tmr.create()
tmr_wifi_init4:alarm(0.1*1000, tmr.ALARM_AUTO , function()
gpio.write(zLED, gpio.LOW) tmr.delay(10000) gpio.write(zLED, gpio.HIGH)
end)
enduser_setup.start(function()
print("on est sortit du setup wifi et on restart !")
node.restart()
end)
print("setup wifi out...")
print("setup gadget lancé...")
else
-- charge les secrets pour le wifi
f= "secrets_wifi.lua" if file.exists(f) then dofile(f) end
f= "secrets_project.lua" if file.exists(f) then dofile(f) end
wifi.setmode(wifi.STATIONAP,true)
wifi.sta.config{ssid=cli_ssid, pwd=cli_pwd, auto=true, save=true}
wifi.sta.autoconnect(1) wifi.sta.connect()
if node_id == nil then node_id = "generic" end
wifi.sta.config{ssid=cli_ssid, pwd=cli_pwd} wifi.sta.connect()
if node_id == nil then node_id = "generic" ap_pwd = "12345678" end
wifi.ap.config({ ssid = ap_ssid.."_"..node_id, pwd = ap_pwd, save=true })
ap_ssid=nil ap_pwd=nil
wifi_init2=tmr.create()
wifi_init2:alarm(60*1000, tmr.ALARM_SINGLE, function()
tmr_wifi_init2=tmr.create()
tmr_wifi_init2:alarm(60*1000, tmr.ALARM_SINGLE, function()
print("BOOOOUM, y'a plus de AP WIFI !")
wifi.setmode(wifi.STATION,true) wifi_init2=nil
wifi.setmode(wifi.STATION,true) tmr_wifi_init2=nil
print(node.heap()) collectgarbage() print(node.heap())
end)
gpio.write(zLED, gpio.HIGH) gpio.mode(zLED, gpio.OUTPUT) i=1
wifi_init1=tmr.create()
wifi_init1:alarm(1*1000, tmr.ALARM_AUTO , function()
tmr_wifi_init1=tmr.create()
tmr_wifi_init1:alarm(1*1000, tmr.ALARM_AUTO , function()
gpio.write(zLED, gpio.LOW) tmr.delay(10000) gpio.write(zLED, gpio.HIGH)
if wifi.sta.getip() == nil then
print("Connecting to AP...")
i=i+1
if i > 15 then
print("pas de wifi :-(")
wifi_init2:unregister() wifi_init2=nil
wifi.setmode(wifi.SOFTAP,true)
wifi_init_end()
file.putcontents("_setup_wifi_", "toto")
print("on restart pour le setup wifi")
node.restart()
--tmr_wifi_init2:unregister() tmr_wifi_init2=nil
--wifi.setmode(wifi.SOFTAP,true)
--wifi_init_end()
end
else
wifi_init_end()
@@ -69,6 +77,6 @@ end
wifi_init()
--[[
file.putcontents("_setup_wifi_", "")
file.putcontents("_setup_wifi_", "toto")
file.remove("eus_params.lua")
]]