From 5716fbd93f2c087bb615cacf7f3e24aa126b92fa Mon Sep 17 00:00:00 2001
From: Christian Zufferey <christian@zufferey.com>
Date: Mon, 6 Jan 2020 23:32:50 +0100
Subject: [PATCH] =?UTF-8?q?Je=20suis=20=C3=A0=20nouveau=20en=20train=20de?=
 =?UTF-8?q?=20refactoriser=20ma=20proc=C3=A9dure=20de=20boot,=20car=20j'ai?=
 =?UTF-8?q?=20toujours=20des=20probl=C3=A8mes=20de=20m=C3=A9moire.=20Cela?=
 =?UTF-8?q?=20ne=20fonctionne=20pas=20encore=20:-(?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SonOff/SonOff_2/boot.lua      |  3 ++-
 SonOff/SonOff_2/boot2.lua     | 18 ++----------------
 SonOff/SonOff_2/wifi_init.lua |  8 +++++++-
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/SonOff/SonOff_2/boot.lua b/SonOff/SonOff_2/boot.lua
index 891d369..a5302d7 100644
--- a/SonOff/SonOff_2/boot.lua
+++ b/SonOff/SonOff_2/boot.lua
@@ -1,6 +1,6 @@
 -- Scripts à charger après le boot pour démarrer le core system
 
-print("\n boot.lua zf200106.1815 \n")
+print("\n boot.lua zf200106.2313 \n")
 
 function boot()
     if zswitch ~= nill then
@@ -9,5 +9,6 @@ function boot()
     f= "wifi_init.lua"   if file.exists(f) then dofile(f) end
     f= "telnet_srv2.lua"   if file.exists(f) then dofile(f) end
     f= "web_srv2.lua"   if file.exists(f) then dofile(f) end
+    second_chance=nil   initz=nil   f=nil   boot=nil
 end
 boot()
diff --git a/SonOff/SonOff_2/boot2.lua b/SonOff/SonOff_2/boot2.lua
index 21f0970..abe0417 100644
--- a/SonOff/SonOff_2/boot2.lua
+++ b/SonOff/SonOff_2/boot2.lua
@@ -1,10 +1,9 @@
 -- Scripts à charger après le boot pour démarrer son projet
 
-print("\n boot2.lua zf200106.1817 \n")
+print("\n boot2.lua zf200106.2331 \n")
 
 function boot2()
     print("boot2 starting...")
-    second_chance=nil   initz=nil   boot=nil
     boot2_tmr=nil   boot2_tmr1=nil   boot2_go=nil
     print(node.heap())   collectgarbage()   print(node.heap())
 
@@ -16,20 +15,7 @@ function boot2()
 
     verbose = true
 
-    boot2_tmr2=tmr.create()
-    boot2_tmr2:alarm(4*1000,  tmr.ALARM_SINGLE, function()
-        print("BOOOOUM, y'a plus de boot2 !")
-        boot2=nil    boot2_tmr2=nil
-        print(node.heap())   collectgarbage()   print(node.heap())
-
-    --tmr.create():alarm(7*1000,  tmr.ALARM_SINGLE, function()
-    --    print("MUOOOOB !")
-    --    collectgarbage()
-    --    print(node.heap())
-        --f= "web_ide2.lua"   if file.exists(f) then dofile(f) end
-    --    f=nil
-    --end)
-    end)
+    boot2=nil
 end
 
 boot2_tmr1=tmr.create()
diff --git a/SonOff/SonOff_2/wifi_init.lua b/SonOff/SonOff_2/wifi_init.lua
index b1c25dc..d56b51b 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   zf200106.1846   \n")
+    print("\n wifi_init.lua   zf200106.2322   \n")
 
     function wifi_init_end()
         wifi_init1:unregister()   zLED=nil   i=nil
@@ -48,6 +48,11 @@ function wifi_init()
             gpio.write(zLED, gpio.LOW)   tmr.delay(10000)   gpio.write(zLED, gpio.HIGH)
             if wifi.sta.getip() == nil then
                 print("Connecting to AP...")
+
+                
+                print(node.heap())   collectgarbage()   print(node.heap())
+                
+                
                 i=i+1
                 if i > 15 then
                     print("pas de wifi :-(")
@@ -65,5 +70,6 @@ wifi_init()
 
 --[[
 file.putcontents("_setup_wifi_", "")
+boot2_go = true
 ]]