diff --git a/Temp_DS18B20/temp_zf/0_cron_temp.lua b/Mesures/energy/0_cron.lua similarity index 100% rename from Temp_DS18B20/temp_zf/0_cron_temp.lua rename to Mesures/energy/0_cron.lua diff --git a/Temp_DS18B20/temp_zf/0_get_temp.lua b/Mesures/energy/0_get_energy.lua similarity index 100% rename from Temp_DS18B20/temp_zf/0_get_temp.lua rename to Mesures/energy/0_get_energy.lua diff --git a/Temp_DS18B20/temp_zf/0_send_temp.lua b/Mesures/energy/0_send_data.lua similarity index 100% rename from Temp_DS18B20/temp_zf/0_send_temp.lua rename to Mesures/energy/0_send_data.lua diff --git a/Mesures/energy/README.md b/Mesures/energy/README.md new file mode 100644 index 0000000..1338570 --- /dev/null +++ b/Mesures/energy/README.md @@ -0,0 +1,118 @@ +# temp_zf + +Petit projet pour mesurer la consommation électrique en temps réel chez moi avec un NodeMCU en LUA, et l'afficher sur ThingSpeak. + +![Image of Yaktocat](.jpg) + +![Image of Yaktocat](.png) + +On peut voir, avec ce projet assez complet, toutes les possibilités offertes de la programmation des NodeMCU en LUA, en mode événementiel.
+Choses qui ne seraient pas possible si on l'avait fait en C++ (mode Arduino), comme par exemple: + +* serveur WEB Active Server Pages ZYX, permet de faire des pages HTML dynamique avec du code LUA in line +* serveur WEB service pour le HUB (API GET) +* serveur WEB pour l'affichage de la consommation électrique +* serveur WEB pour l'IDE, modification du code source en remote directement depuis une page WEB, pas besoin d'IDE +* crontab, horloge pour les mesures de la consommation +* serveur TELNET, utilisation de la console en remote pour le debug + +Toutes les fonctions sont bien séparées dans des scripts, ce qui facilite la portabilité entre les projets mais aussi sa mise au point. + + + +## Astuces de mesures + +Dans ce projet il y a 1x NodeMCU qui mesure la consommation électrique en détectant simplement le petite LED du compteur électrique +: + +Il envoie la puissance sur le NodeMCU de la mesure **extérieure sud** fait office de hub des deux autres mesures de températures et, envoie en même temps les 4x mesures à Thingspeak. Ceci afin de les avoir tous dans le même channel (on économise les channels).
+Cela permet de mesurer des valeurs physiques éloignées dans la maison en utilisant le WIFI comme câble de liaison entre les sondes ! + + +## Installation + +Il faut *flasher* le NodeMCU avec ce firmware: + +https://github.com/zuzu59/NodeMCU_Lua/blob/master/Firmware/nodemcu-master-20-modules-2019-07-01-06-35-13-float.bin + + +Avec ces modules: + +``` +adc ds18b20 file gpio http i2c mdns mqtt net +node ow pcm rtctime sntp spi tmr uart wifi ws2812 +``` + + +## Utilisation + +### Distribution des rôles de NodeMCU + +Comme la mesure de consommation est faite avec 1x NodeMCU, il y a donc 1x fichiers de *secrets*. C'est dans ce fichier de *secrets* qu'il y a l'information de l'adresse IP du NodeMCU qui fait office de *hub* !
+ +``` +secrets_energy.lua +``` + +C'est aussi là qu'il y a le *numéro du field* (zfield), c'est à dire le rôle joué par le NodeMCU_Lua: + +* **4**, consommation électrique + +Et c'est le NodeMCu de mesure de température *sud* qui fait office de *hub*, qui concentre les mesures et les envoie en une fois à Thingspeek ! + + +**faut encore modifier le readme depuis ici ! zf190803.1917** + +### Affichage des températures en local sur le NodeMCU + +On peut lire la température directement sur le NodeMCU au moyen de cet url (il faut modifier l'adresse IP du NodeMCU en question): + +nodemcu 28 int, http://192.168.0.171/disp_temp.html + +nodemcu 29 sud, http://192.168.0.180/disp_temp.html + +nodemcu 30 nord, http://192.168.0.105/disp_temp.html + + +### Affichage du petit serveur web du NodeMCU_Lua + +Chaque NodeMCU a son propre serveur WEB, on peut l'accéder simplement depuis son adresse IP: + +nodemcu 28 int, http://192.168.0.171 + +nodemcu 29 sud, http://192.168.0.180 + +nodemcu 30 nord, http://192.168.0.105 + + +### Modification du code source du NodeMCU en remote + +Très pratique pour le debug, on peut directement modifier le code source Lua du NodeMCU en remote avec cet url: + +nodemcu 28 int, http://192.168.0.171:88 + +nodemcu 29 sud, http://192.168.0.180:88 + +nodemcu 30 sord, http://192.168.0.105:88 + + +### Utilisation de la console du NodeMCU en remote + +Très pratique pour le debug, on peut accéder à la console du NodeMCU en remote avec telnet: + +nodemcu 28 int, **telnet -rN 192.168.0.171** + +nodemcu 29 sud, **telnet -rN 192.168.0.180** + +nodemcu 30 nord, **telnet -rN 192.168.0.105** + + +## Visualisation sur ThingSpeak +La totale en détail +https://thingspeak.com/channels/817940 + +Seulement la corrélation entre les trois température +https://thingspeak.com/apps/plugins/300559 + + +zf190803.1917 diff --git a/Mesures/energy/_secrets_energy.lua_ b/Mesures/energy/_secrets_energy.lua_ new file mode 100644 index 0000000..66ee4a7 --- /dev/null +++ b/Mesures/energy/_secrets_energy.lua_ @@ -0,0 +1,17 @@ +-- 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 ! + +function secrets() + print("\n secrets_temp_zf_out_sud.lua zf190727.1006 \n") + + cli_ssid="xxx" + cli_pwd="xxx" + + thingspeak_url="http://api.thingspeak.com/update?api_key=xxx&" + hub_url="http://192.168.0.180/api_hub_temp.html?" + zfield=1 ou 2 ou 3 ! + +end +secrets() +secrets=nil diff --git a/Temp_DS18B20/solar_zf/a1.lua b/Mesures/energy/a1.lua similarity index 100% rename from Temp_DS18B20/solar_zf/a1.lua rename to Mesures/energy/a1.lua diff --git a/Temp_DS18B20/temp_zf/a2.lua b/Mesures/energy/a2.lua similarity index 100% rename from Temp_DS18B20/temp_zf/a2.lua rename to Mesures/energy/a2.lua diff --git a/Temp_DS18B20/temp_zf/a3.lua b/Mesures/energy/a3.lua similarity index 100% rename from Temp_DS18B20/temp_zf/a3.lua rename to Mesures/energy/a3.lua diff --git a/Mesures/energy/boot.lua b/Mesures/energy/boot.lua new file mode 100644 index 0000000..d432a99 --- /dev/null +++ b/Mesures/energy/boot.lua @@ -0,0 +1,37 @@ +-- Scripts à charger après le boot pour démarrer son appli + +print("\n boot.lua zf190803.1908 \n") + +function heartbeat() + f= "flash_led_xfois.lua" if file.exists(f) then dofile(f) end + flash_led_xfois() + boottimer1=tmr.create() + boottimer1:alarm(1*1000, tmr.ALARM_AUTO, function() + xfois =2 + blink_LED () + end) +end + +-- charge ses propres secrets +f= "secrets_energy.lua" if file.exists(f) then dofile(f) end + +--f= "led_rgb.lua" if file.exists(f) then dofile(f) end +--f= "wifi_ap_start.lua" if file.exists(f) then dofile(f) 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_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_temp.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 + +f=nil +--heartbeat=nil +heartbeat() + + + + diff --git a/Temp_DS18B20/temp_zf/disp_temp.html b/Mesures/energy/disp_data.html similarity index 100% rename from Temp_DS18B20/temp_zf/disp_temp.html rename to Mesures/energy/disp_data.html diff --git a/Temp_DS18B20/solar_zf/flash_led_xfois.lua b/Mesures/energy/flash_led_xfois.lua similarity index 100% rename from Temp_DS18B20/solar_zf/flash_led_xfois.lua rename to Mesures/energy/flash_led_xfois.lua diff --git a/Temp_DS18B20/temp_zf/goodies/a6.lua b/Mesures/energy/goodies/a6.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/a6.lua rename to Mesures/energy/goodies/a6.lua diff --git a/Temp_DS18B20/temp_zf/goodies/a7.lua b/Mesures/energy/goodies/a7.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/a7.lua rename to Mesures/energy/goodies/a7.lua diff --git a/Temp_DS18B20/temp_zf/goodies/a8.lua b/Mesures/energy/goodies/a8.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/a8.lua rename to Mesures/energy/goodies/a8.lua diff --git a/Temp_DS18B20/temp_zf/goodies/a9.lua b/Mesures/energy/goodies/a9.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/a9.lua rename to Mesures/energy/goodies/a9.lua diff --git a/Temp_DS18B20/solar_zf/goodies/a_tst_variables.lua b/Mesures/energy/goodies/a_tst_variables.lua similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/a_tst_variables.lua rename to Mesures/energy/goodies/a_tst_variables.lua diff --git a/Temp_DS18B20/solar_zf/goodies/led_rgb.lua b/Mesures/energy/goodies/led_rgb.lua similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/led_rgb.lua rename to Mesures/energy/goodies/led_rgb.lua diff --git a/Temp_DS18B20/solar_zf/goodies/rm_files.lua b/Mesures/energy/goodies/rm_files.lua similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/rm_files.lua rename to Mesures/energy/goodies/rm_files.lua diff --git a/Temp_DS18B20/solar_zf/goodies/t1.csv b/Mesures/energy/goodies/t1.csv similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/t1.csv rename to Mesures/energy/goodies/t1.csv diff --git a/Temp_DS18B20/solar_zf/goodies/wifi_ap_start.lua b/Mesures/energy/goodies/wifi_ap_start.lua similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/wifi_ap_start.lua rename to Mesures/energy/goodies/wifi_ap_start.lua diff --git a/Temp_DS18B20/solar_zf/wifi_get_ip.lua b/Mesures/energy/goodies/wifi_get_ip.lua similarity index 100% rename from Temp_DS18B20/solar_zf/wifi_get_ip.lua rename to Mesures/energy/goodies/wifi_get_ip.lua diff --git a/Temp_DS18B20/solar_zf/goodies/wifi_off.lua b/Mesures/energy/goodies/wifi_off.lua similarity index 100% rename from Temp_DS18B20/solar_zf/goodies/wifi_off.lua rename to Mesures/energy/goodies/wifi_off.lua diff --git a/Temp_DS18B20/temp_zf/initz.lua b/Mesures/energy/initz.lua similarity index 100% rename from Temp_DS18B20/temp_zf/initz.lua rename to Mesures/energy/initz.lua diff --git a/Temp_DS18B20/solar_zf/oldies/ds18b20-example.lua b/Mesures/energy/oldies/ds18b20-example.lua similarity index 100% rename from Temp_DS18B20/solar_zf/oldies/ds18b20-example.lua rename to Mesures/energy/oldies/ds18b20-example.lua diff --git a/Temp_DS18B20/solar_zf/oldies/ds18b20-web.lua b/Mesures/energy/oldies/ds18b20-web.lua similarity index 100% rename from Temp_DS18B20/solar_zf/oldies/ds18b20-web.lua rename to Mesures/energy/oldies/ds18b20-web.lua diff --git a/Temp_DS18B20/solar_zf/oldies/ds18b20.lua b/Mesures/energy/oldies/ds18b20.lua similarity index 100% rename from Temp_DS18B20/solar_zf/oldies/ds18b20.lua rename to Mesures/energy/oldies/ds18b20.lua diff --git a/Temp_DS18B20/solar_zf/set_time.lua b/Mesures/energy/set_time.lua similarity index 100% rename from Temp_DS18B20/solar_zf/set_time.lua rename to Mesures/energy/set_time.lua diff --git a/Temp_DS18B20/solar_zf/telnet_srv2.lua b/Mesures/energy/telnet_srv2.lua similarity index 100% rename from Temp_DS18B20/solar_zf/telnet_srv2.lua rename to Mesures/energy/telnet_srv2.lua diff --git a/Temp_DS18B20/temp_zf/thingspeak.mat b/Mesures/energy/thingspeak.mat similarity index 100% rename from Temp_DS18B20/temp_zf/thingspeak.mat rename to Mesures/energy/thingspeak.mat diff --git a/Temp_DS18B20/temp_zf/web_ide2.lua b/Mesures/energy/web_ide2.lua similarity index 100% rename from Temp_DS18B20/temp_zf/web_ide2.lua rename to Mesures/energy/web_ide2.lua diff --git a/Temp_DS18B20/temp_zf/web_srv2.lua b/Mesures/energy/web_srv2.lua similarity index 100% rename from Temp_DS18B20/temp_zf/web_srv2.lua rename to Mesures/energy/web_srv2.lua diff --git a/Temp_DS18B20/solar_zf/wifi_ap_stop.lua b/Mesures/energy/wifi_ap_stop.lua similarity index 100% rename from Temp_DS18B20/solar_zf/wifi_ap_stop.lua rename to Mesures/energy/wifi_ap_stop.lua diff --git a/Temp_DS18B20/temp_zf/wifi_cli_conf.lua b/Mesures/energy/wifi_cli_conf.lua similarity index 100% rename from Temp_DS18B20/temp_zf/wifi_cli_conf.lua rename to Mesures/energy/wifi_cli_conf.lua diff --git a/Temp_DS18B20/solar_zf/wifi_cli_start.lua b/Mesures/energy/wifi_cli_start.lua similarity index 100% rename from Temp_DS18B20/solar_zf/wifi_cli_start.lua rename to Mesures/energy/wifi_cli_start.lua diff --git a/Temp_DS18B20/temp_zf/wifi_info.lua b/Mesures/energy/wifi_info.lua similarity index 100% rename from Temp_DS18B20/temp_zf/wifi_info.lua rename to Mesures/energy/wifi_info.lua diff --git a/Temp_DS18B20/temp_zf/z_index.html b/Mesures/energy/z_index.html similarity index 100% rename from Temp_DS18B20/temp_zf/z_index.html rename to Mesures/energy/z_index.html diff --git a/Temp_DS18B20/solar_zf/z_page1.html b/Mesures/energy/z_page1.html similarity index 100% rename from Temp_DS18B20/solar_zf/z_page1.html rename to Mesures/energy/z_page1.html diff --git a/Temp_DS18B20/solar_zf/z_page2.html b/Mesures/energy/z_page2.html similarity index 100% rename from Temp_DS18B20/solar_zf/z_page2.html rename to Mesures/energy/z_page2.html diff --git a/Temp_DS18B20/solar_zf/z_page3.html b/Mesures/energy/z_page3.html similarity index 100% rename from Temp_DS18B20/solar_zf/z_page3.html rename to Mesures/energy/z_page3.html diff --git a/Temp_DS18B20/temp_zf/z_page4.html b/Mesures/energy/z_page4.html similarity index 100% rename from Temp_DS18B20/temp_zf/z_page4.html rename to Mesures/energy/z_page4.html diff --git a/Temp_DS18B20/solar_zf/README.md b/Mesures/solar_zf/README.md similarity index 100% rename from Temp_DS18B20/solar_zf/README.md rename to Mesures/solar_zf/README.md diff --git a/Temp_DS18B20/solar_zf/_credentials_solar.lua_ b/Mesures/solar_zf/_credentials_solar.lua_ similarity index 100% rename from Temp_DS18B20/solar_zf/_credentials_solar.lua_ rename to Mesures/solar_zf/_credentials_solar.lua_ diff --git a/Temp_DS18B20/temp_zf/a1.lua b/Mesures/solar_zf/a1.lua similarity index 100% rename from Temp_DS18B20/temp_zf/a1.lua rename to Mesures/solar_zf/a1.lua diff --git a/Temp_DS18B20/solar_zf/a2.lua b/Mesures/solar_zf/a2.lua similarity index 100% rename from Temp_DS18B20/solar_zf/a2.lua rename to Mesures/solar_zf/a2.lua diff --git a/Temp_DS18B20/solar_zf/a3.lua b/Mesures/solar_zf/a3.lua similarity index 100% rename from Temp_DS18B20/solar_zf/a3.lua rename to Mesures/solar_zf/a3.lua diff --git a/Temp_DS18B20/solar_zf/a4.lua b/Mesures/solar_zf/a4.lua similarity index 100% rename from Temp_DS18B20/solar_zf/a4.lua rename to Mesures/solar_zf/a4.lua diff --git a/Temp_DS18B20/solar_zf/boot.lua b/Mesures/solar_zf/boot.lua similarity index 100% rename from Temp_DS18B20/solar_zf/boot.lua rename to Mesures/solar_zf/boot.lua diff --git a/Temp_DS18B20/temp_zf/flash_led_xfois.lua b/Mesures/solar_zf/flash_led_xfois.lua similarity index 100% rename from Temp_DS18B20/temp_zf/flash_led_xfois.lua rename to Mesures/solar_zf/flash_led_xfois.lua diff --git a/Temp_DS18B20/temp_zf/goodies/a_tst_variables.lua b/Mesures/solar_zf/goodies/a_tst_variables.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/a_tst_variables.lua rename to Mesures/solar_zf/goodies/a_tst_variables.lua diff --git a/Temp_DS18B20/temp_zf/goodies/led_rgb.lua b/Mesures/solar_zf/goodies/led_rgb.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/led_rgb.lua rename to Mesures/solar_zf/goodies/led_rgb.lua diff --git a/Temp_DS18B20/temp_zf/goodies/rm_files.lua b/Mesures/solar_zf/goodies/rm_files.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/rm_files.lua rename to Mesures/solar_zf/goodies/rm_files.lua diff --git a/Temp_DS18B20/temp_zf/goodies/t1.csv b/Mesures/solar_zf/goodies/t1.csv similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/t1.csv rename to Mesures/solar_zf/goodies/t1.csv diff --git a/Temp_DS18B20/temp_zf/goodies/wifi_ap_start.lua b/Mesures/solar_zf/goodies/wifi_ap_start.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/wifi_ap_start.lua rename to Mesures/solar_zf/goodies/wifi_ap_start.lua diff --git a/Temp_DS18B20/temp_zf/goodies/wifi_off.lua b/Mesures/solar_zf/goodies/wifi_off.lua similarity index 100% rename from Temp_DS18B20/temp_zf/goodies/wifi_off.lua rename to Mesures/solar_zf/goodies/wifi_off.lua diff --git a/Temp_DS18B20/solar_zf/img/20190601_195725.jpg b/Mesures/solar_zf/img/20190601_195725.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/20190601_195725.jpg rename to Mesures/solar_zf/img/20190601_195725.jpg diff --git a/Temp_DS18B20/solar_zf/img/20190601_195730.jpg b/Mesures/solar_zf/img/20190601_195730.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/20190601_195730.jpg rename to Mesures/solar_zf/img/20190601_195730.jpg diff --git a/Temp_DS18B20/solar_zf/img/20190601_195740.jpg b/Mesures/solar_zf/img/20190601_195740.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/20190601_195740.jpg rename to Mesures/solar_zf/img/20190601_195740.jpg diff --git a/Temp_DS18B20/solar_zf/img/20190601_195747.jpg b/Mesures/solar_zf/img/20190601_195747.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/20190601_195747.jpg rename to Mesures/solar_zf/img/20190601_195747.jpg diff --git a/Temp_DS18B20/solar_zf/img/Solar_zf 2019-06-17 à 14.55.46.png b/Mesures/solar_zf/img/Solar_zf 2019-06-17 à 14.55.46.png similarity index 100% rename from Temp_DS18B20/solar_zf/img/Solar_zf 2019-06-17 à 14.55.46.png rename to Mesures/solar_zf/img/Solar_zf 2019-06-17 à 14.55.46.png diff --git a/Temp_DS18B20/solar_zf/img/ds18b20 parasite mode 2.jpg b/Mesures/solar_zf/img/ds18b20 parasite mode 2.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/ds18b20 parasite mode 2.jpg rename to Mesures/solar_zf/img/ds18b20 parasite mode 2.jpg diff --git a/Temp_DS18B20/solar_zf/img/ds18b20 parasite mode.jpg b/Mesures/solar_zf/img/ds18b20 parasite mode.jpg similarity index 100% rename from Temp_DS18B20/solar_zf/img/ds18b20 parasite mode.jpg rename to Mesures/solar_zf/img/ds18b20 parasite mode.jpg diff --git a/Temp_DS18B20/solar_zf/initz.lua b/Mesures/solar_zf/initz.lua similarity index 100% rename from Temp_DS18B20/solar_zf/initz.lua rename to Mesures/solar_zf/initz.lua diff --git a/Temp_DS18B20/temp_zf/oldies/ds18b20-example.lua b/Mesures/solar_zf/oldies/ds18b20-example.lua similarity index 100% rename from Temp_DS18B20/temp_zf/oldies/ds18b20-example.lua rename to Mesures/solar_zf/oldies/ds18b20-example.lua diff --git a/Temp_DS18B20/temp_zf/oldies/ds18b20-web.lua b/Mesures/solar_zf/oldies/ds18b20-web.lua similarity index 100% rename from Temp_DS18B20/temp_zf/oldies/ds18b20-web.lua rename to Mesures/solar_zf/oldies/ds18b20-web.lua diff --git a/Temp_DS18B20/temp_zf/oldies/ds18b20.lua b/Mesures/solar_zf/oldies/ds18b20.lua similarity index 100% rename from Temp_DS18B20/temp_zf/oldies/ds18b20.lua rename to Mesures/solar_zf/oldies/ds18b20.lua diff --git a/Temp_DS18B20/temp_zf/set_time.lua b/Mesures/solar_zf/set_time.lua similarity index 100% rename from Temp_DS18B20/temp_zf/set_time.lua rename to Mesures/solar_zf/set_time.lua diff --git a/Temp_DS18B20/solar_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png b/Mesures/solar_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png similarity index 100% rename from Temp_DS18B20/solar_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png rename to Mesures/solar_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png diff --git a/Temp_DS18B20/solar_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png b/Mesures/solar_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png similarity index 100% rename from Temp_DS18B20/solar_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png rename to Mesures/solar_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png diff --git a/Temp_DS18B20/solar_zf/simulation/échelle sonde.xlsx b/Mesures/solar_zf/simulation/échelle sonde.xlsx similarity index 100% rename from Temp_DS18B20/solar_zf/simulation/échelle sonde.xlsx rename to Mesures/solar_zf/simulation/échelle sonde.xlsx diff --git a/Temp_DS18B20/temp_zf/telnet_srv2.lua b/Mesures/solar_zf/telnet_srv2.lua similarity index 100% rename from Temp_DS18B20/temp_zf/telnet_srv2.lua rename to Mesures/solar_zf/telnet_srv2.lua diff --git a/Temp_DS18B20/solar_zf/thingspeak.mat b/Mesures/solar_zf/thingspeak.mat similarity index 100% rename from Temp_DS18B20/solar_zf/thingspeak.mat rename to Mesures/solar_zf/thingspeak.mat diff --git a/Temp_DS18B20/solar_zf/web_ide2.lua b/Mesures/solar_zf/web_ide2.lua similarity index 100% rename from Temp_DS18B20/solar_zf/web_ide2.lua rename to Mesures/solar_zf/web_ide2.lua diff --git a/Temp_DS18B20/solar_zf/web_srv2.lua b/Mesures/solar_zf/web_srv2.lua similarity index 100% rename from Temp_DS18B20/solar_zf/web_srv2.lua rename to Mesures/solar_zf/web_srv2.lua diff --git a/Temp_DS18B20/temp_zf/wifi_ap_stop.lua b/Mesures/solar_zf/wifi_ap_stop.lua similarity index 100% rename from Temp_DS18B20/temp_zf/wifi_ap_stop.lua rename to Mesures/solar_zf/wifi_ap_stop.lua diff --git a/Temp_DS18B20/solar_zf/wifi_cli_conf.lua b/Mesures/solar_zf/wifi_cli_conf.lua similarity index 100% rename from Temp_DS18B20/solar_zf/wifi_cli_conf.lua rename to Mesures/solar_zf/wifi_cli_conf.lua diff --git a/Temp_DS18B20/temp_zf/wifi_cli_start.lua b/Mesures/solar_zf/wifi_cli_start.lua similarity index 100% rename from Temp_DS18B20/temp_zf/wifi_cli_start.lua rename to Mesures/solar_zf/wifi_cli_start.lua diff --git a/Temp_DS18B20/temp_zf/wifi_get_ip.lua b/Mesures/solar_zf/wifi_get_ip.lua similarity index 100% rename from Temp_DS18B20/temp_zf/wifi_get_ip.lua rename to Mesures/solar_zf/wifi_get_ip.lua diff --git a/Temp_DS18B20/solar_zf/wifi_info.lua b/Mesures/solar_zf/wifi_info.lua similarity index 100% rename from Temp_DS18B20/solar_zf/wifi_info.lua rename to Mesures/solar_zf/wifi_info.lua diff --git a/Temp_DS18B20/solar_zf/z_index.html b/Mesures/solar_zf/z_index.html similarity index 100% rename from Temp_DS18B20/solar_zf/z_index.html rename to Mesures/solar_zf/z_index.html diff --git a/Temp_DS18B20/temp_zf/z_page1.html b/Mesures/solar_zf/z_page1.html similarity index 100% rename from Temp_DS18B20/temp_zf/z_page1.html rename to Mesures/solar_zf/z_page1.html diff --git a/Temp_DS18B20/temp_zf/z_page2.html b/Mesures/solar_zf/z_page2.html similarity index 100% rename from Temp_DS18B20/temp_zf/z_page2.html rename to Mesures/solar_zf/z_page2.html diff --git a/Temp_DS18B20/temp_zf/z_page3.html b/Mesures/solar_zf/z_page3.html similarity index 100% rename from Temp_DS18B20/temp_zf/z_page3.html rename to Mesures/solar_zf/z_page3.html diff --git a/Mesures/temp_zf - copie/0_cron_temp.lua b/Mesures/temp_zf - copie/0_cron_temp.lua new file mode 100644 index 0000000..b56e2a0 --- /dev/null +++ b/Mesures/temp_zf - copie/0_cron_temp.lua @@ -0,0 +1,19 @@ +-- Petit script pour faire office de crontab pour les mesures de température +print("\n 0_cron_temp.lua zf190728.1054 \n") + + cron1=tmr.create() + cron1:alarm(10*1000, tmr.ALARM_AUTO, function() + get_temp() + end) + + if zfield == 2 then + cron2=tmr.create() + cron2:alarm(20*1000, tmr.ALARM_AUTO, function() + print("cron2........................") + zurl=thingspeak_url.."field1="..tostring(ztemp1).."&field2="..tostring(ztemp2).."&field3="..tostring(ztemp3) + send_temp() + end) + end + + + diff --git a/Mesures/temp_zf - copie/0_get_temp.lua b/Mesures/temp_zf - copie/0_get_temp.lua new file mode 100644 index 0000000..2fcea1a --- /dev/null +++ b/Mesures/temp_zf - copie/0_get_temp.lua @@ -0,0 +1,34 @@ +-- Lit le capteur de température solaire en fonction de son field qui se trouve dans les secrets ! +print("\n 0_get_temp.lua zf190728.1014 \n") + +-- lecture: https://thingspeak.com/channels/802784/private_show +-- source: https://nodemcu.readthedocs.io/en/master/modules/ds18b20/ + +local ow_pin = 3 +ds18b20.setup(ow_pin) + +function get_temp() + ds18b20.read( + function(ind,rom,res,temp,tdec,par) + print(ind, temp, zfield) + if zfield == 1 then + ztemp1 = temp + zurl=hub_url.."field1="..tostring(ztemp1) + send_temp() + elseif zfield == 2 then + ztemp2 = temp + elseif zfield == 3 then + ztemp3 = temp + zurl=hub_url.."field3="..tostring(ztemp3) + send_temp() + end + print(ztemp1, ztemp2, ztemp3) + end,{}) +end + +--[[ + +get_temp() + +]] + diff --git a/Mesures/temp_zf - copie/0_send_temp.lua b/Mesures/temp_zf - copie/0_send_temp.lua new file mode 100644 index 0000000..3b38c03 --- /dev/null +++ b/Mesures/temp_zf - copie/0_send_temp.lua @@ -0,0 +1,25 @@ +-- Petit script pour envoyer les valeurs de température sur un serveur WEB via un HTTP GET +print("\n 0_send_temp.lua zf190727.1331 \n") + +function send_temp() + print("send_web_temp: ") + print(zurl) + + http.get(zurl, nil, function(code, data) +-- print("toto") + if (code < 0) then + print("HTTP request failed") + print("zuzu", code, data) + else + print(code, data) + end +-- print("tutu") + end) +-- print("titi") +end + +--[[ + +send_temp() + +]] diff --git a/Temp_DS18B20/temp_zf/README.md b/Mesures/temp_zf - copie/README.md similarity index 100% rename from Temp_DS18B20/temp_zf/README.md rename to Mesures/temp_zf - copie/README.md diff --git a/Temp_DS18B20/temp_zf/_secrets_temp_zf.lua_ b/Mesures/temp_zf - copie/_secrets_temp_zf.lua_ similarity index 86% rename from Temp_DS18B20/temp_zf/_secrets_temp_zf.lua_ rename to Mesures/temp_zf - copie/_secrets_temp_zf.lua_ index d0a2d6a..66ee4a7 100644 --- a/Temp_DS18B20/temp_zf/_secrets_temp_zf.lua_ +++ b/Mesures/temp_zf - copie/_secrets_temp_zf.lua_ @@ -5,11 +5,12 @@ function secrets() print("\n secrets_temp_zf_out_sud.lua zf190727.1006 \n") - cli_ssid="" - cli_pwd="" + cli_ssid="xxx" + cli_pwd="xxx" thingspeak_url="http://api.thingspeak.com/update?api_key=xxx&" hub_url="http://192.168.0.180/api_hub_temp.html?" + zfield=1 ou 2 ou 3 ! end secrets() diff --git a/Mesures/temp_zf - copie/a1.lua b/Mesures/temp_zf - copie/a1.lua new file mode 100644 index 0000000..1f98ae2 --- /dev/null +++ b/Mesures/temp_zf - copie/a1.lua @@ -0,0 +1,23 @@ +-- programme pour faire un test depuis de le webide + +-- source: https://nodemcu.readthedocs.io/en/master/modules/ds18b20/ + +function a1() + print("\n a1.lua zf190601.1627 \n") +end + +a1() + +local ow_pin = 3 +ds18b20.setup(ow_pin) + +print("toto182538") + +-- read all sensors and print all measurement results +ds18b20.read( + function(ind,rom,res,temp,tdec,par) + print(ind,string.format("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X",string.match(rom,"(%d+):(%d+):(%d+):(%d+):(%d+):(%d+):(%d+):(%d+)")),res,temp,tdec,par) + end,{}) + +print("tutu152603") + diff --git a/Mesures/temp_zf - copie/a2.lua b/Mesures/temp_zf - copie/a2.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/a2.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Mesures/temp_zf - copie/a3.lua b/Mesures/temp_zf - copie/a3.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/a3.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Temp_DS18B20/temp_zf/api_hub_temp.html b/Mesures/temp_zf - copie/api_hub_temp.html similarity index 100% rename from Temp_DS18B20/temp_zf/api_hub_temp.html rename to Mesures/temp_zf - copie/api_hub_temp.html diff --git a/Temp_DS18B20/temp_zf/boot.lua b/Mesures/temp_zf - copie/boot.lua similarity index 100% rename from Temp_DS18B20/temp_zf/boot.lua rename to Mesures/temp_zf - copie/boot.lua diff --git a/Mesures/temp_zf - copie/disp_temp.html b/Mesures/temp_zf - copie/disp_temp.html new file mode 100644 index 0000000..ffd491c --- /dev/null +++ b/Mesures/temp_zf - copie/disp_temp.html @@ -0,0 +1,30 @@ + + + + + + Affichage des températures + + + +

