From e66fa356f4131890d2e84efde23ecc6252a18049 Mon Sep 17 00:00:00 2001 From: Christian Zufferey Date: Thu, 23 Aug 2018 10:43:56 +0200 Subject: [PATCH] =?UTF-8?q?-=20refactoris=C3=A9=20toutes=20les=20ent=C3=AA?= =?UTF-8?q?tes=20avec=20le=20bon=20nom=20et=20la=20bonne=20date=20de=20ver?= =?UTF-8?q?sion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Wifi/wifi_ap_start.lua | 2 +- Wifi/wifi_ap_stop.lua | 3 +-- Wifi/wifi_cli_conf.lua | 2 +- Wifi/wifi_cli_start.lua | 2 +- Wifi/wifi_cli_stop.lua | 3 +-- Wifi/wifi_cnf_start.lua | 3 +-- Wifi/wifi_cnf_stop.lua | 2 +- Wifi/wifi_get_ip.lua | 3 +-- Wifi/wifi_info.lua | 7 +++---- Wifi/wifi_off.lua | 2 +- Wifi/wifi_start.lua | 4 +--- 11 files changed, 13 insertions(+), 20 deletions(-) diff --git a/Wifi/wifi_ap_start.lua b/Wifi/wifi_ap_start.lua index 8b046ab..4cb44ba 100755 --- a/Wifi/wifi_ap_start.lua +++ b/Wifi/wifi_ap_start.lua @@ -1,5 +1,5 @@ -- Démarre un WIFI AP -print("\wifi_ap_start.lua zf20180724.2220 \n") +print("\n wifi_ap_start.lua zf180823.1039 \n") wifi.setmode(wifi.SOFTAP) wifi.ap.config({ ssid = "NodeMCU", pwd = "12345678" }) diff --git a/Wifi/wifi_ap_stop.lua b/Wifi/wifi_ap_stop.lua index e83ae31..d8818b8 100644 --- a/Wifi/wifi_ap_stop.lua +++ b/Wifi/wifi_ap_stop.lua @@ -1,5 +1,5 @@ -- Démarre le WIFI en mode AP -print("\wifi_ap_stop.lua zf180822.1425 \n") +print("\n wifi_ap_stop.lua zf180823.1039 \n") local zmodewifi=wifi.getmode() if zmodewifi == wifi.SOFTAP then @@ -8,4 +8,3 @@ elseif zmodewifi == wifi.STATIONAP then wifi.setmode(wifi.STATION) end print("WIFI AP arrêté") - diff --git a/Wifi/wifi_cli_conf.lua b/Wifi/wifi_cli_conf.lua index 6dad55c..3cdec34 100644 --- a/Wifi/wifi_cli_conf.lua +++ b/Wifi/wifi_cli_conf.lua @@ -1,4 +1,4 @@ -- Petit script pour configurer le client WIFI du NodeMCU -print("\wifi_cli_conf.lua zf180822.1407 \n") +print("\n wifi_cli_conf.lua zf180823.1039 \n") wifi.sta.config{ssid="Hugo", pwd="tototutu", save=true} diff --git a/Wifi/wifi_cli_start.lua b/Wifi/wifi_cli_start.lua index d0ca47e..03d4cde 100644 --- a/Wifi/wifi_cli_start.lua +++ b/Wifi/wifi_cli_start.lua @@ -1,5 +1,5 @@ -- Petit script pour connecter le NodeMCU sur un AP Wifi avec l'accompte sauvé en EEPROM -print("\wifi_clidef_start.lua zf180822.1504 \n") +print("\n wifi_cli_start.lua zf180823.1039 \n") local zmodewifi=wifi.getmode() if zmodewifi == wifi.NULLMODE then diff --git a/Wifi/wifi_cli_stop.lua b/Wifi/wifi_cli_stop.lua index 0f799f6..d42b479 100644 --- a/Wifi/wifi_cli_stop.lua +++ b/Wifi/wifi_cli_stop.lua @@ -1,5 +1,5 @@ -- Démarre le WIFI en mode AP -print("\wifi_cli_stop.lua zf180822.1506 \n") +print("\n wifi_cli_stop.lua zf180823.1039 \n") local zmodewifi=wifi.getmode() if zmodewifi == wifi.STATION then @@ -8,4 +8,3 @@ elseif zmodewifi == wifi.STATIONAP then wifi.setmode(wifi.SOFTAP) end print("WIFI CLI arrêté") - diff --git a/Wifi/wifi_cnf_start.lua b/Wifi/wifi_cnf_start.lua index 33321bc..4da7fec 100644 --- a/Wifi/wifi_cnf_start.lua +++ b/Wifi/wifi_cnf_start.lua @@ -1,5 +1,5 @@ -- Enclenche le mode configuration WIFI -print("\nzf180718.1107\n") +print("\n wifi_cnf_start.lua zf180823.1039 \n") function get_ip() if wifi.sta.getip() == nil then @@ -16,4 +16,3 @@ wifi.sta.clearconfig() print("\nwifi config http://192.168.4.1\n") tmr.alarm(0, 1000, tmr.ALARM_AUTO , get_ip) enduser_setup.start() - diff --git a/Wifi/wifi_cnf_stop.lua b/Wifi/wifi_cnf_stop.lua index cf2f3ba..18af9c2 100644 --- a/Wifi/wifi_cnf_stop.lua +++ b/Wifi/wifi_cnf_stop.lua @@ -1,4 +1,4 @@ -- Déclenche le mode configuration WIFI --- zf180713.1453 +print("\n wifi_cnf_stop.lua zf180823.1039 \n") enduser_setup.stop() diff --git a/Wifi/wifi_get_ip.lua b/Wifi/wifi_get_ip.lua index c3c8b15..9fcd4fb 100644 --- a/Wifi/wifi_get_ip.lua +++ b/Wifi/wifi_get_ip.lua @@ -1,5 +1,5 @@ -- Petit script pour obtenir l'adresse IP du NodeMCU connecté sur un AP Wifi -print("\wifi_get_ip.lua zf180822.1522 \n") +print("\n wifi_get_ip.lua zf180823.1039 \n") wifitimer1=tmr.create() tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function() @@ -10,4 +10,3 @@ tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function() dofile("wifi_info.lua") end end) - diff --git a/Wifi/wifi_info.lua b/Wifi/wifi_info.lua index d4411b5..5aec97f 100644 --- a/Wifi/wifi_info.lua +++ b/Wifi/wifi_info.lua @@ -1,5 +1,5 @@ -- Petit script pour afficher les infos actuel du WIFI -print("\wifi_info.lua zf180822.1520 \n") +print("\n wifi_info.lua zf180823.1039 \n") local zmodewifi=wifi.getmode() @@ -13,7 +13,7 @@ elseif zmodewifi == wifi.STATION then do local sta_config=wifi.sta.getconfig(true) print(string.format("Current client config:\n\tssid:\"%s\"\tpassword:\"%s\"\n\tbssid:\"%s\"\tbssid_set:%s", sta_config.ssid, sta_config.pwd, sta_config.bssid, (sta_config.bssid_set and "true" or "false"))) - end + end elseif zmodewifi == wifi.SOFTAP then print("WIFI mode AP") print("AP MAC:\n\t"..wifi.ap.getmac()) @@ -24,8 +24,7 @@ elseif zmodewifi == wifi.STATIONAP then do local sta_config=wifi.sta.getconfig(true) print(string.format("Current client config:\n\tssid:\"%s\"\tpassword:\"%s\"\n\tbssid:\"%s\"\tbssid_set:%s", sta_config.ssid, sta_config.pwd, sta_config.bssid, (sta_config.bssid_set and "true" or "false"))) - end + end print("AP MAC: "..wifi.ap.getmac()) print("AP IP: "..wifi.ap.getip()) end - diff --git a/Wifi/wifi_off.lua b/Wifi/wifi_off.lua index 54fcc3d..3aedd6d 100644 --- a/Wifi/wifi_off.lua +++ b/Wifi/wifi_off.lua @@ -1,4 +1,4 @@ -- Déconnecte le WIFI --- zf180713.1453 +print("\n wifi_off.lua zf180823.1039 \n") wifi.sta.disconnect() diff --git a/Wifi/wifi_start.lua b/Wifi/wifi_start.lua index 91e071d..19a6a7c 100644 --- a/Wifi/wifi_start.lua +++ b/Wifi/wifi_start.lua @@ -1,7 +1,5 @@ -- Exemple de petit script pour démarrer le WIFI - -print("\n wifi_start.lua zf180822.1510 \n") +print("\n wifi_start.lua zf180823.1039 \n") dofile("wifi_cli_start.lua") dofile("wifi_ap_start.lua") -