diff --git a/CVCncLib/Modules/ComCNOsaiVB6.vb b/CVCncLib/Modules/ComCNOsaiVB6.vb index 1d0793d6..9f24b97e 100644 --- a/CVCncLib/Modules/ComCNOsaiVB6.vb +++ b/CVCncLib/Modules/ComCNOsaiVB6.vb @@ -14,13 +14,13 @@ Public Class ComCNOSAIVB6 Inherits ComCNOsai - Public Sub New(ByRef szRemoteName As String, ByRef b_debug As Boolean) + Public Sub New(ByVal szRemoteName As String, ByVal b_debug As Boolean) - MyBase.New(szRemoteName, b_debug) + MyBase.New(szRemoteName, b_debug) - End Sub + End Sub - Public Overrides Function OpenSession() As Boolean + Public Overrides Function OpenSession() As Boolean Dim nReturn As Short diff --git a/CVCncLib/testSam.dll b/CVCncLib/testSam.dll index c63c3c77..e13ee8be 100644 Binary files a/CVCncLib/testSam.dll and b/CVCncLib/testSam.dll differ diff --git a/IOB-UT/baseUtils.cs b/IOB-UT/baseUtils.cs index 44a43fba..a063594e 100644 --- a/IOB-UT/baseUtils.cs +++ b/IOB-UT/baseUtils.cs @@ -709,6 +709,10 @@ namespace IOB_UT /// OSAI_OPEN, /// + /// Adapter OSAI VB6 + /// + OSAI_VB6, + /// /// Adapter SIEMENS /// SIEMENS, diff --git a/IOB-WIN/IobOSAI.cs b/IOB-WIN/IobOSAI.cs index 8d15e964..64a3ece5 100644 --- a/IOB-WIN/IobOSAI.cs +++ b/IOB-WIN/IobOSAI.cs @@ -252,6 +252,10 @@ namespace IOB_WIN { OSAI_ref = new Open_Series(IOBConf.cncIpAddr, false); } + else if (IOBConf.tipoIob == tipoAdapter.OSAI_VB6) + { + OSAI_ref = new ComCNOSAIVB6(IOBConf.cncIpAddr, false); + } else { OSAI_ref = new ComCNOsai(IOBConf.cncIpAddr, false); diff --git a/Jenkinsfile b/Jenkinsfile index 6dc6c8e8..fd5af76e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=302']) { + withEnv(['NEXT_BUILD_NUMBER=303']) { // 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'