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

fix timing... e sistemazione watchdog...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-06-07 18:47:43 +02:00
parent 12ea31bf76
commit f6a338735f
7 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/MTC_Adapter/AdapterGeneric.cs
+2 -2
View File
@@ -2408,8 +2408,8 @@ namespace MTC_Adapter
if (utils.CRB("sendWatchDog"))
{
int resto = 0;
Math.DivRem(DateTime.Now.Second, 2, out resto);
setFlag = resto == 0;
Math.DivRem(DateTime.Now.Second / utils.CRI("cycleWatchDog"), 2, out resto);
setFlag = resto != 0;
// se watchdog è cambiato lo invio, altrimenti lascio come è...
if (setFlag != lastWatchDog)
{
MTC_Adapter/MTC_Adapter/AdapterSiemens.cs
-11
View File
@@ -1008,17 +1008,6 @@ namespace MTC_Adapter
string tipoAsse = "";
string direzione = "";
// leggo le posizioni SINO ai 16 assi permessi...
#if false
int memIndex = 0;
inizio = DateTime.Now;
// MODIFICA: leggo float direttamente x posizione assi...
float[] axisPosFloat = new float[axisPosData.Length];
SIEMENSMemRW_Float(R, baseMemAx, memIndex, ref axisPosFloat);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-AXIS_POS", MemBlockTop.Length), DateTime.Now.Subtract(inizio).Ticks);
#endif
inizio = DateTime.Now;
// !!!FARE!!! test lettura di TUTTI i dati assi....
SIEMENS.AxData[] ValAssi = SIEMENS_ref.getAllAxisPos();
MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
+1
View File
@@ -18,5 +18,6 @@
<add key="trayClose" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="recTime" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="ipPLC" value="192.168.139.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>
MTC_Adapter/MTC_Adapter/App.CMS-OSAI.config
+1
View File
@@ -18,5 +18,6 @@
<add key="trayClose" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="recTime" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="ipPLC" value="192.168.139.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>
MTC_Adapter/MTC_Adapter/App.CMS-SIEMENS.config
+1
View File
@@ -18,5 +18,6 @@
<add key="trayClose" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="recTime" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="ipPLC" value="192.168.214.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="3" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>
MTC_Adapter/MTC_Adapter/App.SCM-ESA.config
+1
View File
@@ -13,6 +13,7 @@
<add key="autoLoadConf" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="openDumpOnStart" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="procIotMem" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--clock di base update...-->
<add key="timerIntMs" value="10" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--COMMENTATO IN DEBUG LOCALE-->
MTC_Adapter/MTC_Adapter/App.config
+2 -1
View File
@@ -11,7 +11,7 @@
<add key="startTimerMs" value="250"/>
<add key="timerIntMs" value="5"/><!--invio da adapter ad agent: 5ms-->
<add key="fastCount" value="60"/><!--100ms-->
<add key="normCount" value="150"/><!--500ms-->
<add key="normCount" value="100"/><!--500ms-->
<add key="slowCount" value="1000"/><!--5 sec-->
<add key="alarmSyncCount" value="6000"/><!--30 sec-->
<add key="waitEndCycle" value="0"/><!--ms attesa dopo ogni ciclo lettura...-->
@@ -87,6 +87,7 @@
<add key="eStopCode" value="152"/>
<!--gestione watchdog CMS-->
<add key="sendWatchDog" value="true"/>
<add key="cycleWatchDog" value="3"/>
<add key="readAllTop" value="true"/>
<add key="fastCopy" value="true"/>
<add key="ClientSettingsProvider.ServiceUri" value=""/>