From 2b18f3e80047340b019cc4bc9817be0a22b0b0f2 Mon Sep 17 00:00:00 2001
From: Christian Zufferey <christian@zufferey.com>
Date: Sat, 25 Jul 2020 11:13:42 +0200
Subject: [PATCH] =?UTF-8?q?Refactoris=C3=A9=20le=20dossier=20pet=5Ftracker?=
 =?UTF-8?q?=5F2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DeepSleep/Pet_tracker_2/0_dsleep2.lua         |  3 +-
 DeepSleep/Pet_tracker_2/0_wifi_scan.lua       |  4 +-
 DeepSleep/Pet_tracker_2/_zlocal_cmd.txt       | 88 -------------------
 .../Pet_tracker_2/{ => goodies}/0_cron.lua    |  0
 .../{ => goodies}/0_http_post.lua             |  0
 .../{ => goodies}/a_test_power_wifi.lua       |  0
 DeepSleep/Pet_tracker_2/{ => goodies}/cat.lua |  0
 DeepSleep/Pet_tracker_2/{ => goodies}/dir.lua |  0
 .../Pet_tracker_2/{ => goodies}/dir3.lua      |  0
 .../Pet_tracker_2/{ => goodies}/head.lua      |  0
 .../Pet_tracker_2/{ => goodies}/repair.lua    |  0
 .../Pet_tracker_2/{ => goodies}/restart.lua   |  0
 12 files changed, 4 insertions(+), 91 deletions(-)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/0_cron.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/0_http_post.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/a_test_power_wifi.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/cat.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/dir.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/dir3.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/head.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/repair.lua (100%)
 rename DeepSleep/Pet_tracker_2/{ => goodies}/restart.lua (100%)

diff --git a/DeepSleep/Pet_tracker_2/0_dsleep2.lua b/DeepSleep/Pet_tracker_2/0_dsleep2.lua
index 6041310..6d7710c 100644
--- a/DeepSleep/Pet_tracker_2/0_dsleep2.lua
+++ b/DeepSleep/Pet_tracker_2/0_dsleep2.lua
@@ -3,11 +3,10 @@
 
 -- ATTENTION: il faut connecter la pin 0 à la pin RESET avec une résistance de 1k !
 
-print("\n dsleep.lua   zf200724.1803   \n")
+print("\n dsleep.lua   zf200725.1053   \n")
 
 zLED=4
 f= "flash_led_xfois.lua"   if file.exists(f) then dofile(f) end
-f= "secrets_project.lua"    if file.exists(f) then dofile(f) end
 
 function ztime()
     tm = rtctime.epoch2cal(rtctime.get()+2*3600)
diff --git a/DeepSleep/Pet_tracker_2/0_wifi_scan.lua b/DeepSleep/Pet_tracker_2/0_wifi_scan.lua
index 68d0f21..a54b9f6 100644
--- a/DeepSleep/Pet_tracker_2/0_wifi_scan.lua
+++ b/DeepSleep/Pet_tracker_2/0_wifi_scan.lua
@@ -1,6 +1,8 @@
 -- Scripts pour tester l'écoute des AP WIFI
 
-print("\n wifi_scan.lua zf200724.1827 \n")
+print("\n wifi_scan.lua zf200725.1053 \n")
+
+f= "secrets_project.lua"    if file.exists(f) then dofile(f) end
 
 -- https://www.epochconverter.com/
 ztime2020 = 1577836800      -- Unix time pour 1.1.2020 0:0:0 GMT
diff --git a/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt b/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
index 00a003c..9f2c12e 100644
--- a/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
+++ b/DeepSleep/Pet_tracker_2/_zlocal_cmd.txt
@@ -11,94 +11,6 @@ print("le flag est à "..rtcmem.read32(10))
 f= "wifi_info.lua"   if file.exists(f) then dofile(f) end
 
 
-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
 
 
 
