diff --git a/Wifi/wifi_ap_start.lua b/Wifi/wifi_ap_start.lua
index f87996f..d860795 100644
--- a/Wifi/wifi_ap_start.lua
+++ b/Wifi/wifi_ap_start.lua
@@ -1,22 +1,15 @@
 -- Démarre le WIFI en mode AP
-print("\wifi_ap_start.lua   zf180822.1447   \n")
-
-function zap_start()
-    wifi.ap.config({ ssid = "NodeMCU "..wifi.ap.getmac(), pwd = "12345678" })
-end
+print("\wifi_ap_start.lua   zf180822.1544   \n")
 
 local zmodewifi=wifi.getmode()
 if zmodewifi == wifi.NULLMODE then
     print("WIFI mode AP only")
     wifi.setmode(wifi.SOFTAP)
-    zap_start()
 elseif zmodewifi == wifi.STATION then
     print("WIFI mode AP+CLI")
     wifi.setmode(wifi.STATIONAP)
-    zap_start()
-else
-    print("on ne fait rien car cela tourne déjà !")
 end
+wifi.ap.config({ ssid = "NodeMCU "..wifi.ap.getmac(), pwd = "12345678" })
 dofile("wifi_info.lua")
 
 
diff --git a/Wifi/wifi_ap_stop.lua b/Wifi/wifi_ap_stop.lua
index c89dd2c..e83ae31 100644
--- a/Wifi/wifi_ap_stop.lua
+++ b/Wifi/wifi_ap_stop.lua
@@ -9,18 +9,3 @@ elseif zmodewifi == wifi.STATIONAP then
 end
 print("WIFI AP arrêté")
 
-
-
-
---[[
-wifi.setmode(wifi.NULLMODE)
-print(wifi.ap.getconfig())
-print(wifi.ap.getmac())
-print(wifi.getdefaultmode())
-
-print(wifi.getmode())
-print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP)
-
-print(wifi.getphymode())
-print(wifi.PHYMODE_B, wifi.PHYMODE_G, wifi.PHYMODE_N)
-]]
diff --git a/Wifi/wifi_cli_start.lua b/Wifi/wifi_cli_start.lua
index 0419120..d0ca47e 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.1412   \n")
+print("\wifi_clidef_start.lua   zf180822.1504   \n")
 
 local zmodewifi=wifi.getmode()
 if zmodewifi == wifi.NULLMODE then
@@ -8,10 +8,7 @@ if zmodewifi == wifi.NULLMODE then
 elseif zmodewifi == wifi.SOFTAP then
     print("WIFI mode AP+CLI")
     wifi.setmode(wifi.STATIONAP)
-else
-    print("on ne fait rien car cela tourne déjà !")
 end
+wifi.sta.autoconnect(1)
 wifi.sta.connect()
 dofile("wifi_get_ip.lua")
-
-
diff --git a/Wifi/wifi_cli_stop.lua b/Wifi/wifi_cli_stop.lua
index 11af8c0..0f799f6 100644
--- a/Wifi/wifi_cli_stop.lua
+++ b/Wifi/wifi_cli_stop.lua
@@ -1,26 +1,11 @@
 -- Démarre le WIFI en mode AP
-print("\wifi_ap_stop.lua   zf180822.1425   \n")
+print("\wifi_cli_stop.lua   zf180822.1506   \n")
 
 local zmodewifi=wifi.getmode()
-if zmodewifi == wifi.STATIONAP then
+if zmodewifi == wifi.STATION then
     wifi.setmode(wifi.NULLMODE)
-elseif zmodewifi == wifi.SOFTAP then
-    wifi.setmode(wifi.STATION)
+elseif zmodewifi == wifi.STATIONAP then
+    wifi.setmode(wifi.SOFTAP)
 end
-print("WIFI AP arrêté")
+print("WIFI CLI arrêté")
 
