diff --git a/PCM/Cigales/boot.lua b/PCM/Cigales/boot.lua index 5b08a8e..1f44973 100644 --- a/PCM/Cigales/boot.lua +++ b/PCM/Cigales/boot.lua @@ -1,6 +1,6 @@ -- Scripts à charger après le boot pour démarrer son appli -print("\n boot.lua zf190119.1933 \n") +print("\n boot.lua zf190721.1603 \n") function heartbeat() f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end @@ -11,6 +11,7 @@ function heartbeat() end) end +f= "wifi_off.lua" if file.exists(f) then dofile(f) end --f= "wifi_ap_start.lua" if file.exists(f) then dofile(f) end --f= "wifi_cli_conf.lua" if file.exists(f) then dofile(f) end --f= "wifi_cli_start.lua" if file.exists(f) then dofile(f) end diff --git a/PCM/Cigales/flash_led_xfois.lua b/PCM/Cigales/goodies/flash_led_xfois.lua similarity index 100% rename from PCM/Cigales/flash_led_xfois.lua rename to PCM/Cigales/goodies/flash_led_xfois.lua diff --git a/PCM/Cigales/rm_files.lua b/PCM/Cigales/goodies/rm_files.lua similarity index 100% rename from PCM/Cigales/rm_files.lua rename to PCM/Cigales/goodies/rm_files.lua diff --git a/PCM/Cigales/telnet_srv2.lua b/PCM/Cigales/goodies/telnet_srv2.lua similarity index 100% rename from PCM/Cigales/telnet_srv2.lua rename to PCM/Cigales/goodies/telnet_srv2.lua diff --git a/PCM/Cigales/web_ide2.lua b/PCM/Cigales/goodies/web_ide2.lua similarity index 100% rename from PCM/Cigales/web_ide2.lua rename to PCM/Cigales/goodies/web_ide2.lua diff --git a/PCM/Cigales/wifi_ap_start.lua b/PCM/Cigales/goodies/wifi_ap_start.lua similarity index 100% rename from PCM/Cigales/wifi_ap_start.lua rename to PCM/Cigales/goodies/wifi_ap_start.lua diff --git a/PCM/Cigales/wifi_cli_conf.lua b/PCM/Cigales/goodies/wifi_cli_conf.lua similarity index 100% rename from PCM/Cigales/wifi_cli_conf.lua rename to PCM/Cigales/goodies/wifi_cli_conf.lua diff --git a/PCM/Cigales/wifi_cli_start.lua b/PCM/Cigales/goodies/wifi_cli_start.lua similarity index 100% rename from PCM/Cigales/wifi_cli_start.lua rename to PCM/Cigales/goodies/wifi_cli_start.lua diff --git a/PCM/Cigales/initz.lua b/PCM/Cigales/initz.lua index a027599..4b1b29f 100644 --- a/PCM/Cigales/initz.lua +++ b/PCM/Cigales/initz.lua @@ -3,14 +3,14 @@ -- 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 zf190131.009 \n") +print("\n init.lua zf190601.1612 \n") zswitch=3 --switch flash gpio.mode(zswitch, gpio.INT, gpio.PULLUP) function hvbouton() -- gpio.trig(zswitch, "none") - tmr.unregister(initalarme) + initalarme:unregister() f= "boot.lua" if file.exists(f) then dofile(f) end end @@ -20,7 +20,8 @@ function second_chance() print("seconde chance...") f= "repair.lua" if file.exists(f) then dofile(f) end initalarme=tmr.create() - tmr.alarm(initalarme, 8*1000, tmr.ALARM_SINGLE, function() +-- tmr.alarm(initalarme, 4*1000, tmr.ALARM_SINGLE, function() + initalarme:alarm(4*1000, tmr.ALARM_SINGLE, function() f= "boot.lua" if file.exists(f) then dofile(f) end end) end @@ -32,6 +33,11 @@ if reset_reason == 0 then second_chance() elseif reset_reason == 4 then print("node.restart") + gpio.trig(zswitch) + hvbouton=nil + second_chance=nil + zswitch=nil + reset_reason=nil f= "boot.lua" if file.exists(f) then dofile(f) end elseif reset_reason == 5 then print("dsleep wake up") diff --git a/PCM/Cigales/play_file.lua b/PCM/Cigales/play_file.lua index aefea71..ca49b77 100644 --- a/PCM/Cigales/play_file.lua +++ b/PCM/Cigales/play_file.lua @@ -1,6 +1,6 @@ -- Scripts pour jouer un fichier son sur un HP -print("\n play_file.lua zf190721.1238 \n") +print("\n play_file.lua zf190721.1600 \n") -- **************************************************************************** @@ -17,6 +17,8 @@ function cb_drained(d) file.seek("set", 0) -- uncomment the following line for continuous playback --d:play(pcm.RATE_8K) + d:play(pcm.RATE_16K) + end function cb_stopped(d) @@ -28,7 +30,7 @@ function cb_paused(d) print("playback paused") end -file.open("cigale_10s_16k.wav", "r") +file.open("cigale_1mn_16k.wav", "r") drv = pcm.new(pcm.SD, 5) diff --git a/PCM/Cigales/Capture d’écran 2019-02-10 à 12.53.56.png b/PCM/Cigales/schemas/Capture d’écran 2019-02-10 à 12.53.56.png similarity index 100% rename from PCM/Cigales/Capture d’écran 2019-02-10 à 12.53.56.png rename to PCM/Cigales/schemas/Capture d’écran 2019-02-10 à 12.53.56.png diff --git a/PCM/Cigales/play_file.fzz b/PCM/Cigales/schemas/play_file.fzz similarity index 100% rename from PCM/Cigales/play_file.fzz rename to PCM/Cigales/schemas/play_file.fzz diff --git a/PCM/Cigales/play_file_bb.pdf b/PCM/Cigales/schemas/play_file_bb.pdf similarity index 100% rename from PCM/Cigales/play_file_bb.pdf rename to PCM/Cigales/schemas/play_file_bb.pdf diff --git a/PCM/Cigales/play_file_schéma.pdf b/PCM/Cigales/schemas/play_file_schéma.pdf similarity index 100% rename from PCM/Cigales/play_file_schéma.pdf rename to PCM/Cigales/schemas/play_file_schéma.pdf diff --git a/PCM/Cigales/cigale_10s_16k.wav b/PCM/Cigales/sounds/cigale_10s_16k.wav similarity index 100% rename from PCM/Cigales/cigale_10s_16k.wav rename to PCM/Cigales/sounds/cigale_10s_16k.wav diff --git a/PCM/Cigales/cigale_1mn_16k.wav b/PCM/Cigales/sounds/cigale_1mn_16k.wav similarity index 100% rename from PCM/Cigales/cigale_1mn_16k.wav rename to PCM/Cigales/sounds/cigale_1mn_16k.wav diff --git a/PCM/Cigales/cigale_20s_16k.wav b/PCM/Cigales/sounds/cigale_20s_16k.wav similarity index 100% rename from PCM/Cigales/cigale_20s_16k.wav rename to PCM/Cigales/sounds/cigale_20s_16k.wav diff --git a/Temp_DS18B20/solar_zf/initz.lua b/Temp_DS18B20/solar_zf/initz.lua index 15c85ae..4b1b29f 100644 --- a/Temp_DS18B20/solar_zf/initz.lua +++ b/Temp_DS18B20/solar_zf/initz.lua @@ -3,14 +3,14 @@ -- 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 zf190601.1620 \n") +print("\n init.lua zf190601.1612 \n") zswitch=3 --switch flash gpio.mode(zswitch, gpio.INT, gpio.PULLUP) function hvbouton() -- gpio.trig(zswitch, "none") - tmr.unregister(initalarme) + initalarme:unregister() f= "boot.lua" if file.exists(f) then dofile(f) end end diff --git a/Temp_DS18B20/temp_zf/initz.lua b/Temp_DS18B20/temp_zf/initz.lua index 15c85ae..4b1b29f 100644 --- a/Temp_DS18B20/temp_zf/initz.lua +++ b/Temp_DS18B20/temp_zf/initz.lua @@ -3,14 +3,14 @@ -- 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 zf190601.1620 \n") +print("\n init.lua zf190601.1612 \n") zswitch=3 --switch flash gpio.mode(zswitch, gpio.INT, gpio.PULLUP) function hvbouton() -- gpio.trig(zswitch, "none") - tmr.unregister(initalarme) + initalarme:unregister() f= "boot.lua" if file.exists(f) then dofile(f) end end diff --git a/Temp_DS18B20/tst_ds18b20/initz.lua b/Temp_DS18B20/tst_ds18b20/initz.lua index 15c85ae..4b1b29f 100644 --- a/Temp_DS18B20/tst_ds18b20/initz.lua +++ b/Temp_DS18B20/tst_ds18b20/initz.lua @@ -3,14 +3,14 @@ -- 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 zf190601.1620 \n") +print("\n init.lua zf190601.1612 \n") zswitch=3 --switch flash gpio.mode(zswitch, gpio.INT, gpio.PULLUP) function hvbouton() -- gpio.trig(zswitch, "none") - tmr.unregister(initalarme) + initalarme:unregister() f= "boot.lua" if file.exists(f) then dofile(f) end end diff --git a/zpackage/initz.lua b/zpackage/initz.lua index 771f253..4b1b29f 100644 --- a/zpackage/initz.lua +++ b/zpackage/initz.lua @@ -3,14 +3,14 @@ -- 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 zf190310.1549 \n") +print("\n init.lua zf190601.1612 \n") zswitch=3 --switch flash gpio.mode(zswitch, gpio.INT, gpio.PULLUP) function hvbouton() -- gpio.trig(zswitch, "none") - tmr.unregister(initalarme) + initalarme:unregister() f= "boot.lua" if file.exists(f) then dofile(f) end end @@ -20,7 +20,8 @@ function second_chance() print("seconde chance...") f= "repair.lua" if file.exists(f) then dofile(f) end initalarme=tmr.create() - tmr.alarm(initalarme, 4*1000, tmr.ALARM_SINGLE, function() +-- tmr.alarm(initalarme, 4*1000, tmr.ALARM_SINGLE, function() + initalarme:alarm(4*1000, tmr.ALARM_SINGLE, function() f= "boot.lua" if file.exists(f) then dofile(f) end end) end