Affichage des températures 190727.1349

+
+ Les températures mesurées sont:
+ + + <% + if (ztemp1 ~= nil) then + zout("
Température intérieure chambre à coucher "..ztemp1.."°C") + end + if (ztemp2 ~= nil) then + zout("
Température extérieure sud (nodemcu 29) "..ztemp2.."°C") + end + if (ztemp3 ~= nil) then + zout("
Température extérieure nord (nodemcu 30) "..ztemp3.."°C") + end + + zout("

RAM: "..node.heap().."
") + %> + + + diff --git a/Mesures/temp_zf - copie/flash_led_xfois.lua b/Mesures/temp_zf - copie/flash_led_xfois.lua new file mode 100644 index 0000000..090ec4c --- /dev/null +++ b/Mesures/temp_zf - copie/flash_led_xfois.lua @@ -0,0 +1,39 @@ +-- programme pour faire clignoter x fois une LED avec un rapport on/off + +function flash_led_xfois() + print("\n flash_led_xfois.lua zf190601.1618 \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) + ztmr_Flash_LED:alarm(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) + ztmr_Flash_LED:alarm(zTm_On_LED, tmr.ALARM_SINGLE, blink_LED) + end + end + end + +-- xfois =2 +-- blink_LED () +end + + + + diff --git a/Mesures/temp_zf - copie/goodies/a6.lua b/Mesures/temp_zf - copie/goodies/a6.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/a6.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Mesures/temp_zf - copie/goodies/a7.lua b/Mesures/temp_zf - copie/goodies/a7.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/a7.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Mesures/temp_zf - copie/goodies/a8.lua b/Mesures/temp_zf - copie/goodies/a8.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/a8.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Mesures/temp_zf - copie/goodies/a9.lua b/Mesures/temp_zf - copie/goodies/a9.lua new file mode 100644 index 0000000..46e85c1 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/a9.lua @@ -0,0 +1 @@ +-- programme pour faire un test depuis de le webide diff --git a/Mesures/temp_zf - copie/goodies/a_tst_variables.lua b/Mesures/temp_zf - copie/goodies/a_tst_variables.lua new file mode 100644 index 0000000..bbae700 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/a_tst_variables.lua @@ -0,0 +1,6 @@ +-- Scripts pour afficher toutes les variables et fonctions en cours dans le système + +print("\n a_tst_variable.lua zf190310.1525 \n") + +for n in pairs (_G) do print(n) end + diff --git a/Mesures/temp_zf - copie/goodies/led_rgb.lua b/Mesures/temp_zf - copie/goodies/led_rgb.lua new file mode 100644 index 0000000..7a5d396 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/led_rgb.lua @@ -0,0 +1,37 @@ +-- Scripts juste pour allumer ou éteindre une LED sur un ruban RGB +-- tout sur la couleur: https://www.w3schools.com/colors/default.asp +-- roue des couleurs: https://iro.js.org/?ref=oldsite + +print("\n led_rgb.lua zf190303.1436 \n") + +nbleds=3 +ws2812.init() +myLedStrip = ws2812.newBuffer(nbleds, 3) + +function RGB_clear() + myLedStrip:fill(0, 0, 0) ws2812.write(myLedStrip) +end + +function RGB_reform(R1, G1, B1) --conversion de RGB à BRG + rR1=B1 rG1=R1 rB1=G1 +end + +function zled_rgb(num_led, R1, G1, B1, zpower) + RGB_reform(R1, G1, B1) + myLedStrip:set(num_led, rR1*zpower, rG1*zpower, rB1*zpower) + ws2812.write(myLedStrip) +end + +function zled_write() + ws2812.write(myLedStrip) +end + + +RGB_clear() + +--[[ +zled_rgb(1,255,0,0,1) +zled_rgb(2,0,255,0,1) +zled_rgb(2,0,255,0,0.05) +zled_rgb(3,0,0,255,1) +]] diff --git a/Mesures/temp_zf - copie/goodies/rm_files.lua b/Mesures/temp_zf - copie/goodies/rm_files.lua new file mode 100644 index 0000000..81241cb --- /dev/null +++ b/Mesures/temp_zf - copie/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/Mesures/temp_zf - copie/goodies/t1.csv b/Mesures/temp_zf - copie/goodies/t1.csv new file mode 100644 index 0000000..7dc8514 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/t1.csv @@ -0,0 +1,27 @@ +ohm,% +33,100 +36,96.77419355 +41,92.74193548 +45,88.70967742 +52,84.67741935 +56,80.64516129 +61,76.61290323 +67,72.58064516 +72,68.5483871 +79,64.51612903 +83,60.48387097 +91,56.4516129 +97,52.41935484 +104,48.38709677 +112,44.35483871 +117,40.32258065 +121,36.29032258 +128,32.25806452 +132,28.22580645 +139,24.19354839 +150,20.16129032 +166,16.12903226 +191,12.09677419 +207,8.064516129 +224,4.032258065 +240,0 \ No newline at end of file diff --git a/Mesures/temp_zf - copie/goodies/wifi_ap_start.lua b/Mesures/temp_zf - copie/goodies/wifi_ap_start.lua new file mode 100644 index 0000000..f7ade0d --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/wifi_ap_start.lua @@ -0,0 +1,19 @@ +-- Démarre le WIFI en mode AP + +function wifi_ap_start() + print("\n wifi_ap_start.lua zf190310.1511 \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 +end + +wifi_ap_start() +wifi_ap_start=nil diff --git a/Mesures/temp_zf - copie/goodies/wifi_get_ip.lua b/Mesures/temp_zf - copie/goodies/wifi_get_ip.lua new file mode 100644 index 0000000..82bcdc2 --- /dev/null +++ b/Mesures/temp_zf - copie/goodies/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/Mesures/temp_zf - copie/goodies/wifi_off.lua b/Mesures/temp_zf - copie/goodies/wifi_off.lua new file mode 100644 index 0000000..c1c7235 --- /dev/null +++ b/Mesures/temp_zf - copie/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/Temp_DS18B20/temp_zf/img/20190728_122840.jpg b/Mesures/temp_zf - copie/img/20190728_122840.jpg similarity index 100% rename from Temp_DS18B20/temp_zf/img/20190728_122840.jpg rename to Mesures/temp_zf - copie/img/20190728_122840.jpg diff --git a/Temp_DS18B20/temp_zf/img/20190728_122850.jpg b/Mesures/temp_zf - copie/img/20190728_122850.jpg similarity index 100% rename from Temp_DS18B20/temp_zf/img/20190728_122850.jpg rename to Mesures/temp_zf - copie/img/20190728_122850.jpg diff --git a/Temp_DS18B20/temp_zf/img/Capture d’écran 2019-07-28 à 12.31.14.png b/Mesures/temp_zf - copie/img/Capture d’écran 2019-07-28 à 12.31.14.png similarity index 100% rename from Temp_DS18B20/temp_zf/img/Capture d’écran 2019-07-28 à 12.31.14.png rename to Mesures/temp_zf - copie/img/Capture d’écran 2019-07-28 à 12.31.14.png diff --git a/Temp_DS18B20/temp_zf/img/ds18b20 parasite mode 2.jpg b/Mesures/temp_zf - copie/img/ds18b20 parasite mode 2.jpg similarity index 100% rename from Temp_DS18B20/temp_zf/img/ds18b20 parasite mode 2.jpg rename to Mesures/temp_zf - copie/img/ds18b20 parasite mode 2.jpg diff --git a/Temp_DS18B20/temp_zf/img/ds18b20 parasite mode.jpg b/Mesures/temp_zf - copie/img/ds18b20 parasite mode.jpg similarity index 100% rename from Temp_DS18B20/temp_zf/img/ds18b20 parasite mode.jpg rename to Mesures/temp_zf - copie/img/ds18b20 parasite mode.jpg diff --git a/Mesures/temp_zf - copie/initz.lua b/Mesures/temp_zf - copie/initz.lua new file mode 100644 index 0000000..ab33e85 --- /dev/null +++ b/Mesures/temp_zf - copie/initz.lua @@ -0,0 +1,53 @@ +--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 zf190621.1612 \n") + +zswitch=3 --switch flash +gpio.mode(zswitch, gpio.INT, gpio.PULLUP) + +function hvbouton() +-- gpio.trig(zswitch, "none") + initalarme:unregister() + f= "boot.lua" if file.exists(f) then dofile(f) end +end + +gpio.trig(zswitch, "both", hvbouton) + +function second_chance() + print("seconde chance...") + f= "repair.lua" if file.exists(f) then dofile(f) end + initalarme=tmr.create() +-- tmr.alarm(initalarme, 4*1000, tmr.ALARM_SINGLE, function() + initalarme:alarm(4*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") + gpio.trig(zswitch) + hvbouton=nil + second_chance=nil + zswitch=nil + reset_reason=nil + 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("external reset") + second_chance() +-- f= "boot.lua" if file.exists(f) then dofile(f) end +else + print("autre raison") + second_chance() +end + diff --git a/Mesures/temp_zf - copie/oldies/ds18b20-example.lua b/Mesures/temp_zf - copie/oldies/ds18b20-example.lua new file mode 100644 index 0000000..8354695 --- /dev/null +++ b/Mesures/temp_zf - copie/oldies/ds18b20-example.lua @@ -0,0 +1,52 @@ +t = require("ds18b20") +pin = 3 -- gpio0 = 3, gpio2 = 4 + +local function readout(temp) + if t.sens then + print("Total number of DS18B20 sensors: ".. #t.sens) + for i, s in ipairs(t.sens) do + print(string.format(" sensor #%d address: %s%s", i, ('%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X'):format(s:byte(1,8)), s:byte(9) == 1 and " (parasite)" or "")) + end + end + for addr, temp in pairs(temp) do + print(string.format("Sensor %s: %s °C", ('%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X'):format(addr:byte(1,8)), temp)) + end + + -- Module can be released when it is no longer needed + --t = nil + --package.loaded["ds18b20"]=nil +end + +t:enable_debug() +file.remove("ds18b20_save.lc") -- remove saved addresses +print("=============================================", node.heap()) +print("first call, no addresses in flash, search is performed") +t:read_temp(readout, pin, t.C) + +tmr.create():alarm(2000, tmr.ALARM_SINGLE, function() + print("=============================================", node.heap()) + print("second readout, no new search, found addresses are used") + t:read_temp(readout, pin) + +tmr.create():alarm(2000, tmr.ALARM_SINGLE, function() + print("=============================================", node.heap()) + print("force search again") + t:read_temp(readout, pin, nil, true) + +tmr.create():alarm(2000, tmr.ALARM_SINGLE, function() + print("=============================================", node.heap()) + print("save search results") + t:read_temp(readout, pin, nil, false, true) + +tmr.create():alarm(2000, tmr.ALARM_SINGLE, function() + print("=============================================", node.heap()) + print("use saved addresses") + t.sens={} + t:read_temp(readout, pin) +end) + +end) + +end) + +end) diff --git a/Mesures/temp_zf - copie/oldies/ds18b20-web.lua b/Mesures/temp_zf - copie/oldies/ds18b20-web.lua new file mode 100644 index 0000000..408612f --- /dev/null +++ b/Mesures/temp_zf - copie/oldies/ds18b20-web.lua @@ -0,0 +1,35 @@ +t = require('ds18b20') + +port = 80 +pin = 3 -- gpio0 = 3, gpio2 = 4 +gconn = {} -- global variable for connection + +function readout(temp) + local resp = "HTTP/1.1 200 OK\nContent-Type: text/html\nRefresh: 5\n\n" .. + "" .. + "" .. + "ESP8266
" + + for addr, temp in pairs(temp) do + resp = resp .. string.format("Sensor %s: %s ℃
", ('%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X '):format(addr:byte(1,8)), temp) + end + + resp = resp .. + "Node ChipID: " .. node.chipid() .. "
" .. + "Node MAC: " .. wifi.sta.getmac() .. "
" .. + "Node Heap: " .. node.heap() .. "
" .. + "Timer Ticks: " .. tmr.now() .. "
" .. + "" + + gconn:send(resp) + gconn:on("sent",function(conn) conn:close() end) +end + +srv=net.createServer(net.TCP) +srv:listen(port, + function(conn) + gconn = conn + -- t:read_temp(readout) -- default pin value is 3 + t:read_temp(readout, pin) + end +) diff --git a/Mesures/temp_zf - copie/oldies/ds18b20.lua b/Mesures/temp_zf - copie/oldies/ds18b20.lua new file mode 100644 index 0000000..b672c87 --- /dev/null +++ b/Mesures/temp_zf - copie/oldies/ds18b20.lua @@ -0,0 +1,223 @@ +-------------------------------------------------------------------------------- +-- DS18B20 one wire module for NODEMCU +-- NODEMCU TEAM +-- LICENCE: http://opensource.org/licenses/MIT +-- @voborsky, @devsaurus, TerryE 26 Mar 2017 +---------------------------------------------------------------------------------------------------------------------------------------------------------------- +local modname = ... + +-- Used modules and functions +local table, string, ow, tmr, print, type, tostring, pcall, ipairs = + table, string, ow, tmr, print, type, tostring, pcall, ipairs +-- Local functions +local ow_setup, ow_search, ow_select, ow_read, ow_read_bytes, ow_write, ow_crc8, ow_reset, ow_reset_search, ow_skip, ow_depower = + ow.setup, ow.search, ow.select, ow.read, ow.read_bytes, ow.write, ow.crc8, ow.reset, ow.reset_search, ow.skip, ow.depower +local node_task_post, node_task_LOW_PRIORITY = node.task.post, node.task.LOW_PRIORITY +local string_char, string_dump = string.char, string.dump +local now, tmr_create, tmr_ALARM_SINGLE = tmr.now, tmr.create, tmr.ALARM_SINGLE +local table_sort, table_concat = table.sort, table.concat +local math_floor = math.floor +local file_open = file.open + +table, string, tmr, ow = nil, nil, nil, nil + +local DS18B20FAMILY = 0x28 +local DS1920FAMILY = 0x10 -- and DS18S20 series +local CONVERT_T = 0x44 +local READ_SCRATCHPAD = 0xBE +local READ_POWERSUPPLY= 0xB4 +local MODE = 1 + +local pin, cb, unit = 3 +local status = {} + +local debugPrint = function() return end + +-------------------------------------------------------------------------------- +-- Implementation +-------------------------------------------------------------------------------- +local function enable_debug() + debugPrint = function (...) print(now(),' ', ...) end +end + +local function to_string(addr, esc) + if type(addr) == 'string' and #addr == 8 then + return ( esc == true and + '"\\%u\\%u\\%u\\%u\\%u\\%u\\%u\\%u"' or + '%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X '):format(addr:byte(1,8)) + else + return tostring(addr) + end +end + +local function readout(self) + local next = false + local sens = self.sens + local temp = self.temp + for i, s in ipairs(sens) do + if status[i] == 1 then + ow_reset(pin) + local addr = s:sub(1,8) + ow_select(pin, addr) -- select the sensor + ow_write(pin, READ_SCRATCHPAD, MODE) + data = ow_read_bytes(pin, 9) + + local t=(data:byte(1)+data:byte(2)*256) + -- t is actually signed so process the sign bit and adjust for fractional bits + -- the DS18B20 family has 4 fractional bits and the DS18S20s, 1 fractional bit + t = ((t <= 32767) and t or t - 65536) * + ((addr:byte(1) == DS18B20FAMILY) and 625 or 5000) + + if 1/2 == 0 then + -- integer version + if unit == 'F' then + t = (t * 18)/10 + 320000 + elseif unit == 'K' then + t = t + 2731500 + end + local sgn = t<0 and -1 or 1 + local tA = sgn*t + local tH=tA/10000 + local tL=(tA%10000)/1000 + ((tA%1000)/100 >= 5 and 1 or 0) + + if tH and (t~=850000) then + temp[addr]=(sgn<0 and "-" or "")..tH.."."..tL + debugPrint(to_string(addr),(sgn<0 and "-" or "")..tH.."."..tL) + status[i] = 2 + end + -- end integer version + else + -- float version + if t and (math_floor(t/10000)~=85) then + t = t / 10000 + if unit == 'F' then + t = t * 18/10 + 32 + elseif unit == 'K' then + t = t + 27315/100 + end + self.temp[addr]=t + debugPrint(to_string(addr), t) + status[i] = 2 + end + -- end float version + end + end + next = next or status[i] == 0 + end + if next then + node_task_post(node_task_LOW_PRIORITY, function() return conversion(self) end) + else + --sens = {} + if cb then + node_task_post(node_task_LOW_PRIORITY, function() return cb(temp) end) + end + end +end + +local function conversion(self) + local sens = self.sens + local powered_only = true + for _, s in ipairs(sens) do powered_only = powered_only and s:byte(9) ~= 1 end + if powered_only then + debugPrint("starting conversion: all sensors") + ow_reset(pin) + ow_skip(pin) -- select the sensor + ow_write(pin, CONVERT_T, MODE) -- and start conversion + for i, s in ipairs(sens) do status[i] = 1 end + else + for i, s in ipairs(sens) do + if status[i] == 0 then + local addr, parasite = s:sub(1,8), s:byte(9) + debugPrint("starting conversion:", to_string(addr), parasite == 1 and "parasite" or " ") + ow_reset(pin) + ow_select(pin, addr) -- select the sensor + ow_write(pin, CONVERT_T, MODE) -- and start conversion + status[i] = 1 + if parasite == 1 then break end -- parasite sensor blocks bus during conversion + end + end + end + tmr_create():alarm(750, tmr_ALARM_SINGLE, function() return readout(self) end) +end + +local function _search(self, lcb, lpin, search, save) + self.temp = {} + if search then self.sens = {}; status = {} end + local temp = self.temp + local sens = self.sens + pin = lpin or pin + + local addr + if not search and #sens == 0 then + -- load addreses if available + debugPrint ("geting addreses from flash") + local s,check,a = pcall(dofile, "ds18b20_save.lc") + if s and check == "ds18b20" then + for i = 1, #a do sens[i] = a[i] end + end + debugPrint (#sens, "addreses found") + end + + ow_setup(pin) + if search or #sens == 0 then + ow_reset_search(pin) + -- ow_target_search(pin,0x28) + -- search the first device + addr = ow_search(pin) + else + for i, s in ipairs(sens) do status[i] = 0 end + end + local function cycle() + debugPrint("cycle") + if addr then + local crc=ow_crc8(addr:sub(1,7)) + if (crc==addr:byte(8)) and ((addr:byte(1)==DS1920FAMILY) or (addr:byte(1)==DS18B20FAMILY)) then + ow_reset(pin) + ow_select(pin, addr) + ow_write(pin, READ_POWERSUPPLY, MODE) + local parasite = (ow_read(pin)==0 and 1 or 0) + sens[#sens+1]= addr..string_char(parasite) -- {addr=addr, parasite=parasite, status=0} + debugPrint("contact: ", to_string(addr), parasite == 1 and "parasite" or " ") + end + addr = ow_search(pin) + node_task_post(node_task_LOW_PRIORITY, cycle) + else + ow_depower(pin) + -- place powered sensors first + table_sort(sens, function(a, b) return a:byte(9) 0 do -- this is because str might be longer than the packet size! + local k, l = F1_SIZE - fifo1l, #str + local chunk + if #fifo1 >= 32 or (k < l and k < 16) then + insert(fifo2, concat(fifo1)) + fifo2l, fifo1, fifo1l, k = fifo2l + fifo1l, {}, 0, F1_SIZE + end + if l > k+16 then -- also tolerate a size overrun of 16 bytes to avoid a split + chunk, str = str:sub(1,k), str:sub(k+1) + else + chunk, str = str, '' + end + insert(fifo1, chunk) + fifo1l = fifo1l + #chunk + end + if not s and socket then + s = socket + sendLine() + else + flushGarbage() + end + end + + local function receiveLine(s, line) + node.input(line) + end + + local function disconnect(s) + fifo1, fifo1l, fifo2, fifo2l, s = {}, 0, {}, 0, nil + node.output(nil) + end + + socket:on("receive", receiveLine) + socket:on("disconnection", disconnect) + socket:on("sent", sendLine) + node.output(queueLine, 0) +end + +net.createServer(net.TCP, 180):listen(23, telnet_listener) +print("Telnet server running...\nUsage: telnet -rN ip\n") diff --git a/Mesures/temp_zf - copie/thingspeak.mat b/Mesures/temp_zf - copie/thingspeak.mat new file mode 100644 index 0000000..6a2694d --- /dev/null +++ b/Mesures/temp_zf - copie/thingspeak.mat @@ -0,0 +1,40 @@ +% Template MATLAB code for visualizing correlated data using the +% SCATTER function. + +% zf190728.1213 + +% Prior to running this MATLAB code template, assign the channel variables. +% Set 'readChannelID' to the channel ID of the channel to read from. +% Also, assign the read field IDs to the variables 'fieldID1', and 'fieldID2'. + +% Replace the [] with channel ID to read data from: +readChannelID = []]; +fieldID1 = 1; +fieldID2 = 2; +fieldID3 = 3; + +% Channel Read API Key +% If your channel is private, then enter the read API +% Key between the '' below: +readAPIKey = ''; + +%% Read Data %% + +nbMesures = 200 + +% Read 1 data variable +[data1, time1] = thingSpeakRead(readChannelID, 'Field', fieldID1, 'NumPoints', nbMesures, 'ReadKey', readAPIKey); + +% Read 2 data variable +[data2, time2] = thingSpeakRead(readChannelID, 'Field', fieldID2, 'NumPoints', nbMesures, 'ReadKey', readAPIKey); + +% Read 3 data variable +[data3, time3] = thingSpeakRead(readChannelID, 'Field', fieldID3, 'NumPoints', nbMesures, 'ReadKey', readAPIKey); + +%% Visualize Data %% +plot(time1,data1, time2,data2, time3,data3); + +legend({'Tint 1er','Text sud','Text nord'}); +xlabel('Time (GMT ! )'); +ylabel('Temperature °C'); +title('Mesures température 1023 Crissier'); diff --git a/Mesures/temp_zf - copie/web_ide2.lua b/Mesures/temp_zf - copie/web_ide2.lua new file mode 100644 index 0000000..e0eeb01 --- /dev/null +++ b/Mesures/temp_zf - copie/web_ide2.lua @@ -0,0 +1,159 @@ +-- Petit WEB IDE tout simple autonome +-- ATTENTION: tourne sur le port 88 ! + +print("\n web_ide2.lua zf190706.1430 \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\n") + conn:send("

