From 8eaa3579c265f9b72f55abc74c7af9282e80e99b Mon Sep 17 00:00:00 2001 From: Christian Zufferey Date: Sat, 8 Dec 2018 18:28:13 +0100 Subject: [PATCH] =?UTF-8?q?Commenc=C3=A9=20=C3=A0=20travailler=20sur=20les?= =?UTF-8?q?=20tests=20deep=20sleep=20avec=20le=20NodeMCU=20ESP-M3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DeepSleep/ESP-M3/boot.lua | 25 +++ DeepSleep/ESP-M3/credentials.lua | 9 + DeepSleep/ESP-M3/dsleep.lua | 69 ++++++++ DeepSleep/ESP-M3/flash_led_xfois.lua | 33 ++++ DeepSleep/ESP-M3/goodies/a_test_fill.lua | 30 ++++ DeepSleep/ESP-M3/goodies/a_train1.lua | 29 ++++ DeepSleep/ESP-M3/goodies/blink_led1.lua | 23 +++ DeepSleep/ESP-M3/goodies/blink_led2.lua | 18 ++ DeepSleep/ESP-M3/goodies/cat.lua | 17 ++ DeepSleep/ESP-M3/goodies/dir.lua | 15 ++ DeepSleep/ESP-M3/goodies/flash_led_xfois.lua | 32 ++++ DeepSleep/ESP-M3/goodies/initz - copie.lua | 19 +++ DeepSleep/ESP-M3/goodies/rm_files.lua | 12 ++ DeepSleep/ESP-M3/goodies/wifi_ap_start.lua | 14 ++ DeepSleep/ESP-M3/goodies/wifi_cli_stop.lua | 10 ++ DeepSleep/ESP-M3/goodies/wifi_off.lua | 9 + DeepSleep/ESP-M3/initz.lua | 34 ++++ DeepSleep/ESP-M3/repair.lua | 16 ++ DeepSleep/ESP-M3/web_ide2.lua | 158 ++++++++++++++++++ DeepSleep/ESP-M3/wifi_ap_stop.lua | 10 ++ DeepSleep/ESP-M3/wifi_cli_conf.lua | 12 ++ DeepSleep/ESP-M3/wifi_cli_start.lua | 14 ++ DeepSleep/ESP-M3/wifi_get_ip.lua | 12 ++ DeepSleep/ESP-M3/wifi_info.lua | 31 ++++ DeepSleep/ESP-M3/wifi_off.lua | 9 + ESP-M3/blink_led2.lua | 18 ++ .../Capture d’écran 2018-11-21 à 15.48.57.png | Bin zflash-eps01.sh | 25 +++ 28 files changed, 703 insertions(+) create mode 100644 DeepSleep/ESP-M3/boot.lua create mode 100644 DeepSleep/ESP-M3/credentials.lua create mode 100644 DeepSleep/ESP-M3/dsleep.lua create mode 100644 DeepSleep/ESP-M3/flash_led_xfois.lua create mode 100644 DeepSleep/ESP-M3/goodies/a_test_fill.lua create mode 100644 DeepSleep/ESP-M3/goodies/a_train1.lua create mode 100644 DeepSleep/ESP-M3/goodies/blink_led1.lua create mode 100644 DeepSleep/ESP-M3/goodies/blink_led2.lua create mode 100644 DeepSleep/ESP-M3/goodies/cat.lua create mode 100644 DeepSleep/ESP-M3/goodies/dir.lua create mode 100644 DeepSleep/ESP-M3/goodies/flash_led_xfois.lua create mode 100644 DeepSleep/ESP-M3/goodies/initz - copie.lua create mode 100644 DeepSleep/ESP-M3/goodies/rm_files.lua create mode 100644 DeepSleep/ESP-M3/goodies/wifi_ap_start.lua create mode 100644 DeepSleep/ESP-M3/goodies/wifi_cli_stop.lua create mode 100644 DeepSleep/ESP-M3/goodies/wifi_off.lua create mode 100644 DeepSleep/ESP-M3/initz.lua create mode 100644 DeepSleep/ESP-M3/repair.lua create mode 100644 DeepSleep/ESP-M3/web_ide2.lua create mode 100644 DeepSleep/ESP-M3/wifi_ap_stop.lua create mode 100644 DeepSleep/ESP-M3/wifi_cli_conf.lua create mode 100644 DeepSleep/ESP-M3/wifi_cli_start.lua create mode 100644 DeepSleep/ESP-M3/wifi_get_ip.lua create mode 100644 DeepSleep/ESP-M3/wifi_info.lua create mode 100644 DeepSleep/ESP-M3/wifi_off.lua create mode 100644 ESP-M3/blink_led2.lua rename ESP-xx/{ESP-WIFI-Kearboard => ESP-WIFI-Keyboard}/Capture d’écran 2018-11-21 à 15.48.57.png (100%) create mode 100755 zflash-eps01.sh diff --git a/DeepSleep/ESP-M3/boot.lua b/DeepSleep/ESP-M3/boot.lua new file mode 100644 index 0000000..5564b63 --- /dev/null +++ b/DeepSleep/ESP-M3/boot.lua @@ -0,0 +1,25 @@ +-- Scripts à charger après le boot pour démarrer son appli + +print("\n boot.lua zf181208.1752 \n") + +function heartbeat() + f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end + boottimer1=tmr.create() + tmr.alarm(boottimer1, 1*1000, tmr.ALARM_AUTO, function() + xfois =2 + blink_LED () + end) +end + +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 +f= "wifi_cli_start.lua" if file.exists(f) then dofile(f) end +--f= "telnet_srv.lua" if file.exists(f) then dofile(f) end +f= "web_ide2.lua" if file.exists(f) then dofile(f) end +f= "dsleep.lua" if file.exists(f) then dofile(f) end + +--heartbeat() + + + + diff --git a/DeepSleep/ESP-M3/credentials.lua b/DeepSleep/ESP-M3/credentials.lua new file mode 100644 index 0000000..0efde32 --- /dev/null +++ b/DeepSleep/ESP-M3/credentials.lua @@ -0,0 +1,9 @@ +-- Petit script pour configurer les choses secrètes que l'on n'aimerait +-- pas être exportées sur Internet (github) +-- faut donc le mettre ailleurs que dans le dépôt ! + +print("\n credential.lua zf181205.1910 \n") + +cli_ssid="3g-s7" +cli_pwd="12234567" + diff --git a/DeepSleep/ESP-M3/dsleep.lua b/DeepSleep/ESP-M3/dsleep.lua new file mode 100644 index 0000000..86b46f4 --- /dev/null +++ b/DeepSleep/ESP-M3/dsleep.lua @@ -0,0 +1,69 @@ +-- Teste le deep sleep ! +-- s'endore pendant 3 secondes après 8 secondes +-- à mettre à la place du init.lua ! + +-- ATTENTION: il faut connecter la pin 0 à la pin RESET ! + +print("\n dsleep.lua zf181208.1755 \n") + +function dsleep_on() + print("Je dors...") + node.dsleep(10*1000*1000) +end + +function dsleep_off() + tmr.unregister(train3timer1) +end + +function watch_wifi_on() + ztmr_watch_wifi_on=tmr.create() + tmr.alarm(ztmr_watch_wifi_on, 1000, tmr.ALARM_AUTO , function() + if wifi.sta.getip() == nil then + print("Unconnected... (on)") + else + tmr.stop(ztmr_watch_wifi_on) + print("Connected... (on)") + f= "wifi_info.lua" if file.exists(f) then dofile(f) end + watch_wifi_off() + end + end) +end + +function watch_wifi_off() + tmr.unregister(ztmr_watch_wifi_on) + ztmr_watch_wifi_off=tmr.create() + tmr.alarm(ztmr_watch_wifi_off, 1000, tmr.ALARM_AUTO , function() + if wifi.sta.getip() == nil then + tmr.stop(ztmr_watch_wifi_off) + print("Unconnected... (off)") + watch_wifi_on() + tmr.unregister(ztmr_watch_wifi_off) + else + print("Connected... (off)") + end + end) +end + + + + +_, reset_reason = node.bootreason() +print("reset_reason: ",reset_reason) +if reset_reason == 4 then print("Coucou, soft reset...") end +if reset_reason == 5 then print("Coucou, je suis réveillé...") end +if reset_reason == 6 then print("Coucou, hard reset...") end + + +watch_wifi_on() + + + + + +--[[ +ztmr_SLEEP = tmr.create() +tmr.alarm(ztmr_SLEEP, 10*1000, tmr.ALARM_SINGLE, function () + print("Je dors...") + node.dsleep(10*1000*1000) +end) +]] \ No newline at end of file diff --git a/DeepSleep/ESP-M3/flash_led_xfois.lua b/DeepSleep/ESP-M3/flash_led_xfois.lua new file mode 100644 index 0000000..c50e5ab --- /dev/null +++ b/DeepSleep/ESP-M3/flash_led_xfois.lua @@ -0,0 +1,33 @@ +-- programme pour faire clignoter x fois une LED avec un rapport on/off +print("\n flash_led_xfois.lua zf181208.1521 \n") + +--zLED=0 --NodeMCU +zLED=4 --EPS-M3 +zTm_On_LED = 50 --> en ms +zTm_Off_LED = 100 --> en ms +nbfois = 0 +gpio.write(zLED, gpio.HIGH) +gpio.mode(zLED, gpio.OUTPUT) +ztmr_Flash_LED = tmr.create() + +function blink_LED () + if nbfois >= xfois then +-- print(nbfois) + nbfois = 0 + else + if gpio.read(zLED)==gpio.HIGH then + gpio.write(zLED, gpio.LOW) + tmr.alarm(ztmr_Flash_LED, zTm_Off_LED, tmr.ALARM_SINGLE, blink_LED) + else + gpio.write(zLED, gpio.HIGH) + nbfois = nbfois+1 + tmr.alarm(ztmr_Flash_LED, zTm_On_LED, tmr.ALARM_SINGLE, blink_LED) + end + end +end + +xfois =2 +blink_LED () + + + diff --git a/DeepSleep/ESP-M3/goodies/a_test_fill.lua b/DeepSleep/ESP-M3/goodies/a_test_fill.lua new file mode 100644 index 0000000..b015d37 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/a_test_fill.lua @@ -0,0 +1,30 @@ +-- Scripts juste pour tester des effets à la mano +-- tout sur la couleur: https://www.w3schools.com/colors/default.asp +-- roue des couleurs: https://iro.js.org/?ref=oldsite + +print("\n a_tst_fill.lua zf181125.1632 \n") + +znbled=300 + +function RGB_clear() + ws2812.init() + buffer = ws2812.newBuffer(znbled, 3) + buffer:fill(0, 0, 0) + ws2812.write(buffer) +end + +function RGB_fill(nbled, Red, Green, Blue) + buffer = ws2812.newBuffer(nbled, 3) + buffer:fill(Green, Red, Blue) -- Green, Red , Blue + ws2812.write(buffer) +end + +RGB_clear() +RGB_clear() ; RGB_fill(100, 255, 0, 0) +RGB_clear() ; RGB_fill(100, 0, 255, 0) +RGB_clear() ; RGB_fill(100, 0, 0, 255) +RGB_clear() ; l=0.10 ; R=l*(255) ; G=l*(80*0.99) ; B=l*(0*0.99) ; RGB_fill(300, R, G, B) + + + + diff --git a/DeepSleep/ESP-M3/goodies/a_train1.lua b/DeepSleep/ESP-M3/goodies/a_train1.lua new file mode 100644 index 0000000..43b4201 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/a_train1.lua @@ -0,0 +1,29 @@ +-- Scripts juste pour tester l'effet train +-- tout sur la couleur: https://www.w3schools.com/colors/default.asp +-- roue des couleurs: https://iro.js.org/?ref=oldsite + +print("\n a_train1.lua zf181204.2004 \n") + +znbled=36 + +function RGB_clear() + ws2812.init() + buffer = ws2812.newBuffer(znbled, 3) + buffer:fill(0, 0, 0) + ws2812.write(buffer) +end + +RGB_clear() + +j=1 +local i, buffer = 0, ws2812.newBuffer(znbled, 3); buffer:fill(0, 0, 0); tmr.create():alarm(20, 1, function() + i = i + j + buffer:fade(2) + buffer:set(i % buffer:size() + 1, 255, 255, 255) + ws2812.write(buffer) + if i>=buffer:size()-1 or i<=0 then + j=j*-1 + end +end) + + diff --git a/DeepSleep/ESP-M3/goodies/blink_led1.lua b/DeepSleep/ESP-M3/goodies/blink_led1.lua new file mode 100644 index 0000000..43a0e80 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/blink_led1.lua @@ -0,0 +1,23 @@ +-- programme pour faire clignoter une LED avec un rapport on/off + +print("\n blink_led1.lua zf181116.0014 \n") + +zLED=0 +zTm_On_LED = 50 --> en ms +zTm_Off_LED = 500 --> en ms +zFlag_LED = 0 + +function blink_LED () + if zFlag_LED==gpio.LOW then + zFlag_LED=gpio.HIGH + tmr.alarm(ztmr_LED, zTm_Off_LED, tmr.ALARM_SINGLE, blink_LED) + else + zFlag_LED=gpio.LOW + tmr.alarm(ztmr_LED, zTm_On_LED, tmr.ALARM_SINGLE, blink_LED) + end + gpio.write(zLED, zFlag_LED) +end + +gpio.mode(zLED, gpio.OUTPUT) +ztmr_LED = tmr.create() +blink_LED () diff --git a/DeepSleep/ESP-M3/goodies/blink_led2.lua b/DeepSleep/ESP-M3/goodies/blink_led2.lua new file mode 100644 index 0000000..5a0d956 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/blink_led2.lua @@ -0,0 +1,18 @@ +-- programme pour faire clignoter une LED version simplifiée +-- ATTENTION, cela utilise la pin4 pour la LED des module ESP-M3 ! + +print("\n blink_led2.lua zf181208.146 \n") + +zLED=4 +gpio.mode(zLED, gpio.OUTPUT) +ztmr_LED = tmr.create() +value = true + +tmr.alarm(ztmr_LED, 100, tmr.ALARM_AUTO, function () + if value then + gpio.write(zLED, gpio.HIGH) + else + gpio.write(zLED, gpio.LOW) + end + value = not value +end) diff --git a/DeepSleep/ESP-M3/goodies/cat.lua b/DeepSleep/ESP-M3/goodies/cat.lua new file mode 100644 index 0000000..7c309b9 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/cat.lua @@ -0,0 +1,17 @@ +-- fonction cat() pour afficher le contenu d'un fichier dans la flash +print("\n cat.lua zf180826.1109 \n") + +function cat(zfile) + print("\n"..zfile.."\n-------------------------------") + + zfilei = file.open(zfile, "r") + i=1 + zline=file.readline() + repeat + print(i..": "..string.sub(zline,1,string.len(zline)-1)) + i=i+1 zline=file.readline() + until zline== nil + file.close(zfilei) + + print("-------------------------------") +end diff --git a/DeepSleep/ESP-M3/goodies/dir.lua b/DeepSleep/ESP-M3/goodies/dir.lua new file mode 100644 index 0000000..8bf9414 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/dir.lua @@ -0,0 +1,15 @@ +-- fonction dir() pour afficher les fichiers dans la flash +print("\n dir.lua zf180826.1019 \n") + +function dir() + print("\n-------------------------------") + l=file.list() i=0 + for k,v in pairs(l) do + i=i+v + print(k..string.rep(" ",19-string.len(k)).." : "..v.." bytes") + end + print("-------------------------------") + print('\nUsed: '..i..' bytes\nusage: dofile("file.lua")\n') +end + +dir() diff --git a/DeepSleep/ESP-M3/goodies/flash_led_xfois.lua b/DeepSleep/ESP-M3/goodies/flash_led_xfois.lua new file mode 100644 index 0000000..afc4adb --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/flash_led_xfois.lua @@ -0,0 +1,32 @@ +-- programme pour faire clignoter x fois une LED avec un rapport on/off +print("\n flash_led_xfois.lua zf181204.1955 \n") + +zLED=0 +zTm_On_LED = 50 --> en ms +zTm_Off_LED = 100 --> en ms +nbfois = 0 +gpio.write(zLED, gpio.HIGH) +gpio.mode(zLED, gpio.OUTPUT) +ztmr_Flash_LED = tmr.create() + +function blink_LED () + if nbfois >= xfois then +-- print(nbfois) + nbfois = 0 + else + if gpio.read(zLED)==gpio.HIGH then + gpio.write(zLED, gpio.LOW) + tmr.alarm(ztmr_Flash_LED, zTm_Off_LED, tmr.ALARM_SINGLE, blink_LED) + else + gpio.write(zLED, gpio.HIGH) + nbfois = nbfois+1 + tmr.alarm(ztmr_Flash_LED, zTm_On_LED, tmr.ALARM_SINGLE, blink_LED) + end + end +end + +xfois =2 +blink_LED () + + + diff --git a/DeepSleep/ESP-M3/goodies/initz - copie.lua b/DeepSleep/ESP-M3/goodies/initz - copie.lua new file mode 100644 index 0000000..80d817d --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/initz - copie.lua @@ -0,0 +1,19 @@ +--Script de bootstrap, test au moment du boot qui a été la cause de boot. +-- Si la cause est un power on ou une connexion depuis l'IDE, alors +-- le script repair.lua pendant 30 secondes avant de continuer +--Source: https://nodemcu.readthedocs.io/en/master/en/modules/node/#nodebootreason + +print("\n init.lua zf181125.1340 \n") + +_, reset_reason = node.bootreason() +print("reset_reason:",reset_reason) +if reset_reason == 6 or reset_reason == 6 then + 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() + f= "boot.lua" if file.exists(f) then dofile(f) end + end) +else + f= "boot.lua" if file.exists(f) then dofile(f) end +end diff --git a/DeepSleep/ESP-M3/goodies/rm_files.lua b/DeepSleep/ESP-M3/goodies/rm_files.lua new file mode 100644 index 0000000..81241cb --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/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/DeepSleep/ESP-M3/goodies/wifi_ap_start.lua b/DeepSleep/ESP-M3/goodies/wifi_ap_start.lua new file mode 100644 index 0000000..60b5793 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/wifi_ap_start.lua @@ -0,0 +1,14 @@ +-- Démarre le WIFI en mode AP + +print("\n wifi_ap_start.lua zf181119.2359 \n") + +local zmodewifi=wifi.getmode() +if zmodewifi == wifi.NULLMODE then + print("WIFI mode AP only") + wifi.setmode(wifi.SOFTAP) +elseif zmodewifi == wifi.STATION then + print("WIFI mode AP+CLI") + wifi.setmode(wifi.STATIONAP) +end +wifi.ap.config({ ssid = "NodeMCU "..wifi.ap.getmac(), pwd = "12345678" }) +f= "wifi_info.lua" if file.exists(f) then dofile(f) end diff --git a/DeepSleep/ESP-M3/goodies/wifi_cli_stop.lua b/DeepSleep/ESP-M3/goodies/wifi_cli_stop.lua new file mode 100644 index 0000000..9429aa5 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/wifi_cli_stop.lua @@ -0,0 +1,10 @@ +-- Démarre le WIFI en mode AP +print("\n wifi_cli_stop.lua zf180824.2000 \n") + +local zmodewifi=wifi.getmode() +if zmodewifi == wifi.STATION then + wifi.setmode(wifi.NULLMODE) +elseif zmodewifi == wifi.STATIONAP then + wifi.setmode(wifi.SOFTAP) +end +print("WIFI CLI arrêté") diff --git a/DeepSleep/ESP-M3/goodies/wifi_off.lua b/DeepSleep/ESP-M3/goodies/wifi_off.lua new file mode 100644 index 0000000..c1c7235 --- /dev/null +++ b/DeepSleep/ESP-M3/goodies/wifi_off.lua @@ -0,0 +1,9 @@ +-- Déconnecte le WIFI +print("\n wifi_off.lua zf180822.0959 \n") + +wifi.setmode(wifi.NULLMODE) + +--[[ +print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP) +print(wifi.getmode()) +]] diff --git a/DeepSleep/ESP-M3/initz.lua b/DeepSleep/ESP-M3/initz.lua new file mode 100644 index 0000000..292bfe1 --- /dev/null +++ b/DeepSleep/ESP-M3/initz.lua @@ -0,0 +1,34 @@ +--Script de bootstrap, test au moment du boot qui a été la cause de boot. +-- Si la cause est un power on ou une connexion depuis l'IDE, alors +-- 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 zf181208.1756 \n") + +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() + f= "boot.lua" if file.exists(f) then dofile(f) end + end) +end + +_, reset_reason = node.bootreason() +print("reset_reason:",reset_reason) +if reset_reason == 0 then + print("power on") + second_chance() +elseif reset_reason == 4 then + print("node.restart") + f= "boot.lua" if file.exists(f) then dofile(f) end +elseif reset_reason == 5 then + print("dsleep wake up") + f= "boot.lua" if file.exists(f) then dofile(f) end +elseif reset_reason == 6 then + print("reset") + second_chance() +else + print("autre raison") +end + diff --git a/DeepSleep/ESP-M3/repair.lua b/DeepSleep/ESP-M3/repair.lua new file mode 100644 index 0000000..626b5e5 --- /dev/null +++ b/DeepSleep/ESP-M3/repair.lua @@ -0,0 +1,16 @@ +-- Scripts de seconde chance pour réparer une boucle dans le restart + +print("\n repair.lua zf181119.2356 \n") + +--f= "wifi_ap_start.lua" if file.exists(f) then dofile(f) end +--f= "telnet_srv.lua" if file.exists(f) then dofile(f) end + +f= "az_init_led.lua" if file.exists(f) then dofile(f) end + + +--[[ +jobtimer1=tmr.create() +tmr.alarm(jobtimer1, 5*1000, tmr.ALARM_AUTO, function() + print("repair...") +end) +]] \ No newline at end of file diff --git a/DeepSleep/ESP-M3/web_ide2.lua b/DeepSleep/ESP-M3/web_ide2.lua new file mode 100644 index 0000000..6b58a0e --- /dev/null +++ b/DeepSleep/ESP-M3/web_ide2.lua @@ -0,0 +1,158 @@ +-- Petit WEB IDE tout simple autonome +-- ATTENTION: tourne sur le port 88 ! + +print("\n _web_ide2.lua zf181205.2112 \n") + +--[[ +XChip's NodeMCU IDE + +Create, Edit and run NodeMCU files using your webbrowser. +Examples: +http:/// will list all the files in the MCU +http:///newfile.lua displays the file on your browser +http:///newfile.lua?edit allows to creates or edits the specified script in your browser +http:///newfile.lua?run it will run the specified script and will show the returned value +]]-- + +srv=net.createServer(net.TCP) +srv:listen(88,function(conn) + + local rnrn=0 + local Status = 0 + local DataToGet = 0 + local method="" + local url="" + local vars="" + + conn:on("receive",function(conn,payload) + + if Status==0 then + _, _, method, url, vars = string.find(payload, "([A-Z]+) /([^?]*)%??(.*) HTTP") + print(method, url, vars) + end + + if method=="POST" then + + if Status==0 then + --print("status", Status) + _,_,DataToGet, payload = string.find(payload, "Content%-Length: (%d+)(.+)") + if DataToGet~=nil then + DataToGet = tonumber(DataToGet) + --print(DataToGet) + rnrn=1 + Status = 1 + else + print("bad length") + end + end + + -- find /r/n/r/n + if Status==1 then + --print("status", Status) + local payloadlen = string.len(payload) + local mark = "\r\n\r\n" + local i + for i=1, payloadlen do + if string.byte(mark, rnrn) == string.byte(payload, i) then + rnrn=rnrn+1 + if rnrn==5 then + payload = string.sub(payload, i+1,payloadlen) + file.open(url, "w") + file.close() + Status=2 + break + end + else + rnrn=1 + end + end + if Status==1 then + return + end + end + + if Status==2 then + --print("status", Status) + if payload~=nil then + DataToGet=DataToGet-string.len(payload) + --print("DataToGet:", DataToGet, "payload len:", string.len(payload)) + file.open(url, "a+") + file.write(payload) + file.close() + else + conn:send("HTTP/1.1 200 OK\r\n\r\nERROR") + Status=0 + end + + if DataToGet==0 then + conn:send("HTTP/1.1 200 OK\r\n\r\nOK") + Status=0 + end + end + + return + end + + DataToGet = -1 + + if url == "favicon.ico" then + conn:send("HTTP/1.1 404 file not found") + return + end + + conn:send("HTTP/1.1 200 OK\r\n\r\n") + + -- it wants a file in particular + if url~="" and vars=="" then + DataToGet = 0 + return + end + + conn:send("

