From a993e73ab4b6b6cd8a9c8afde41dd805bdbbeb3a Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 28 Apr 2016 18:20:02 +0200
Subject: [PATCH] Integrato PATH

---
 AgentBin/simulator/CMS_DEMO.xml |  42 +++++++++++++++++---------------
 MTC_Sim/.vs/MTC_Sim/v14/.suo    | Bin 136192 -> 136192 bytes
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/AgentBin/simulator/CMS_DEMO.xml b/AgentBin/simulator/CMS_DEMO.xml
index e76199e..9319780 100644
--- a/AgentBin/simulator/CMS_DEMO.xml
+++ b/AgentBin/simulator/CMS_DEMO.xml
@@ -10,11 +10,7 @@
         <DataItem category="SAMPLE" id="ACC_TIME" type="ACCUMULATED_TIME"/>
         <DataItem category="SAMPLE" id="CLOCK" type="CLOCK_TIME"/>
         <DataItem category="SAMPLE" id="POWER" type="WATTAGE"/>
-        <DataItem category="EVENT" id="CurrProg" type="PROGRAM"/>
-        <DataItem category="EVENT" id="CurrProg_RowNum" type="LINE"/>
         <DataItem category="EVENT" id="OperatorId" type="MESSAGE"/>
-        <DataItem category="EVENT" id="RUN_MODE" type="CONTROLLER_MODE"/>
-        <DataItem category="EVENT" id="EXECUTION" type="EXECUTION"/>
         <DataItem category="EVENT" id="Cod_M" type="MESSAGE"/>
         <DataItem category="EVENT" id="Cod_S" type="MESSAGE"/>
         <DataItem category="EVENT" id="Cod_T" type="MESSAGE"/>
@@ -164,8 +160,7 @@
                 <DataItem category="SAMPLE" id="cl3" name="Cload" nativeUnits="PERCENT" type="LOAD" units="PERCENT"/>-->
               </DataItems>
             </Rotary>
-            
-            <Linear id="z1" name="Z">
+            <!--<Linear id="z1" name="Z">
               <DataItems>
                 <DataItem category="SAMPLE" id="z2" name="Zact" nativeUnits="MILLIMETER" subType="ACTUAL" type="POSITION" units="MILLIMETER"/>
                 <DataItem category="SAMPLE" id="z3" name="Zcom" nativeUnits="MILLIMETER" subType="COMMANDED" type="POSITION" units="MILLIMETER"/>
@@ -173,7 +168,7 @@
                 <DataItem category="CONDITION" id="Zloadc" type="LOAD"/>
                 <DataItem category="CONDITION" id="Zsystem" type="SYSTEM"/>
               </DataItems>
-            </Linear>
+            </Linear>-->
           </Components>
         </Axes>
         <Controller id="cn1" name="controller">
@@ -185,21 +180,30 @@
             <DataItem category="CONDITION" id="system" type="SYSTEM"/>
           </DataItems>
           <Components>
-            <Path id="pth" name="path">
+            <Path id="Path_01" name="Path 01">
               <DataItems>
+                <DataItem category="EVENT" id="RUN_MODE" type="CONTROLLER_MODE"/>
+                <DataItem category="EVENT" id="CurrProg" type="PROGRAM"/>
+                <DataItem category="EVENT" id="CurrProg_RowNum" type="LINE"/>
+                <DataItem category="EVENT" id="EXECUTION" type="EXECUTION"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActX" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione X"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActY" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Y"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActZ" nativeUnits="MILLIMETER" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER" name="Posizione Z"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActI" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo I"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActJ" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo J"/>
+                <DataItem category="SAMPLE" id="Path_01_PosActK" nativeUnits="DEGREE" subType="ACTUAL" type="ANGLE" units="DEGREE" name="Angolo K"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedRate" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND" subType="ACTUAL" name="Path FEED"/>
+                <DataItem category="SAMPLE" id="Path_01_FeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path FEED Override"/>
+                <DataItem category="SAMPLE" id="Path_01_SpeedOverr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT" subType="OVERRIDE" name="Path SPEED Override"/>
+                
+                
+                
+                
+                
                 <DataItem category="EVENT" id="cn2" name="block" type="BLOCK"/>
