From ad7b286fb498a95bd9fa99aca9aeabf83b3adc5e Mon Sep 17 00:00:00 2001 From: Christian Zufferey Date: Sat, 15 Dec 2018 14:56:03 +0100 Subject: [PATCH] =?UTF-8?q?Super=20bien=20am=C3=A9lior=C3=A9=20mon=20chape?= =?UTF-8?q?au=20=C3=A0=20LED=20RGB=20*=20ajout=C3=A9=20le=20nouveau=20teln?= =?UTF-8?q?et=20serveur=20*=20modifi=C3=A9=20la=20page=20HTML=20du=20chape?= =?UTF-8?q?au=20afin=20de=20pouvoir=20aller=20directement=20sur=20la=20pag?= =?UTF-8?q?e=20wWEBIDE=20*=20ajout=C3=A9=20une=20fonction=20pour=20reforma?= =?UTF-8?q?ter=20le=20positionnement=20des=20LED=20RGB=20suivant=20le=20ru?= =?UTF-8?q?ban=20de=20LED=20que=20l'on=20a=20*=20mis=20les=20vraies=20coul?= =?UTF-8?q?eurs=20des=20LED=20RGB=20dans=20la=20page=20HTML=20du=20chapeau?= =?UTF-8?q?,=20vu=20que=20c'est=20reformat=C3=A9=20maintenant=20*=20ajout?= =?UTF-8?q?=C3=A9=20les=20changements=20de=20vitesse=20'tr=C3=A8s=20vite'?= =?UTF-8?q?=20et=20'tr=C3=A8s=20lent'=20dans=20la=20page=20HTML=20du=20cha?= =?UTF-8?q?peau=20*=20ajout=C3=A9=20un=20fichier=20vide.lua=20pour=20faire?= =?UTF-8?q?=20des=20petites=20d=C3=A9mos=20du=20WEBIDE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LED_RGB_WS2812/chapeau_led/a_train3.lua | 25 ++++++++++++++++--------- LED_RGB_WS2812/chapeau_led/index.html | 8 +++++--- LED_RGB_WS2812/chapeau_led/webleds.lua | 10 +++++++--- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/LED_RGB_WS2812/chapeau_led/a_train3.lua b/LED_RGB_WS2812/chapeau_led/a_train3.lua index a3cf167..72cefeb 100644 --- a/LED_RGB_WS2812/chapeau_led/a_train3.lua +++ b/LED_RGB_WS2812/chapeau_led/a_train3.lua @@ -2,7 +2,7 @@ -- tout sur la couleur: https://www.w3schools.com/colors/default.asp -- roue des couleurs: https://iro.js.org/?ref=oldsite -print("\n a_train3.lua zf181205.1919 \n") +print("\n a_train3.lua zf181215.1434 \n") nbleds=36 fade1=0.05 fade2=0.2 fade3=0.4 fade4=1 @@ -18,20 +18,27 @@ function RGB_clear() myLedStrip:fill(0, 0, 0) ws2812.write(myLedStrip) end +function RGB_reform() + rR1=B1 rG1=R1 rB1=G1 + rR2=B2 rG2=R2 rB2=G2 +end + function train1_fill() + RGB_reform() myLedStrip1:fill(0,0,0) - myLedStrip1:set(1, G1*fade1, R1*fade1, B1*fade1) - myLedStrip1:set(2, G1*fade2, R1*fade2, B1*fade2) - myLedStrip1:set(3, G1*fade3, R1*fade3, B1*fade3) - myLedStrip1:set(4, G1*fade4, R1*fade4, B1*fade4) + myLedStrip1:set(1, rR1*fade1, rG1*fade1, rB1*fade1) + myLedStrip1:set(2, rR1*fade2, rG1*fade2, rB1*fade2) + myLedStrip1:set(3, rR1*fade3, rG1*fade3, rB1*fade3) + myLedStrip1:set(4, rR1*fade4, rG1*fade4, rB1*fade4) end function train2_fill() + RGB_reform() myLedStrip2:fill(0,0,0) - myLedStrip2:set(nbleds, G2*fade1, R2*fade1, B2*fade1) - myLedStrip2:set(nbleds-1, G2*fade2, R2*fade2, B2*fade2) - myLedStrip2:set(nbleds-2, G2*fade3, R2*fade3, B2*fade3) - myLedStrip2:set(nbleds-3, G2*fade4, R2*fade4, B2*fade4) + myLedStrip2:set(nbleds, rR2*fade1, rG2*fade1, rB2*fade1) + myLedStrip2:set(nbleds-1, rR2*fade2, rG2*fade2, rB2*fade2) + myLedStrip2:set(nbleds-2, rR2*fade3, rG2*fade3, rB2*fade3) + myLedStrip2:set(nbleds-3, rR2*fade4, rG2*fade4, rB2*fade4) end function train_mix() diff --git a/LED_RGB_WS2812/chapeau_led/index.html b/LED_RGB_WS2812/chapeau_led/index.html index 7daf968..b30af7d 100644 --- a/LED_RGB_WS2812/chapeau_led/index.html +++ b/LED_RGB_WS2812/chapeau_led/index.html @@ -50,15 +50,17 @@ h2 {

Vitesse de l'effet:

Couleurs des trains:


Restart

-zf181215.1416
+zf181215.1451
diff --git a/LED_RGB_WS2812/chapeau_led/webleds.lua b/LED_RGB_WS2812/chapeau_led/webleds.lua index 8db36b7..dbdc716 100644 --- a/LED_RGB_WS2812/chapeau_led/webleds.lua +++ b/LED_RGB_WS2812/chapeau_led/webleds.lua @@ -1,7 +1,7 @@ -- Petit script de serveur WEB pour piloter les effets des LED RGB -- source: https://github.com/nodemcu/nodemcu-firmware/blob/master/lua_examples/webap_toggle_pin.lua -print("\n webleds.lua zf181205.2101 \n") +print("\n webleds.lua zf181215.1447 \n") -- send a file from memory to the client; max. line length = 1024 bytes! @@ -47,9 +47,13 @@ srv:listen(80, function(conn) train_stop() if (_GET.speed == "inc") then train_speed=train_speed*0.8 - else + elseif (_GET.speed == "dec") then train_speed=train_speed*1.2 - end + elseif (_GET.speed == "tresvite") then + train_speed=7 + elseif (_GET.speed == "treslent") then + train_speed=77 + end train_start() end