From 59538d23feb024cd9f9e9766cc9a45377f722195 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Tue, 17 May 2016 13:58:14 +0200
Subject: [PATCH] Aggiunta speed assi (da capire...)

---
 MTC_Sim/.vs/MTC_Sim/v14/.suo                 | Bin 288768 -> 288768 bytes
 MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb |  28 +++++++++++++++++++
 MTC_Sim/MTC_Sim/AdapterFanuc.cs              |   6 ++++
 3 files changed, 34 insertions(+)

diff --git a/MTC_Sim/.vs/MTC_Sim/v14/.suo b/MTC_Sim/.vs/MTC_Sim/v14/.suo
index bdb00ff5566d60766b8b09c12fab324957983c01..28036c431f6847a14c7ffd9454f52f635c64b91a 100644
GIT binary patch
delta 647
zcma)1T}YEr7~cEr+xo0!4cG5Q3ld3M%UM)JL$Z+r!`4_~HEKqL<%mTaD1@z8dJ|Zl
z@^ldfhguRr>IeH0yco0#p=i4hjV`i_+EuWGQC;}c`66MLz3`s*`Qbe0J;{PSS+L(f
zOig3nJ+NfIR$pk;t|L!$lO0i<bW7_{ny9MJWHK$wT71y4%hmah7{Wb?6BYb!1+J5L
z5K&9a-St$4TK9sy?74cPN|nYA+55FcwWU=(Dq)LkRvp>N;-P@rEXlDIp&ZJyxA17?
zQz?Z!TF=@1R>iks#uEXSLxWaM*sLN6(Tns(QpQs`uv}=A#rs2Sb;PBW`=71SA3Lej
zHvYtafcek85!0wQ_TM6tjJZ-hk{iz(+*s3?x3&83vm`z`#Cfph(nWpyEQP_o{F-Eu
zLYp=<e-Pp_STK`f;bN^e^0VD6u0kv*A_{irWr}4N9PItFLw^Mdk+_Dmm8>ELF$0Eo
zZr#0}evk0FHTaZP34CxJ_VLLH^6}UNsd};+NlSV&tm!GT4Q<05f9*t(KJfWzI+U5A
zIe&#P%zK^i=#Q4D%bcl2e68gSOeQ}+8HV76Andv~h)q_TJNr=TZSsS@zd^(LQafsD
zhK^%EA8_HDV!0&!)Bkr58+dlNjJ8KnBHnNX0X-1IDDlz_LyZ}#0r}@fwDNEq#TT9g
Oz~zze>qffU{NoR(`vA}Y

delta 781
zcmY+9T}V_x6vyv5_wMZ~X8R$E7DyDL;McBER*LI&P1C>%r4Pz1B1E=WX{D8<HnGhI
zBWoV!A@Jd5tAz!6VMifT+g%8XG&AkZH;E|qL81r6=IR=DV3_m&pa1-3#y@58Pg%N)
zpm?x24^7UZoQPd-#z}y?q*O|Wd-`Rm1mc<mL0IRdlIFSHk3Ht>HABU!iw_%P0mEwD
z)(3e11l=Zc)c2i(<pP8f@?5EjJIDw7_)_#WrJ|ZdtohHp0U+MG8WWUppTsw0>nn8~
z5~zCX`N=dx6K~5&Mdd@65lC#v)K^*(WX+G-9n{)zs68Sn#siMU#$+WhBbEQlKIq*c
z=GzbJPanN1lPb1s@0TtNCIS-2SSK;RxT62~mTb#1Fc~~z>|2$}bz96+V*7nPYjzH_
zMOmvyayryOE-dWV`+uJmhpqwYu(~d4O-R~bc98MaB=T`Ri47psg62k|=~iZyVbP@B
zkO+RrWw~bf(@*n9L8hT$I6;?3z)XKe;ea7sK?P8>3l4fI0_AM{4LE^%M!`z2M!-p@
zCm<vE7J$AELk6u6LmG3Afgh<a49?IyBdmsD51R=?2*h22Kpzf63U!WfKz9_XSZ5S`
ziScTIAlUfVECQXMfd%Tx!>{m(Hs|4y&@9YXZuUL&S0UOr6UzlS-{;+nX44rIgiPuz
zLXD0&(897ExKmEP$la~F#d|Xst_@-j;}p%dfst&2YudP`mnGz4qiCw-(bE56DRP1^
z?vLTNA#Apg8<&6%9>P?5yBgD3p&Q==J#`(=u}Tm20sWkVN2#X@C063W31CY%Q3a;9
Q7{~0#aWde;pif->3oZI74*&oF

diff --git a/MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb b/MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
index 760dfa2..e45f26c 100644
--- a/MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
+++ b/MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
@@ -638,6 +638,34 @@ Namespace CNC
 
         End Function
 
+        Public Function getAllAxisSpeed() As Focas1.ODBSPEED
+
+            Dim nPathIdx As Integer
+            Dim nNumAxisRead As Integer
+            Dim nReturn As Integer
+            Dim szAssi() As String = {String.Empty}
+
+            Dim speedAssi As Focas1.ODBSPEED
+
+            'leggo il numero del processo attivo
+            nPathIdx = GetActivePath()
+            'leggo num max assi dal cn
+            nNumAxisRead = Focas1.MAX_AXIS
+
+            If Is30Series Then
+
+                ' leggo tutto!!!
+                nReturn = Focas1.cnc_rdspeed(nLibHandle(nPathIdx), -1, speedAssi)
+
+                If F_CheckRetError_Cnc(nReturn, "cnc_rdspeed RefreshAxisSpeed CNC.FANUC.CMS_CncLib") Then
+                    Throw New CmsNcException("ERR cnc_rdspeed RefreshAxisSpeed CNC.FANUC.CMS_CncLib")
+                End If
+            End If
+
+            Return speedAssi
+
+        End Function
+
 
         ''' <summary>
         ''' Legge o scrive Byte da MEMORIE PLC
diff --git a/MTC_Sim/MTC_Sim/AdapterFanuc.cs b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
index b7fe152..7aa3a88 100644
--- a/MTC_Sim/MTC_Sim/AdapterFanuc.cs
+++ b/MTC_Sim/MTC_Sim/AdapterFanuc.cs
@@ -597,6 +597,10 @@ namespace MTC_Sim
             CMSCncLib.Focas1.ODBPOS posAssi = FANUC_ref.getAllAxisPos();
             if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_POS", DateTime.Now.Subtract(inizio).Ticks);
 
+            inizio = DateTime.Now;
+            CMSCncLib.Focas1.ODBSPEED speedAssi = FANUC_ref.getAllAxisSpeed();
+            if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_SPEED", DateTime.Now.Subtract(inizio).Ticks);
+
             // fare: salvataggio assi...
             StringBuilder sb = new StringBuilder();
             sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, ToGo:{2:N3}{3}", posAssi.p1.abs.name, (double)(posAssi.p1.abs.data) / Math.Pow(10, posAssi.p1.abs.dec), posAssi.p1.dist.name, (double)(posAssi.p1.dist.data) / Math.Pow(10, posAssi.p1.dist.dec), Environment.NewLine));
@@ -605,6 +609,8 @@ namespace MTC_Sim
             sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, ToGo:{2:N3}{3}", posAssi.p4.abs.name, (double)(posAssi.p4.abs.data) / Math.Pow(10, posAssi.p4.abs.dec), posAssi.p4.dist.name, (double)(posAssi.p4.dist.data) / Math.Pow(10, posAssi.p4.dist.dec), Environment.NewLine));
             sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, ToGo:{2:N3}{3}", posAssi.p5.abs.name, (double)(posAssi.p5.abs.data) / Math.Pow(10, posAssi.p5.abs.dec), posAssi.p5.dist.name, (double)(posAssi.p5.dist.data) / Math.Pow(10, posAssi.p5.dist.dec), Environment.NewLine));
             sb.AppendLine(string.Format("Asse {0}: PosAct:{1:N3}, ToGo:{2:N3}{3}", posAssi.p6.abs.name, (double)(posAssi.p6.abs.data) / Math.Pow(10, posAssi.p6.abs.dec), posAssi.p6.dist.name, (double)(posAssi.p6.dist.data) / Math.Pow(10, posAssi.p6.dist.dec), Environment.NewLine));
+            sb.AppendLine(string.Format("{0} {1}", speedAssi.actf.name, speedAssi.actf.data));
+            sb.AppendLine(string.Format("{0} {1}", speedAssi.acts.name, speedAssi.acts.data));
             parentForm.showMessage(sb.ToString());
         }