Merge branch 'FeatureOpcUaBaglietto' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into FeatureOpcUaBaglietto

IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.ini

@@ -50,7 +50,7 @@ CHANGE_ODL_MODE=TIME
 CHANGE_ODL_HOURS=24
 CHANGE_ODL_IDLE_MIN=5
 PZCOUNT_MODE=OPC
-DISABLE_PZCOUNT=FALSE
+DISABLE_PZCOUNT=TRUE
 ENABLE_SEND_PZC_BLOCK=TRUE
 MIN_SEND_PZC_BLOCK=0
 MAX_SEND_PZC_BLOCK=100

IOB-WIN-NEXT/DATA/CONF/BAGLIETTO_CIMOLAI_01.json

@@ -2,21 +2,21 @@
   "BrowseFullVal": "ns=2;i=1001",
   "BrowseNSIndex": 2,
   "BrowseValue": 1001,
-  "keyPartCount": "Conteggio",
-  "keyPartReq": "Set Quantità Lotto",
-  "keyPartId": "Generale: Nome Ricetta",
-  "keyProgName": "Generale: Nome Ricetta",
+  "keyPartCount": "",
+  "keyPartReq": "",
+  "keyPartId": "",
+  "keyProgName": "",
   "keyRunMode": "",
   "pingAsPowerOn": true,
-  "forcePingOk": true,
+  "forcePingOk": false,
   "condWork": [
     {
-      "keyName": "Selettore in Automatico",
-      "targetValue": "True"
+      "keyName": "PLC/DB13/Gen/Marcia_AUX",
+      "targetValue": "2"
     },
     {
-      "keyName": "Memoria Ciclo Automatico",
-      "targetValue": "True"
+      "keyName": "PLC/DB231/InCorso",
+      "targetValue": "1"
     }
   ],
   "condPowerOn": {
@@ -25,27 +25,28 @@
   },
   "condReady": {
     "checkMode": "AND",
-    "checkList": []
+    "checkList": [
+      {
+        "keyName": "PLC/DB13/Gen/Marcia_AUX",
+        "targetValue": "2"
+      }
+    ]
   },
   "condManual": {
     "checkMode": "AND",
-    "checkList": [
-      {
-        "keyName": "Selettore in Manuale",
-        "targetValue": "True"
-      }
-    ]
+    "checkList": []
   },
   "condEStop": {
     "checkMode": "AND",
     "checkList": []
   },
   "condError": {
-    "checkMode": "AND",
+    "checkMode": "OR",
+    "negateValue": true,
     "checkList": [
       {
-        "keyName": "Memoria Allarme Attivo",
-        "targetValue": "True"
+        "keyName": "PLC/DB13/Gen/ComProfibusMessage",
+        "targetValue": "0"
       }
     ]
   },
@@ -63,12 +64,7 @@
   },
   "condSetup": {
     "checkMode": "AND",
-    "checkList": [
-      {
-        "keyName": "Fine Lotto (1=Stop Ciclo)",
-        "targetValue": "1"
-      }
-    ]
+    "checkList": []
   },
   "fluxLogVeto": [
     ""
@@ -104,14 +100,5 @@
     "MemConfRead": "ns=4;s=tomes_1_Watchdog",
     "MemConfWrite": "ns=4;s=tomach_1_watchdog",
     "MaxVal": 9999
-  },
-  "actStopProd": {
-    "ns=4;i=14": "1"
-  },
-  "actSetRecipe": {
-    "ns=4;i=10": "1"
-  },
-  "actResetCounter": {
-    "ns=4;i=13": "1"
   }
 }

IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.ini

@@ -53,7 +53,7 @@ PZCOUNT_MODE=OPC
 DISABLE_PZCOUNT=FALSE
 ENABLE_SEND_PZC_BLOCK=TRUE
 MIN_SEND_PZC_BLOCK=0
-MAX_SEND_PZC_BLOCK=100
+MAX_SEND_PZC_BLOCK=10000
 ENABLE_DYN_DATA=FALSE
 FORCE_DYN_DATA=TRUE
 ENABLE_DATA_FILTER=TRUE

IOB-WIN-NEXT/DATA/CONF/FINASSI_OMP_01.json

