Egalware/CMS-MTConn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refresh con nuovi metodi

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-05-20 12:16:00 +02:00
parent 760df45542
commit 236cc82d62
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Sim/CMSCncLib/CNC/CNC.FANUC/CNC.FANUC.vb
+1
View File
@@ -824,6 +824,7 @@ Namespace CNC
End Function
Public Function getSpindleSpeed() As Focas1.ODBSPEED
' RIFERIMENTO:
' C:\Users\samuele\Documents\FOCAS A02B-0207-K737_04.20\Document\SpecE\Position\cnc_rdspeed.htm
MTC_Sim/MTC_Sim/AdapterFanuc.cs
+22 -8
View File
@@ -619,6 +619,19 @@ namespace MTC_Sim
mClock.Value = DateTime.Now.Date.ToFileTimeUtc();
mPower.Value = "NA";
}
/// <summary>
/// Leggo dati globali comuni (x path, assi...)
/// </summary>
public override void getGlobalData()
{
base.getGlobalData();
inizio = DateTime.Now;
CMSCncLib.Focas1.ODBDY2_1 allData = FANUC_ref.getAllDynData();
if (utils.CRB("recTime")) TimingData.addResult("R-ALL DATA", DateTime.Now.Subtract(inizio).Ticks);
}
public override void getUnOp()
{
@@ -651,18 +664,17 @@ namespace MTC_Sim
public override void getPath()
{
base.getPath();
DateTime inizio = DateTime.Now;
// recupero dati feedrate
DateTime inizio = DateTime.Now;
inizio = DateTime.Now;
FeedRate = FANUC_ref.getGlobalFeedrate().data;
if (utils.CRB("recTime")) TimingData.addResult("R{0}-FEEDRATE", DateTime.Now.Subtract(inizio).Ticks);
if (utils.CRB("recTime")) TimingData.addResult("R-FEEDRATE", DateTime.Now.Subtract(inizio).Ticks);
// recupero vettore generale G MODE
inizio = DateTime.Now;
CMSCncLib.Focas1.ODBGCD vettGCodes = FANUC_ref.getPathGCodeMod();
if (utils.CRB("recTime")) TimingData.addResult("R{0}-GCodModal", DateTime.Now.Subtract(inizio).Ticks);
if (utils.CRB("recTime")) TimingData.addResult("R-GCodModal", DateTime.Now.Subtract(inizio).Ticks);
string GCodAttivi = "";
GCodAttivi += string.Format("# {0} #", vettGCodes.gcd0.code);
@@ -696,7 +708,7 @@ namespace MTC_Sim
inizio = DateTime.Now;
vettGCodes = FANUC_ref.getPathGCode1Shot();
if (utils.CRB("recTime")) TimingData.addResult("R{0}-GCodOneShot", DateTime.Now.Subtract(inizio).Ticks);
if (utils.CRB("recTime")) TimingData.addResult("R-GCodOneShot", DateTime.Now.Subtract(inizio).Ticks);
if (vettGCodes.gcd0.flag > 0) GCodAttivi += string.Format("# {0} #", vettGCodes.gcd0.code);
if (vettGCodes.gcd1.flag > 0) GCodAttivi += string.Format("# {0} #", vettGCodes.gcd1.code);
if (vettGCodes.gcd2.flag > 0) GCodAttivi += string.Format("# {0} #", vettGCodes.gcd2.code);
@@ -704,7 +716,7 @@ namespace MTC_Sim
inizio = DateTime.Now;
CMSCncLib.Focas1.ODB5AXMAN vettTTCoord = FANUC_ref.getPathTTCoord();
if (utils.CRB("recTime")) TimingData.addResult("R{0}-TTCoord", DateTime.Now.Subtract(inizio).Ticks);
if (utils.CRB("recTime")) TimingData.addResult("R-TTCoord", DateTime.Now.Subtract(inizio).Ticks);
// FARE!! per ora solo 1 path...
@@ -749,6 +761,8 @@ namespace MTC_Sim
CMSCncLib.Focas1.ODBPOS posAssi = FANUC_ref.getAllAxisPos();
if (utils.CRB("recTime")) TimingData.addResult("R-AXIS_POS", DateTime.Now.Subtract(inizio).Ticks);
int numAx = 6;
for (int i = 0; i < numAx; i++)
{
MTC_Sim/MTC_Sim/AdapterGeneric.cs
+15 -2
View File
@@ -516,6 +516,8 @@ namespace MTC_Sim
public DateTime dtAvvioAdp = DateTime.Now;
public DateTime dtStopAdp = DateTime.Now;
public DateTime inizio;
/// <summary>
/// adapter globale
@@ -1079,10 +1081,11 @@ namespace MTC_Sim
}
else if (ciclo == gatherCycle.MF)
{
// leggo parametri a media freq (path, assi, Unità Operatrice)
// leggo parametri a media freq (dati globali, path, assi, Unità Operatrice)
getGlobalData();
getPath();
getUnOp();
getAxis();
getUnOp();
}
// ciclo lento
else if (ciclo == gatherCycle.LF)
@@ -1127,6 +1130,12 @@ namespace MTC_Sim
eh_refreshed(this, new EventArgs());
}
}
/// <summary>
/// recupero dati globali (e comuni)
/// </summary>
public virtual void getGlobalData()
{
}
/// <summary>
/// riporta il log di tutti i dati di results temporali registrati
@@ -1338,6 +1347,10 @@ namespace MTC_Sim
/// FeedRate globale
/// </summary>
public int FeedRate { get; set; }
/// <summary>
/// SpeedRate mandrino globale
/// </summary>
public int SpeedRate { get; set; }
//protected int _feedrate = 0;