From 7394b7931edbf0389c154974f9926d0132432ded Mon Sep 17 00:00:00 2001
From: Christian Zufferey <christian@zufferey.com>
Date: Wed, 22 Jul 2020 19:45:48 +0200
Subject: [PATCH] =?UTF-8?q?Cela=20commence=20=C3=A0=20marcher,=20il=20s'en?=
 =?UTF-8?q?dore,=20se=20r=C3=A9veille,=20scan=20le=20r=C3=A9seau=20wifi=20?=
 =?UTF-8?q?et=20se=20rendort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DeepSleep/Pet_tracker_2/0_dsleep2.lua           | 15 ++++++++++++++-
 .../Pet_tracker_2/{a.lua => 0_wifi_scan.lua}    | 17 +++++++++++------
 DeepSleep/Pet_tracker_2/_zlocal_cmd.txt         |  9 ++++++---
 DeepSleep/Pet_tracker_2/boot.lua                |  5 ++++-
 4 files changed, 35 insertions(+), 11 deletions(-)
 rename DeepSleep/Pet_tracker_2/{a.lua => 0_wifi_scan.lua} (72%)

diff --git a/DeepSleep/Pet_tracker_2/0_dsleep2.lua b/DeepSleep/Pet_tracker_2/0_dsleep2.lua
index 3532bdf..68c83b8 100644
--- a/DeepSleep/Pet_tracker_2/0_dsleep2.lua
+++ b/DeepSleep/Pet_tracker_2/0_dsleep2.lua
@@ -3,7 +3,7 @@
 
 -- ATTENTION: il faut connecter la pin 0 à la pin RESET avec une résistance de 1k !
 
-print("\n dsleep.lua   zf200722.1546   \n")
+print("\n dsleep.lua   zf200722.1944   \n")
 
 zLED=4
 f= "flash_led_xfois.lua"   if file.exists(f) then dofile(f) end
@@ -48,6 +48,19 @@ print(ztime())
 -- on se réveil, vérifie si on peut avoir du réseau autrement on va redormir
 function dsleep_wake_up()
     print("Coucou, je suis réveillé... et il est "..ztime())
+    if wifi.sta.getip() == nil then
+        print("Unconnected...")
+        f = "0_wifi_scan.lua"   if file.exists(f) then dofile(f) end
+        wifi.setmode(wifi.STATION)
+        scan_wifi()
+    else
+        print("Connected...")
+    end
+   -- f= "wifi_info.lua"   if file.exists(f) then dofile(f) end
+
+
+
+
 
 end
 
diff --git a/DeepSleep/Pet_tracker_2/a.lua b/DeepSleep/Pet_tracker_2/0_wifi_scan.lua
similarity index 72%
rename from DeepSleep/Pet_tracker_2/a.lua
rename to DeepSleep/Pet_tracker_2/0_wifi_scan.lua
index 7d44bbc..7e9e3b9 100644
--- a/DeepSleep/Pet_tracker_2/a.lua
+++ b/DeepSleep/Pet_tracker_2/0_wifi_scan.lua
@@ -1,6 +1,6 @@
 -- Scripts pour tester l'écoute des AP WIFI
 
-print("\n a.lua zf200722.1544 \n")
+print("\n wifi_scan.lua zf200722.1944 \n")
 
 --f= "wifi_ap_stop.lua"   if file.exists(f) then dofile(f) end
 --f= "wifi_cli_conf.lua"   if file.exists(f) then dofile(f) end
@@ -11,20 +11,25 @@ print("\n a.lua zf200722.1544 \n")
 
 
 -- print AP list in new format
-function a()
+function scan_wifi()
     print(ztime())
     function listap(t)
-        print("")
+        print("on affiche le résultat...")
         for k,v in pairs(t) do
-            print(k.." : "..v)
+            local ssid, rssi, authmode, channel = string.match(v, "([^,]+),([^,]+),([^,]+),([^,]*)")
+            print(ssid,rssi)
+--            print(k.." : "..v)
         end
-        print("")
+        print("on a terminé d'afficher...")
+        dsleep_on()
     end
+    print("on scanne...")
     wifi.sta.getap(1, listap)
+    print("on a terminé...")
 end
 
 --[[
-a()
+scan_wifi()
 ]]
 
 
diff --git a/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt b/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
index 362205f..9561a32 100644
--- a/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
+++ b/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
@@ -1,18 +1,21 @@
-zf200722.1537
-
+zf200722.1944
 
 dsleep_on()
 print(node.bootreason())
 print("le flag est à "..rtcmem.read32(10))
 
 f= "wifi_info.lua"   if file.exists(f) then dofile(f) end
+print(ztime())
+
+wifi.setmode(wifi.STATION)
+a()
+wifi.setmode(wifi.NULLMODE,true)
 
 function ztime()
     tm = rtctime.epoch2cal(rtctime.get()+2*3600)
     print(string.format("%04d/%02d/%02d %02d:%02d:%02d", tm["year"], tm["mon"], tm["day"], tm["hour"], tm["min"], tm["sec"]))
 end
 
-print(ztime())
 
 
 
diff --git a/DeepSleep/Pet_tracker_2/boot.lua b/DeepSleep/Pet_tracker_2/boot.lua
index d8afafb..99e5c7c 100644
--- a/DeepSleep/Pet_tracker_2/boot.lua
+++ b/DeepSleep/Pet_tracker_2/boot.lua
@@ -1,7 +1,7 @@
 -- Scripts à charger après le boot pour démarrer son projet
 
 function boot()
-    print("\n boot.lua   zf200722.1536   \n")
+    print("\n boot.lua   zf200722.1944   \n")
     print("On lance le boot...")
     collectgarbage() print(node.heap())
     local f        
@@ -18,6 +18,9 @@ function boot()
 
     f = "0_dsleep2.lua"   if file.exists(f) then dofile(f) end
     print(node.heap()) collectgarbage() print(node.heap())
+
+    -- f = "0_wifi_scan.lua"   if file.exists(f) then dofile(f) end
+    -- print(node.heap()) collectgarbage() print(node.heap())
     
     -- f = "flash_led_xfois.lua"   if file.exists(f) then dofile(f) end
     -- print(node.heap()) collectgarbage() print(node.heap())