From b4a03330851867e3b53dedc2a61869687d9a9189 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 14 Jul 2022 11:19:23 +0200 Subject: [PATCH] fix x accodamento dari RAW: - errore init IOB - scambio URL di default - inviava il dato watchdog sul "canale sbagliato" --- IOB-UT-NEXT/Objects.cs | 60 +++++++++++++++++++++++----- IOB-WIN-NEXT/AdapterForm.cs | 2 +- IOB-WIN-NEXT/DATA/CONF/MAIN.ini | 2 +- IOB-WIN-NEXT/DATA/CONF/SIM_DP_01.ini | 2 +- IOB-WIN-NEXT/DATA/CONF/SIM_DP_02.ini | 6 +-- IOB-WIN-NEXT/IobConfiguration.cs | 5 ++- 6 files changed, 61 insertions(+), 16 deletions(-) diff --git a/IOB-UT-NEXT/Objects.cs b/IOB-UT-NEXT/Objects.cs index d10b609e..55fd73de 100644 --- a/IOB-UT-NEXT/Objects.cs +++ b/IOB-UT-NEXT/Objects.cs @@ -59,6 +59,56 @@ namespace IOB_UT_NEXT #endregion Public Methods } +#if false + /// + /// Classe di base per trasferimento informazioni di tipo RawTransfer + /// + public class BaseRawTransf + { + #region Public Properties + + /// + /// Data-Ora riferimento (x ordinamento fifo) + /// + public DateTime dataRif { get; set; } = DateTime.Now; + + /// + /// Messaggio in modalità raw/stringa + /// + public object mesContent { get; set; } = new object(); + + /// + /// Tipo di messaggio trasmesso + /// + public rawTransfType mesType { get; set; } = rawTransfType.ND; + + /// + /// Costruttore senza parametri + /// + public BaseRawTransf() + { + this.dataRif = DateTime.Now; + this.mesContent = new object(); + this.mesType = rawTransfType.ND; + } + + /// + /// Costruttore oggetto + /// + /// + /// + /// + public BaseRawTransf(DateTime dataRif, object mesContent, rawTransfType mesType) + { + this.dataRif = dataRif; + this.mesContent = mesContent; + this.mesType = mesType; + } + + #endregion Public Properties + } +#endif + /// /// Gestione dati di timing /// @@ -211,8 +261,6 @@ namespace IOB_UT_NEXT /// public class IobWinStatus { - #region Public Properties - /// /// ID univoco /// @@ -278,10 +326,6 @@ namespace IOB_UT_NEXT /// public int queueUlLen { get; set; } = 0; - #endregion Public Properties - - #region Public Methods - /// /// Override metodo di equality /// @@ -320,9 +364,7 @@ namespace IOB_UT_NEXT { return base.GetHashCode(); } - - #endregion Public Methods - } + } #endif /// diff --git a/IOB-WIN-NEXT/AdapterForm.cs b/IOB-WIN-NEXT/AdapterForm.cs index 2c6b6890..3326e38e 100644 --- a/IOB-WIN-NEXT/AdapterForm.cs +++ b/IOB-WIN-NEXT/AdapterForm.cs @@ -1168,7 +1168,7 @@ namespace IOB_WIN_NEXT cpuType = fIni.ReadString("CNC", "CPUTYPE", ""), rack = (short)fIni.ReadInteger("CNC", "RACK", 0), slot = (short)fIni.ReadInteger("CNC", "SLOT", 0), - serverData = new serverMapo(fIni.ReadString("SERVER", "MPIP", "::1"), fIni.ReadString("SERVER", "MPURL", "/MP/IO"), fIni.ReadString("SERVER", "CMDBASE", "/IOB/input/"), fIni.ReadString("SERVER", "CMDFLOG", "/IOB/flog/"), fIni.ReadString("SERVER", "CMDULOG", "/IOB/ulog/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"), fIni.ReadString("SERVER", "CLI_INST", "SW_CLI"), fIni.ReadString("SERVER", "CMD_FORCLE_SPLIT_ODL", "/IOB/forceSplitOdlFull/"), fIni.ReadString("SERVER", "CMDRAWTRANSF", "/IOB/rawTransfJson/")), + serverData = new serverMapo(fIni.ReadString("SERVER", "MPIP", "::1"), fIni.ReadString("SERVER", "MPURL", "/MP/IO"), fIni.ReadString("SERVER", "CMDBASE", "/IOB/input/"), fIni.ReadString("SERVER", "CMDFLOG", "/IOB/flog/"), fIni.ReadString("SERVER", "CMDULOG", "/IOB/ulog/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"), fIni.ReadString("SERVER", "CLI_INST", "SW_CLI"), fIni.ReadString("SERVER", "CMD_FORCLE_SPLIT_ODL", "/IOB/forceSplitOdlFull/"), fIni.ReadString("SERVER", "CMD_IDLE_TIME", "/IOB/getIdlePeriod/"), fIni.ReadString("SERVER", "CMDRAWTRANSF", "/IOB/rawTransfJson/")), MAX_COUNTER_BLINK = Convert.ToInt32(fIni.ReadString("BLINK", "MAX_COUNTER_BLINK", "1")), BLINK_FILT = Convert.ToInt32(fIni.ReadString("BLINK", "BLINK_FILT", "0")), TCMaxDelayFactor = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_TC_FACTOR", "1.2").Replace(".", ",")), diff --git a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini index 8de8fe46..67d759d5 100644 --- a/IOB-WIN-NEXT/DATA/CONF/MAIN.ini +++ b/IOB-WIN-NEXT/DATA/CONF/MAIN.ini @@ -38,6 +38,6 @@ CLI_INST=SteamWareSim ;STARTLIST=GIACO_ICOEL_002 ;STARTLIST=GIACO_CENTERFRIGO ;STARTLIST=GIACO_NWSE -STARTLIST=GIACO_CENTERFRIGO +STARTLIST=SIM_DP_01 MAXCNC=10 \ No newline at end of file diff --git a/IOB-WIN-NEXT/DATA/CONF/SIM_DP_01.ini b/IOB-WIN-NEXT/DATA/CONF/SIM_DP_01.ini index ed602c4d..aa27bb39 100644 --- a/IOB-WIN-NEXT/DATA/CONF/SIM_DP_01.ini +++ b/IOB-WIN-NEXT/DATA/CONF/SIM_DP_01.ini @@ -50,7 +50,7 @@ SIM_PZCNT=10|3 SIM_ALARM=1000|20 SIM_MANU=50|6 ; 1 = indica che la macchina è multi --> allo scadere del contapezzo gestisce ANCHE il giro tavola sui bit relativi -SIM_MULTI=1 +IS_MULTI=1 ; indica gestione e simulazione bit 5 --> slow/emergenza SIM_SLOW=3500|20 ; indica gestione e simulazione bit 6 --> warmup/cooldown diff --git a/IOB-WIN-NEXT/DATA/CONF/SIM_DP_02.ini b/IOB-WIN-NEXT/DATA/CONF/SIM_DP_02.ini index 3b8d3b95..e6e6e604 100644 --- a/IOB-WIN-NEXT/DATA/CONF/SIM_DP_02.ini +++ b/IOB-WIN-NEXT/DATA/CONF/SIM_DP_02.ini @@ -1,6 +1,6 @@ ;Configurazione IOB-WIN [IOB] -CNCTYPE=SIMULA +CNCTYPE=SIMULA PING_MS_TIMEOUT=500 [MACHINE] @@ -24,7 +24,7 @@ CMD_ODL_STARTED=/IOB/getCurrOdlStart/ CMD_FORCLE_SPLIT_ODL=/IOB/forceSplitOdlFull/ CMD_IDLE_TIME=/IOB/getIdlePeriod/ -[MEMORY] +[MEMORY] [BLINK] MAX_COUNTER_BLINK = 15 @@ -50,7 +50,7 @@ SIM_PZCNT=10|2 SIM_ALARM=1000|20 SIM_MANU=50|6 ; 1 = indica che la macchina è multi --> allo scadere del contapezzo gestisce ANCHE il giro tavola sui bit relativi -SIM_MULTI=1 +IS_MULTI=1 ; indica gestione e simulazione bit 5 --> slow/emergenza SIM_SLOW=6500|20 ; indica gestione e simulazione bit 6 --> warmup/cooldown diff --git a/IOB-WIN-NEXT/IobConfiguration.cs b/IOB-WIN-NEXT/IobConfiguration.cs index b29b8739..61efb264 100644 --- a/IOB-WIN-NEXT/IobConfiguration.cs +++ b/IOB-WIN-NEXT/IobConfiguration.cs @@ -86,7 +86,7 @@ namespace IOB_WIN_NEXT /// /// Dati di conf del server MoonPro cui comunicare /// - public serverMapo serverData { get; set; } = new serverMapo("127.0.0.1", "/", "/IOB/input/", "/IOB/flog/", "/IOB", "/IOB/enabled/", "/sendReboot.aspx?idxMacchina=", "/IOB/getCurrOdlStart/"); + public serverMapo serverData { get; set; } = new serverMapo("127.0.0.1", "/", "/IOB/input/", "/IOB/flog/", "/IOB/ulog/", "/IOB", "/IOB/enabled/", "/sendReboot.aspx?idxMacchina=", "/IOB/getCurrOdlStart/","SteamWare","/IOB/forceSplitOdlFull", "/IOB/getIdlePeriod", "/IOB/rawTransfJson"); /// /// Slot (Siemens S7) @@ -146,7 +146,10 @@ namespace IOB_WIN_NEXT /// Comando x check abilitato /// Comando x reboot /// Comando x check data avvio ODL + /// Installazione /// Comando x forzare split ODL + /// URL calcolo idle time + /// Url invio raw transf public serverMapo(string MPIP_, string MPURL_ = "/MP/IO", string CMDBASE_ = "/IOB/input/", string CMDFLOG_ = "/IOB/flog/", string CMDULOG_ = "/IOB/ulog/", string CMDALIVE_ = "IOB", string CMDENABLED_ = "/IOB/enabled/", string CMDREBO_ = "/sendReboot.aspx?idxMacchina=", string CMD_ODL_STARTED_ = "/IOB/getCurrOdlStart/", string CLI_INST_ = "SteamWare", string CMD_FORCLE_SPLIT_ODL_ = "/IOB/forceSplitOdlFull/", string CMD_IDLE_TIME_ = "/IOB/getIdlePeriod/", string CMDRAWTRANSFJSON_ = "/IOB/rawTransfJson/") { if (!string.IsNullOrEmpty(MPIP_))