diff --git a/IOB-UT-NEXT/Config/Base/CmdUriDto.cs b/IOB-UT-NEXT/Config/Base/CmdUriDto.cs
index a27d96ad..a3a64fa7 100644
--- a/IOB-UT-NEXT/Config/Base/CmdUriDto.cs
+++ b/IOB-UT-NEXT/Config/Base/CmdUriDto.cs
@@ -16,7 +16,7 @@ namespace IOB_UT_NEXT.Config.Base
///
public CmdUriDto(string baseURI)
{
- BaseUri = baseURI;
+ _baseUri = baseURI;
}
#endregion Public Constructors
@@ -46,7 +46,7 @@ namespace IOB_UT_NEXT.Config.Base
public string GetCommand(string key)
{
// default ad implicito con IOB...
- string answ = $"{BaseUri}/IOB/{key}/";
+ string answ = $"{_baseUri}/{key}/";
if (CurrSetup.ContainsKey(key))
{
answ = CurrSetup[key];
@@ -57,7 +57,8 @@ namespace IOB_UT_NEXT.Config.Base
public Dictionary StdCommands()
{
CurrSetup = new Dictionary();
- CurrSetup.Add("alive", "IOB");
+ //CurrSetup.Add("alive", "IOB");
+ CurrSetup.Add("alive", _baseUri);
//CurrSetup.Add("Base", "IOB/input/");
//CurrSetup.Add("BaseJson", "IOB/evListJson/");
//CurrSetup.Add("RawTransfJson", "IOB/rawTransfJson/");
@@ -84,7 +85,7 @@ namespace IOB_UT_NEXT.Config.Base
#region Protected Properties
- protected string BaseUri { get; set; } = "IOB";
+ protected string _baseUri { get; set; } = "IOB";
protected Dictionary CurrSetup { get; set; } = new Dictionary();
#endregion Protected Properties
diff --git a/IOB-UT-NEXT/Config/Base/ServerMapoDto.cs b/IOB-UT-NEXT/Config/Base/ServerMapoDto.cs
index 0819aa42..c19c7f09 100644
--- a/IOB-UT-NEXT/Config/Base/ServerMapoDto.cs
+++ b/IOB-UT-NEXT/Config/Base/ServerMapoDto.cs
@@ -17,8 +17,13 @@ namespace IOB_UT_NEXT.Config.Base
///
public string ApiUrl(string CmdReq)
{
- // default ad implicito con IOB...
- string answ = $"{BaseAppUrl}IOB/{CmdReq}/";
+ // verifico se vadano inizializzati i commands...
+ if (Commands.Count == 0)
+ {
+ Commands = new CmdUriDto(BaseApiClass).StdCommands();
+ }
+ // default ad implicito con IOB/RIOB da conf...
+ string answ = $"{BaseAppUrl}{BaseApiClass}/{CmdReq}/";
if (Commands.ContainsKey(CmdReq))
{
answ = $"{BaseAppUrl}{Commands[CmdReq]}";
@@ -33,6 +38,11 @@ namespace IOB_UT_NEXT.Config.Base
///
public string BaseAppUrl { get; set; } = "/MP/IO/";
+ ///
+ /// nome di base del metodo API
+ ///
+ public string BaseApiClass { get; set; } = "IOB";
+
///
/// Disabilitazione ping verso server
///
@@ -46,7 +56,7 @@ namespace IOB_UT_NEXT.Config.Base
///
/// Dizionario comandi configurati
///
- public Dictionary Commands { get; set; } = new CmdUriDto("IOB").StdCommands();
+ public Dictionary Commands { get; set; } = new Dictionary();
///
/// Directory Installazione di riferimento x applicativi MAN/IOB sotto la radice C:\
diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs
index b0d86f15..a425dbc6 100644
--- a/IOB-UT-NEXT/Config/IobConfTree.cs
+++ b/IOB-UT-NEXT/Config/IobConfTree.cs
@@ -356,6 +356,9 @@ namespace IOB_UT_NEXT.Config
{
newConfObj.MapoMes.BaseAppUrl = $"{MpUrl}/".Replace("//", "/");
}
+ string api = fIni.ReadString("SERVER", "APICLASS", "IOB");
+ newConfObj.MapoMes.BaseApiClass = api;
+
// copio conf ping come x server...
newConfObj.MapoMes.DisabPing = newConfObj.Device.DisabPing;
// verifico opzione per disabilitare FeepAlive (es non voglio keepalive e info IOB da acquisitori potenza che sovrascrivono dati IOB macchina)
diff --git a/IOB-WIN-FTP/DATA/CONF/MAIN.ini b/IOB-WIN-FTP/DATA/CONF/MAIN.ini
index 2cb4f81c..ebc0bef6 100644
--- a/IOB-WIN-FTP/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-FTP/DATA/CONF/MAIN.ini
@@ -20,4 +20,3 @@ CLI_INST=SteamWareSim
STARTLIST=FTP_SONATEST
MAXCNC=10
-
diff --git a/IOB-WIN-MTC/DATA/CONF/MAIN.ini b/IOB-WIN-MTC/DATA/CONF/MAIN.ini
index f8f64958..fe692601 100644
--- a/IOB-WIN-MTC/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-MTC/DATA/CONF/MAIN.ini
@@ -27,4 +27,3 @@ CLI_INST=SteamWareSim
STARTLIST=LVF652
MAXCNC=10
-
diff --git a/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini b/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
index 5b4d1fe7..90d227c9 100644
--- a/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-OPC-UA/DATA/CONF/MAIN.ini
@@ -22,16 +22,15 @@ CLI_INST=SteamWareSim
;STARTLIST=2014
;STARTLIST=3026
;STARTLIST=2015
-;STARTLIST=SIMUL_01
+STARTLIST=SIMUL_01
;STARTLIST=TEND_250_53
;STARTLIST=Tend_RAMA_10_47
;STARTLIST=3026
;STARTLIST=TFT_RAMA_001
;STARTLIST=SIM_DP_01
;STARTLIST=1042
-STARTLIST=2014
+;STARTLIST=2014
;STARTLIST=2015
;STARTLIST=2016
MAXCNC=10
-
diff --git a/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01-IO.ini b/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01-IO.ini
new file mode 100644
index 00000000..72ded021
--- /dev/null
+++ b/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01-IO.ini
@@ -0,0 +1,119 @@
+;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=250
+;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
diff --git a/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01.ini b/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01.ini
index 72ded021..0e31a618 100644
--- a/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01.ini
+++ b/IOB-WIN-OPC-UA/DATA/CONF/SIMUL_01.ini
@@ -16,16 +16,17 @@ 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/
+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]
diff --git a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj
index 37b1f7e5..9f5e5256 100644
--- a/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj
+++ b/IOB-WIN-OPC-UA/IOB-WIN-OPC-UA.csproj
@@ -267,6 +267,9 @@
+
+ Always
+
diff --git a/IOB-WIN-PING/DATA/CONF/MAIN.ini b/IOB-WIN-PING/DATA/CONF/MAIN.ini
index 3e8827de..ab68298b 100644
--- a/IOB-WIN-PING/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-PING/DATA/CONF/MAIN.ini
@@ -20,4 +20,3 @@ STARTLIST=SIMUL_08
;STARTLIST=3023-PING,3024-PING
MAXCNC=10
-
diff --git a/IOB-WIN-SIEMENS/DATA/CONF/MAIN.ini b/IOB-WIN-SIEMENS/DATA/CONF/MAIN.ini
index 86a6b0d6..4a6f0faa 100644
--- a/IOB-WIN-SIEMENS/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-SIEMENS/DATA/CONF/MAIN.ini
@@ -39,4 +39,3 @@ CLI_INST=SteamWareSim
STARTLIST=PIZ03
MAXCNC=10
-
diff --git a/IOB-WIN-WPS/DATA/CONF/MAIN.ini b/IOB-WIN-WPS/DATA/CONF/MAIN.ini
index 302ae9b5..f9bc9700 100644
--- a/IOB-WIN-WPS/DATA/CONF/MAIN.ini
+++ b/IOB-WIN-WPS/DATA/CONF/MAIN.ini
@@ -24,4 +24,3 @@ CLI_INST=SteamWareSim
STARTLIST=SIMUL_06
MAXCNC=10
-