-
-
-
---[[
-wifi.setmode(wifi.NULLMODE)
-print(wifi.ap.getconfig())
-print(wifi.ap.getmac())
-print(wifi.getdefaultmode())
-
-print(wifi.getmode())
-print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP)
-
-print(wifi.getphymode())
-print(wifi.PHYMODE_B, wifi.PHYMODE_G, wifi.PHYMODE_N)
-]]
diff --git a/Wifi/wifi_cnf_start.lua b/Wifi/wifi_cnf_start.lua
new file mode 100644
index 0000000..67068e3
--- /dev/null
+++ b/Wifi/wifi_cnf_start.lua
@@ -0,0 +1,7 @@
+-- Petit script pour démarrer le mode configuration WIFI du NodeMCU
+print("\wifi_cnf_start.lua   zf180822.1540   \n")
+
+print("\nwifi config http://192.168.4.1\n")
+dofile("wifi_get_ip.lua")
+enduser_setup.start()
+
diff --git a/Wifi/wifi_cnf_stop.lua b/Wifi/wifi_cnf_stop.lua
new file mode 100644
index 0000000..2b2b817
--- /dev/null
+++ b/Wifi/wifi_cnf_stop.lua
@@ -0,0 +1,6 @@
+-- Petit script pour arrêter le mode configuration WIFI du NodeMCU
+print("\wifi_cnf_stop.lua   zf180822.1538   \n")
+
+enduser_setup.stop()
+wifi.sta.autoconnect(1)
+wifi.sta.connect()
diff --git a/Wifi/wifi_get_ip.lua b/Wifi/wifi_get_ip.lua
index 65f140b..c3c8b15 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.1422   \n")
+print("\wifi_get_ip.lua   zf180822.1522   \n")
 
 wifitimer1=tmr.create()
 tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function()
@@ -7,11 +7,7 @@ tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function()
         print("Connecting to AP...")
     else
         tmr.stop(wifitimer1)
-        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    
-        print("Connected IP:\n\t"..wifi.sta.getip())
+        dofile("wifi_info.lua")
     end
 end)
 
diff --git a/Wifi/wifi_info.lua b/Wifi/wifi_info.lua
index aa8b24a..d4411b5 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.1452   \n")
+print("\wifi_info.lua   zf180822.1520   \n")
 
 local zmodewifi=wifi.getmode()
 
@@ -9,10 +9,10 @@ if zmodewifi == wifi.NULLMODE then
     print("WIFI OFF")
 elseif zmodewifi == wifi.STATION then
     print("WIFI mode CLI")
-    print("Client IP:\n\t"..wifi.sta.getip())
+    print("Connected IP:\n",wifi.sta.getip())
     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")))
+        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    
 elseif zmodewifi == wifi.SOFTAP then
     print("WIFI mode AP")
@@ -20,25 +20,12 @@ elseif zmodewifi == wifi.SOFTAP then
     print("AP IP:\n\t"..wifi.ap.getip())
 elseif zmodewifi == wifi.STATIONAP then
     print("WIFI mode CLI+AP")
-    print("Client IP:\n\t"..wifi.sta.getip())
+    print("Connected IP:\n",wifi.sta.getip())
     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")))
+        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    
     print("AP MAC: "..wifi.ap.getmac())
     print("AP IP: "..wifi.ap.getip())
 end
 
-
---[[
-wifi.setmode(wifi.NULLMODE)
-print(wifi.ap.getconfig())
-print(wifi.ap.getmac())
-print(wifi.getdefaultmode())
-
-print(wifi.getmode())
-print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP)
-
-print(wifi.getphymode())
-print(wifi.PHYMODE_B, wifi.PHYMODE_G, wifi.PHYMODE_N)
-]]
diff --git a/Wifi/wifi_start.lua b/Wifi/wifi_start.lua
new file mode 100644
index 0000000..91e071d
--- /dev/null
+++ b/Wifi/wifi_start.lua
@@ -0,0 +1,7 @@
+-- Exemple de petit script pour démarrer le WIFI
+
+print("\n wifi_start.lua   zf180822.1510   \n")
+
+dofile("wifi_cli_start.lua")
+dofile("wifi_ap_start.lua")
+
diff --git a/Wifi/wificnf_start.lua b/Wifi/wificnf_start.lua
deleted file mode 100644
index 33321bc..0000000
--- a/Wifi/wificnf_start.lua
+++ /dev/null
@@ -1,19 +0,0 @@
--- Enclenche le mode configuration WIFI
-print("\nzf180718.1107\n")
-
-function get_ip()
-    if wifi.sta.getip() == nil then
-        print("Connecting to AP...")
-    else
-        tmr.stop(0)
-        print("Connected! IP: ",wifi.sta.getip())
-        tmr.alarm(0,3000,tmr.ALARM_SINGLE, function() node.restart() end)
-    end
-end
-
-wifi.sta.disconnect()
-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/wificnf_stop.lua b/Wifi/wificnf_stop.lua
deleted file mode 100644
index cf2f3ba..0000000
--- a/Wifi/wificnf_stop.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Déclenche le mode configuration WIFI
--- zf180713.1453
-
-enduser_setup.stop()