diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index d9acb6a..b696af7 100644
Binary files a/MTC_Sim/.vs/MTC_Sim/v14/.suo and b/MTC_Sim/.vs/MTC_Sim/v14/.suo differ
diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 3492b2c..4803d42 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -12,6 +12,8 @@ namespace MTC_Sim
     using System.Diagnostics;
 
 
+    #region macro oggetti da istanziare a blocchi da conf XML
+
 
     /// <summary>
     /// Singola pompa da vuoto, 0..n
@@ -304,9 +306,45 @@ namespace MTC_Sim
         /// </summary>
         public Sample mAxMastId;
         /// <summary>
+        /// Event tipo asse: lineare, rotazionale...
+        /// </summary>
+        public Event mAxType;
+        /// <summary>
         /// Bit direzione: 1 = avanti/clockwise, 0 indietro/counterclockwise
         /// </summary>
-        public Event mAxDir;
+        public Sample mAxDir;
+        /// <summary>
+        /// Load
+        /// </summary>
+        public Sample mAxLoad;
+        /// <summary>
+        /// Posizione Attuale
+        /// </summary>
+        public Sample mAxPosAct;
+        /// <summary>
+        /// Posizione Target
+        /// </summary>
+        public Sample mAxPosTgt;
+        /// <summary>
+        /// Feed Attuale
+        /// </summary>
+        public Sample mAxFeedAct;
+        /// <summary>
+        /// Feed Override
+        /// </summary>
+        public Sample mAxFeedOver;
+        /// <summary>
+        /// Accelerazione Attuale
+        /// </summary>
+        public Sample mAxAccelAct;
+        /// <summary>
+        /// Tempo Lavoro cumulato
+        /// </summary>
+        public Sample mAxAccTime;
+        /// <summary>
+        /// Carica batteria
+        /// </summary>
+        public Sample mAxBattery;
 
         /// <summary>
         /// Classe Asse con relativo ID UNIVOCO ed alias
@@ -324,7 +362,16 @@ namespace MTC_Sim
             mAxMainProc = new Sample(string.Format("Ax_{0}_MainProc", idx));
             mAxIsMaster = new Event(string.Format("Ax_{0}_IsMast", idx));
             mAxMastId = new Sample(string.Format("Ax_{0}_MastId", idx));
-            mAxDir = new Event(string.Format("Ax_{0}_Dir", idx));
+            mAxType = new Event(string.Format("Ax_{0}_Type", idx));
+            mAxDir = new Sample(string.Format("Ax_{0}_Dir", idx));
+            mAxLoad = new Sample(string.Format("Ax_{0}_Load", idx));
+            mAxPosAct = new Sample(string.Format("Ax_{0}_PosAct", idx));
+            mAxPosTgt = new Sample(string.Format("Ax_{0}_PosTgt", idx));
+            mAxFeedAct = new Sample(string.Format("Ax_{0}_FeedAct", idx));
+            mAxFeedOver = new Sample(string.Format("Ax_{0}_FeedOver", idx));
+            mAxAccelAct = new Sample(string.Format("Ax_{0}_AccelAct", idx));
+            mAxAccTime = new Sample(string.Format("Ax_{0}_AccTime", idx));
+            mAxBattery = new Sample(string.Format("Ax_{0}_Battery", idx));
         }
 
     }
@@ -345,6 +392,9 @@ namespace MTC_Sim
         // creare
     }
 
+    #endregion
+
+
     public class AdapterGeneric
     {