From c142fbad84ec276974915a3cebe64e215a42d24d Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 10 Jan 2019 13:59:13 +0100
Subject: [PATCH] Review parametri simulazione

---
 IOB-WIN/AdapterForm.cs         | 6 ------
 IOB-WIN/App.config             | 2 --
 IOB-WIN/DATA/CONF/MAIN.ini     | 6 +++---
 IOB-WIN/DATA/CONF/SIMUL_01.ini | 6 +++---
 IOB-WIN/DATA/CONF/SIMUL_02.ini | 4 ++--
 IOB-WIN/DATA/CONF/SIMUL_03.ini | 6 +++---
 IOB-WIN/DATA/CONF/SIMUL_04.ini | 6 +++---
 IOB-WIN/IobSimula.cs           | 8 ++++----
 8 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/IOB-WIN/AdapterForm.cs b/IOB-WIN/AdapterForm.cs
index 1784eb60..7b7e43a0 100644
--- a/IOB-WIN/AdapterForm.cs
+++ b/IOB-WIN/AdapterForm.cs
@@ -35,10 +35,6 @@ namespace IOB_WIN
     /// </summary>
     protected int sampleMemCount;
     /// <summary>
-    /// timer base in avvio
-    /// </summary>
-    protected int startTimerMs = 250;
-    /// <summary>
     /// ultimo tentativo riavvio...
     /// </summary>
     protected DateTime lastStartTry;
@@ -162,8 +158,6 @@ namespace IOB_WIN
       firstStart = DateTime.Now;
       lastStartTry = DateTime.Now;
 
-      startTimerMs = utils.CRI("startTimerMs");
-
 #if DEBUG
       // Setup the logging view for Sentinel - http://sentinel.codeplex.com
       var sentinelTarget = new NLogViewerTarget()
diff --git a/IOB-WIN/App.config b/IOB-WIN/App.config
index 4613f87c..92319c4c 100644
--- a/IOB-WIN/App.config
+++ b/IOB-WIN/App.config
@@ -17,8 +17,6 @@
     <add key="doSampleMemory" value="false"/>
     <add key="basePrgMemPath" value="CNCMEMUSER"/>
     <add key="pingMsTimeout" value="250"/>
-    <!--gestione TIMERS e periodi multipli x thread lenti-->
-    <add key="startTimerMs" value="250"/>
     <!-- ciclo corto x invio a server: ms -->
     <add key="timerIntMs" value="10"/>
     <add key="fastCount" value="20"/>
diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index 22288981..921bfa89 100644
--- a/IOB-WIN/DATA/CONF/MAIN.ini
+++ b/IOB-WIN/DATA/CONF/MAIN.ini
@@ -11,7 +11,7 @@ CMDIOB2CALL=/IOB/getIob2call?GWIP=
 
 [IOB]         
 ;--- TEST SIMULAZIONE                
-;STARTLIST=SIMUL_01                               
-STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
+STARTLIST=SIMUL_01                               
+;STARTLIST=SIMUL_01,SIMUL_02,SIMUL_03,SIMUL_04
 
-MAXCNC=4
\ No newline at end of file
+MAXCNC=10
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_01.ini b/IOB-WIN/DATA/CONF/SIMUL_01.ini
index 97f201e2..8c7dbaab 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_01.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_01.ini
@@ -31,10 +31,10 @@ BLINK_FILT=0
 ;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice 
 PZCOUNT_MODE=BIT
 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo)
-PER_BASE=600    
+PER_BASE=1200    
 SIM_PZCNT=5|1 
-SIM_ALARM=100|2
-SIM_MANU=25|2
+SIM_ALARM=1000|20
+SIM_MANU=50|6
 
 [BRANCH]
 NAME=master
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_02.ini b/IOB-WIN/DATA/CONF/SIMUL_02.ini
index 9b119452..d7a5d448 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_02.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_02.ini
@@ -33,8 +33,8 @@ PZCOUNT_MODE=BIT
 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE in ms, default 1 secondo)
 PER_BASE=1500    
 SIM_PZCNT=8|1 
-SIM_ALARM=100|4
-SIM_MANU=50|3
+SIM_ALARM=900|15
+SIM_MANU=40|5
 
 [BRANCH]
 NAME=master
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_03.ini b/IOB-WIN/DATA/CONF/SIMUL_03.ini
index f9d0ff7c..74e342b3 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_03.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_03.ini
@@ -31,10 +31,10 @@ BLINK_FILT=0
 ;PZCOUNT_MODE=STD.[PAR/MEM].info|BIT.indice 
 PZCOUNT_MODE=BIT
 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE, default 1 secondo)
-PER_BASE=2050     
+PER_BASE=1700     
 SIM_PZCNT=15|1 
-SIM_ALARM=100|2
-SIM_MANU=25|2
+SIM_ALARM=1000|20
+SIM_MANU=100|4
 
 [BRANCH]
 NAME=master
\ No newline at end of file
diff --git a/IOB-WIN/DATA/CONF/SIMUL_04.ini b/IOB-WIN/DATA/CONF/SIMUL_04.ini
index bd58c015..05c271db 100644
--- a/IOB-WIN/DATA/CONF/SIMUL_04.ini
+++ b/IOB-WIN/DATA/CONF/SIMUL_04.ini
@@ -32,9 +32,9 @@ BLINK_FILT=0
 PZCOUNT_MODE=BIT
 ; per il simulatore: 50|1 = WAIT 50, DURATION 1 con riferimento al PERIODO base (PER_BASE, default 1 secondo)
 PER_BASE=800    
-SIM_PZCNT=11|1 
-SIM_ALARM=100|2
-SIM_MANU=25|2
+SIM_PZCNT=13|1 
+SIM_ALARM=1000|20
+SIM_MANU=100|10
 
 [BRANCH]
 NAME=master
\ No newline at end of file
diff --git a/IOB-WIN/IobSimula.cs b/IOB-WIN/IobSimula.cs
index a275923c..43a7486b 100644
--- a/IOB-WIN/IobSimula.cs
+++ b/IOB-WIN/IobSimula.cs
@@ -166,7 +166,7 @@ namespace IOB_WIN
       if (bit3.wait <= 0)
       {
         // segnalo BIT
-        B_input = 9;
+        B_input += (1 << 3);
         // decremento duration
         bit3.duration--;
         // controllo se sia scaduta la duration... in quel caso reset...
@@ -177,8 +177,8 @@ namespace IOB_WIN
       }
       else if (bit4.wait <= 0)
       {
-        // segnalo BIT  
-        B_input = 17;
+        // segnalo BIT    
+        B_input += (1 << 4);
         // decremento duration
         bit4.duration--;
         // controllo se sia scaduta la duration... in quel caso reset...
@@ -197,7 +197,7 @@ namespace IOB_WIN
         // controllo se sia scaduta la duration... in quel caso reset...
         if (bit2.duration <= 0)
         {
-          bit2 = setupSimPar("SIM_MANU");
+          bit2 = setupSimPar("SIM_PZCNT");
           // salvo nuovo contapezzi (incremento di 1...)
           contapezzi++;
           sendContapezzi = true;