-
-
-
-srv_rt:on("connection", nil)
-
-
-
-
-=node.heap()
-rt_connect()
-
-        fifo1, fifo1l, fifo2, fifo2l = nil, nil, nil, nil
-        rec = nil
-        k = nil
-        l = nil
-        s = nil
-        chunk = nil
-        socket = nil
-        flushGarbage = nil
-        sendLine = nil
-        queueLine = nil
-        receiveLine = nil
-        zconnection = nil
-        disconnect = nil
-        telnet_listener=nil
-        srv_rt=nil
-=node.heap()
-
-
-
-
-
-
-
-
-
-
-=node.heap()
-dofile("0_rtelnet1.lua")
-=node.heap()
-telnet_listener=nil
-=node.heap()
-srv_rt=nil
-=node.heap()
-
-
-
-for k,v in ipairs(debug.getregistry()) do print(k,v) end
-
-
-
-node.stripdebug(3)
-node.compile('0_tst4_socat.lua')
-
-print(srv_rt)
-print(srv_rt:getpeer())
-srv_rt:close()
-
-print(socket)
-print(socket:getpeer())
-socket:close()
-
-verbose=true
-node.output(nil)
-
-http_post(influxdb_url,"energy,value=test1_"..yellow_id.." val=1")   print("toto",node.heap(),#t_zurl)
-
-
-=srv_rt:getaddr()
-tmr_socat1:unregister()
-for k,v in pairs(_G) do print(k,v) end
-
-total_allocated, estimated_used = node.egc.meminfo()
-print(total_allocated, estimated_used)
-
-print(console_port)
-
-srv_rt = nil   collectgarbage()
-
-
diff --git a/DeepSleep/Pet_tracker_2/0_cron.lua b/DeepSleep/Pet_tracker_2/goodies/0_cron.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/0_cron.lua
rename to DeepSleep/Pet_tracker_2/goodies/0_cron.lua
diff --git a/DeepSleep/Pet_tracker_2/0_http_post.lua b/DeepSleep/Pet_tracker_2/goodies/0_http_post.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/0_http_post.lua
rename to DeepSleep/Pet_tracker_2/goodies/0_http_post.lua
diff --git a/DeepSleep/Pet_tracker_2/a_test_power_wifi.lua b/DeepSleep/Pet_tracker_2/goodies/a_test_power_wifi.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/a_test_power_wifi.lua
rename to DeepSleep/Pet_tracker_2/goodies/a_test_power_wifi.lua
diff --git a/DeepSleep/Pet_tracker_2/cat.lua b/DeepSleep/Pet_tracker_2/goodies/cat.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/cat.lua
rename to DeepSleep/Pet_tracker_2/goodies/cat.lua
diff --git a/DeepSleep/Pet_tracker_2/dir.lua b/DeepSleep/Pet_tracker_2/goodies/dir.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/dir.lua
rename to DeepSleep/Pet_tracker_2/goodies/dir.lua
diff --git a/DeepSleep/Pet_tracker_2/dir3.lua b/DeepSleep/Pet_tracker_2/goodies/dir3.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/dir3.lua
rename to DeepSleep/Pet_tracker_2/goodies/dir3.lua
diff --git a/DeepSleep/Pet_tracker_2/head.lua b/DeepSleep/Pet_tracker_2/goodies/head.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/head.lua
rename to DeepSleep/Pet_tracker_2/goodies/head.lua
diff --git a/DeepSleep/Pet_tracker_2/repair.lua b/DeepSleep/Pet_tracker_2/goodies/repair.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/repair.lua
rename to DeepSleep/Pet_tracker_2/goodies/repair.lua
diff --git a/DeepSleep/Pet_tracker_2/restart.lua b/DeepSleep/Pet_tracker_2/goodies/restart.lua
similarity index 100%
rename from DeepSleep/Pet_tracker_2/restart.lua
rename to DeepSleep/Pet_tracker_2/goodies/restart.lua