diff --git a/Workshop/181004/btn_led.lua b/Workshop/181004/btn_led.lua deleted file mode 100644 index d61af6b..0000000 --- a/Workshop/181004/btn_led.lua +++ /dev/null @@ -1,17 +0,0 @@ --- Programme qui allume la led bleue quand on appuie le bouton flash --- hv180711.1125 - -zledbleue=0 --led bleue -zswitch=3--switch flash - -gpio.mode(zswitch, gpio.INT, gpio.PULLUP) - -function bouton() - if gpio.read(zswitch)==0 then - gpio.write(zledbleue, gpio.LOW) - else - gpio.write(zledbleue, gpio.HIGH) - end -end - -gpio.trig(zswitch, "both", bouton) diff --git a/Workshop/181004/btn_led_remote/ko/btn_led.lua b/Workshop/181004/btn_led_remote/ko/btn_led.lua deleted file mode 100644 index fcd333d..0000000 --- a/Workshop/181004/btn_led_remote/ko/btn_led.lua +++ /dev/null @@ -1,21 +0,0 @@ --- Programme qui allume la led bleue quand on appuie le bouton flash --- hv180711.1125 - -zledbleue=0 --led bleue -zswitch=3--switch flash - -gpio.mode(zswitch, gpio.INT, gpio.PULLUP) - -function bouton() - if gpio.read(zswitch)==0 then - zstate="OFF" - disp_send() - --gpio.write(zledbleue, gpio.LOW) - else - zstate="ON" - disp_send() - --gpio.write(zledbleue, gpio.HIGH) - end -end - -gpio.trig(zswitch, "both", bouton) diff --git a/Workshop/181004/blink_led1.lua b/Workshop/181015/blink_led1.lua similarity index 100% rename from Workshop/181004/blink_led1.lua rename to Workshop/181015/blink_led1.lua diff --git a/Workshop/181004/blink_led_ko.lua b/Workshop/181015/blink_led_ko.lua similarity index 100% rename from Workshop/181004/blink_led_ko.lua rename to Workshop/181015/blink_led_ko.lua diff --git a/Workshop/181015/btn_led.lua b/Workshop/181015/btn_led.lua new file mode 100644 index 0000000..78c4c12 --- /dev/null +++ b/Workshop/181015/btn_led.lua @@ -0,0 +1,23 @@ +-- Programme qui allume la led bleue quand on appuie le bouton flash +-- zf181011.1749 + +print("\n btn_led_front.lua zf181011.1819 \n") + + +zledbleue=0 --led bleue +zswitch=3 --switch flash + +gpio.mode(zswitch, gpio.INT, gpio.PULLUP) + +function zbtn() + if gpio.read(zswitch)==0 then + zled_state="ON" + gpio.write(zledbleue, gpio.LOW) + else + zled_state="OFF" + gpio.write(zledbleue, gpio.HIGH) + end + print(zled_state) +end + +gpio.trig(zswitch, "both", zbtn) diff --git a/Workshop/181015/btn_led_remote/btn/btn_led.lua b/Workshop/181015/btn_led_remote/btn/btn_led.lua new file mode 100644 index 0000000..78c4c12 --- /dev/null +++ b/Workshop/181015/btn_led_remote/btn/btn_led.lua @@ -0,0 +1,23 @@ +-- Programme qui allume la led bleue quand on appuie le bouton flash +-- zf181011.1749 + +print("\n btn_led_front.lua zf181011.1819 \n") + + +zledbleue=0 --led bleue +zswitch=3 --switch flash + +gpio.mode(zswitch, gpio.INT, gpio.PULLUP) + +function zbtn() + if gpio.read(zswitch)==0 then + zled_state="ON" + gpio.write(zledbleue, gpio.LOW) + else + zled_state="OFF" + gpio.write(zledbleue, gpio.HIGH) + end + print(zled_state) +end + +gpio.trig(zswitch, "both", zbtn) diff --git a/Workshop/181004/btn_led_remote/initz.lua b/Workshop/181015/btn_led_remote/btn/initz.lua similarity index 100% rename from Workshop/181004/btn_led_remote/initz.lua rename to Workshop/181015/btn_led_remote/btn/initz.lua diff --git a/Workshop/181004/rm_files.lua b/Workshop/181015/btn_led_remote/btn/rm_files.lua similarity index 100% rename from Workshop/181004/rm_files.lua rename to Workshop/181015/btn_led_remote/btn/rm_files.lua diff --git a/Workshop/181004/btn_led_remote/start_boot.lua b/Workshop/181015/btn_led_remote/btn/start_boot.lua similarity index 100% rename from Workshop/181004/btn_led_remote/start_boot.lua rename to Workshop/181015/btn_led_remote/btn/start_boot.lua diff --git a/Workshop/181004/btn_led_remote/wifi_cli_conf.lua b/Workshop/181015/btn_led_remote/btn/wifi_cli_conf.lua similarity index 100% rename from Workshop/181004/btn_led_remote/wifi_cli_conf.lua rename to Workshop/181015/btn_led_remote/btn/wifi_cli_conf.lua diff --git a/Workshop/181004/btn_led_remote/wifi_cli_start.lua b/Workshop/181015/btn_led_remote/btn/wifi_cli_start.lua similarity index 100% rename from Workshop/181004/btn_led_remote/wifi_cli_start.lua rename to Workshop/181015/btn_led_remote/btn/wifi_cli_start.lua diff --git a/Workshop/181004/btn_led_remote/wifi_get_ip.lua b/Workshop/181015/btn_led_remote/btn/wifi_get_ip.lua similarity index 100% rename from Workshop/181004/btn_led_remote/wifi_get_ip.lua rename to Workshop/181015/btn_led_remote/btn/wifi_get_ip.lua diff --git a/Workshop/181004/btn_led_remote/wifi_info.lua b/Workshop/181015/btn_led_remote/btn/wifi_info.lua similarity index 100% rename from Workshop/181004/btn_led_remote/wifi_info.lua rename to Workshop/181015/btn_led_remote/btn/wifi_info.lua diff --git a/Workshop/181015/btn_led_remote/initz.lua b/Workshop/181015/btn_led_remote/initz.lua new file mode 100644 index 0000000..c0e1f86 --- /dev/null +++ b/Workshop/181015/btn_led_remote/initz.lua @@ -0,0 +1,22 @@ +--Programme qui démarre le robot en appuyant sur le bouton flash et le redémarre si le bouton flash est appuyer pendant 3 secondes + +print("\n init.lua hv180906.1450\n") + +zswitch=3 --switch flash +gpio.mode(zswitch, gpio.INT, gpio.PULLUP) +initalarme=tmr.create() + +function hvbouton() + gpio.trig(zswitch, "none") + tmr.unregister(initalarme) + dofile("start_boot.lua") + dofile("start_job.lua") +end + +--gpio.trig(zswitch, "both", hvbouton) + +tmr.alarm(initalarme, 8000, tmr.ALARM_SINGLE, function() + print("\nStart\n") + dofile("start_boot.lua") +-- dofile("start_job.lua") +end) diff --git a/Workshop/181004/btn_led_remote/ko/web_cli.lua b/Workshop/181015/btn_led_remote/ko/web_cli.lua similarity index 100% rename from Workshop/181004/btn_led_remote/ko/web_cli.lua rename to Workshop/181015/btn_led_remote/ko/web_cli.lua diff --git a/Workshop/181015/btn_led_remote/start_boot.lua b/Workshop/181015/btn_led_remote/start_boot.lua new file mode 100644 index 0000000..06b0f39 --- /dev/null +++ b/Workshop/181015/btn_led_remote/start_boot.lua @@ -0,0 +1,7 @@ +-- Scripts à charger au moment du boot afin de pouvoir travailler avec le robot à distance +print("\n start_boot.lua zf180907.1440 \n") + +dofile("wifi_cli_conf.lua") +dofile("wifi_cli_start.lua") +dofile("web_led_onoff.lua") + diff --git a/Workshop/181004/btn_led_remote/web_led_onoff.lua b/Workshop/181015/btn_led_remote/web_led_onoff.lua similarity index 100% rename from Workshop/181004/btn_led_remote/web_led_onoff.lua rename to Workshop/181015/btn_led_remote/web_led_onoff.lua diff --git a/Workshop/181004/wifi_cli_conf.lua b/Workshop/181015/btn_led_remote/wifi_cli_conf.lua similarity index 100% rename from Workshop/181004/wifi_cli_conf.lua rename to Workshop/181015/btn_led_remote/wifi_cli_conf.lua diff --git a/Workshop/181004/wifi_cli_start.lua b/Workshop/181015/btn_led_remote/wifi_cli_start.lua similarity index 100% rename from Workshop/181004/wifi_cli_start.lua rename to Workshop/181015/btn_led_remote/wifi_cli_start.lua diff --git a/Workshop/181004/wifi_get_ip.lua b/Workshop/181015/btn_led_remote/wifi_get_ip.lua similarity index 100% rename from Workshop/181004/wifi_get_ip.lua rename to Workshop/181015/btn_led_remote/wifi_get_ip.lua diff --git a/Workshop/181004/wifi_info.lua b/Workshop/181015/btn_led_remote/wifi_info.lua similarity index 100% rename from Workshop/181004/wifi_info.lua rename to Workshop/181015/btn_led_remote/wifi_info.lua diff --git a/Workshop/181004/cat.lua b/Workshop/181015/cat.lua similarity index 100% rename from Workshop/181004/cat.lua rename to Workshop/181015/cat.lua diff --git a/Workshop/181004/dir.lua b/Workshop/181015/dir.lua similarity index 100% rename from Workshop/181004/dir.lua rename to Workshop/181015/dir.lua diff --git a/Workshop/181004/init.lua b/Workshop/181015/init.lua similarity index 100% rename from Workshop/181004/init.lua rename to Workshop/181015/init.lua diff --git a/Workshop/181015/rm_files.lua b/Workshop/181015/rm_files.lua new file mode 100644 index 0000000..81241cb --- /dev/null +++ b/Workshop/181015/rm_files.lua @@ -0,0 +1,12 @@ +-- pour effacer TOUS les fichiers qui se trouve dans la flash du NodeMCU + +print("\n rm_files.lua zf180907.1511 \n") + + +l=file.list() i=0 +for k,v in pairs(l) do + i=i+v + file.remove(k) +end +print("-------------------------------") +print("\nC'est tout effaced :-) \n") diff --git a/Workshop/181004/start_boot.lua b/Workshop/181015/start_boot.lua similarity index 100% rename from Workshop/181004/start_boot.lua rename to Workshop/181015/start_boot.lua diff --git a/Workshop/181004/start_job.lua b/Workshop/181015/start_job.lua similarity index 100% rename from Workshop/181004/start_job.lua rename to Workshop/181015/start_job.lua diff --git a/Workshop/181004/telnet_srv.lua b/Workshop/181015/telnet_srv.lua similarity index 100% rename from Workshop/181004/telnet_srv.lua rename to Workshop/181015/telnet_srv.lua diff --git a/Workshop/181004/thefirst.lua b/Workshop/181015/thefirst.lua similarity index 100% rename from Workshop/181004/thefirst.lua rename to Workshop/181015/thefirst.lua diff --git a/Workshop/181004/web_get.lua b/Workshop/181015/web_get.lua similarity index 100% rename from Workshop/181004/web_get.lua rename to Workshop/181015/web_get.lua diff --git a/Workshop/181004/web_html.lua b/Workshop/181015/web_html.lua similarity index 100% rename from Workshop/181004/web_html.lua rename to Workshop/181015/web_html.lua diff --git a/Workshop/181004/web_led_onoff.lua b/Workshop/181015/web_led_onoff.lua similarity index 100% rename from Workshop/181004/web_led_onoff.lua rename to Workshop/181015/web_led_onoff.lua diff --git a/Workshop/181004/web_srv.lua b/Workshop/181015/web_srv.lua similarity index 100% rename from Workshop/181004/web_srv.lua rename to Workshop/181015/web_srv.lua diff --git a/Workshop/181004/wifi_ap_start.lua b/Workshop/181015/wifi_ap_start.lua similarity index 100% rename from Workshop/181004/wifi_ap_start.lua rename to Workshop/181015/wifi_ap_start.lua diff --git a/Workshop/181004/wifi_ap_stop.lua b/Workshop/181015/wifi_ap_stop.lua similarity index 100% rename from Workshop/181004/wifi_ap_stop.lua rename to Workshop/181015/wifi_ap_stop.lua diff --git a/Workshop/181015/wifi_cli_conf.lua b/Workshop/181015/wifi_cli_conf.lua new file mode 100644 index 0000000..13f5198 --- /dev/null +++ b/Workshop/181015/wifi_cli_conf.lua @@ -0,0 +1,4 @@ +-- Petit script pour configurer le client WIFI du NodeMCU +print("\n wifi_cli_conf.lua zf180824.2000 \n") + +wifi.sta.config{ssid="3G-zf", pwd="12234567", save=true} diff --git a/Workshop/181015/wifi_cli_start.lua b/Workshop/181015/wifi_cli_start.lua new file mode 100644 index 0000000..aac8bea --- /dev/null +++ b/Workshop/181015/wifi_cli_start.lua @@ -0,0 +1,14 @@ +-- Petit script pour connecter le NodeMCU sur un AP Wifi avec l'accompte sauvé en EEPROM +print("\n wifi_cli_start.lua zf180824.2000 \n") + +local zmodewifi=wifi.getmode() +if zmodewifi == wifi.NULLMODE then + print("WIFI mode CLI only") + wifi.setmode(wifi.STATION) +elseif zmodewifi == wifi.SOFTAP then + print("WIFI mode AP+CLI") + wifi.setmode(wifi.STATIONAP) +end +wifi.sta.autoconnect(1) +wifi.sta.connect() +dofile("wifi_get_ip.lua") diff --git a/Workshop/181004/wifi_cli_stop.lua b/Workshop/181015/wifi_cli_stop.lua similarity index 100% rename from Workshop/181004/wifi_cli_stop.lua rename to Workshop/181015/wifi_cli_stop.lua diff --git a/Workshop/181004/wifi_cnf_start.lua b/Workshop/181015/wifi_cnf_start.lua similarity index 100% rename from Workshop/181004/wifi_cnf_start.lua rename to Workshop/181015/wifi_cnf_start.lua diff --git a/Workshop/181004/wifi_cnf_stop.lua b/Workshop/181015/wifi_cnf_stop.lua similarity index 100% rename from Workshop/181004/wifi_cnf_stop.lua rename to Workshop/181015/wifi_cnf_stop.lua diff --git a/Workshop/181015/wifi_get_ip.lua b/Workshop/181015/wifi_get_ip.lua new file mode 100644 index 0000000..83b6369 --- /dev/null +++ b/Workshop/181015/wifi_get_ip.lua @@ -0,0 +1,12 @@ +-- Petit script pour obtenir l'adresse IP du NodeMCU connecté sur un AP Wifi +print("\n wifi_get_ip.lua zf180824.2000 \n") + +wifitimer1=tmr.create() +tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function() + if wifi.sta.getip() == nil then + print("Connecting to AP...") + else + tmr.stop(wifitimer1) + dofile("wifi_info.lua") + end +end) diff --git a/Workshop/181015/wifi_info.lua b/Workshop/181015/wifi_info.lua new file mode 100644 index 0000000..800b8d4 --- /dev/null +++ b/Workshop/181015/wifi_info.lua @@ -0,0 +1,28 @@ +-- Petit script pour afficher les infos actuel du WIFI +print("\n wifi_info.lua zf180824.2000 \n") + +local zmodewifi=wifi.getmode() + +if zmodewifi == wifi.NULLMODE then + print("WIFI OFF") +elseif zmodewifi == wifi.STATION then + print("WIFI mode CLI") + print("Connected IP:\n",wifi.sta.getip()) + do + local sta_config=wifi.sta.getconfig(true) + print(string.format("Current client config:\n\tssid:\"%s\"\tpassword:\"%s\"\n\tbssid:\"%s\"\tbssid_set:%s", sta_config.ssid, sta_config.pwd, sta_config.bssid, (sta_config.bssid_set and "true" or "false"))) + end +elseif zmodewifi == wifi.SOFTAP then + print("WIFI mode AP") + print("AP MAC:\n\t"..wifi.ap.getmac()) + print("AP IP:\n\t"..wifi.ap.getip()) +elseif zmodewifi == wifi.STATIONAP then + print("WIFI mode CLI+AP") + print("Connected IP:\n",wifi.sta.getip()) + do + local sta_config=wifi.sta.getconfig(true) + print(string.format("Current client config:\n\tssid:\"%s\"\tpassword:\"%s\"\n\tbssid:\"%s\"\tbssid_set:%s", sta_config.ssid, sta_config.pwd, sta_config.bssid, (sta_config.bssid_set and "true" or "false"))) + end + print("AP MAC: "..wifi.ap.getmac()) + print("AP IP: "..wifi.ap.getip()) +end diff --git a/Workshop/181004/wifi_off.lua b/Workshop/181015/wifi_off.lua similarity index 100% rename from Workshop/181004/wifi_off.lua rename to Workshop/181015/wifi_off.lua diff --git a/Workshop/181004/wifi_start.lua b/Workshop/181015/wifi_start.lua similarity index 100% rename from Workshop/181004/wifi_start.lua rename to Workshop/181015/wifi_start.lua