-                <DataItem category="EVENT" id="cn3" name="mode" type="CONTROLLER_MODE"/>
-                <DataItem category="EVENT" id="cn4" name="line" type="LINE"/>
-                <DataItem category="EVENT" id="cn5" name="program" type="PROGRAM"/>
-                <DataItem category="EVENT" id="cn6" name="execution" type="EXECUTION"/>
+>
                 <DataItem category="EVENT" id="cnt1" name="tool_id" type="TOOL_ID"/>
-                <DataItem category="SAMPLE" id="Ppos" nativeUnits="MILLIMETER_3D" subType="ACTUAL" type="PATH_POSITION" units="MILLIMETER_3D"/>
-                <DataItem category="SAMPLE" id="Frt" nativeUnits="MILLIMETER/SECOND" type="PATH_FEEDRATE" units="MILLIMETER/SECOND">
-                  <Source>path_feedrate</Source>
-                </DataItem>
-                <DataItem category="SAMPLE" id="Fovr" nativeUnits="PERCENT" type="PATH_FEEDRATE" units="PERCENT">
-                  <Source>feed_ovr</Source>
-                </DataItem>
+                
               </DataItems>
             </Path>
           </Components>
diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index 1293cea49d3f402eb81c93a90e15304eaeb1634d..2966b7a5310b6d657239ea30ceab37121aec11d0 100644
GIT binary patch
delta 531
zcmXw!O=wd=6oqppV|;`}UPL9v5JMZ1ih?x=B36x1#f_<MiqMr6Dz>H+ZL?6&w{R6j
zW2Rv?BF(Fg&ny%j=nD!7?geXCRjL$;rHg_h6rn}q4b}@E_sp4l=Ergj%Q1@GNzeZ>
zJ)Ta|UgA%y)oR-y+5>=`iX*Hu$r4H|XEZ8@FI7I^n4VzoftTVW@5CE%nWu16JmC97
zJ(TGt4iIVLh&UJDC6;+$({Wl&>)-s>X?zr`XYPyJ{)BL{=Jpq~v4^0WTY95MD7IUy
zWDQ@P90swL9SqKsY`^al^(GCZM6oZ9HByK8I(d4f&j=u+R|jrwMng|rytB>D_lQ@O
zsE*!kdZ*Lt%r0`f#>CIbq!@eZlP0iFJRF;qCdVl~S}w)x#SU@xdrd6X1LAqb(C_L8
zp*XnRWXg}INI#3|*wR<1F7lQmsux?;d2khmPo5Y@T4t}IOWqvD6Sp-8K*hjjhF~$*
zio=3@n?qKfEyHm8hfxix4$5A~7F7UKSBQJ?t5NvWBhur9P2|Dk)DXgM_%S|vcif<_
z{;MAiwV`_F<b@G9GBtv|GLxg@mmEZbGW`t+H&MevNWF%s=E1~dx$0II(7$u$3km_Z
Iz*s)?7rchBLjV8(

delta 575
zcmXw#Ur3Wt7{<TncvxSu(UdeBV=i0HO2|e;Xnz)zbknRG3A)JzgS5#gS71=Pt}xr7
zotqN+q{CWJ#DOLWt024*%800tQDaHOpom6M)Ytog9{6#d_u)C`eb33{%}m~$?AgSO
z<>fUDH^~O#pKaTY>*zH^v)<5o4_THp(?g~B?FH=7Y4!qmAP(}4(Bc#iW4E}@w>9-q
zx`)_KM2KFoz}JZycdy<{l|@ALU;gtD-irF+Yo^m^noMyu*4?t1#6yBS+qb;Wilf1H
zQHz-_2E%w_h~Kfe$2s+m0`G|`1;S!-Ac#Mt`gCo;bYq{cAHTE;C7nKbWvw;dYn7Qb
z!L1UrvRs_`IwL+*+~WSUspl&@Ain21Me43gdVy|nGxbt>Ir{ae%=)czNJfA;@vZ9B
zZ>n3MIJmXMR3rR?$$$=gu0VB>_oYqsqgl0qsbk>E2bbJGhKP)vMVGudj5|d;4nPIL
z9wm@r#Y_h>kk68c$s;#l76*q>@ThTk)oHrpGBHX_pi!mZQd3~LbI`3hdhyC?rw<8G
zap1N5n7}QWPhgjvI*+)rsEI<oq4mT{*64V8fpm)#e<g=TkeA^RY?aX@wO%T~=TVQr
lWaJY<#n22Eo76l_Qg*Ca?3B^x7%LVQF}Pm+ps9Yr{~y<Gy`TU9