diff --git a/Mesures/energy/0_get_energy.lua b/Mesures/energy/0_get_energy.lua index fba1b5f..e25350e 100644 --- a/Mesures/energy/0_get_energy.lua +++ b/Mesures/energy/0_get_energy.lua @@ -1,5 +1,5 @@ -- Lit le capteur LDR pour mesurer la consommation électrique du compteur de la maison -print("\n 0_get_energy.lua zf190803.2138 \n") +print("\n 0_get_energy.lua zf190805.1038 \n") -- lecture: https://thingspeak.com/channels/802784/private_show @@ -8,13 +8,22 @@ local zledbleue=0 --led bleue gpio.mode(ldr_pin, gpio.INT, gpio.FLOAT) +zt1_energy = tmr.now() +zt2_energy = tmr.now() + function get_energy() if gpio.read(ldr_pin)==0 then zled_state="OFF" gpio.write(zledbleue, gpio.HIGH) + zt1_energy = tmr.now() else zled_state="ON" gpio.write(zledbleue, gpio.LOW) + zt2_energy = tmr.now() + zt_energy = (zt2_energy-zt1_energy)/1000000 + print("Durée ".. zt_energy) + zpuissance = math.floor(3600/zt_energy)/1000 + print("Puissance ".. zpuissance.."kW") end print("btn_led: "..zled_state) -- disp_send() @@ -28,3 +37,4 @@ get_energy() ]] + diff --git a/Mesures/energy/a3.lua b/Mesures/energy/a3.lua index 46e85c1..4fbbc4c 100644 --- a/Mesures/energy/a3.lua +++ b/Mesures/energy/a3.lua @@ -1 +1,3 @@ -- programme pour faire un test depuis de le webide +node.restart() + diff --git a/Mesures/energy/boot.lua b/Mesures/energy/boot.lua index e1ae4ed..586ae71 100644 --- a/Mesures/energy/boot.lua +++ b/Mesures/energy/boot.lua @@ -1,6 +1,6 @@ -- Scripts à charger après le boot pour démarrer son appli -print("\n boot.lua zf190803.2137 \n") +print("\n boot.lua zf190805.1042 \n") function heartbeat() f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end @@ -24,7 +24,7 @@ f= "telnet_srv2.lua" if file.exists(f) then dofile(f) end f= "web_ide2.lua" if file.exists(f) then dofile(f) end f= "web_srv2.lua" if file.exists(f) then dofile(f) end -f= "0_get_energy.lua" if file.exists(f) then dofile(f) end +--f= "0_get_energy.lua" if file.exists(f) then dofile(f) end --f= "0_send_temp.lua" if file.exists(f) then dofile(f) end --f= "0_cron_temp.lua" if file.exists(f) then dofile(f) end @@ -34,4 +34,3 @@ heartbeat=nil - diff --git a/Mesures/temp_zf - copie/0_cron_temp.lua b/Mesures/temp_zf/0_cron_temp.lua similarity index 100% rename from Mesures/temp_zf - copie/0_cron_temp.lua rename to Mesures/temp_zf/0_cron_temp.lua diff --git a/Mesures/temp_zf - copie/0_get_temp.lua b/Mesures/temp_zf/0_get_temp.lua similarity index 100% rename from Mesures/temp_zf - copie/0_get_temp.lua rename to Mesures/temp_zf/0_get_temp.lua diff --git a/Mesures/temp_zf - copie/0_send_temp.lua b/Mesures/temp_zf/0_send_temp.lua similarity index 100% rename from Mesures/temp_zf - copie/0_send_temp.lua rename to Mesures/temp_zf/0_send_temp.lua diff --git a/Mesures/temp_zf - copie/README.md b/Mesures/temp_zf/README.md similarity index 100% rename from Mesures/temp_zf - copie/README.md rename to Mesures/temp_zf/README.md diff --git a/Mesures/temp_zf - copie/_secrets_temp_zf.lua_ b/Mesures/temp_zf/_secrets_temp_zf.lua_ similarity index 100% rename from Mesures/temp_zf - copie/_secrets_temp_zf.lua_ rename to Mesures/temp_zf/_secrets_temp_zf.lua_ diff --git a/Mesures/temp_zf - copie/a1.lua b/Mesures/temp_zf/a1.lua similarity index 100% rename from Mesures/temp_zf - copie/a1.lua rename to Mesures/temp_zf/a1.lua diff --git a/Mesures/temp_zf - copie/a2.lua b/Mesures/temp_zf/a2.lua similarity index 100% rename from Mesures/temp_zf - copie/a2.lua rename to Mesures/temp_zf/a2.lua diff --git a/Mesures/temp_zf - copie/a3.lua b/Mesures/temp_zf/a3.lua similarity index 100% rename from Mesures/temp_zf - copie/a3.lua rename to Mesures/temp_zf/a3.lua diff --git a/Mesures/temp_zf - copie/api_hub_temp.html b/Mesures/temp_zf/api_hub_temp.html similarity index 100% rename from Mesures/temp_zf - copie/api_hub_temp.html rename to Mesures/temp_zf/api_hub_temp.html diff --git a/Mesures/temp_zf - copie/boot.lua b/Mesures/temp_zf/boot.lua similarity index 100% rename from Mesures/temp_zf - copie/boot.lua rename to Mesures/temp_zf/boot.lua diff --git a/Mesures/temp_zf - copie/disp_temp.html b/Mesures/temp_zf/disp_temp.html similarity index 100% rename from Mesures/temp_zf - copie/disp_temp.html rename to Mesures/temp_zf/disp_temp.html diff --git a/Mesures/temp_zf - copie/flash_led_xfois.lua b/Mesures/temp_zf/flash_led_xfois.lua similarity index 100% rename from Mesures/temp_zf - copie/flash_led_xfois.lua rename to Mesures/temp_zf/flash_led_xfois.lua diff --git a/Mesures/temp_zf - copie/goodies/a6.lua b/Mesures/temp_zf/goodies/a6.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/a6.lua rename to Mesures/temp_zf/goodies/a6.lua diff --git a/Mesures/temp_zf - copie/goodies/a7.lua b/Mesures/temp_zf/goodies/a7.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/a7.lua rename to Mesures/temp_zf/goodies/a7.lua diff --git a/Mesures/temp_zf - copie/goodies/a8.lua b/Mesures/temp_zf/goodies/a8.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/a8.lua rename to Mesures/temp_zf/goodies/a8.lua diff --git a/Mesures/temp_zf - copie/goodies/a9.lua b/Mesures/temp_zf/goodies/a9.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/a9.lua rename to Mesures/temp_zf/goodies/a9.lua diff --git a/Mesures/temp_zf - copie/goodies/a_tst_variables.lua b/Mesures/temp_zf/goodies/a_tst_variables.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/a_tst_variables.lua rename to Mesures/temp_zf/goodies/a_tst_variables.lua diff --git a/Mesures/temp_zf - copie/goodies/led_rgb.lua b/Mesures/temp_zf/goodies/led_rgb.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/led_rgb.lua rename to Mesures/temp_zf/goodies/led_rgb.lua diff --git a/Mesures/temp_zf - copie/goodies/rm_files.lua b/Mesures/temp_zf/goodies/rm_files.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/rm_files.lua rename to Mesures/temp_zf/goodies/rm_files.lua diff --git a/Mesures/temp_zf - copie/goodies/t1.csv b/Mesures/temp_zf/goodies/t1.csv similarity index 100% rename from Mesures/temp_zf - copie/goodies/t1.csv rename to Mesures/temp_zf/goodies/t1.csv diff --git a/Mesures/temp_zf - copie/goodies/wifi_ap_start.lua b/Mesures/temp_zf/goodies/wifi_ap_start.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/wifi_ap_start.lua rename to Mesures/temp_zf/goodies/wifi_ap_start.lua diff --git a/Mesures/temp_zf - copie/goodies/wifi_get_ip.lua b/Mesures/temp_zf/goodies/wifi_get_ip.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/wifi_get_ip.lua rename to Mesures/temp_zf/goodies/wifi_get_ip.lua diff --git a/Mesures/temp_zf - copie/goodies/wifi_off.lua b/Mesures/temp_zf/goodies/wifi_off.lua similarity index 100% rename from Mesures/temp_zf - copie/goodies/wifi_off.lua rename to Mesures/temp_zf/goodies/wifi_off.lua diff --git a/Mesures/temp_zf - copie/img/20190728_122840.jpg b/Mesures/temp_zf/img/20190728_122840.jpg similarity index 100% rename from Mesures/temp_zf - copie/img/20190728_122840.jpg rename to Mesures/temp_zf/img/20190728_122840.jpg diff --git a/Mesures/temp_zf - copie/img/20190728_122850.jpg b/Mesures/temp_zf/img/20190728_122850.jpg similarity index 100% rename from Mesures/temp_zf - copie/img/20190728_122850.jpg rename to Mesures/temp_zf/img/20190728_122850.jpg diff --git a/Mesures/temp_zf - copie/img/Capture d’écran 2019-07-28 à 12.31.14.png b/Mesures/temp_zf/img/Capture d’écran 2019-07-28 à 12.31.14.png similarity index 100% rename from Mesures/temp_zf - copie/img/Capture d’écran 2019-07-28 à 12.31.14.png rename to Mesures/temp_zf/img/Capture d’écran 2019-07-28 à 12.31.14.png diff --git a/Mesures/temp_zf - copie/img/ds18b20 parasite mode 2.jpg b/Mesures/temp_zf/img/ds18b20 parasite mode 2.jpg similarity index 100% rename from Mesures/temp_zf - copie/img/ds18b20 parasite mode 2.jpg rename to Mesures/temp_zf/img/ds18b20 parasite mode 2.jpg diff --git a/Mesures/temp_zf - copie/img/ds18b20 parasite mode.jpg b/Mesures/temp_zf/img/ds18b20 parasite mode.jpg similarity index 100% rename from Mesures/temp_zf - copie/img/ds18b20 parasite mode.jpg rename to Mesures/temp_zf/img/ds18b20 parasite mode.jpg diff --git a/Mesures/temp_zf - copie/initz.lua b/Mesures/temp_zf/initz.lua similarity index 100% rename from Mesures/temp_zf - copie/initz.lua rename to Mesures/temp_zf/initz.lua diff --git a/Mesures/temp_zf - copie/oldies/ds18b20-example.lua b/Mesures/temp_zf/oldies/ds18b20-example.lua similarity index 100% rename from Mesures/temp_zf - copie/oldies/ds18b20-example.lua rename to Mesures/temp_zf/oldies/ds18b20-example.lua diff --git a/Mesures/temp_zf - copie/oldies/ds18b20-web.lua b/Mesures/temp_zf/oldies/ds18b20-web.lua similarity index 100% rename from Mesures/temp_zf - copie/oldies/ds18b20-web.lua rename to Mesures/temp_zf/oldies/ds18b20-web.lua diff --git a/Mesures/temp_zf - copie/oldies/ds18b20.lua b/Mesures/temp_zf/oldies/ds18b20.lua similarity index 100% rename from Mesures/temp_zf - copie/oldies/ds18b20.lua rename to Mesures/temp_zf/oldies/ds18b20.lua diff --git a/Mesures/temp_zf - copie/set_time.lua b/Mesures/temp_zf/set_time.lua similarity index 100% rename from Mesures/temp_zf - copie/set_time.lua rename to Mesures/temp_zf/set_time.lua diff --git a/Mesures/temp_zf - copie/telnet_srv2.lua b/Mesures/temp_zf/telnet_srv2.lua similarity index 100% rename from Mesures/temp_zf - copie/telnet_srv2.lua rename to Mesures/temp_zf/telnet_srv2.lua diff --git a/Mesures/temp_zf - copie/thingspeak.mat b/Mesures/temp_zf/thingspeak.mat similarity index 100% rename from Mesures/temp_zf - copie/thingspeak.mat rename to Mesures/temp_zf/thingspeak.mat diff --git a/Mesures/temp_zf - copie/web_ide2.lua b/Mesures/temp_zf/web_ide2.lua similarity index 100% rename from Mesures/temp_zf - copie/web_ide2.lua rename to Mesures/temp_zf/web_ide2.lua diff --git a/Mesures/temp_zf - copie/web_srv2.lua b/Mesures/temp_zf/web_srv2.lua similarity index 100% rename from Mesures/temp_zf - copie/web_srv2.lua rename to Mesures/temp_zf/web_srv2.lua diff --git a/Mesures/temp_zf - copie/wifi_ap_stop.lua b/Mesures/temp_zf/wifi_ap_stop.lua similarity index 100% rename from Mesures/temp_zf - copie/wifi_ap_stop.lua rename to Mesures/temp_zf/wifi_ap_stop.lua diff --git a/Mesures/temp_zf - copie/wifi_cli_conf.lua b/Mesures/temp_zf/wifi_cli_conf.lua similarity index 100% rename from Mesures/temp_zf - copie/wifi_cli_conf.lua rename to Mesures/temp_zf/wifi_cli_conf.lua diff --git a/Mesures/temp_zf - copie/wifi_cli_start.lua b/Mesures/temp_zf/wifi_cli_start.lua similarity index 100% rename from Mesures/temp_zf - copie/wifi_cli_start.lua rename to Mesures/temp_zf/wifi_cli_start.lua diff --git a/Mesures/temp_zf - copie/wifi_info.lua b/Mesures/temp_zf/wifi_info.lua similarity index 100% rename from Mesures/temp_zf - copie/wifi_info.lua rename to Mesures/temp_zf/wifi_info.lua diff --git a/Mesures/temp_zf - copie/z_index.html b/Mesures/temp_zf/z_index.html similarity index 100% rename from Mesures/temp_zf - copie/z_index.html rename to Mesures/temp_zf/z_index.html diff --git a/Mesures/temp_zf - copie/z_page1.html b/Mesures/temp_zf/z_page1.html similarity index 100% rename from Mesures/temp_zf - copie/z_page1.html rename to Mesures/temp_zf/z_page1.html diff --git a/Mesures/temp_zf - copie/z_page2.html b/Mesures/temp_zf/z_page2.html similarity index 100% rename from Mesures/temp_zf - copie/z_page2.html rename to Mesures/temp_zf/z_page2.html diff --git a/Mesures/temp_zf - copie/z_page3.html b/Mesures/temp_zf/z_page3.html similarity index 100% rename from Mesures/temp_zf - copie/z_page3.html rename to Mesures/temp_zf/z_page3.html diff --git a/Mesures/temp_zf - copie/z_page4.html b/Mesures/temp_zf/z_page4.html similarity index 100% rename from Mesures/temp_zf - copie/z_page4.html rename to Mesures/temp_zf/z_page4.html