From 52eff4229c13632a30c3daed7f0e3577be104d40 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Thu, 5 Sep 2019 17:33:38 +0200
Subject: [PATCH] ok test saet

---
 CVCncLib/testSam.dll       | Bin 967680 -> 967680 bytes
 IOB-WIN/DATA/CONF/MAIN.ini |   2 +-
 IOB-WIN/IobSiemens.cs      |   5 ++++-
 IOB-WIN/IobSiemensSaet.cs  |  19 ++++++-------------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll
index f6a3d902b31ddb373700a24504747eb04fd60a47..3b4a292235212c009592e8daa7c94e6529b160b7 100644
GIT binary patch
delta 115
zcmV-(0F3{Dh&zCYJCKM2yVr1mi-n5;g^L1(ivxv=1ci$Qg^LD-iwA{^2!)FYg^LP>
ziwm`j3^Ab)7OgBwZr~$Mzx!}}C#CAThs>c2hs>c3x6Gjq{0;-U*Kn81unrjzc)?OG
V@uwL<w*`^c&{R!NxAd?M3=<;>GJgO7

delta 115
zcmZqZux{wEp3uSUQy|pX-P+CA+RfD3&D`3}(%Q}1+RfJ5&EDG0(b~<~+RfG4&Aqjo
z$8e#*k^FpDNvVAQ{Zjsu{^^UpY(KM*2Z(vMpIONFhYw`b^wS&oBn4JA%y}{2^_t^y
Sb&n?&R}Bts|FVIPM;HK53NP6J

diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index a7438273..1f9846f8 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=3013
+STARTLIST=VALV_24
 ;STARTLIST=WPS,WPS
 ;STARTLIST=WPS
 ;STARTLIST=SIMUL_01
diff --git a/IOB-WIN/IobSiemens.cs b/IOB-WIN/IobSiemens.cs
index ab6c091f..ae665209 100644
--- a/IOB-WIN/IobSiemens.cs
+++ b/IOB-WIN/IobSiemens.cs
@@ -508,7 +508,10 @@ namespace IOB_WIN
                   case "DW":
                     uint valDW = S7.Net.Types.Word.FromByteArray(RawInput.Skip(areaCounter.indiceMem).Take(4).ToArray());
                     outputVal = valDW;
-
+                    break;
+                  case "RE":
+                    double valRe = S7.Net.Types.Double.FromByteArray(RawInput.Skip(areaCounter.indiceMem).Take(4).ToArray());
+                    outputVal = valRe;
                     break;
                   default:
                     break;
diff --git a/IOB-WIN/IobSiemensSaet.cs b/IOB-WIN/IobSiemensSaet.cs
index c191b30c..dde7c088 100644
--- a/IOB-WIN/IobSiemensSaet.cs
+++ b/IOB-WIN/IobSiemensSaet.cs
@@ -1,4 +1,5 @@
-using System;
+using IOB_UT;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -28,9 +29,10 @@ namespace IOB_WIN
      *   - DB60.DBD14: temperatura acqua pulita (salvataggio del MAX ogni minuto)
      *                                                
      * - BIT di stato
-     *   - DBX2.1: AUTOMATICO, se 0 --> LAMPADA ROSSA (allarmi/anomalie almeno 1 attivo)
+     *   - DBX2.1: READY TO RUN in AUTOMATICO
      *   - DBX2.3: Macchina in LAVORAZIONE
      *   - DBX2.4: WARNING Differenza tra Part Code MES - Saet (blu)
+     *   - DBX2.5: se 1 --> LAMPADA ROSSA (allarmi almeno 1 attivo)
      *   
      *  PartCounter	DINT	4.0	Conteggio Parziale di pezzi "OK" prodotti dalla macchina						
      *  NumberCode	String [12]	8.0	Valore numerico associato alla ricetta di produzione attualmente utilizzata dalla macchina						
@@ -74,7 +76,6 @@ namespace IOB_WIN
       lastPLCWatchDog = DateTime.Now.AddMinutes(-1);
       // imposto i parametri speciali x calcolo...
       var chiaviTSVC = findOptPar("TSVC");
-#if false
       if (chiaviTSVC.Count > 0)
       {
         lgInfo($"Trovate {chiaviTSVC.Count} chaivi TSVC");
@@ -105,7 +106,6 @@ namespace IOB_WIN
           LastTSVC.Add(item.Key, 0);
         }
       } 
-#endif
     }
 
     #region Metodi specifici (da verificare/completare in implementazione)   
@@ -156,17 +156,10 @@ namespace IOB_WIN
         switch (item.Key)
         {
           case "SendWatchDogMes2Plc":
-            MemBlock[0] = (byte)counterMes2Plc;
-            MemBlock[1] = (byte)(counterMes2Plc >> 8);
+            MemBlock[1] = (byte)counterMes2Plc;
+            MemBlock[0] = (byte)(counterMes2Plc >> 8);
             taskVal = $"VALUE DB1275.92 --> {counterMes2Plc}";
             break;
-          //case "startSetup":
-          //  MemBlock[0] += (1 << 4);
-          //  taskVal = "VALUE DB701.0.4 --> 1";
-          //  break;
-          //case "stopSetup":
-          //  taskVal = "VALUE DB701.0.4 --> 0";
-          //  break;
           default:
             // anche se non faccio nulla SEGNO con value = NOT DONE
             taskVal = "UNKNOWN KEY | NO EXEC";