diff --git a/Boot init.lua/mini/test webide/repair.lua b/Boot init.lua/mini/test webide/repair.lua index e1a54d7..b33274e 100644 --- a/Boot init.lua/mini/test webide/repair.lua +++ b/Boot init.lua/mini/test webide/repair.lua @@ -1,12 +1,12 @@ -- Scripts de seconde chance pour réparer une boucle dans le restart -print("\n repair.lua zf181119.1511 \n") +print("\n repair.lua zf181120.1012 \n") --if file.exists("wifi_ap_start.lua") then dofile("wifi_ap_start.lua") end if file.exists("wifi_ap_stop.lua") then dofile("wifi_ap_stop.lua") end if file.exists("wifi_cli_conf.lua") then dofile("wifi_cli_conf.lua") end if file.exists("wifi_cli_start.lua") then dofile("wifi_cli_start.lua") end -if file.exists("ide2.lua") then dofile("ide2.lua") end +if file.exists("ide.lua") then dofile("ide.lua") end if file.exists("telnet_srv.lua") then dofile("telnet_srv.lua") end jobtimer1=tmr.create() diff --git a/LED_WS2812/Alex/PoC.tar b/LED_RGB_WS2812/Alex/PoC.tar similarity index 100% rename from LED_WS2812/Alex/PoC.tar rename to LED_RGB_WS2812/Alex/PoC.tar diff --git a/LED_WS2812/Alex/PoC/cat.lua b/LED_RGB_WS2812/Alex/PoC/cat.lua similarity index 100% rename from LED_WS2812/Alex/PoC/cat.lua rename to LED_RGB_WS2812/Alex/PoC/cat.lua diff --git a/LED_WS2812/Alex/PoC/dir.lua b/LED_RGB_WS2812/Alex/PoC/dir.lua similarity index 100% rename from LED_WS2812/Alex/PoC/dir.lua rename to LED_RGB_WS2812/Alex/PoC/dir.lua diff --git a/LED_WS2812/Alex/PoC/dossier sans titre/initz.lua b/LED_RGB_WS2812/Alex/PoC/dossier sans titre/initz.lua similarity index 100% rename from LED_WS2812/Alex/PoC/dossier sans titre/initz.lua rename to LED_RGB_WS2812/Alex/PoC/dossier sans titre/initz.lua diff --git a/LED_WS2812/Alex/PoC/index.html b/LED_RGB_WS2812/Alex/PoC/index.html similarity index 100% rename from LED_WS2812/Alex/PoC/index.html rename to LED_RGB_WS2812/Alex/PoC/index.html diff --git a/LED_WS2812/Alex/PoC/initz.lua b/LED_RGB_WS2812/Alex/PoC/initz.lua similarity index 100% rename from LED_WS2812/Alex/PoC/initz.lua rename to LED_RGB_WS2812/Alex/PoC/initz.lua diff --git a/LED_WS2812/Alex/PoC/just_test_3x.lua b/LED_RGB_WS2812/Alex/PoC/just_test_3x.lua similarity index 100% rename from LED_WS2812/Alex/PoC/just_test_3x.lua rename to LED_RGB_WS2812/Alex/PoC/just_test_3x.lua diff --git a/LED_WS2812/Alex/PoC/just_test_6x.lua b/LED_RGB_WS2812/Alex/PoC/just_test_6x.lua similarity index 100% rename from LED_WS2812/Alex/PoC/just_test_6x.lua rename to LED_RGB_WS2812/Alex/PoC/just_test_6x.lua diff --git a/LED_WS2812/Alex/PoC/rm_files.lua b/LED_RGB_WS2812/Alex/PoC/rm_files.lua similarity index 100% rename from LED_WS2812/Alex/PoC/rm_files.lua rename to LED_RGB_WS2812/Alex/PoC/rm_files.lua diff --git a/LED_WS2812/Alex/PoC/start_boot.lua b/LED_RGB_WS2812/Alex/PoC/start_boot.lua similarity index 100% rename from LED_WS2812/Alex/PoC/start_boot.lua rename to LED_RGB_WS2812/Alex/PoC/start_boot.lua diff --git a/LED_WS2812/Alex/PoC/webleds.lua b/LED_RGB_WS2812/Alex/PoC/webleds.lua similarity index 100% rename from LED_WS2812/Alex/PoC/webleds.lua rename to LED_RGB_WS2812/Alex/PoC/webleds.lua diff --git a/LED_WS2812/Alex/PoC/wifiap.lua b/LED_RGB_WS2812/Alex/PoC/wifiap.lua similarity index 100% rename from LED_WS2812/Alex/PoC/wifiap.lua rename to LED_RGB_WS2812/Alex/PoC/wifiap.lua diff --git a/LED_WS2812/WS2813_18031509433725.pdf b/LED_RGB_WS2812/WS2813_18031509433725.pdf similarity index 100% rename from LED_WS2812/WS2813_18031509433725.pdf rename to LED_RGB_WS2812/WS2813_18031509433725.pdf diff --git a/LED_RGB_WS2812/tests effects/a_test_train.lua b/LED_RGB_WS2812/tests effects/a_test_train.lua new file mode 100644 index 0000000..6d56445 --- /dev/null +++ b/LED_RGB_WS2812/tests effects/a_test_train.lua @@ -0,0 +1,64 @@ +-- 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_train.lua zf181125.1258 \n") + +print("Initializing LED strip...") +ws2812.init() +buffer = ws2812.newBuffer(30, 3) +buffer:fill(0, 0, 0) +ws2812.write(buffer) +print("done.") +print() + + + +--[[ + +print("toto") + +ws2812.init() +strip_buffer = ws2812.newBuffer(300, 3) +ws2812_effects.init(strip_buffer) +-- initially all leds off +ws2812_effects.set_speed(255) +ws2812_effects.set_brightness(0) +ws2812_effects.set_color(0,0,0) +ws2812_effects.start() +print("done.") +print() + +ws2812.init() + +local i, buffer = 0, ws2812.newBuffer(300, 3) +buffer:fill(0, 0, 0, 0) + +exit + + +ws2812.init() +j=1 +local i, buffer = 0, ws2812.newBuffer(300, 3); buffer:fill(0, 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) + + + + +ws2812.write(string.char(255, 0, 0, 0, 255, 0, 0, 0, 255)) -- RGB positionnement naturel + +ws2812.write(string.char(0, 255, 0, 0, 0, 255, 255, 0, 0, 255, 0, 255, 255, 255, 0, 0, 255, 255)) -- GBR and CMY en GBR WS2813! + +ws2812.write(string.char(0, 255, 0, 0, 0, 255/3, 255, 0, 0, 255, 0, 255, 255, 255, 0, 0, 255, 255)) -- vert compensé GBR and CMY en GBR WS2813! + +ws2812.write(string.char(128, 255, 128, 200, 200, 255, 255, 200, 200, 255, 255, 255, 40, 40, 40, 5, 5, 5)) -- White RGB & White 100/50/10% + +ws2812.write(string.char(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)) -- LED OFF +]] diff --git a/LED_WS2812/Alex2/PoC/just_test_3x.lua b/LED_RGB_WS2812/tests effects/just_test_3x.lua similarity index 100% rename from LED_WS2812/Alex2/PoC/just_test_3x.lua rename to LED_RGB_WS2812/tests effects/just_test_3x.lua diff --git a/LED_WS2812/Alex2/PoC/just_test_6x.lua b/LED_RGB_WS2812/tests effects/just_test_6x.lua similarity index 100% rename from LED_WS2812/Alex2/PoC/just_test_6x.lua rename to LED_RGB_WS2812/tests effects/just_test_6x.lua diff --git a/LED_RGB_WS2812/tests effects/wip/a_test_fill.lua b/LED_RGB_WS2812/tests effects/wip/a_test_fill.lua new file mode 100644 index 0000000..f9c1804 --- /dev/null +++ b/LED_RGB_WS2812/tests effects/wip/a_test_fill.lua @@ -0,0 +1,79 @@ +-- 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_train.lua zf181125.1258 \n") + +znbled=300 + +function RGB_clear() + ws2812.init() + buffer = ws2812.newBuffer(znbled, 3) + buffer:fill(0, 0, 0) + ws2812.write(buffer) +end + +print("Initializing LED strip...") +RGB_clear() +print("done.") + + +znbled_tst=10 +zlumino=1 --luminosité 0 <> 1 +zR=255*zlumino +zG=255*zlumino +zB=255*zlumino +buffer = ws2812.newBuffer(znbled_tst, 3) +buffer:fill(0, 0, 255) -- Green, Red , Blue +ws2812.write(buffer) + + + +--[[ + +print("toto") + +ws2812.init() +strip_buffer = ws2812.newBuffer(300, 3) +ws2812_effects.init(strip_buffer) +-- initially all leds off +ws2812_effects.set_speed(255) +ws2812_effects.set_brightness(0) +ws2812_effects.set_color(0,0,0) +ws2812_effects.start() +print("done.") +print() + +ws2812.init() + +local i, buffer = 0, ws2812.newBuffer(300, 3) +buffer:fill(0, 0, 0, 0) + +exit + + +ws2812.init() +j=1 +local i, buffer = 0, ws2812.newBuffer(300, 3); buffer:fill(0, 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) + + + + +ws2812.write(string.char(255, 0, 0, 0, 255, 0, 0, 0, 255)) -- RGB positionnement naturel + +ws2812.write(string.char(0, 255, 0, 0, 0, 255, 255, 0, 0, 255, 0, 255, 255, 255, 0, 0, 255, 255)) -- GBR and CMY en GBR WS2813! + +ws2812.write(string.char(0, 255, 0, 0, 0, 255/3, 255, 0, 0, 255, 0, 255, 255, 255, 0, 0, 255, 255)) -- vert compensé GBR and CMY en GBR WS2813! + +ws2812.write(string.char(128, 255, 128, 200, 200, 255, 255, 200, 200, 255, 255, 255, 40, 40, 40, 5, 5, 5)) -- White RGB & White 100/50/10% + +ws2812.write(string.char(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)) -- LED OFF +]] diff --git a/LED_RGB_WS2812/tests effects/wip/blink_led2.lua b/LED_RGB_WS2812/tests effects/wip/blink_led2.lua new file mode 100644 index 0000000..70fa251 --- /dev/null +++ b/LED_RGB_WS2812/tests effects/wip/blink_led2.lua @@ -0,0 +1,17 @@ +-- programme pour faire clignoter une LED version simplifiée + +print("\n blink_led2.lua zf181015.1138 \n") + +zLED=0 +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/LED_RGB_WS2812/tests effects/wip/boot.lua b/LED_RGB_WS2812/tests effects/wip/boot.lua new file mode 100644 index 0000000..6aeec7b --- /dev/null +++ b/LED_RGB_WS2812/tests effects/wip/boot.lua @@ -0,0 +1,32 @@ +-- Scripts à charger après le boot pour démarrer son appli + +print("\n boot.lua zf181125.1234 \n") + +--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 + +--f= "test_train.lua" if file.exists(f) then dofile(f) end + + + + +--[[ +x_dsleep=7 y_dsleep=30 dsleep() + +i=1 +jobtimer1=tmr.create() +tmr.alarm(jobtimer1, 1*1000, tmr.ALARM_AUTO, function() + print(i) i=i+1 + if wifi.sta.getip() ~= nil then + tmr.stop(jobtimer1) + tmr.stop(ztmr_SLEEP) + x_dsleep=300 y_dsleep=30 dsleep() + print("c'est connecté...") + end +end) +]] + diff --git a/LED_WS2812/Alex2/PoC/cat.lua b/LED_RGB_WS2812/tests effects/wip/cat.lua similarity index 100% rename from LED_WS2812/Alex2/PoC/cat.lua rename to LED_RGB_WS2812/tests effects/wip/cat.lua diff --git a/LED_WS2812/Alex2/PoC/dir.lua b/LED_RGB_WS2812/tests effects/wip/dir.lua similarity index 100% rename from LED_WS2812/Alex2/PoC/dir.lua rename to LED_RGB_WS2812/tests effects/wip/dir.lua diff --git a/LED_RGB_WS2812/tests effects/wip/initz.lua b/LED_RGB_WS2812/tests effects/wip/initz.lua new file mode 100644 index 0000000..a9171d9 --- /dev/null +++ b/LED_RGB_WS2812/tests effects/wip/initz.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 zf181120.0002 \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, 30*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/LED_RGB_WS2812/tests effects/wip/repair.lua b/LED_RGB_WS2812/tests effects/wip/repair.lua new file mode 100644 index 0000000..400e952 --- /dev/null +++ b/LED_RGB_WS2812/tests effects/wip/repair.lua @@ -0,0 +1,11 @@ +-- 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 + +jobtimer1=tmr.create() +tmr.alarm(jobtimer1, 5*1000, tmr.ALARM_AUTO, function() + print("repair...") +end) diff --git a/LED_WS2812/Alex2/PoC/rm_files.lua b/LED_RGB_WS2812/tests effects/wip/rm_files.lua similarity index 100% rename from LED_WS2812/Alex2/PoC/rm_files.lua rename to LED_RGB_WS2812/tests effects/wip/rm_files.lua diff --git a/LED_WS2812/Alex2/PoC.tar b/LED_WS2812/Alex2/PoC.tar deleted file mode 100644 index c782384..0000000 Binary files a/LED_WS2812/Alex2/PoC.tar and /dev/null differ diff --git a/LED_WS2812/Alex2/PoC/dossier sans titre/initz.lua b/LED_WS2812/Alex2/PoC/dossier sans titre/initz.lua deleted file mode 100644 index 17beb40..0000000 --- a/LED_WS2812/Alex2/PoC/dossier sans titre/initz.lua +++ /dev/null @@ -1,15 +0,0 @@ - -print() -print("starting init.lua...") -print() -print("local files:") -l=file.list() -for k,v in pairs(l) do - print(k.." "..v) -end -print() - -print("starting webleds...") -print() -dofile('webleds.lua') - diff --git a/LED_WS2812/Alex2/PoC/index.html b/LED_WS2812/Alex2/PoC/index.html deleted file mode 100644 index 62283da..0000000 --- a/LED_WS2812/Alex2/PoC/index.html +++ /dev/null @@ -1,60 +0,0 @@ - - -
-