From 06498486d4cdd1817f1519a09e290fdd394d0148 Mon Sep 17 00:00:00 2001 From: Christian Zufferey Date: Sat, 25 Jul 2020 12:28:42 +0200 Subject: [PATCH] =?UTF-8?q?Voil=C3=A0,=20mon=20socat=20fonctionne=20=C3=A0?= =?UTF-8?q?=20nouveau=20avec=20la=20version=20du=20firmeware=20de=20dec=20?= =?UTF-8?q?19?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Mon socat ne fonctionne plus avec les nouvelles version du firmeware et mon pet tracker utilisait le module rtc-mem qui ne se trouvait pas dans la version de dec 19. J'ai donc dû modifier la procédure de boot afin de ne plus devoir utiliser le module rtc-mem et de pouvoir revenir au firmeware de dec 19 et pouvoir utiliser à nouveau mon socat qui est indispensable afin de pouvoir récupérer les logs des ap wifi scannés lors de la sortie du chat --- DeepSleep/Pet_tracker_3/0_dsleep2.lua | 4 ++-- DeepSleep/Pet_tracker_3/_zremote_cmd.txt | 12 ++++++++++++ DeepSleep/Pet_tracker_3/{goodies => }/cat.lua | 0 DeepSleep/Pet_tracker_3/{goodies => }/dir.lua | 0 DeepSleep/Pet_tracker_3/{goodies => }/head.lua | 0 DeepSleep/Pet_tracker_3/initz.lua | 10 +++------- DeepSleep/Pet_tracker_3/luatool.py | 4 ++-- 7 files changed, 19 insertions(+), 11 deletions(-) rename DeepSleep/Pet_tracker_3/{goodies => }/cat.lua (100%) rename DeepSleep/Pet_tracker_3/{goodies => }/dir.lua (100%) rename DeepSleep/Pet_tracker_3/{goodies => }/head.lua (100%) diff --git a/DeepSleep/Pet_tracker_3/0_dsleep2.lua b/DeepSleep/Pet_tracker_3/0_dsleep2.lua index 6d7710c..77b7f5c 100644 --- a/DeepSleep/Pet_tracker_3/0_dsleep2.lua +++ b/DeepSleep/Pet_tracker_3/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 zf200725.1053 \n") +print("\n dsleep.lua zf200725.1151 \n") zLED=4 f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end @@ -21,7 +21,7 @@ function dsleep_on() tmr.delay(100*1000) -- node.dsleep(4*1000*1000) -- print(node.bootreason()) - rtcmem.write32(10, 43690) --flag pour détecter le réveil dsleep au moment du boot + -- rtcmem.write32(10, 43690) --flag pour détecter le réveil dsleep au moment du boot -- print("le flag est à "..rtcmem.read32(10)) wifi.setmode(wifi.NULLMODE,true) rtctime.dsleep(4*1000*1000) diff --git a/DeepSleep/Pet_tracker_3/_zremote_cmd.txt b/DeepSleep/Pet_tracker_3/_zremote_cmd.txt index 5ee21b5..b7b8dd2 100644 --- a/DeepSleep/Pet_tracker_3/_zremote_cmd.txt +++ b/DeepSleep/Pet_tracker_3/_zremote_cmd.txt @@ -58,6 +58,12 @@ ssh -N -L 23000:localhost:23000 ubuntu@www.zuzu-test.ml & telnet -rN $zIP $zport +file.remove("apwifi.txt") +print(ztime()) +dsleep_on() + +zcat_logs_ap_wifi() + verbose=false ~. @@ -75,6 +81,12 @@ zhead("0_ultra_son.lua") ./luatool.py --ip $zIP:$zport -f 0_tst5_socat.lua ./luatool.py --ip $zIP:$zport -f 0_ultra_son.lua +./luatool.py --ip $zIP:$zport -f dir.lua +./luatool.py --ip $zIP:$zport -f cat.lua +./luatool.py --ip $zIP:$zport -f head.lua + + + ./luatool.py --ip $zIP:$zport --zrestart diff --git a/DeepSleep/Pet_tracker_3/goodies/cat.lua b/DeepSleep/Pet_tracker_3/cat.lua similarity index 100% rename from DeepSleep/Pet_tracker_3/goodies/cat.lua rename to DeepSleep/Pet_tracker_3/cat.lua diff --git a/DeepSleep/Pet_tracker_3/goodies/dir.lua b/DeepSleep/Pet_tracker_3/dir.lua similarity index 100% rename from DeepSleep/Pet_tracker_3/goodies/dir.lua rename to DeepSleep/Pet_tracker_3/dir.lua diff --git a/DeepSleep/Pet_tracker_3/goodies/head.lua b/DeepSleep/Pet_tracker_3/head.lua similarity index 100% rename from DeepSleep/Pet_tracker_3/goodies/head.lua rename to DeepSleep/Pet_tracker_3/head.lua diff --git a/DeepSleep/Pet_tracker_3/initz.lua b/DeepSleep/Pet_tracker_3/initz.lua index f226f9b..60d980e 100644 --- a/DeepSleep/Pet_tracker_3/initz.lua +++ b/DeepSleep/Pet_tracker_3/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 zf200722.1526 \n") +print("\n init.lua zf200725.1150 \n") verbose = true @@ -61,12 +61,8 @@ function initz() initz_end() elseif reset_reason == 6 then print("external reset") - if rtcmem.read32(10) == 43690 then - print("dsleep wake up") - f = "0_dsleep2.lua" if file.exists(f) then dofile(f) end - else - second_chance() - end + print("dsleep wake up") + f = "0_dsleep2.lua" if file.exists(f) then dofile(f) end else print("autre raison") second_chance() diff --git a/DeepSleep/Pet_tracker_3/luatool.py b/DeepSleep/Pet_tracker_3/luatool.py index 29e183f..dd0057d 100755 --- a/DeepSleep/Pet_tracker_3/luatool.py +++ b/DeepSleep/Pet_tracker_3/luatool.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # -*- coding: utf-8 -*- -version = "0.6.8 zf191225.1428" +version = "0.6.9 zf200725.1209" print("luatool.py ver " + version)