From c61c815a5891048b8d45c4e60ef0100fcb6d22a3 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Fri, 27 Apr 2018 08:31:19 +0200
Subject: [PATCH] fix prgName x controlli 16/18

---
 CncLib/CNC/CNC.FANUC/CNC.FANUC.vb | 13 +++++++++++++
 IOB-WIN/DATA/CONF/MAIN.ini        |  2 +-
 IOB-WIN/IOB-WIN.csproj            |  4 +++-
 Jenkinsfile                       |  2 +-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb b/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb
index 39054158..70b98889 100644
--- a/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb
+++ b/CncLib/CNC/CNC.FANUC/CNC.FANUC.vb
@@ -1536,12 +1536,15 @@ Namespace CNC
       Dim nReturn As Integer
 
       Dim prgName(244) As Char
+      Dim prgNum As Focas1.ODBPRO
 
       ' Fill array with a character.
       For index As Integer = 0 To 243
         prgName(index) = ""
       Next
 
+      prgNum = New Focas1.ODBPRO
+
       'leggo il numero del processo attivo
       nPathIdx = GetActivePath()
 
@@ -1553,6 +1556,16 @@ Namespace CNC
         If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.CncLib") Then
           Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.CncLib")
         End If
+      ElseIf Is16Series Then
+        ' leggo tutto!!!
+        nReturn = Focas1.cnc_rdprgnum(nLibHandle(nPathIdx), prgNum)
+        prgName = "O" & prgNum.mdata.ToString()
+
+
+        If F_CheckRetError_Cnc(nReturn, "cnc_pdf_rdmain CNC.FANUC.CncLib") Then
+          Throw New NcException("ERR cnc_pdf_rdmain CNC.FANUC.CncLib")
+        End If
+
       End If
 
 
diff --git a/IOB-WIN/DATA/CONF/MAIN.ini b/IOB-WIN/DATA/CONF/MAIN.ini
index aa7053da..3068db9e 100644
--- a/IOB-WIN/DATA/CONF/MAIN.ini
+++ b/IOB-WIN/DATA/CONF/MAIN.ini
@@ -11,6 +11,6 @@ CMDREBO=/IOB/sendRebootGateway?GWIP=
 CMDIOB2CALL=/IOB/getIob2call?GWIP=
 
 [IOB]
-STARTLIST=3000,2999
+STARTLIST=3007
 MAXCNC=4
 ;STARTLIST=3001,3002,3003,3004,3005
\ No newline at end of file
diff --git a/IOB-WIN/IOB-WIN.csproj b/IOB-WIN/IOB-WIN.csproj
index e3483d34..310c0b23 100644
--- a/IOB-WIN/IOB-WIN.csproj
+++ b/IOB-WIN/IOB-WIN.csproj
@@ -167,7 +167,9 @@
     <None Include="DATA\CONF\3006.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="DATA\CONF\3007.ini" />
+    <None Include="DATA\CONF\3007.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="DATA\CONF\3010.ini">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/Jenkinsfile b/Jenkinsfile
index ab87833a..5a4ce810 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -14,7 +14,7 @@ pipeline {
 
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=257']) {
+        withEnv(['NEXT_BUILD_NUMBER=258']) {
           // env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '1.18.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO-IOB-WIN'