run") + conn:send("



") + 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/Mesures/temp_zf - copie/web_srv2.lua b/Mesures/temp_zf - copie/web_srv2.lua new file mode 100644 index 0000000..2389b01 --- /dev/null +++ b/Mesures/temp_zf - copie/web_srv2.lua @@ -0,0 +1,78 @@ +-- petit script de serveur WEB avec Active Server Page ZYX + +print("\n web_srv2.lua zf190728.1021 \n") + +ztemp=12 + +-- envoie sur le port ouvert mais depuis l'environnement global ! +function zout(zstring) + zzclient:send(zstring) -- envoie le résultat du code lua inline +end + +-- envoie un fichier HTML sur le port. ATTENTION: longueur de la ligne maximale de 1'024 bytes ! +function send_file(zclient, zfilename) + print("start send html...") + zclient:send("HTTP/1.1 200 OK\n") + zclient:send("Content-Type: text/html\n\n") + zzclient = zclient -- export le port sur l'environnement global ! + if zfilename == "" then zfilename = "z_index.html" end + file_web = file.open(zfilename, "r") + if file_web then + repeat + local line = file_web:read('\n') + if line then + if string.find(line, "<%%") then +-- print("start lua...") + flag_lua_code = true -- bascule sur le code lua inline + lua_code = "" + elseif string.find(line, "%%>") then +-- print("stop lua...") + flag_lua_code = false -- revient sur le code HTML +-- print("Et voici le code lua inline:\n"..lua_code) + loadstring(lua_code)() --on exécute ici le code lua inline ! + elseif flag_lua_code then +-- print(line) + lua_code = lua_code..line -- récupère le code lua inline + else + zclient:send(line) -- envoie le code HTML + end + end + until not line + file_web:close() file_web = nil + else + zclient:send("

