Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/IobGomba05'

Browse Source
This commit is contained in:
Samuele Locatelli
2023-09-15 18:50:31 +02:00
parent a29f4dc0b8 babe1c8978
commit c5ee12e8f1
12 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+24
View File
@@ -674,6 +674,9 @@ EgwProxy.Ftp:docfx:
APP_NAME: EgwProxy.Ftp
only:
- SDK/Ftp
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -688,6 +691,9 @@ EgwProxy.Icoel:docfx:
APP_NAME: EgwProxy.Icoel
only:
- SDK/Icoel
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -702,6 +708,9 @@ EgwProxy.MultiCncLib:docfx:
APP_NAME: EgwProxy.MultiCncLib
only:
- SDK/MultiCnc
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -716,6 +725,9 @@ EgwProxy.OsaiCncLib:docfx:
APP_NAME: EgwProxy.OsaiCncLib
only:
- SDK/OsaiCnc
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -730,6 +742,9 @@ EgwProxy.SqlDb:docfx:
APP_NAME: EgwProxy.SqlDb
only:
- SDK/SqlDb
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -744,6 +759,9 @@ EgwProxy.Gomba:docfx:
APP_NAME: EgwProxy.Gomba
only:
- SDK/Gomba
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -758,6 +776,9 @@ IOB-WIN-NEXT:docfx:
APP_NAME: IOB-WIN-NEXT
only:
- master
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
@@ -772,6 +793,9 @@ IOB-MAN:docfx:
APP_NAME: IOB-MAN
only:
- master
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
IOB-UT-NEXT/ToMapo.cs
+3 -3
View File
@@ -435,9 +435,9 @@ namespace IOB_UT_NEXT
/// </summary>
public MachineSetupMode SetupMode { get; set; } = MachineSetupMode.ND;
/// <summary> Dizionario dei parametri da scrivere quando si rilevano differenze tra i
/// parametri MES/Macchina string (key) --> memoria da scrivere tuple<int isEqual,int
/// notEqual> --> valori da scrivere quando uguali o diversi </summary>
/// <summary>
/// Dizionario dei parametri da scrivere quando si rilevano differenze tra i parametri MES/Macchina
/// </summary>
public List<MachineSetupAction> writeParAction { get; set; } = new List<MachineSetupAction>();
#endregion Public Properties
IOB-WIN-NEXT/Iob/Generic.cs
+6 -2
View File
@@ -4646,10 +4646,14 @@ namespace IOB_WIN_NEXT.Iob
/// </summary>
protected int maxPingRetry { get; set; } = 5;
/// <summary> Coda massima ammessa per FLog (se <=0 disattivata...) </summary>
/// <summary>
/// Coda massima ammessa per FLog (se <=0 disattivata...)
/// </summary>
protected int maxQueueFLog { get; set; } = utils.CRI("maxQueueFLog");
/// <summary> Coda massima ammessa per FLog (se <=0 disattivata...) </summary>
/// <summary>
/// Coda massima ammessa per FLog (se <=0 disattivata...)
/// </summary>
protected int maxQueueRawTransf { get; set; } = utils.CRI("maxQueueRawTransf");
/// <summary>
IOB-WIN-NEXT/Iob/Kawasaki.cs
+4 -1
View File
@@ -185,7 +185,10 @@ namespace IOB_WIN_NEXT.Iob
return prgName;
}
/// <summary> Recupero info sistema generiche <returns></returns>
/// <summary>
/// Recupero info sistema generiche
/// </summary>
/// <returns></returns>
public override Dictionary<string, string> getSysInfo()
{
// valore non presente in vers default... se gestito fare override
IOB-WIN-NEXT/Iob/Simula.cs
+4 -1
View File
@@ -376,7 +376,10 @@ namespace IOB_WIN_NEXT.Iob
return prgName;
}
/// <summary> Recupero info sistema generiche <returns></returns>
/// <summary>
/// Recupero info sistema generiche
/// </summary>
/// <returns></returns>
public override Dictionary<string, string> getSysInfo()
{
// valore non presente in vers default... se gestito fare override
IOB-WIN-NEXT/IobBeckhoff/Beckhoff.cs
+5 -1
View File
@@ -13,7 +13,11 @@ namespace IOB_WIN_NEXT.IobBeckhoff
#region Public Constructors
/// <summary> Estende l'init della classe base <param name="caller"></param> <param name="IOBConf"></param>
/// <summary>
/// Estende l'init della classe base
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public Beckhoff(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("NEW IobBeckhoff Adapter");
IOB-WIN-NEXT/IobBeckhoff/BeckhoffCpa.cs
+5 -1
View File
@@ -9,7 +9,11 @@ namespace IOB_WIN_NEXT.IobBeckhoff
{
#region Public Constructors
/// <summary> Estende l'init della classe base <param name="caller"></param> <param name="IOBConf"></param>
/// <summary>
/// Estende l'init della classe base
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public BeckhoffCpa(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("START IobBeckhoffCPA Adapter specifico");
IOB-WIN-NEXT/IobConfiguration.cs
+3 -1
View File
@@ -71,7 +71,9 @@ namespace IOB_WIN_NEXT
/// </summary>
public bool disableStateCh { get; set; } = false;
/// <summary> Nome del file IOB di avvio (REDIS <--> MAN) </summary>
/// <summary>
/// Nome del file IOB di avvio (REDIS <--> MAN)
/// </summary>
public string filenameIOB { get; set; } = "ND";
/// <summary>
IOB-WIN-NEXT/IobModbusTCP/ModbusTCP.cs
+5 -1
View File
@@ -23,7 +23,11 @@ namespace IOB_WIN_NEXT.IobModbusTCP
{
#region Public Constructors
/// Classe base con i metodi x ModBusTCP </summary> <param name="caller"></param> <param name="adpConf"></param>
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public ModbusTCP(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("NEW IOB ModBus TCP");
IOB-WIN-NEXT/IobModbusTCP/ModbusTCPHam.cs
+2 -1
View File
@@ -18,10 +18,11 @@ namespace IOB_WIN_NEXT.IobModbusTCP
{
#region Public Constructors
/// <summary>
/// Classe base con i metodi x ModBusTCP
/// </summary>
/// <param name="caller"></param>
/// <param name="adpConf"></param>
/// <param name="IOBConf"></param>
public ModbusTCPHam(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("NEW IOB ModBus TCP HAM");
IOB-WIN-NEXT/IobNet/Ping.cs
+12 -4
View File
@@ -10,7 +10,11 @@ namespace IOB_WIN_NEXT.IobNet
{
#region Public Constructors
/// <summary> Estende l'init della classe base <param name="caller"></param> <param name="IOBConf"></param>
/// <summary>
/// Estende l'init della classe base
/// </summary>
/// <param name="caller"></param>
/// <param name="IOBConf"></param>
public Ping(AdapterForm caller, IobConfiguration IOBConf) : base(caller, IOBConf)
{
lgInfo("NEW IobPing (WatchDog)");
@@ -214,9 +218,13 @@ namespace IOB_WIN_NEXT.IobNet
}
}
/// <summary> calcola status ping:
/// - se ha < 50% coda richiesta --> true
/// - se ha > 50% del max coda --> true se èmaggior parte a 1 (true) </summary> <returns></returns>
/// <summary>
/// calcola status ping:
/// se ha < 50% coda richiesta --> true
/// se ha > 50% del max coda --> true se èmaggior parte a 1 (true)
/// </summary>
/// <returns></returns>
protected bool pingStatusOk()
{
bool answ = true;
IOB-WIN-NEXT/UAClient.cs
+4 -1
View File
@@ -688,7 +688,10 @@ namespace IOB_WIN_NEXT
return monItList;
}
/// Write a list of nodes to the Server </summary>
/// <summary>
/// Write a list of nodes to the Server
/// </summary>
/// <param name="node2Write"></param>
public void WriteNodes(List<WriteValue> node2Write)
{
if (node2Write != null)