NodeMCU IDE

") + + if vars=="edit" then + conn:send("") + conn:send("Back to file list


") + conn:send("run") + end + + if vars=="run" then + conn:send("") + local st, result=pcall(dofile, url) + conn:send(tostring(result)) + conn:send("") + end + + if url=="" then + local l = file.list(); + for k,v in pairs(l) do + conn:send(""..k..", size:"..v.."
") + end + end + + conn:send("") + + end) + conn:on("sent",function(conn) + if DataToGet>=0 and method=="GET" then + if file.open(url, "r") then + file.seek("set", DataToGet) + local line=file.read(512) + file.close() + if line then + conn:send(line) + DataToGet = DataToGet + 512 + + if (string.len(line)==512) then + return + end + end + end + end + + conn:close() + end) +end) +print("listening, free:", node.heap()) + diff --git a/DeepSleep/ESP-M3/wifi_ap_stop.lua b/DeepSleep/ESP-M3/wifi_ap_stop.lua new file mode 100644 index 0000000..2738627 --- /dev/null +++ b/DeepSleep/ESP-M3/wifi_ap_stop.lua @@ -0,0 +1,10 @@ +-- Démarre le WIFI en mode AP +print("\n wifi_ap_stop.lua zf180824.2000 \n") + +local zmodewifi=wifi.getmode() +if zmodewifi == wifi.SOFTAP then + wifi.setmode(wifi.NULLMODE) +elseif zmodewifi == wifi.STATIONAP then + wifi.setmode(wifi.STATION) +end +print("WIFI AP arrêté") diff --git a/DeepSleep/ESP-M3/wifi_cli_conf.lua b/DeepSleep/ESP-M3/wifi_cli_conf.lua new file mode 100644 index 0000000..6726313 --- /dev/null +++ b/DeepSleep/ESP-M3/wifi_cli_conf.lua @@ -0,0 +1,12 @@ +-- Petit script pour configurer le client WIFI du NodeMCU + +print("\n wifi_cli_conf.lua zf181205.1931 \n") + +--credentials par défaut +cli_ssid="3g-s7" +cli_pwd="12234567" + +--ses propre credentials +f= "credentials.lua" if file.exists(f) then dofile(f) end + +wifi.sta.config{ssid=cli_ssid, pwd=cli_pwd, save=true} diff --git a/DeepSleep/ESP-M3/wifi_cli_start.lua b/DeepSleep/ESP-M3/wifi_cli_start.lua new file mode 100644 index 0000000..f1091ac --- /dev/null +++ b/DeepSleep/ESP-M3/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 zf181119.2359 \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() +f= "wifi_get_ip.lua" if file.exists(f) then dofile(f) end diff --git a/DeepSleep/ESP-M3/wifi_get_ip.lua b/DeepSleep/ESP-M3/wifi_get_ip.lua new file mode 100644 index 0000000..82bcdc2 --- /dev/null +++ b/DeepSleep/ESP-M3/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 zf181119.2318 \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) + f= "wifi_info.lua" if file.exists(f) then dofile(f) end + end +end) diff --git a/DeepSleep/ESP-M3/wifi_info.lua b/DeepSleep/ESP-M3/wifi_info.lua new file mode 100644 index 0000000..5062fcf --- /dev/null +++ b/DeepSleep/ESP-M3/wifi_info.lua @@ -0,0 +1,31 @@ +-- Petit script pour afficher les infos actuel du WIFI +print("\n wifi_info.lua zf181119.0014 \n") + +local zmodewifi=wifi.getmode() + +--wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP + +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",wifi.ap.getmac()) + print("AP IP:\n",wifi.ap.getip()) + print("AP Connect:\n",wifi.ap.getconfig()) +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/DeepSleep/ESP-M3/wifi_off.lua b/DeepSleep/ESP-M3/wifi_off.lua new file mode 100644 index 0000000..c1c7235 --- /dev/null +++ b/DeepSleep/ESP-M3/wifi_off.lua @@ -0,0 +1,9 @@ +-- Déconnecte le WIFI +print("\n wifi_off.lua zf180822.0959 \n") + +wifi.setmode(wifi.NULLMODE) + +--[[ +print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP) +print(wifi.getmode()) +]] diff --git a/ESP-M3/blink_led2.lua b/ESP-M3/blink_led2.lua new file mode 100644 index 0000000..5a0d956 --- /dev/null +++ b/ESP-M3/blink_led2.lua @@ -0,0 +1,18 @@ +-- programme pour faire clignoter une LED version simplifiée +-- ATTENTION, cela utilise la pin4 pour la LED des module ESP-M3 ! + +print("\n blink_led2.lua zf181208.146 \n") + +zLED=4 +gpio.mode(zLED, gpio.OUTPUT) +ztmr_LED = tmr.create() +value = true + +tmr.alarm(ztmr_LED, 100, tmr.ALARM_AUTO, function () + if value then + gpio.write(zLED, gpio.HIGH) + else + gpio.write(zLED, gpio.LOW) + end + value = not value +end) diff --git a/ESP-xx/ESP-WIFI-Kearboard/Capture d’écran 2018-11-21 à 15.48.57.png b/ESP-xx/ESP-WIFI-Keyboard/Capture d’écran 2018-11-21 à 15.48.57.png similarity index 100% rename from ESP-xx/ESP-WIFI-Kearboard/Capture d’écran 2018-11-21 à 15.48.57.png rename to ESP-xx/ESP-WIFI-Keyboard/Capture d’écran 2018-11-21 à 15.48.57.png diff --git a/zflash-eps01.sh b/zflash-eps01.sh new file mode 100755 index 0000000..a86eff5 --- /dev/null +++ b/zflash-eps01.sh @@ -0,0 +1,25 @@ +#!/bin/bash +#Petit script pour flasher facilement les ESP-01 (les petit avec 1MB) avec un firmware + +#ATTENTION: c'est pour ma structure, il faudra donc l'adapter + +#zf1812.1429 + + +#test si l'argument est vide +if [ -z "$1" ] + then + echo -e "\nSyntax: ./zflash.sh ../../Firmware/nodemcu-master-13-modules-2018-10-11-16-35-53-float.bin \n\n" + exit +fi + +echo ---------- start zflash.sh + +cd ./Tools/esptool-master + +python esptool.py erase_flash +sleep 2 +#python esptool.py write_flash -fm dio 0x00000 $1 +python esptool.py write_flash -fm dout 0x00000 $1 +sleep 2 +screen /dev/cu.wchusbserial1410 115200