"..zfilename.." not found - 404 error

Home
") + end +end + + +srv = net.createServer() +srv:listen(80, function(conn) + conn:on("receive", function(client, request) + _, _, method, path, vars = string.find(request, "([A-Z]+) (.+)?(.+) HTTP") + + print("zrequest: \n---\n"..request.."---") + +-- print("method: ", method) print("path: ", path) print("vars: ", vars) + + if not string.find(request, "/favicon.ico") then + print("coucou") + if (method == nil) then + _, _, method, path = string.find(request, "([A-Z]+) (.+) HTTP") + end + print("method: ", method) print("path: ", path) print("vars: ", vars) + _GET = {} + if (vars ~= nil) then + for k, v in string.gmatch(vars, "(%w+)=(%w+)&*") do + _GET[k] = v + print(k..": "..v) + end + end + file_html=string.gsub(path, "/", "") + -- print("file_html: ",file_html) + send_file(client, file_html) + end + end) + conn:on("sent", function(c) c:close() end) +end) + + diff --git a/Mesures/temp_zf - copie/wifi_ap_stop.lua b/Mesures/temp_zf - copie/wifi_ap_stop.lua new file mode 100644 index 0000000..2738627 --- /dev/null +++ b/Mesures/temp_zf - copie/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/Mesures/temp_zf - copie/wifi_cli_conf.lua b/Mesures/temp_zf - copie/wifi_cli_conf.lua new file mode 100644 index 0000000..559916b --- /dev/null +++ b/Mesures/temp_zf - copie/wifi_cli_conf.lua @@ -0,0 +1,11 @@ +-- Petit script pour configurer le client WIFI du NodeMCU + +function wifi_cli_conf() + print("\n wifi_cli_conf.lua zf190726.1912 \n") + + -- les secrets sont maintenant initialisés par boot.lua ! + wifi.sta.config{ssid=cli_ssid, pwd=cli_pwd, save=true} +end + +wifi_cli_conf() +wifi_cli_conf=nil diff --git a/Mesures/temp_zf - copie/wifi_cli_start.lua b/Mesures/temp_zf - copie/wifi_cli_start.lua new file mode 100644 index 0000000..045957e --- /dev/null +++ b/Mesures/temp_zf - copie/wifi_cli_start.lua @@ -0,0 +1,20 @@ +-- Petit script pour connecter le NodeMCU sur un AP Wifi avec l'accompte sauvé en EEPROM + +function wifi_cli_start() + print("\n wifi_cli_start.lua zf190310.1519 \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 +end + +wifi_cli_start() +wifi_cli_start=nil diff --git a/Mesures/temp_zf - copie/wifi_info.lua b/Mesures/temp_zf - copie/wifi_info.lua new file mode 100644 index 0000000..1bc5c41 --- /dev/null +++ b/Mesures/temp_zf - copie/wifi_info.lua @@ -0,0 +1,33 @@ +-- Petit script pour afficher les infos actuel du WIFI +print("\n wifi_info.lua zf190727.1220 \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()) + local sta_config=wifi.sta.getconfig(true) + print("Current client config:") + print("\tssid:", sta_config.ssid) + print("\tpassword:", sta_config.pwd) + print("\tbssid:", sta_config.bssid) +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()) + local sta_config=wifi.sta.getconfig(true) + print("Current client config:") + print("\tssid:", sta_config.ssid) + print("\tpassword:", sta_config.pwd) + print("\tbssid:", sta_config.bssid) + print("AP MAC: ", wifi.ap.getmac()) + print("AP IP: ", wifi.ap.getip()) +end diff --git a/Mesures/temp_zf - copie/z_index.html b/Mesures/temp_zf - copie/z_index.html new file mode 100644 index 0000000..79c5352 --- /dev/null +++ b/Mesures/temp_zf - copie/z_index.html @@ -0,0 +1,23 @@ + + + + + + ESP8266 home page + + + +

ESP8266 home page 190727.0941

+

Différentes pages HTML:

+

+ Page 1, affichage de la température dynamique en code Lua inline.
+ Page 2, tableau dynamique écrit en Lua inline.
+ Page 3, affichage du capteur non linéaire corrigé.
+ Page 4, test de récupération d'arguments pour un web service.
+ API HUB Temp, test d'un web service hub de mesures de température.
+ Affichage des températures, affiche les températures mesurées.
+ Page qui n'existe pas !
+

+ + + diff --git a/Mesures/temp_zf - copie/z_page1.html b/Mesures/temp_zf - copie/z_page1.html new file mode 100644 index 0000000..c0bd757 --- /dev/null +++ b/Mesures/temp_zf - copie/z_page1.html @@ -0,0 +1,26 @@ + + + + + + ESP8266 page 1 + + + +

ESP8266 page 1 190127.1445

+
+ Coucou c'est la page 1 !
+ Retour à la home page...


+ +La température est: + +<% +ztemp=ztemp+1 +zout(ztemp.."°C") +%> + +
Mais il fait encore trop froid !
+ + + + diff --git a/Mesures/temp_zf - copie/z_page2.html b/Mesures/temp_zf - copie/z_page2.html new file mode 100644 index 0000000..1516626 --- /dev/null +++ b/Mesures/temp_zf - copie/z_page2.html @@ -0,0 +1,51 @@ + + + + + + ESP8266 page 2 + + + +

ESP8266 page 2 190127.1449

+
+ Coucou c'est la page 2 !
+ Retour à la home page...


+ + Voici un tableau dynamique écrit en Lua inline.

+ + Le code Lua pour créer ce tableau se trouve dans le code HTML de cette page et est exécuté sur le NodeMCU.
+ Les données du tableau viennent du NodeMCU !

+ + <% + -- création du tableau sur le NodeMCUjuste juste pour la démo ici ! + zmac_adrs={} + zmac_adrs["b8:d7:af:a6:bd:86"]={["zname"]="S7 zf", ["zrssi"]=45, ["ztime"]="12:03:36"} + zmac_adrs["cc:c0:79:7d:f5:d5"]={["zname"]="S7 Mélanie", ["zrssi"]=50, ["ztime"]="14:23:46"} + zmac_adrs["5c:f9:38:a1:f7:f0"]={["zname"]="MAC zf", ["zrssi"]=40, ["ztime"]="11:53:16"} + zmac_adrs["d8:30:62:5a:d6:3a"]={["zname"]="IMAC Maman", ["zrssi"]=55, ["ztime"]="17:07:23"} + %> + + + + + + <% + for k, v in pairs(zmac_adrs) do + zout("\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\t\n") + zout("\n") + end + %> +
MACNameRSSITime
" .. k .. "" .. tostring(zmac_adrs[k]["zname"]) .. "" .. tostring(zmac_adrs[k]["zrssi"]) .. "" .. tostring(zmac_adrs[k]["ztime"]) .. "
+ + <% + -- libère la mémoire du tableau sur le NodeMCU qui avait été créé pour la démo ici ! + zmac_adrs=nil + %> + + + diff --git a/Mesures/temp_zf - copie/z_page3.html b/Mesures/temp_zf - copie/z_page3.html new file mode 100644 index 0000000..6abc4ed --- /dev/null +++ b/Mesures/temp_zf - copie/z_page3.html @@ -0,0 +1,50 @@ + + + + + + ESP8266 page 3 + + + +

ESP8266 page 3 190505.1156

+
+ Coucou c'est la page 3 !
+ Retour à la home page...


+ + Voici le résultat du capteur non linéaire corrigé avec une table + d'interpolation dans un fichier .csv sur la flash.

+ + Le code Lua pour afficher ce résultat se trouve dans le code HTML de cette page et est exécuté sur le NodeMCU.
+ Les données viennent du NodeMCU !

+ + <% + zout("Il reste: "..node.heap().." de RAM !

\n") + %> + + <% + zx0=83 + get_correction(zx0) + zout("la valeur corrigée de "..zx0.." est "..zy0.."
") + %> + + <% + zx0=91 + get_correction(zx0) + zout("la valeur corrigée de "..zx0.." est "..zy0.."
") + %> + + <% + zx0=100 + get_correction(zx0) + zout("la valeur corrigée de "..zx0.." est "..zy0.."
") + %> + +
Yeah... cela fonctionne vachement bien !

+ + <% + zout("Il reste: "..node.heap().." de RAM !

\n") + %> + + + diff --git a/Mesures/temp_zf - copie/z_page4.html b/Mesures/temp_zf - copie/z_page4.html new file mode 100644 index 0000000..49f7086 --- /dev/null +++ b/Mesures/temp_zf - copie/z_page4.html @@ -0,0 +1,53 @@ + + + + + + ESP8266 page 3 + + + +

ESP8266 page 4 190726.1955

+
+ Web service concentrateur de mesures de température !
+ Retour à la home page...


+ + Test d'un web service qui fonctionne avec l'Active Server Page ZYX.

+ + Le code Lua pour afficher ce résultat se trouve dans le code HTML de cette page et est exécuté sur le NodeMCU.
+ Les données viennent du NodeMCU !

+ + <% + zout("Il reste: "..node.heap().." de RAM !

\n") + %> + + Les arguments du web service (GET) sont:

+ <% + if (vars ~= nil) then + zout("
vars: "..vars.."
") + for k, v in string.gmatch(vars, "(%w+)=(%w+)&*") do + _GET[k] = v + zout(k..": "..v.."
") + if k == "field1" then + ztemp1_conc = v + elseif k == "field2" then + ztemp2_conc = v + elseif k == "field3" then + ztemp3_conc = v + end + end + end + zout("
Les températures récupérées sont: "..ztemp1_conc..", "..ztemp2_conc..", "..ztemp3_conc) + %> + + + + +

Yeah... cela fonctionne vachement bien !

+ + <% + zout("Il reste: "..node.heap().." de RAM !

\n") + %> + + + diff --git a/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png b/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png deleted file mode 100644 index f906daa..0000000 Binary files a/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-19 à 22.20.27.png and /dev/null differ diff --git a/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png b/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png deleted file mode 100644 index 2307d8c..0000000 Binary files a/Temp_DS18B20/temp_zf/simulation/Capture d’écran 2019-04-20 à 09.05.41.png and /dev/null differ diff --git a/Temp_DS18B20/temp_zf/simulation/échelle sonde.xlsx b/Temp_DS18B20/temp_zf/simulation/échelle sonde.xlsx deleted file mode 100644 index 21a2e7d..0000000 Binary files a/Temp_DS18B20/temp_zf/simulation/échelle sonde.xlsx and /dev/null differ