Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop

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

@@ -1,7 +1,7 @@
 ;Configurazione IOB-WIN
 [IOB]                
 ;Centro di lavoro OpcUa
-CNCTYPE=OpcUaSiemensEMCO
+CNCTYPE=OpcUaSiemens
 ;CNCTYPE=OpcUa
 PING_MS_TIMEOUT=500
 
@@ -14,7 +14,7 @@ IP=192.168.51.214
 PORT=4840
 GETPRGNAME=true
 
-[SERVER]                 
+[SERVER]
 MPIP=http://192.168.51.77
 MPURL=/MP/IO
 CMDBASE=/IOB/input/

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

@@ -2,11 +2,11 @@
   "BrowseFullVal": "ns=2;s=Sinumerik",
   "BrowseNSIndex": 4,
   "BrowseValue": 5001,
-  "keyPartCount": "ns=2;s=/Channel/State/actParts",
+  "keyPartCount": "actParts",
   "keyPartReq": "",
   "keyPartId": "",
   "keyProgName": "",
-  "keyRunMode": "ns=2;s=/Channel/State/acProg",
+  "keyRunMode": "acProg",
   "pingAsPowerOn": true,
   "Identity": {
     "UserName": "DONATI_1",
@@ -14,24 +14,17 @@
   },
   "condWork": [
     {
-      "keyName": "ns=2;s=/Channel/State/acProg",
+      "keyName": "acProg",
       "targetValue": "2"
     }
   ],
   "condPowerOn": {
-    "checkMode": "AND",
-    "checkList": [
-      {
-        "keyName": "ns=2;s=/Channel/State/acProg",
-        "targetValue": "1"
-      }
-    ]
   },
   "condReady": {
     "checkMode": "AND",
     "checkList": [
       {
-        "keyName": "ns=2;s=/Channel/State/acProg",
+        "keyName": "acProg",
         "targetValue": "3"
       }
     ]
@@ -40,7 +33,7 @@
     "checkMode": "AND",
     "checkList": [
       {
-        "keyName": "ns=2;s=/Channel/State/acProg",
+        "keyName": "acProg",
         "targetValue": "4"
       }
     ]
@@ -49,7 +42,7 @@
     "checkMode": "AND",
     "checkList": [
       {
-        "keyName": "ns=2;s=/Nck/State/aStopesi",
+        "keyName": "aStopesi",
         "targetValue": "0"
       }
     ]
@@ -58,7 +51,7 @@
     "checkMode": "AND",
     "checkList": [
       {
-        "keyName": "ns=2;s=/Channel/State/acProg",
+        "keyName": "acProg",
         "targetValue": "1"
       }
     ]
@@ -69,6 +62,7 @@
   },
   "condWarmUpCoolDown": {
     "checkMode": "OR",
+    "negateValue": true,
     "checkList": [
     ]
   },
@@ -122,9 +116,8 @@
     "ns=2;s=/Channel/Spindle",
     "ns=2;s=/DriveVsa",
     "ns=2;s=Sinumerik/FileSystem",
-    "ns=2;s=/Methods/",
-    "ns=2;s=/Nck/",
-    "ns=2;s=/NC/",
+    "ns=2;s=/Methods",
+    "ns=2;s=/NC",
     "ns=2;s=/NC/_N_NC_GD1_ACX",
     "ns=2;s=/NC/_N_NC_GD4_ACX",
     "ns=2;s=/NC/_N_CH_GD1_ACX",
@@ -202,9 +195,48 @@
     "ns=2;s=/Channel/ProgramInfo/progName",
     "ns=2;s=/Channel/State/actFeedRateIpo",
     "ns=2;s=/Channel/State/actFeedRateIpoOvr",
-    "ns=2;s=/Channel/State/feedRateIpoOvr"
+    "ns=2;s=/Channel/State/feedRateIpoOvr",
+    "ns=2;s=/Nck/State/aStopesi",
+    "ns=2;s=/NC/_N_CH_GD2_ACX/CODICE_ARTICOLO",
+    "ns=2;s=/NC/_N_CH_GD2_ACX/CODICE_COMMESSA",
+    "ns=2;s=/NC/_N_CH_GD2_ACX/QUANTITA_PRODOTTA",
+    "ns=2;s=/NC/_N_CH_GD2_ACX/QUANTITA_RICHIESTA"
   ],
+  "mMapWrite": {
+    "setComm": {
+      "name": "setComm",
+      "description": "Commessa",
+      "tipoMem": "String",
+      "memAddr": "ns=2;s=/NC/_N_CH_GD2_ACX/CODICE_COMMESSA",
+      "index": 0,
+      "size": 20
+    },
+    "setArt": {
+      "name": "setArt",
+      "description": "Articolo",
+      "tipoMem": "String",
+      "memAddr": "ns=2;s=/NC/_N_CH_GD2_ACX/CODICE_ARTICOLO",
+      "index": 0,
+      "size": 20
+    },
+    "setPzComm": {
+      "name": "setPzComm",
+      "description": "Qty",
+      "tipoMem": "Int",
+      "memAddr": "ns=2;s=/NC/_N_CH_GD2_ACX/QUANTITA_RICHIESTA",
+      "index": 0,
+      "size": 4
+    }
+  },
   "mMapRead": {
+    "OPC_QtaProd": {
+      "name": "OPC_QtaProd",
+      "description": "Qta prodotta",
+      "tipoMem": "Int",
+      "memAddr": "ns=2;s=/NC/_N_CH_GD2_ACX/QUANTITA_PRODOTTA",
+      "index": 0,
+      "size": 4
+    },
     "OPC_Status": {
       "name": "OPC_Status",
       "description": "Stato",
@@ -269,6 +301,5 @@
       "index": 0,
       "size": 1
     }
-
   }
 }

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

@@ -48,8 +48,8 @@ CLI_INST=SteamWareSim
 ;STARTLIST=VL27
 
 ;NB: mettere copy always ai file di conf x fare test...
-;STARTLIST=SIMUL_01
-STARTLIST=Tend_RAMA_10_47
+STARTLIST=2014
+;STARTLIST=Tend_RAMA_10_47
 
 
 MAXCNC=10

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

@@ -515,8 +515,12 @@
     </Compile>
     <Compile Include="UAClient.cs" />
     <Compile Include="utils.cs" />
-    <None Include="DATA\CONF\2014.ini" />
-    <None Include="DATA\CONF\2014.json" />
+    <None Include="DATA\CONF\2014.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="DATA\CONF\2014.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\3010_alarm.json" />
     <None Include="DATA\CONF\3028.json" />
     <None Include="DATA\CONF\3028.ini" />