From be32296b38d420c725bf23ad3fd84f27a8f0bf36 Mon Sep 17 00:00:00 2001 From: Christian Zufferey Date: Fri, 10 Jan 2020 12:39:48 +0100 Subject: [PATCH] =?UTF-8?q?Voil=C3=A0,=20ma=20nouvelle=20proc=C3=A9dure=20?= =?UTF-8?q?de=20boot=20est=20termin=C3=A9e,=20enfin.=20Reste=20encore=20?= =?UTF-8?q?=C3=A0=20la=20tester=20pendant=20un=20certain=20temps=20;-)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SonOff/SonOff_2/a.lua | 49 ------------- SonOff/SonOff_2/{ => goodies}/0_cron.lua | 0 SonOff/SonOff_2/{ => goodies}/0_send_data.lua | 0 SonOff/SonOff_2/goodies/a.lua | 69 ++++++++++--------- SonOff/SonOff_2/{ => goodies}/boot2.lua | 0 SonOff/SonOff_2/{ => goodies}/dir2.lua | 0 SonOff/SonOff_2/{ => goodies}/disp_temp.html | 0 SonOff/SonOff_2/{ => goodies}/set_time.lua | 0 SonOff/SonOff_2/{ => goodies}/wifi_clear.html | 0 .../SonOff_2/{ => goodies}/wifi_set_conf.html | 0 SonOff/SonOff_2/{ => goodies}/zz_host_dir.lua | 0 .../SonOff_2/{ => goodies}/zz_host_dir2.lua | 0 SonOff/SonOff_2/initz.lua | 6 +- SonOff/SonOff_2/wifi_init.lua | 6 +- 14 files changed, 40 insertions(+), 90 deletions(-) delete mode 100644 SonOff/SonOff_2/a.lua rename SonOff/SonOff_2/{ => goodies}/0_cron.lua (100%) rename SonOff/SonOff_2/{ => goodies}/0_send_data.lua (100%) rename SonOff/SonOff_2/{ => goodies}/boot2.lua (100%) rename SonOff/SonOff_2/{ => goodies}/dir2.lua (100%) rename SonOff/SonOff_2/{ => goodies}/disp_temp.html (100%) rename SonOff/SonOff_2/{ => goodies}/set_time.lua (100%) rename SonOff/SonOff_2/{ => goodies}/wifi_clear.html (100%) rename SonOff/SonOff_2/{ => goodies}/wifi_set_conf.html (100%) rename SonOff/SonOff_2/{ => goodies}/zz_host_dir.lua (100%) rename SonOff/SonOff_2/{ => goodies}/zz_host_dir2.lua (100%) diff --git a/SonOff/SonOff_2/a.lua b/SonOff/SonOff_2/a.lua deleted file mode 100644 index 709aa75..0000000 --- a/SonOff/SonOff_2/a.lua +++ /dev/null @@ -1,49 +0,0 @@ -print("a start... zf190105.2344") - - -srv:close() -srv=nil - -wifi.setmode(wifi.NULLMODE,true) - -print("toto") -tmr.delay(1*1000*1000) -print("tutu") - -wifi.setmode(wifi.STATIONAP,true) - -wifi.sta.config{ssid="", pwd="", auto=true, save=true} -wifi.sta.autoconnect(1) wifi.sta.connect() -wifi.ap.config({ ssid = "toto", auth=wifi.OPEN, save=true }) - -wifi.setmode(wifi.STATION,true) - ---wifi.setmode(wifi.STATIONAP) ---wifi.ap.config({ssid="MyPersonalSSID", auth=wifi.OPEN}) ---enduser_setup.manual(true) - ---[[ -srv:close() -srv=nil - -wifi.setmode(wifi.NULLMODE,true) - -print("toto") -a1=tmr.create() -a1:alarm(10*1000, tmr.ALARM_SINGLE, function() - enduser_setup.start( - function() - print("Connected to WiFi as:" .. wifi.sta.getip()) - end, - function(err, str) - print("enduser_setup: Err #" .. err .. ": " .. str) - end, - print -- Lua print function can serve as the debug callback - ) - print(node.heap()) collectgarbage() print(node.heap()) - print("tutu") -end) - -]] - - diff --git a/SonOff/SonOff_2/0_cron.lua b/SonOff/SonOff_2/goodies/0_cron.lua similarity index 100% rename from SonOff/SonOff_2/0_cron.lua rename to SonOff/SonOff_2/goodies/0_cron.lua diff --git a/SonOff/SonOff_2/0_send_data.lua b/SonOff/SonOff_2/goodies/0_send_data.lua similarity index 100% rename from SonOff/SonOff_2/0_send_data.lua rename to SonOff/SonOff_2/goodies/0_send_data.lua diff --git a/SonOff/SonOff_2/goodies/a.lua b/SonOff/SonOff_2/goodies/a.lua index 7c59e2f..709aa75 100644 --- a/SonOff/SonOff_2/goodies/a.lua +++ b/SonOff/SonOff_2/goodies/a.lua @@ -1,48 +1,49 @@ --- Scripts pour tester le multi-tâche +print("a start... zf190105.2344") -function lenteur() - print("in...") - tmr.delay(1*1000*1000) - print("out...") - i=i+1 - zrepeat() -end +srv:close() +srv=nil -function zrepeat() - if i<5 then - node.task.post(lenteur) - end - print("out2...") -end +wifi.setmode(wifi.NULLMODE,true) +print("toto") +tmr.delay(1*1000*1000) +print("tutu") -t1=tmr.now() +wifi.setmode(wifi.STATIONAP,true) -i=0 -zrepeat() +wifi.sta.config{ssid="", pwd="", auto=true, save=true} +wifi.sta.autoconnect(1) wifi.sta.connect() +wifi.ap.config({ ssid = "toto", auth=wifi.OPEN, save=true }) -t2=tmr.now() -print("durée: "..t2-t1) +wifi.setmode(wifi.STATION,true) +--wifi.setmode(wifi.STATIONAP) +--wifi.ap.config({ssid="MyPersonalSSID", auth=wifi.OPEN}) +--enduser_setup.manual(true) --[[ +srv:close() +srv=nil -t1={} -for k,v in pairs(pfile) do - t1[#t1+1]=k -end +wifi.setmode(wifi.NULLMODE,true) -print(t1[3]) +print("toto") +a1=tmr.create() +a1:alarm(10*1000, tmr.ALARM_SINGLE, function() + enduser_setup.start( + function() + print("Connected to WiFi as:" .. wifi.sta.getip()) + end, + function(err, str) + print("enduser_setup: Err #" .. err .. ": " .. str) + end, + print -- Lua print function can serve as the debug callback + ) + print(node.heap()) collectgarbage() print(node.heap()) + print("tutu") +end) + +]] -t1 = file.list() -print(file.list()["a.lua"]) - - -print(file.list[1]) -print(#file.list) - - - -]] \ No newline at end of file diff --git a/SonOff/SonOff_2/boot2.lua b/SonOff/SonOff_2/goodies/boot2.lua similarity index 100% rename from SonOff/SonOff_2/boot2.lua rename to SonOff/SonOff_2/goodies/boot2.lua diff --git a/SonOff/SonOff_2/dir2.lua b/SonOff/SonOff_2/goodies/dir2.lua similarity index 100% rename from SonOff/SonOff_2/dir2.lua rename to SonOff/SonOff_2/goodies/dir2.lua diff --git a/SonOff/SonOff_2/disp_temp.html b/SonOff/SonOff_2/goodies/disp_temp.html similarity index 100% rename from SonOff/SonOff_2/disp_temp.html rename to SonOff/SonOff_2/goodies/disp_temp.html diff --git a/SonOff/SonOff_2/set_time.lua b/SonOff/SonOff_2/goodies/set_time.lua similarity index 100% rename from SonOff/SonOff_2/set_time.lua rename to SonOff/SonOff_2/goodies/set_time.lua diff --git a/SonOff/SonOff_2/wifi_clear.html b/SonOff/SonOff_2/goodies/wifi_clear.html similarity index 100% rename from SonOff/SonOff_2/wifi_clear.html rename to SonOff/SonOff_2/goodies/wifi_clear.html diff --git a/SonOff/SonOff_2/wifi_set_conf.html b/SonOff/SonOff_2/goodies/wifi_set_conf.html similarity index 100% rename from SonOff/SonOff_2/wifi_set_conf.html rename to SonOff/SonOff_2/goodies/wifi_set_conf.html diff --git a/SonOff/SonOff_2/zz_host_dir.lua b/SonOff/SonOff_2/goodies/zz_host_dir.lua similarity index 100% rename from SonOff/SonOff_2/zz_host_dir.lua rename to SonOff/SonOff_2/goodies/zz_host_dir.lua diff --git a/SonOff/SonOff_2/zz_host_dir2.lua b/SonOff/SonOff_2/goodies/zz_host_dir2.lua similarity index 100% rename from SonOff/SonOff_2/zz_host_dir2.lua rename to SonOff/SonOff_2/goodies/zz_host_dir2.lua diff --git a/SonOff/SonOff_2/initz.lua b/SonOff/SonOff_2/initz.lua index 84b69ab..7209536 100644 --- a/SonOff/SonOff_2/initz.lua +++ b/SonOff/SonOff_2/initz.lua @@ -3,7 +3,7 @@ -- le script repair.lua pendant xx secondes avant de continuer --Source: https://nodemcu.readthedocs.io/en/master/en/modules/node/#nodebootreason -print("\n init.lua zf200107.1525 \n") +print("\n init.lua zf200110.1232 \n") function initz() @@ -25,8 +25,8 @@ function initz() function second_chance() print("seconde chance...") - zLED=4 -- NodeMCU - --zLED=7 -- SonOff + --zLED=4 -- NodeMCU + zLED=7 -- SonOff gpio.write(zLED, gpio.LOW) gpio.mode(zLED, gpio.OUTPUT) initalarme1=tmr.create() initalarme1:alarm(10*1000, tmr.ALARM_SINGLE, function() diff --git a/SonOff/SonOff_2/wifi_init.lua b/SonOff/SonOff_2/wifi_init.lua index 5be5793..5d23451 100644 --- a/SonOff/SonOff_2/wifi_init.lua +++ b/SonOff/SonOff_2/wifi_init.lua @@ -1,7 +1,7 @@ -- Petit script pour initaliser la couche WIFI function wifi_init() - print("\n wifi_init.lua zf200109.1848 \n") + print("\n wifi_init.lua zf200110.1236 \n") function wifi_init_end() wifi_init1:unregister() i=nil @@ -12,7 +12,7 @@ function wifi_init() 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=10 end + zdelay=1 if reset_reason=="seconde_chance" then zdelay=20 end wifi_init3=tmr.create() wifi_init3:alarm(zdelay*1000, tmr.ALARM_SINGLE, function() f= "boot.lua" if file.exists(f) then dofile(f) end @@ -44,8 +44,6 @@ function wifi_init() print(node.heap()) collectgarbage() print(node.heap()) end) - zLED=4 -- NodeMCU - --zLED=7 -- SonOff 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()