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

Merge remote-tracking branch 'gogs.steamware.net/develop' into develop

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-06-27 14:20:27 +02:00
parent 7bcb2d752e c84f1f56ce
commit eadf16b1e6
13 changed files with 1134 additions and 571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MTC_Adapter/MTC_Adapter/AdapterESA.cs
+12 -2
View File
@@ -597,6 +597,7 @@ namespace MTC_Adapter
lg.Error("Errore connessione mancante in getIotMem_Word");
}
StringBuilder sb = new StringBuilder();
int numAlarmCNC = 0;
int numero = 0;
int byteNum = 0;
@@ -774,6 +775,13 @@ namespace MTC_Adapter
}
}
}
// verifico se nei mandini ho un tool e quanti cambi...
for (int i = 0; i < vettUnOp.Length; i++)
{
if (vettUnOp[i].mUnOpToolId.Value.ToString() != "") sb.AppendLine(string.Format("UnOp_{0}: ToolId: {1} | NumCU: {2}", i+1, vettUnOp[i].mUnOpToolId.Value, vettUnOp[i].mUnOpNumCU.Value));
}
// update form!
parentForm.dataMonitor_2 += sb.ToString();
}
/// <summary>
/// Carica ed acquisisce dati del buffer DWORD (32 bit) di memoria
@@ -986,7 +994,7 @@ namespace MTC_Adapter
sb.AppendLine(string.Format("{0}: {1}", mapIOT_String[j].varName, valString));
}
// update form!
parentForm.dataMonitor_1 += sb.ToString();
parentForm.dataMonitor_2 += sb.ToString();
}
public override void getGlobalData()
{
@@ -1000,6 +1008,8 @@ namespace MTC_Adapter
{
// inizializzo data monitor su FORM
parentForm.dataMonitor_1 = "";
parentForm.dataMonitor_2 = "";
parentForm.dataMonitor_3 = "";
// recupero le varie memorie (prima string che mi serve x area selezionata --> programma selezionato)
getIotMem_String();
@@ -1107,7 +1117,7 @@ namespace MTC_Adapter
prevDirAxis[i] = newDir;
}
parentForm.dataMonitor_1 += sb.ToString();
parentForm.dataMonitor_3 += sb.ToString();
}
}
}
MTC_Adapter/MTC_Adapter/AdapterFanuc.cs
+69 -34
View File
@@ -709,53 +709,88 @@ namespace MTC_Adapter
/// <summary>
/// Gestione lettura dati manutenzione
/// </summary>
private void getMtzDataFromPlc()
public override bool getMtzDataFromPlc()
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 14000;
byte[] tabDatiMtzByte = new byte[4 * maintData.Length];
uint[] tabDatiMtz = new uint[maintData.Length];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiMtzByte);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiMtz", tabDatiMtzByte.Length), DateTime.Now.Subtract(inizio).Ticks);
// copio byte --> word!
Buffer.BlockCopy(tabDatiMtzByte, 0, tabDatiMtz, 0, tabDatiMtzByte.Length);
// decodifico aree memoria secondo tab configurazione
processMaintData(tabDatiMtz, maintData);
bool fatto = false;
try
{
if (maintData.Length > 0)
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 14000;
byte[] tabDatiMtzByte = new byte[4 * maintData.Length];
uint[] tabDatiMtz = new uint[maintData.Length];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiMtzByte);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiMtz", tabDatiMtzByte.Length), DateTime.Now.Subtract(inizio).Ticks);
// copio byte --> word!
Buffer.BlockCopy(tabDatiMtzByte, 0, tabDatiMtz, 0, tabDatiMtzByte.Length);
// decodifico aree memoria secondo tab configurazione
processMaintData(tabDatiMtz, maintData);
}
fatto = true;
}
catch
{ }
return fatto;
}
/// <summary>
/// Gestione lettura dati analogici
/// </summary>
private void getAnalogDataFromPlc()
public override bool getAnalogDataFromPlc()
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 15000;
byte[] tabDatiAnalogByte = new byte[4 * analogData.Length];
uint[] tabDatiAnalog = new uint[analogData.Length];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiAnalogByte);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiAnalog", tabDatiAnalogByte.Length * 4), DateTime.Now.Subtract(inizio).Ticks);
// copio byte --> word!
Buffer.BlockCopy(tabDatiAnalogByte, 0, tabDatiAnalog, 0, tabDatiAnalogByte.Length);
// decodifico aree memoria secondo tab configurazione
processAnalogData(tabDatiAnalog, analogData);
bool fatto = false;
try
{
if (analogData.Length > 0)
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 15000;
byte[] tabDatiAnalogByte = new byte[4 * analogData.Length];
uint[] tabDatiAnalog = new uint[analogData.Length];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiAnalogByte);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiAnalog", tabDatiAnalogByte.Length * 4), DateTime.Now.Subtract(inizio).Ticks);
// copio byte --> word!
Buffer.BlockCopy(tabDatiAnalogByte, 0, tabDatiAnalog, 0, tabDatiAnalogByte.Length);
// decodifico aree memoria secondo tab configurazione
processAnalogData(tabDatiAnalog, analogData);
}
fatto = true;
}
catch
{ }
return fatto;
}
/// <summary>
/// Gestione lettura dati status da PLC
/// </summary>
private void getStatusDataFromPlc()
public override bool getStatusDataFromPlc()
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 14512;
int numByte = 1 + (statusData.Length / 8);
byte[] tabDatiStatus = new byte[numByte];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiStatus);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiStatus", tabDatiStatus.Length), DateTime.Now.Subtract(inizio).Ticks);
bool fatto = false;
try
{
if (statusData.Length > 0)
{
// recupero i dati di manutenzione dall'area di memoria IN BLOCCO
int memIndex = 14512;
int numByte = 1 + (statusData.Length / 8);
byte[] tabDatiStatus = new byte[numByte];
inizio = DateTime.Now;
FanucMemRW(R, FANUC.MemType.R, memIndex, ref tabDatiStatus);
if (utils.CRB("recTime")) TimingData.addResult(string.Format("R{0}-DatiStatus", tabDatiStatus.Length), DateTime.Now.Subtract(inizio).Ticks);
// decodifico aree memoria secondo tab configurazione
processStatusData(tabDatiStatus, statusData);
// decodifico aree memoria secondo tab configurazione
processStatusData(tabDatiStatus, statusData);
}
fatto = true;
}
catch
{ }
return fatto;
}
/// <summary>
/// Leggo dati globali comuni (x path, assi...)
MTC_Adapter/MTC_Adapter/App.CMS-FANUC.config
+3 -1
View File
@@ -2,6 +2,7 @@
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--clock di base update...-->
<add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="fastCount" value="20" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="normCount" value="50" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
@@ -13,11 +14,12 @@
<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="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--COMMENTATO IN DEBUG LOCALE-->
<add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<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
+3 -1
View File
@@ -2,6 +2,7 @@
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--clock di base update...-->
<add key="timerIntMs" value="10" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="fastCount" value="20" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="normCount" value="100" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
@@ -13,11 +14,12 @@
<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="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="2" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--COMMENTATO IN DEBUG LOCALE-->
<add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<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
+3 -1
View File
@@ -2,6 +2,7 @@
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--clock di base update...-->
<add key="timerIntMs" value="5" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="fastCount" value="60" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="normCount" value="150" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
@@ -13,11 +14,12 @@
<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="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="cycleWatchDog" value="3" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<!--COMMENTATO IN DEBUG LOCALE-->
<add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<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
+2 -2
View File
@@ -2,6 +2,7 @@
<!-- For more information on using app.config transformation visit http://go.microsoft.com/fwlink/?LinkId=125889 -->
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--clock di base update...-->
<add key="timerIntMs" value="10" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="fastCount" value="20" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="normCount" value="50" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
@@ -14,12 +15,11 @@
<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-->
<add key="startMinimized" value="true" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<add key="windowCanMax" value="false" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
<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="127.0.0.1" xdt:Transform="Replace" xdt:Locator="Match(key)"/>
</appSettings>
</configuration>
MTC_Adapter/MTC_Adapter/App.config
+2 -2
View File
@@ -39,9 +39,9 @@
<!--<add key="ipPLC" value="192.168.157.2"/>-->
<!--OSAI DEV-->
<!--<add key ="ipPLC" value="192.168.157.2" />-->
<!--OSAI PROD-->
<!--CMS PROD-->
<add key ="ipPLC" value="192.168.139.1" />
<add key="recTime" value="true"/>
<add key="verbose" value="true"/>
<add key="loglevel" value="5"/>
MTC_Adapter/MTC_Adapter/DATA/CONF/Adapter_ItemList.xml
+2 -6
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<AdapterConf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<Version>1</Version>
<NomeAdapt>ADAPTER_OSAI</NomeAdapt>
<TipoAdapt>OSAI</TipoAdapt>
<NomeAdapt>ADAPTER_FANUC</NomeAdapt>
<TipoAdapt>FANUC</TipoAdapt>
<ContOreMaccOn>0</ContOreMaccOn>
<ContOreMaccLav>0</ContOreMaccLav>
<ContSlittaTast>0</ContSlittaTast>
@@ -81,10 +81,6 @@
<ident>Path_01</ident>
<dataRefList />
</element>
<element>
<ident>Path_02</ident>
<dataRefList />
</element>
</Path>
<UnOp>
<element>
MTC_Adapter/MTC_Adapter/DATA/CONF/AlarmList.map
+1024 -502
View File
File diff suppressed because it is too large Load Diff
MTC_Adapter/MTC_Adapter/MTC-Adapter.csproj
+3 -9
View File
@@ -168,15 +168,9 @@
<None Include="DATA\DAT\PersistData.dat">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\CMS\AnalogDataSIEMENS.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\CMS\AnalogDataFANUC.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\CMS\AnalogDataOSAI.map">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="Resources\CMS\AnalogDataSIEMENS.map" />
<None Include="Resources\CMS\AnalogDataFANUC.map" />
<None Include="Resources\CMS\AnalogDataOSAI.map" />
<None Include="Resources\CMS\Appunti CMS OSAI.txt" />
<None Include="Resources\CMS\OSAI.xml">
<SubType>Designer</SubType>
MTC_Adapter/MTC_Adapter/postBuildTgt.bat
+8 -8
View File
@@ -5,10 +5,10 @@ echo Effettua pulizia post build: configurazione %1. directory %2
if %1 == "Release" goto Release
if %1 == "Debug" goto Debug
if %1 == "SCM-ESA" goto SCM
if %1 == "CMS-FANUC" goto CMS
if %1 == "CMS-OSAI" goto CMS
if %1 == "CMS-SIEMENS" goto CMS
if %1 == "SCM-ESA" goto SCM
:Release
REM INIZIO eliminando i files pdb
@@ -40,13 +40,13 @@ if %1 == "CMS-OSAI" goto OSAI
echo SCM: Elimino files IOT di CMS
REM INIZIO eliminando i files pdb
del /S %2"*.pdb""
del %2"DATA\CONF\AnalogData.map"
del %2"DATA\CONF\CounterList.map"
del %2"DATA\CONF\HaltTypeList.map"
del %2"DATA\CONF\StatusList.map"
del %2"DATA\CONF\SubModeList.map"
del /S %2"CMSCncLib.dll"
del /S %2"CMSCncLib.xml"
REM del %2"DATA\CONF\AnalogData.map"
REM del %2"DATA\CONF\CounterList.map"
REM del %2"DATA\CONF\HaltTypeList.map"
REM del %2"DATA\CONF\StatusList.map"
REM del %2"DATA\CONF\SubModeList.map"
REM del /S %2"CMSCncLib.dll"
REM del /S %2"CMSCncLib.xml"
goto END
:FANUC
MTC_Adapter/MTC_Adapter/setupTgt.bat
+1 -1
View File
@@ -42,7 +42,7 @@ echo SCM: copio files SCM - Rimini
del %2"Resources\MTCA.ico"
del %2"DATA\CONF\Adapter_ItemList.xml"
del %2"DATA\CONF\AlarmList.map"
del %2"DATA\CONF\EsaKvara.ini"
REM del %2"DATA\CONF\EsaKvara.ini"
del %2"DATA\CONF\IOT_ByteList.map"
del %2"DATA\CONF\IOT_WordList.map"
del %2"DATA\CONF\IOT_DWordList.map"
MTC_Adapter/VersGen/VersGen.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.5.9999.129")]
[assembly: AssemblyFileVersion("1.5.9999.129")]
[assembly: AssemblyVersion("1.5.9999.141")]
[assembly: AssemblyFileVersion("1.5.9999.141")]
[assembly: AssemblyCopyright("Steamware-CMS-SCM © 2015-2017")]
[assembly: AssemblyCompany("Steamware-CMS-SCM")]