From 988ac4e7bda0dcf986362dbad36fd5cfbf178f9f Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 30 Sep 2020 23:28:50 +0200
Subject: [PATCH] ancora update simulazione slow TCiclo

---
 IOB-WIN/AdapterForm.cs         | 58 ++++++++++++++++++++++------------
 IOB-WIN/DATA/CONF/SIMUL_01.ini |  2 +-
 IOB-WIN/IobSimula.cs           |  4 +--
 3 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index 73200365..ffea06b6 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -675,24 +675,42 @@ namespace IOB_WIN
       IOBConf = new IobConfiguration
       {
         pingMsTimeout = fIni.ReadInteger("IOB", "PING_MS_TIMEOUT", 500)
-          ,vendor = curVendor
-          ,model = curModel
-          ,tipoIob = tipoScelto
-          ,optPar = optParRead
-          ,versIOB = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()
-          ,codIOB = CurrIOB
-          ,cncIpAddr = fIni.ReadString("CNC", "IP", "::1")
-          ,cncPort = fIni.ReadString("CNC", "PORT", "0")
-          ,iniFileName = iniConfFile
-          ,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", "/"), fIni.ReadString("SERVER", "CMDBASE", "/"), fIni.ReadString("SERVER", "CMDFLOG", "/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"))
-          ,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(".",","))
-          ,TCLambda = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_LAMBDA", "0.5").Replace(".", ","))
-          ,TCMaxIncrPz = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_INCR", "5").Replace(".", ","))
+          ,
+        vendor = curVendor
+          ,
+        model = curModel
+          ,
+        tipoIob = tipoScelto
+          ,
+        optPar = optParRead
+          ,
+        versIOB = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString()
+          ,
+        codIOB = CurrIOB
+          ,
+        cncIpAddr = fIni.ReadString("CNC", "IP", "::1")
+          ,
+        cncPort = fIni.ReadString("CNC", "PORT", "0")
+          ,
+        iniFileName = iniConfFile
+          ,
+        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", "/"), fIni.ReadString("SERVER", "CMDBASE", "/"), fIni.ReadString("SERVER", "CMDFLOG", "/"), fIni.ReadString("SERVER", "CMDALIVE", "/"), fIni.ReadString("SERVER", "CMDENABLED", "/"), fIni.ReadString("SERVER", "CMDREBO", "/"), fIni.ReadString("SERVER", "CMD_ODL_STARTED", "/IOB/getCurrOdlStart/"))
+          ,
+        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(".", ","))
+          ,
+        TCLambda = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_LAMBDA", "0.5").Replace(".", ","))
+          ,
+        TCMaxIncrPz = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_INCR", "5").Replace(".", ","))
       };
       lgInfo($"Creato IOBConf!");
 
@@ -725,8 +743,8 @@ namespace IOB_WIN
       alQueueLen = iobObj.QueueAlarm.Count;
       msQueueLen = iobObj.QueueMessages.Count;
       // aggiorno labels counters...
-      counterIob = $"contapezziIOB {iobObj.contapezziIOB}";
-      counterMac = $"contapezziPLC {iobObj.contapezziPLC}";
+      counterIob = $"pz IOB {iobObj.contapezziIOB}";
+      counterMac = $"pz PLC {iobObj.contapezziPLC}";
       // verifico IOB status
       IobWinStatus currIobStatus = new IobWinStatus()
       {
diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.ini b/IOB-WIN/DATA/CONF/SIMUL_01.ini
index c9de96b9..d157c096 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_01.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_01.ini
@@ -61,7 +61,7 @@ ENABLE_DYN_DATA=TRUE
 FORCE_DYN_DATA=TRUE
 NEW_DYN_DATA=TRUE  
 ; indica parametri gestione TcMan
-TC_MAX_TC_FACTOR=3.5
+TC_MAX_TC_FACTOR=3.9
 TC_LAMBDA=0.4
 TC_MAX_INCR=5
 
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index 26bbd075..cfeef427 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -354,10 +354,10 @@ namespace IOB_WIN
         }
         else if (bit2.wait <= 0)
         {
-          // salvo nuovo contapezziPLC (incremento RAND 0..4)
+          // salvo nuovo contapezziPLC (incremento RAND 0..3)
           var rand = new Random();
           // se online vero delta altrimenti solo 0..1 50% probabilità
-          int delta = IobOnline ? rand.Next(1, 5) : rand.Next(0, 2);
+          int delta = IobOnline ? rand.Next(1, 4) : rand.Next(0, 2);
           if (!isMulti)
           {
             // solo se MP online...