From a697b86c0736b00d3e3e9517bfa4fcabed9d85c6 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Mon, 4 Apr 2016 19:17:53 +0200
Subject: [PATCH] Completata gestione feed/speed rate...

---
 MTC_Sim/.vs/MTC_Sim/v14/.suo      | Bin 107520 -> 107520 bytes
 MTC_Sim/MTC_Sim/AdapterDemo.cs    |  29 ++++++++++++-
 MTC_Sim/MTC_Sim/AdapterGeneric.cs |  67 ++++++++++++++++++++++++++++--
 MTC_Sim/MTC_Sim/CMS_MachineSim.cs |   5 +++
 MTC_Sim/MTC_Sim/utils.cs          |   2 +-
 5 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index e1086870a0eff7dae72ce7f7db6237f7f935861b..5fb2d12a475378fbf0f59c5f899b055cde53ea83 100644
GIT binary patch
delta 1070
zcmah{T}V@57(UP0Pe(nQI&B@%VlDqrgQ1uOnt@XSAsp4zoBRV=5yWB_Dz<iECb5X^
zVBeJ{GYq8*@dW3xT}W6LQXvM}h2C{pIOqqY-fx>zCe#b>`5vD4eV^z1zVn6F%%L^&
z@@>(yJ%`C@)h~8S1%e>_p->}A`Fz3*%Nru>Mf9PNRTxW4atZMk9v9QNmDWoUPm%h~
zXf*MHMfDh;S&k8HqimsU*7l5dU|R05jZABPGlNGWc8@nxlo2ka<e0miOym6Y%6T*4
z97+@A{@n3&-AZeo)+;TVRMFNUolevI7+Sy<M%3Y!i_;|6N)>9tSSe_OC21=kno$FV
z;i%K0I+SvmUx|3ArUewzvt7<Iv4;^mCH`M7kE9BZ$T{5Vs==iN99;&Pckn&(NbWOn
zMiyh$VysMzT1T*}janaKrE(RrC9Bi4PQ-8ZSM56s_%y$<1C_c4#n9kt)N0yG8r8PC
z(9xdxM4hN5g0dkxp7QAg-<Eujbi9;2R+_7F(lVP$?0GP6R}lpM%Ov3=+wozBjSt`)
z+xB6W4SR8cqfh#d6HCBGs$s7J=dqr|`cf6VmDpu);zhC_St|dUy@~=HIO$KXqh7QR
zAh}QaIO1c3hX}bpbGJ?X)eUrk9MFR?7W5&PJsCnZdwC7kBRZWK9cTP5Vg3%Xbu#DG
zxBBq|_J)0H!4)4R+{|ZEC(YRTS$_|tgRA1BXR$C0kwqS$DA}i1_^<`mHwbCr7K+sm
z?X~RfO*C=F$>w@-<%A-DUgcuOuqwVmxJmyWL_Sz+H%*3MWc~@XurK#f&Z$Oyb^?Q7
o@4Zx=Bty?*)U%l><m&DzFwxSNk^A{NqJMn^1*%Jw7Q#^e0s!lSPyhe`

delta 980
zcmbVK?MqW(6u-Z_-RWvuo362;4o#h63OST!s0o_{1*6gXhrlI-L=l2SFR1r}Wz>T7
zfu263rO2X4EN^g$f`lae6hYR9lvw{kAA(-isPkO!w1WEJ1LryCIWNE8IfqAGu&E2S
zhbLv_b<*;Tv0nKQTd-wWG}!2TDM^yAm@Ya64AzoB8(BZiv(vOYNEeMHitP^5v4JJ5
zx1C;kwURhV+O?eZG?eQ<K0RStuZ<&NCvVOKDkXa}iFlTfwwZRBsfFK7b|J||62<iA
z>o?Kcr5!1}r!cwp46@p}+F{HVMd5@X&$q=AfhyKloMLLk&D^d?p}-W_BB1rTQbvs!
z{6AT~6h^%<hiFm$qujd^u#nU9cVIFkPx|Ficg#^iAu+-lZE&x}k?(NT`?<m)&(_U@
z%?G#HUs3*d5=qNdTK<9JCieOlEZT5XD{m<9Tbje$wYttgv+%Gx^_7M$Z^(?QXN~>r
zrp*Yp{HnzYlz!qksC~OoV4ZEPv6~q0{F74y$a2JSmw&BBi=L{&eejQQEMoCS7smM2
zK}7JD%qcz-N0=|~!#KZn5n+9~234VT77LgUcyBNeZ@WHn0AblTE;eBt@7x6GMv~ZX
zS&t867r18-=XrlOHS=IUT<b#F17oJKm7(8s;R`%XE6j9<=33}>>PyE^2IXc+Pls5*
zT5>hg$074%B}(}~H|%;@50;QV0WVKp!xlCe_3*6&nD))U#8jK+KwnCH^4RKLPo-5@
pd2$GydfO15B7F%md(^o@4`0TF>>M_0B`NcKTF+d8AL$hQzW~YhP~!jq

diff --git a/MTC_Sim/MTC_Sim/AdapterDemo.cs b/MTC_Sim/MTC_Sim/AdapterDemo.cs
index 31df5e3..346a666 100644
--- a/MTC_Sim/MTC_Sim/AdapterDemo.cs
+++ b/MTC_Sim/MTC_Sim/AdapterDemo.cs
@@ -91,13 +91,38 @@ namespace MTC_Sim
                 mTravel.Add(Condition.Level.FAULT, "ERR_06: Travel outside boundaries", "OP");
         }
 
-        public override void getAxes()
+        public override void getPath()
         {
-            base.getAxes();
+            base.getPath();
+
 
             mxLoad.Value = parentForm.datiProd.xLoad;
             mcLoad.Value = parentForm.datiProd.cLoad;
         }
+        public override int FeedRate
+        {
+            get
+            {
+                return parentForm.datiProd.PathFeedrate;
+            }
+        }
+
+        public override int FeedRateOver
+        {
+            get
+            {
+                return parentForm.datiProd.PathFeedrateOver;
+            }
+        }
+
+        public override int SpeedRateOver
+        {
+            get
+            {
+                return parentForm.datiProd.PathSpeedrateOver;
+            }
+        }
+
         /// <summary>
         /// Recupero dati da form...
         /// </summary>
diff --git a/MTC_Sim/MTC_Sim/AdapterGeneric.cs b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
index 58ca33a..3d791e8 100644
--- a/MTC_Sim/MTC_Sim/AdapterGeneric.cs
+++ b/MTC_Sim/MTC_Sim/AdapterGeneric.cs
@@ -65,6 +65,10 @@ namespace MTC_Sim
             mAdapter.AddDataItem(mMessage);
 
             // TimeSeries (es assi)
+            mAdapter.AddDataItem(mPathFeed);
+            mAdapter.AddDataItem(mPathFeedOver);
+            mAdapter.AddDataItem(mPathSpeedOver);
+
             mAdapter.AddDataItem(mPosition);
             mAdapter.AddDataItem(mxLoad);
 
@@ -213,6 +217,9 @@ namespace MTC_Sim
         #region Samples
 
 
+        public Sample mPathFeed = new Sample("PATH_FEEDRATE");
+        public Sample mPathFeedOver = new Sample("PATH_FEEDRATE_OVER");
+        public Sample mPathSpeedOver = new Sample("PATH_SPEEDRATE_OVER");
 
         public Sample mPosition = new Sample("xPosition");
         public Sample mxLoad = new Sample("xLoad");
@@ -280,7 +287,7 @@ namespace MTC_Sim
             // fix dati x ulteriori (allarmi, modalità RUN/EXEC, ...)
             getCurrMode();
 
-            getAxes();
+            getPath();
 
             getAlarms();
 
@@ -299,9 +306,10 @@ namespace MTC_Sim
         /// <summary>
         /// recupero dati ASSI
         /// </summary>
-        public virtual void getAxes()
+        public virtual void getPath()
         {
-            // da gestire su ogni adapter...
+            // SE presente recupero dati path
+            checkPath();
         }
         /// <summary>
         /// recupero allarmi
@@ -356,6 +364,59 @@ namespace MTC_Sim
 
         #region area metodi comunicazione con PLC/CNC
 
+        public void checkPath()
+        {
+            if (utils.IsSetAny(STROBE_PLC, Strobe.FEED_SPEED))
+            {
+                // leggo i valori feed/speed
+                mPathFeed.Value = FeedRate;
+                mPathFeedOver.Value = FeedRateOver;
+                mPathSpeedOver.Value = SpeedRateOver;
+                
+                // alzo flag lettura...
+                if (utils.IsSetAll(STROBE_PLC, Strobe.FEED_SPEED)) STROBE_ADP = STROBE_ADP | Strobe.FEED_SPEED;
+
+            }
+            else
+            {
+                // resetto eventuali flag di lettura...
+                if (utils.IsSetAll(STROBE_ADP, Strobe.FEED_SPEED)) STROBE_ADP -= Strobe.FEED_SPEED;
+            }
+        }
+
+        /// <summary>
+        /// recupera FeedRate (fare override!)
+        /// </summary>
+        public virtual int FeedRate
+        {
+            get
+            {
+                int answ = 0;
+                return answ;
+            }
+        }
+        /// <summary>
+        /// recupera FeedRateOver (fare override!)
+        /// </summary>
+        public virtual int FeedRateOver
+        {
+            get
+            {
+                int answ = 0;
+                return answ;
+            }
+        }
+        /// <summary>
+        /// recupera SpeedRateOver (fare override!)
+        /// </summary>
+        public virtual int SpeedRateOver
+        {
+            get
+            {
+                int answ = 0;
+                return answ;
+            }
+        }
 
         public void checkProd()
         {
diff --git a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs
index 6170138..b39ee00 100644
--- a/MTC_Sim/MTC_Sim/CMS_MachineSim.cs
+++ b/MTC_Sim/MTC_Sim/CMS_MachineSim.cs
@@ -207,6 +207,11 @@ namespace MTC_Sim
                 answ.pzKo = pzKo;
                 answ.pzTot = pzOk + pzKo;
 
+                // FEED/SPEED
+                answ.PathFeedrate = hsPathFeed.Value;
+                answ.PathFeedrateOver= hsPathFeedOver.Value;
+                answ.PathSpeedrateOver= hsPathSpeedOver.Value;
+
                 // load...
                 answ.xLoad = xLoad.Value;
                 answ.cLoad = cLoad.Value;
diff --git a/MTC_Sim/MTC_Sim/utils.cs b/MTC_Sim/MTC_Sim/utils.cs
index 5fff87f..ae457a2 100644
--- a/MTC_Sim/MTC_Sim/utils.cs
+++ b/MTC_Sim/MTC_Sim/utils.cs
@@ -143,7 +143,7 @@ namespace MTC_Sim
         public int pzOk;
         public int pzKo;
 
-        public UInt32 PathFeedrate;
+        public int PathFeedrate;
         public int PathFeedrateOver;
         public int PathSpeedrateOver;