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

Merge branch 'release/UpdateTest_IOC_RIOB_02'

Browse Source
This commit is contained in:
Samuele Locatelli
2026-04-04 12:02:37 +02:00
parent c4d3ad16e8 1a43c31b32
commit 355ea5634d
6 changed files with 191 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/Config/Base/ServerMapoDto.cs
+47 -41
View File
@@ -9,6 +9,51 @@ namespace IOB_UT_NEXT.Config.Base
{
public class ServerMapoDto
{
#region Public Properties
/// <summary>
/// nome di base del metodo API
/// </summary>
public string BaseApiClass { get; set; } = "IOB";
/// <summary>
/// URL Base del server applicativo
/// </summary>
public string BaseAppUrl { get; set; } = "/MP/IO/";
/// <summary>
/// Directory Installazione di riferimento x applicativi MAN/IOB sotto la radice C:\
/// </summary>
public string ClientInstall { get; set; } = "SteamWare";
/// <summary>
/// Dizionario comandi configurati
/// </summary>
public Dictionary<string, string> Commands { get; set; } = new Dictionary<string, string>();
/// <summary>
/// Disabilitazione keepalive aggiungendo opzione in URL
/// </summary>
public bool DisabKeepAlive { get; set; } = false;
/// <summary>
/// Disabilitazione ping verso server
/// </summary>
public bool DisabPing { get; set; } = false;
/// <summary>
/// Indirizzo IP server
/// </summary>
public string IpAddr { get; set; } = "127.0.0.1";
/// <summary>
/// Indica il metodo di trasporto http/https
/// </summary>
public string Transport { get; set; } = "http";
#endregion Public Properties
#region Public Methods
/// <summary>
/// Restituisce la API del comando richiesto dalla BaseUrl
@@ -33,45 +78,6 @@ namespace IOB_UT_NEXT.Config.Base
return answ;
}
/// <summary>
/// URL Base del server applicativo
/// </summary>
public string BaseAppUrl { get; set; } = "/MP/IO/";
/// <summary>
/// nome di base del metodo API
/// </summary>
public string BaseApiClass { get; set; } = "IOB";
/// <summary>
/// Disabilitazione ping verso server
/// </summary>
public bool DisabPing { get; set; } = false;
/// <summary>
/// Disabilitazione keepalive aggiungendo opzione in URL
/// </summary>
public bool DisabKeepAlive { get; set; } = false;
/// <summary>
/// Dizionario comandi configurati
/// </summary>
public Dictionary<string, string> Commands { get; set; } = new Dictionary<string, string>();
/// <summary>
/// Directory Installazione di riferimento x applicativi MAN/IOB sotto la radice C:\
/// </summary>
public string ClientInstall { get; set; } = "SteamWare";
/// <summary>
/// Indirizzo IP server
/// </summary>
public string IpAddr { get; set; } = "127.0.0.1";
/// <summary>
/// Indica il metodo di trasporto http/https
/// </summary>
public string Transport { get; set; } = "http";
#endregion Public Methods
}
}
}
IOB-WIN-FANUC/DATA/CONF/MAIN.ini
+2 -2
View File
@@ -17,7 +17,7 @@ CLI_INST=SteamWareSim
;--- TEST sul campo
; SIMULAZIONE verso server ufficio
;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
;STARTLIST=SIMUL_01
STARTLIST=SIMUL_01
;STARTLIST=3025,3027,3028
;STARTLIST=3025
;STARTLIST=VL27
@@ -30,6 +30,6 @@ CLI_INST=SteamWareSim
;STARTLIST=3004,3005
;STARTLIST=3028
;STARTLIST=3029
STARTLIST=LVF755
;STARTLIST=LVF755
MAXCNC=10
IOB-WIN-FANUC/DATA/CONF/SIMUL_01-IO.ini
+120
View File
@@ -0,0 +1,120 @@
;Configurazione IOB-WIN
[IOB]
CNCTYPE=SIMULA
PING_MS_TIMEOUT=500
MinDeltaSec=5
EnableRedisQueue=true
;IOB_NAME=TFT_RAMA_001
[MACHINE]
VENDOR=STEAMWARE
MODEL=DEMO_SIMULATOR
[CNC]
IP=127.0.0.1
PORT=0000
[SERVER]
MPIP=http://10.74.82.218
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
CMD_ODL_STARTED=/IOB/getCurrOdlStart/
CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/
CMD_IDLE_TIME=/IOB/getIdlePeriod/
[MEMORY]
[BLINK]
MAX_COUNTER_BLINK = 15
BLINK_FILT=0
[OPTPAR]
DISABLE_SEND_WDST=TRUE
AUTO_CHANGE_ODL=true
AUTO_SNAPSHOT_DOSSIER=true
CHANGE_ODL_HOURS=24
CHANGE_ODL_IDLE_MIN=0
CHANGE_ODL_MODE=SIMUL
; gestione custom timer
timerIntMs=100
;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice
PZCOUNT_MODE=BIT
ENABLE_PZ_RESET=TRUE
;gestione invio pezzi in blocco
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
; gestione cambio ODL automatico (minuti minimi durata)
MIN_DURATA_ODL=960
; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 10 secondi)
PER_BASE=10100
SIM_PZCNT=5|1
SIM_ALARM=100|10
SIM_MANU=50|6
; indica gestione e simulazione bit 5 --> slow
SIM_SLOW=3600|20
; indica gestione e simulazione bit 6 --> warmup/cooldown
SIM_WUCD=8000|20
; indica gestione e simulazione bit 7 --> emergenza
SIM_EMRG=4000|10
; indica simulazione delle funzionalità power ON/ OFF
SIM_POW_ON_OFF=true
T_ON=7
T_OFF=22
; indica simulazione controlli utente
SIM_RC=641|1
; indica simulazione registro scarti
SIM_RS=461|1
; indica simulazione dichiarazioni (note) utente
SIM_DICH=761|1
; indica matricola opr simulata
SIM_MATR_OPR=1
; test x datasync...
DATA_SYNC_AT_START=true
; test sim dossiers tipo Kepware
SIM_KWP=true
; gestione DynData simulati
ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
NEW_DYN_DATA=TRUE
; indica parametri gestione TcMan
TC_MAX_TC_FACTOR=3.9
TC_LAMBDA=0.4
TC_MAX_INCR=5
MAX_PZ_INCR_PERC=1000
; conf parametri memoria READ/WRITE
PARAM_CONF=SIMUL_01.json
ALARM_CONF=SIMUL_01_alarm.json
;test gestione logfile (eg: soitaab)
EnabelPodlManFull=true
CodGruppoIob=STEAMWARE-SIM-FASE-01
; invio flux alla lettura file
sendFluxOnRead=true
;conf test FTP
FTP_SERVER=ftp.steamware.net
FTP_USER=testftpuser
FTP_PWD=we4reFromB3rghem!
FTP_CERT=
FTP_SKIP=TRUE
FTP_LOC_DIR=temp\csv
FTP_REM_DIR=
CSV_ADD_HEADER=true
[BRANCH]
NAME=master
; Tags manuali
[TAGS]
Customer=Steamware
HostOS=WIN
HostName=IOB-WIN-SIMULA
HostAddr=10.74.82.76
IOB-WIN-FANUC/DATA/CONF/SIMUL_01.ini
+10 -8
View File
@@ -16,16 +16,18 @@ PORT=0000
[SERVER]
MPIP=http://10.74.82.218
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
MPURL=/MP/IOC/api
APICLASS=RIOB
CMDBASE=/RIOB/input/
CMDFLOG=/RIOB/flog/
CMDULOG=/RIOB/ulog/
CMDALIVE=/RIOB
CMDENABLED=/RIOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
CMD_ODL_STARTED=/IOB/getCurrOdlStart/
CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/
CMD_IDLE_TIME=/IOB/getIdlePeriod/
CMD_ODL_STARTED=/RIOB/getCurrOdlStart/
CMD_FORCLE_SPLIT_ODL=/RIOB/forceSplitOdlFull/
CMD_IDLE_TIME=/RIOB/getIdlePeriod/
[MEMORY]
IOB-WIN-FANUC/IOB-WIN-FANUC.csproj
+10 -3
View File
@@ -282,6 +282,7 @@
<None Include="DATA\CONF\LVF755.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01-IO.ini" />
<None Include="DATA\CONF\VL27.ini" />
<None Include="DATA\CONF\VL27.json" />
<None Include="NLog.config">
@@ -293,9 +294,15 @@
<None Include="DATA\CONF\MAIN.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.ini" />
<None Include="DATA\CONF\SIMUL_01.json" />
<None Include="DATA\CONF\SIMUL_01_alarm.json" />
<None Include="DATA\CONF\SIMUL_01.ini">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_alarm.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="DATA\CONF\SIMUL_01_WD.ini" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
IOB-WIN-FANUC/Iob/Fanuc.cs
+2 -3
View File
@@ -1578,7 +1578,7 @@ namespace IOB_WIN_FANUC.Iob
parentForm.commPlcActive = false;
lgInfo($"FANUC_ref CONNECT | connected: {FANUC_ref.Connected}| szStatusConnection: {szStatusConnection}");
connectionOk = FANUC_ref.Connected;
// refresh stato allarmi!!!
if (connectionOk)
{
@@ -2343,7 +2343,6 @@ namespace IOB_WIN_FANUC.Iob
#region Private Methods
/// <summary>
/// Calcola il valore bitmap segnale in uscita data la bVal (mem area + bit) + indice i
/// </summary>
@@ -3023,7 +3022,7 @@ namespace IOB_WIN_FANUC.Iob
private void tryReduceErrorCount(string topic)
{
numErroriCheck -= 1;
if (numErroriCheck>=0)
if (numErroriCheck >= 0)
{
lgTrace($"[Thread: {Thread.CurrentThread.ManagedThreadId}] | numErroriCheck: {numErroriCheck}");
}