@@ -54,7 +54,8 @@
   },
   "condWarmUpCoolDown": {
     "checkMode": "OR",
-    "checkList": []
+    "checkList": [],
+    "negateValue":  true
   },
   "condWarning": {
     "checkMode": "AND",

IOB-WIN-NEXT/DATA/CONF/MAIN.ini

@@ -40,7 +40,7 @@ CLI_INST=SteamWareSim
 ;STARTLIST=GIACO_NWSE
 ;STARTLIST=SIM_DP_01
 ;STARTLIST=FINASSI_HELPI_01
-;STARTLIST=FINASSI_OMP_01
-STARTLIST=BAGLIETTO_CIMOLAI_01
+STARTLIST=FINASSI_OMP_01
+;STARTLIST=BAGLIETTO_CIMOLAI_01
 
 MAXCNC=10

IOB-WIN-NEXT/IOB-WIN-NEXT.csproj

@@ -350,6 +350,9 @@
     <None Include="DATA\CONF\GIACO_CEDAX_003_MBlock.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="DATA\CONF\BAGLIETTO_CIMOLAI_01_alarm.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\GIACO_CENTERFRIGO_MBlock.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -438,6 +441,7 @@
     <Content Include="Readme\InterfacciaSiemensFape.txt" />
     <Content Include="Readme\InterfacciaSiemensTorri.txt" />
     <Content Include="Readme\ToDo.txt" />
+    <Content Include="RemoteDebugInfo.txt" />
     <Content Include="Resources\ChangeLog.html">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

IOB-WIN-NEXT/IobGeneric.cs

@@ -3942,6 +3942,20 @@ namespace IOB_WIN_NEXT
         /// </summary>
         protected int watchDogPeriod = 2;
 
+        /// <summary>
+        /// Boolean x indicare contapezzi abilitato a livello di conf apoplicazione
+        /// </summary>
+        protected bool enablePzCountByApp = true;
+
+        /// <summary>
+        /// Boolean x indicare contapezzi abilitato forzatamente da IOB
+        /// </summary>
+        protected bool enablePzCountByIob = true;
+        /// <summary>
+        /// Boolean x indicare contapezzi disabilitato forzatamente da IOB
+        /// </summary>
+        protected bool disablePzCounteByIob = false;
+
         #endregion Protected Fields
 
         #region Protected Properties

IOB-WIN-NEXT/IobOpcUa.cs

@@ -28,6 +28,11 @@ namespace IOB_WIN_NEXT
         {
             // gestione invio ritardato contapezzi
             pzCountDelay = utils.CRI("pzCountDelay");
+
+            enablePzCountByApp = utils.CRB("enableContapezzi");
+            enablePzCountByIob = (getOptPar("ENABLE_PZCOUNT") == "TRUE");
+            disablePzCounteByIob = (getOptPar("DISABLE_PZCOUNT") == "TRUE");
+
             // gestione data filtering...
             if (!string.IsNullOrEmpty(getOptPar("ENABLE_DATA_FILTER")))
             {
@@ -157,7 +162,7 @@ namespace IOB_WIN_NEXT
         /// </summary>
         public override void processContapezzi()
         {
-            if (utils.CRB("enableContapezzi"))
+            if ((enablePzCountByApp || enablePzCountByIob) && !(disablePzCounteByIob))
             {
                 // da ridefinire la gestione base del contapezzi OPC-UA...
             }

IOB-WIN-NEXT/IobOpcUaMBH.cs

@@ -47,7 +47,7 @@ namespace IOB_WIN_NEXT
         /// </summary>
         public override void processContapezzi()
         {
-            if (utils.CRB("enableContapezzi"))
+            if ((enablePzCountByApp || enablePzCountByIob) && !(disablePzCounteByIob))
             {
                 // check condizione validazione
                 if (checkMultiCondition(opcUaParams.condCountEnabled) || opcUaParams.condCountEnabled.checkList.Count == 0)

IOB-WIN-NEXT/RemoteDebugInfo.txt

@@ -0,0 +1,18 @@
+Per effettuare debug remoto:
+
+1) verificare che sia presente nel server remoto il sw RemoteDebugTool
+2) verificare sia avviato e configurato
+3) verificare esistenza cartella C:\Steamware\IOB-WIN-NEXT-DEB\ 
+4) impostare path di avvio come C:\Steamware\IOB-WIN-NEXT-DEB\IOB-WIN-NEXT.exe
+5) impostare la remote machine con ip: porta, ad esempio sotto si trovano i aprametri x i vari clienti
+6) modificare il path dello script di replica post build
+7) impostare nel file di avvio la machcina corretta: DATA/CONF/MAIN.ini (in fondo, sezione [IOB] ad esempio STARTLIST=FINASSI_OMP_01)
+
+
+
+Remote Machine conf:
+ Baglietto:
+ - 192.168.60.15:4026
+
+ Cereria Finassi:
+ - 10.150.0.1:4026

IOB-WIN-NEXT/postBuildTgt.bat

@@ -57,9 +57,9 @@ REM copia script verso server remoto
 echo Debug remoto: effettuo robocopy sync (verificare remote per cliente)
 
 REM FINASSI
-REM ROBOCOPY . \\10.150.0.1\Steamware\IOB-WIN-NEXT-DEB /MIR
+ROBOCOPY . \\10.150.0.1\Steamware\IOB-WIN-NEXT-DEB /MIR
 REM Baglietto
-ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR
+REM ROBOCOPY . \\192.168.60.15\Steamware\IOB-WIN-NEXT-DEB /MIR
 
 goto END