diff --git a/Wifi/wifi_ap_start.lua b/Wifi/wifi_ap_start.lua
old mode 100755
new mode 100644
index 4cb44ba..ce3c29b
--- a/Wifi/wifi_ap_start.lua
+++ b/Wifi/wifi_ap_start.lua
@@ -1,5 +1,13 @@
--- Démarre un WIFI AP
-print("\n wifi_ap_start.lua   zf180823.1039   \n")
+-- Démarre le WIFI en mode AP
+print("\n wifi_ap_start.lua   zf180824.2000   \n")
 
-wifi.setmode(wifi.SOFTAP)
-wifi.ap.config({ ssid = "NodeMCU", pwd = "12345678" })
+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" })
+dofile("wifi_info.lua")
diff --git a/Wifi/wifi_ap_stop.lua b/Wifi/wifi_ap_stop.lua
index d8818b8..2738627 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("\n wifi_ap_stop.lua   zf180823.1039   \n")
+print("\n wifi_ap_stop.lua   zf180824.2000   \n")
 
 local zmodewifi=wifi.getmode()
 if zmodewifi == wifi.SOFTAP then
diff --git a/Wifi/wifi_cli_conf.lua b/Wifi/wifi_cli_conf.lua
index 3cdec34..d3cd11e 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("\n wifi_cli_conf.lua   zf180823.1039   \n")
+print("\n wifi_cli_conf.lua   zf180824.2000   \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 03d4cde..aac8bea 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("\n wifi_cli_start.lua   zf180823.1039   \n")
+print("\n wifi_cli_start.lua   zf180824.2000   \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 d42b479..9429aa5 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("\n wifi_cli_stop.lua   zf180823.1039   \n")
+print("\n wifi_cli_stop.lua   zf180824.2000   \n")
 
 local zmodewifi=wifi.getmode()
 if zmodewifi == wifi.STATION then
diff --git a/Wifi/wifi_cnf_start.lua b/Wifi/wifi_cnf_start.lua
index 4da7fec..c4294f8 100644
--- a/Wifi/wifi_cnf_start.lua
+++ b/Wifi/wifi_cnf_start.lua
@@ -1,18 +1,6 @@
--- Enclenche le mode configuration WIFI
-print("\n wifi_cnf_start.lua   zf180823.1039   \n")
+-- Petit script pour démarrer le mode configuration WIFI du NodeMCU
+print("\n wifi_cnf_start.lua   zf180824.2000   \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)
+dofile("wifi_get_ip.lua")
 enduser_setup.start()
diff --git a/Wifi/wifi_cnf_stop.lua b/Wifi/wifi_cnf_stop.lua
index 18af9c2..998c5e0 100644
--- a/Wifi/wifi_cnf_stop.lua
+++ b/Wifi/wifi_cnf_stop.lua
@@ -1,4 +1,6 @@
--- Déclenche le mode configuration WIFI
-print("\n wifi_cnf_stop.lua   zf180823.1039   \n")
+-- Petit script pour arrêter le mode configuration WIFI du NodeMCU
+print("\n wifi_cnf_stop.lua   zf180824.2000   \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 9fcd4fb..83b6369 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("\n wifi_get_ip.lua   zf180823.1039   \n")
+print("\n wifi_get_ip.lua   zf180824.2000   \n")
 
 wifitimer1=tmr.create()
 tmr.alarm(wifitimer1, 1000, tmr.ALARM_AUTO , function()
diff --git a/Wifi/wifi_info.lua b/Wifi/wifi_info.lua
index 5aec97f..d81fc1b 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("\n wifi_info.lua   zf180823.1039   \n")
+print("\n wifi_info.lua   zf180824.2000   \n")
 
 local zmodewifi=wifi.getmode()
 
diff --git a/Wifi/wifi_off.lua b/Wifi/wifi_off.lua
index 3aedd6d..c1c7235 100644
--- a/Wifi/wifi_off.lua
+++ b/Wifi/wifi_off.lua
@@ -1,4 +1,9 @@
 -- Déconnecte le WIFI
-print("\n wifi_off.lua   zf180823.1039   \n")
+print("\n wifi_off.lua   zf180822.0959   \n")
 
-wifi.sta.disconnect()
+wifi.setmode(wifi.NULLMODE)
+
+--[[
+print(wifi.NULLMODE, wifi.STATION, wifi.SOFTAP, wifi.STATIONAP)
+print(wifi.getmode())
+]]
diff --git a/Wifi/wifi_start.lua b/Wifi/wifi_start.lua
index 19a6a7c..7291785 100644
--- a/Wifi/wifi_start.lua
+++ b/Wifi/wifi_start.lua
@@ -1,5 +1,5 @@
 -- Exemple de petit script pour démarrer le WIFI
-print("\n wifi_start.lua   zf180823.1039   \n")
+print("\n wifi_start.lua   zf180824.2000   \n")
 
 dofile("wifi_cli_start.lua")
 dofile("wifi_ap_start.lua")