From 92c6a4abfeb84d785ebf83bfc8c3042fcc77b0fd Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 12 Apr 2016 18:10:16 +0200
Subject: [PATCH] fix oggetto asse...

---
 MTC_Sim/.vs/MTC_Sim/v14/.suo      | Bin 104448 -> 104448 bytes
 MTC_Sim/MTC_Sim/AdapterGeneric.cs |  54 ++++++++++++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index d9acb6a681cfe2d02e774be383a5130789f4c4a5..b696af7632c1d79fbcc79152ca20738ef064f78f 100644
GIT binary patch
delta 442
zcmaLS&r1S96bJBq!|tl-Ve?nkf*C|vEMd_>ML{S?NUE)j>X4_73PD74$xFAObRZ?@
zGDdaFcECJF+FuYI>aVEi6qLP<J#=c|!+SIHof)QBmy31zI036S$p{g1_YY5eiyQ$g
zP!MN)D}o?&tTAr&!IG}hT`>b|C4Ii!CDMT8jrslrzpMkZxYmz!w1~232`wWt(v8*0
zHzgZL#pkOwJ}h5C){d(Vq@r(3ncUdRNI~Z9F04HW+fE-=8}e9lFV-OHMSc`OPM)_@
zsXP?op=u3iOHHyAVQ#yjeSrLkfeSDHRAm<%C2WkaDq$0ZMTjvuB{_rv+#f_#$%W~5
z?9d3efwpT27T;hRq3`)Qn#yQ=@ASmRmGf6;Ihy8aqY0E8L~%#q>3S1boG?a=MyuwJ
l0$%nzw7UZK=4Yl~DsMY5+*pT}=byk?WnYKb?R5e4ksrjjkeC1f

delta 498
zcmYk0%_~Gv7{=#4-FxR^jF~aUXQaqS(y;N-D2rPZ;ra>-ELc)%l5E)6Da<J|k%hCM
zEEsddEEO9Y$?W_U$cAD(r@6^nzuxCO=XuY2Hj~C?(%6mA^kq+&X%CN?j9g(mL^da_
zuVl*Qa%G(waCG&aUCGz9K^ob!hhzB~FVllvZU2Jb&OiaY5>Nw1!5EkX<3L3w(EV~z
zcauKfln6Y_72}j9JaF?sG5A4B5r8&<52)7-^ilwstwdLw+|D_OUJXK^0+fMrxny!Z
zRdG+;@`jBJtdpSpDtaVMt>V79M)~3Qm@%(qsy7QAlSjQzrutCi&nVg!Ri0GmJ(+50
zz2obL5byG{!OcX1iDo9kOtiAtnI*0Etd>W$xUX}<Jle4>x@ScT<L^sDymzogt{?2X
zrSIyMgz#{-)d|xl`;%!B=S*~Ksr21($dB<{g>QQxT7mTve_N%7>lwN$4yj+~%Di2G
S&_FJ56yLC^>*iva?51Cvb(?1Z

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
     {