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

Merge branch 'release/UpdateIobWinNExt'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-16 15:48:43 +01:00
parent 7aa585e463 6df4a2517b
commit e598e4ebfa
11 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/Objects.cs
+2 -2
View File
@@ -61,7 +61,7 @@ namespace IOB_UT_NEXT
}
/// <summary>
/// GEstione dati di timing
/// Gestione dati di timing
/// </summary>
public static class TimingData
{
@@ -411,7 +411,7 @@ namespace IOB_UT_NEXT
protected List<DateTime> lTime;
/// <summary>
/// vettore valoti puntuali della serie
/// vettore valori puntuali della serie
/// </summary>
protected List<int> lVal;
IOB-WIN-NEXT/App.config
+1 -1
View File
@@ -41,7 +41,7 @@
<!--gestione max num errori-->
<add key="maxAliveErrors" value="1000" />
<add key="maxSendErrors" value="100" />
<add key="maxReadErrors" value="50" />
<add key="maxReadErrors" value="20" />
<!--parametri SIM-->
<add key="waitSimPar" value="30" />
<!--<add key="waitSimPar" value="45" />-->
IOB-WIN-NEXT/DATA/CONF/MAIN.ini
+2 -1
View File
@@ -72,6 +72,7 @@ CLI_INST=SteamWareSim
;STARTLIST=SIM_PIZ03
;STARTLIST=MECART_80
;STARTLIST=PING
STARTLIST=PIZ09
;STARTLIST=PIZ09
STARTLIST=PIZ04
MAXCNC=10
IOB-WIN-NEXT/DATA/CONF/PIZ03.ini
+1 -1
View File
@@ -1,6 +1,6 @@
;Configurazione IOB-WIN
[IOB]
;Impianto COMECA per Pizzaferri
;Impianto COMECA Collecchio per Pizzaferri
CNCTYPE=SIEMENS_COMECA
PING_MS_TIMEOUT=500
IOB-WIN-NEXT/DATA/CONF/PIZ04.ini
+3 -2
View File
@@ -1,8 +1,8 @@
;Configurazione IOB-WIN
[IOB]
;Impianto HAM per Pizzaferri
;Impianto HAM Noceto per Pizzaferri
CNCTYPE=MODBUS_TCP_HAM
PING_MS_TIMEOUT=500
PING_MS_TIMEOUT=1000
[MACHINE]
VENDOR=HAM
@@ -10,6 +10,7 @@ MODEL=HAM
[CNC]
IP=hampizzaferri.dyndns.org
;IP=84.33.93.182
PORT=502
[SERVER]
IOB-WIN-NEXT/DATA/CONF/PIZ05.ini
+2 -2
View File
@@ -1,8 +1,8 @@
;Configurazione IOB-WIN
[IOB]
;Impianto HAM per Pizzaferri
;Impianto HAM Baganzola per Pizzaferri
CNCTYPE=MODBUS_TCP_HAM
PING_MS_TIMEOUT=500
PING_MS_TIMEOUT=1000
[MACHINE]
VENDOR=HAM
IOB-WIN-NEXT/DATA/CONF/PIZ08.ini
+1 -1
View File
@@ -1,6 +1,6 @@
;Configurazione IOB-WIN
[IOB]
;Impianto COMECA per Pizzaferri
;Impianto COMECA Pilastrello per Pizzaferri
CNCTYPE=SIEMENS_COMECA
PING_MS_TIMEOUT=500
IOB-WIN-NEXT/DATA/CONF/PIZ09.ini
+2 -2
View File
@@ -1,8 +1,8 @@
;Configurazione IOB-WIN
[IOB]
;Impianto HAM per Pizzaferri
;Impianto HAM Guardamiglio per Pizzaferri
CNCTYPE=MODBUS_TCP_HAM
PING_MS_TIMEOUT=500
PING_MS_TIMEOUT=1000
[MACHINE]
VENDOR=HAM
IOB-WIN-NEXT/IobModbusTCP.cs
+2 -1
View File
@@ -714,6 +714,7 @@ namespace IOB_WIN_NEXT
}
// ora tento avvio PLC... SE PING OK...
lastPING = DateTime.Now;
IPStatus esitoPing = testPingMachine;
if (esitoPing == IPStatus.Success)
{
@@ -749,7 +750,7 @@ namespace IOB_WIN_NEXT
}
else
{
lgError($"Errore in ping: esito {esitoPing}");
lgError($"ModBusTCP IOB | Errore in ping: esito {esitoPing}");
}
parentForm.commPlcActive = false;
}
IOB-WIN-NEXT/IobSiemens.cs
+1 -1
View File
@@ -609,7 +609,7 @@ namespace IOB_WIN_NEXT
}
else
{
lgError($"Errore in ping: esito {esitoPing}");
lgError($"IOB SIEMENS | Errore in ping: esito {esitoPing}");
}
parentForm.commPlcActive = false;
// carico conf vettore memoria...
IOB-WIN-NEXT/NLog.config
+2 -2
View File
@@ -12,7 +12,7 @@
name="f_base"
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.zip"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
archiveNumbering="Sequence"
archiveAboveSize="10240000"
maxArchiveFiles="60"
@@ -23,7 +23,7 @@
name="f_error"
fileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.log"
layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}${newline}${exception:format=tostring}"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.zip"
archiveFileName="${logDir}/${var:codIOB:default=0000}/${shortdate}.{###}.log"
archiveNumbering="Sequence"
archiveAboveSize="10240000"
maxArchiveFiles="60"