diff -r 83314e7b1b4a -r e38ffa806e84 main/config.h
--- a/main/config.h	Sat Oct 26 14:05:17 2019 +0200
+++ b/main/config.h	Wed Oct 30 23:21:46 2019 +0100
@@ -66,17 +66,17 @@
  */
 typedef enum
 {
-    MAIN_LOOP1_INIT = 0,		///< Init fase
-    MAIN_LOOP1_CONNECT,			///< Connect WiFi
-    MAIN_LOOP1_MQTT_CONNECT,		///< Connect MQTT if WiFi
-    MAIN_LOOP1_WAITCON,			///< Wait for connection and measurements
-    MAIN_LOOP1_SEND,			///< Send MQTT node and units messages
-    MAIN_LOOP1_WAITACK,			///< MQTT messages received
-    MAIN_LOOP1_MQTT_DISCONNECT,		///< MQTT disconnect
-    MAIN_LOOP1_DISCONNECT,		///< Disconnect WiFi
-    MAIN_LOOP1_WIFI_OFF,		///< WiFi power off
-    MAIN_LOOP1_DONE			///< All done
-} MAIN_LOOP1;
+    ML1_INIT = 0,		///< Init fase
+    ML1_CONNECT,			///< Connect WiFi
+    ML1_MQTT_CONNECT,		///< Connect MQTT if WiFi
+    ML1_WAITCON,			///< Wait for connection and measurements
+    ML1_SEND,			///< Send MQTT node and units messages
+    ML1_WAITACK,			///< MQTT messages received
+    ML1_MQTT_DISCONNECT,		///< MQTT disconnect
+    ML1_DISCONNECT,		///< Disconnect WiFi
+    ML1_WIFI_OFF,		///< WiFi power off
+    ML1_DONE			///< All done
+} ML1;
 
 
 
@@ -85,18 +85,21 @@
  */
 typedef enum
 {
-    MAIN_LOOP2_INIT = 0,
-    MAIN_LOOP2_UNIT1,			///< Unit 1
-    MAIN_LOOP2_UNIT2,			///< Unit 2
-    MAIN_LOOP2_UNIT3,			///< Unit 3
-    MAIN_LOOP2_UNIT4,			///< Unit 4
-    MAIN_LOOP2_SET_WIFI,		///< WiFi stations setup
-    MAIN_LOOP2_SET_NETWORK,		///< Network setup
-    MAIN_LOOP2_SET_MQTT,		///< MQTT setup
-    MAIN_LOOP2_UPDATE,			///< Update
-    MAIN_LOOP2_INACTIVE,		///< Inactive reached, cleanup
-    MAIN_LOOP2_DONE			///< All done
-} MAIN_LOOP2;
+    ML2_INIT = 0,
+    ML2_USER,			///< User mainmenu
+    ML2_UNIT1,			///< Unit 1
+    ML2_UNIT2,			///< Unit 2
+    ML2_UNIT3,			///< Unit 3
+    ML2_SET_WIFI,		///< WiFi stations setup
+    ML2_SET_NETWORK,		///< Network setup
+    ML2_SET_MQTT,		///< MQTT setup
+    ML2_UPDATE,			///< Update
+    ML2_SETUP_UNIT1,		///< Unit 1 setup
+    ML2_SETUP_UNIT2,		///< Unit 2 setup
+    ML2_SETUP_UNIT3,		///< Unit 3 setup
+    ML2_INACTIVE,		///< Inactive reached, cleanup
+    ML2_DONE			///< All done
+} ML2;