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

Merge branch 'develop' into KVARA

Browse Source
This commit is contained in:
Samuele Locatelli
2020-04-03 17:51:03 +02:00
parent 7ca832f4c1 47094d9947
commit 3fc577fe20
10 changed files with 1192 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=460']) {
withEnv(['NEXT_BUILD_NUMBER=461']) {
// env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '2.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'SCMA'
MTC_Adapter/SCMA/AdapterPLC/SCM/ESA.cs → MTC_Adapter/SCMA/AdapterPLC/CMS/EsaKvara.cs
+3 -3
View File
@@ -7,9 +7,9 @@ using System.Linq;
using System.Text;
using System.Threading;
namespace SCMA.AdapterPLC.SCM
namespace SCMA.AdapterPLC.CMS
{
public class ESA : AdapterGeneric
public class Esa : Generic
{
/// <summary>
/// Configurazione valori da leggere IOT_Byte
@@ -245,7 +245,7 @@ namespace SCMA.AdapterPLC.SCM
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public ESA(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
public Esa(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
{
string iniPath = string.Format(@"{0}\{1}", utils.confDir, utils.CRS("defaultEsaFile"));
MTC_Adapter/SCMA/AdapterFanuc.cs → MTC_Adapter/SCMA/AdapterPLC/CMS/Fanuc.cs
+3 -3
View File
@@ -4,9 +4,9 @@ using SCMA.AdapterCom;
using System;
using System.Text;
namespace SCMA
namespace SCMA.AdapterPLC.CMS
{
public class AdapterFanuc : AdapterGeneric
public class Fanuc : Generic
{
/// <summary>
/// Oggetto MAIN x connessione FANUC
@@ -103,7 +103,7 @@ namespace SCMA
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public AdapterFanuc(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
public Fanuc(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
{
// !!!HARD CODED!!! aggiunto banco STATUS del 2 processo IN CODA... (4+1)DW=20byte x strobes...!!!
Strobes = new byte[20];
MTC_Adapter/SCMA/AdapterOsai.cs → MTC_Adapter/SCMA/AdapterPLC/CMS/Osai.cs
+3 -3
View File
@@ -5,9 +5,9 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace SCMA
namespace SCMA.AdapterPLC.CMS
{
public class AdapterOsai : AdapterGeneric
public class Osai : Generic
{
/// <summary>
/// Oggetto MAIN x connessione OSAI
@@ -196,7 +196,7 @@ namespace SCMA
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public AdapterOsai(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
public Osai(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
{
// !!!HARD CODED!!! aggiunto banco STATUS del 2 processo IN CODA... (4+1)DW=20byte x strobes...!!!
Strobes = new byte[20];
MTC_Adapter/SCMA/AdapterSiemens.cs → MTC_Adapter/SCMA/AdapterPLC/CMS/Siemens.cs
+3 -3
View File
@@ -6,9 +6,9 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace SCMA
namespace SCMA.AdapterPLC.CMS
{
public class AdapterSiemens : AdapterGeneric
public class Siemens : Generic
{
/// <summary>
/// Oggetto MAIN x connessione SIEMENS
@@ -189,7 +189,7 @@ namespace SCMA
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public AdapterSiemens(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
public Siemens(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
{
// !!!HARD CODED!!! aggiunto banco STATUS del 2 processo IN CODA... (4+1)DW=20byte x strobes...!!!
Strobes = new byte[20];
MTC_Adapter/SCMA/AdapterDemo.cs → MTC_Adapter/SCMA/AdapterPLC/Demo.cs
+3 -3
View File
@@ -3,9 +3,9 @@ using MTConnect;
using SCMA.AdapterCom;
using System;
namespace SCMA
namespace SCMA.AdapterPLC
{
public class AdapterDemo : AdapterGeneric
public class Demo : Generic
{
DateTime nextChange;
/// <summary>
@@ -14,7 +14,7 @@ namespace SCMA
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public AdapterDemo(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
public Demo(MainForm caller, AdapterConf adpConf, Gateway gatewayObj) : base(caller, adpConf, gatewayObj)
{
// !!!HARD CODED!!! aggiunto banco STATUS del 2 processo IN CODA... (4+1)DW=20byte x strobes...!!!
Strobes = new byte[20];
MTC_Adapter/SCMA/AdapterGeneric.cs → MTC_Adapter/SCMA/AdapterPLC/Generic.cs
+3 -3
View File
@@ -5,7 +5,7 @@ using System.IO;
using System.Linq;
using System.Text;
namespace SCMA
namespace SCMA.AdapterPLC
{
using AdapterCom;
using MTC;
@@ -520,7 +520,7 @@ namespace SCMA
#endregion macro oggetti da istanziare a blocchi da configurazione XML
public class AdapterGeneric
public class Generic
{
/// <summary>
/// inizializzo l'oggetto sulla form SULLA BASE DEL FILE DI CONFIGURAZIONE letto
@@ -528,7 +528,7 @@ namespace SCMA
/// <param name="caller">FORM chaimante</param>
/// <param name="adpConf">CONFIGURAZIONE adapter</param>
/// <param name="gatewayObj">OGGETTO gestione comunicazione OUT (tipologia e metodi)</param>
public AdapterGeneric(MainForm caller, AdapterConf adpConf, Gateway gatewayObj)
public Generic(MainForm caller, AdapterConf adpConf, Gateway gatewayObj)
{
lg = LogManager.GetCurrentClassLogger();
lg.Info("Avvio preliminare AdapterGeneric");
MTC_Adapter/SCMA/AdapterPLC/SCM/EsaKvara.cs
+1158
View File
File diff suppressed because it is too large Load Diff
MTC_Adapter/SCMA/MainForm.cs
+7 -7
View File
@@ -63,7 +63,7 @@ namespace SCMA
/// <summary>
/// Oggetto x gestione dell'adapter GENERICO (x poter usare metodi di ognuno...)
/// </summary>
AdapterGeneric agObj;
AdapterPLC.Generic agObj;
/// <summary>
/// configurazione caricata
/// </summary>
@@ -380,38 +380,38 @@ namespace SCMA
switch (tipoScelto)
{
case tipoAdapter.DEMO:
agObj = new AdapterDemo(this, adpConf, currGateway);
agObj = new AdapterPLC.Demo(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], true);
EnableTab(tabCtrlMain.TabPages[2], true);
start.Enabled = true;
break;
case tipoAdapter.ESAGV:
agObj = new AdapterPLC.SCM.ESA(this, adpConf, currGateway);
agObj = new AdapterPLC.SCM.EsaKvara(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], true);
EnableTab(tabCtrlMain.TabPages[2], false);
start.Enabled = true;
break;
case tipoAdapter.FANUC:
agObj = new AdapterFanuc(this, adpConf, currGateway);
agObj = new AdapterPLC.CMS.Fanuc(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], true);
EnableTab(tabCtrlMain.TabPages[2], false);
start.Enabled = true;
break;
case tipoAdapter.OSAI:
agObj = new AdapterOsai(this, adpConf, currGateway);
agObj = new AdapterPLC.CMS.Osai(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], true);
EnableTab(tabCtrlMain.TabPages[2], false);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS:
agObj = new AdapterSiemens(this, adpConf, currGateway);
agObj = new AdapterPLC.CMS.Siemens(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], true);
EnableTab(tabCtrlMain.TabPages[2], false);
start.Enabled = true;
break;
case tipoAdapter.ND:
default:
agObj = new AdapterDemo(this, adpConf, currGateway);
agObj = new AdapterPLC.Demo(this, adpConf, currGateway);
EnableTab(tabCtrlMain.TabPages[1], false);
EnableTab(tabCtrlMain.TabPages[2], false);
start.Enabled = false;
MTC_Adapter/SCMA/SCMA.csproj
+8 -9
View File
@@ -141,12 +141,13 @@
<Compile Include="AdapterCom\GatewayMTC.cs" />
<Compile Include="AdapterCom\GatewaySOURS.cs" />
<Compile Include="AdapterConf.cs" />
<Compile Include="AdapterPLC\SCM\ESA.cs" />
<Compile Include="AdapterOsai.cs" />
<Compile Include="AdapterSiemens.cs" />
<Compile Include="AdapterGeneric.cs" />
<Compile Include="AdapterDemo.cs" />
<Compile Include="AdapterFanuc.cs" />
<Compile Include="AdapterPLC\CMS\EsaKvara.cs" />
<Compile Include="AdapterPLC\SCM\EsaKvara.cs" />
<Compile Include="AdapterPLC\CMS\Osai.cs" />
<Compile Include="AdapterPLC\CMS\Siemens.cs" />
<Compile Include="AdapterPLC\Generic.cs" />
<Compile Include="AdapterPLC\Demo.cs" />
<Compile Include="AdapterPLC\CMS\Fanuc.cs" />
<Compile Include="DataModel.cs" />
<Compile Include="DataModelXML.cs" />
<Compile Include="ModelDesignConf.cs" />
@@ -397,9 +398,7 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Folder Include="AdapterPLC\CMS\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.