diff --git a/src/OPCUA XML.lvproj b/src/OPCUA XML.lvproj index 24d9ac2..245f86f 100644 --- a/src/OPCUA XML.lvproj +++ b/src/OPCUA XML.lvproj @@ -73,7 +73,6 @@ - true {B9391BD5-F525-4855-BAB4-285BB2EF109E} password:nevstopopcua OPCUA XML @@ -90,9 +89,11 @@ ../vipb relativeToCommon {0A065555-76F0-419A-92BA-32BCA60E5B4D} + 1 22 1 2 + 2 Destination Directory ../vipb Support Directory @@ -107,7 +108,7 @@ ../vipb/OPCUA(ClientUtility).llb LLB 5 - {7497993C-0399-4DB3-AE68-EEDA5BD13336} + {B19F9F8C-558A-4951-9148-19FED39C7625} Container true true @@ -119,41 +120,55 @@ Exclude Container true + true 2 /My Computer/OCPUA XML/OPCUA XML(dev).lvlib/subVIs + Allow debugging + false + 1 Container /My Computer/OCPUA XML/OPCUA XML(dev).lvlib/Connect OPCUA Server Auto.vi + Allow debugging + false + 1 VI true true + true 3 /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/private + Allow debugging + false + 1 Container 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/ServerRefnum.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/ServerRefnum.vi VI true 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Create.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Create.vi VI 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Start.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Start.vi VI 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Create&Start.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Create&Start.vi VI true 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Stop.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Stop.vi VI 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Close.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Close.vi VI 3 - /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/Stop&Close.vi + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public/Stop&Close.vi VI true /My Computer/OCPUA XML/OPCUA XML(dev).lvlib/Create OPCUA Server Auto.vi + Allow debugging + false + 1 VI true true @@ -161,17 +176,34 @@ /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/private Container 4 - /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/ClientRefnum.vi + /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/public/ClientRefnum.vi VI true 4 - /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/Connect.vi + /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/public/Connect.vi VI true 4 - /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/Disconnect.vi + /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/public/Disconnect.vi VI true + 0 + /My Computer/VIAnalyzerConfig.cfg + Exclude + true + 0 + /My Computer/OCPUA(Utility)/OPCUA Server(UtilityMode)(dev).lvlib/public + Allow debugging + false + 1 + Container + true + 0 + /My Computer/OCPUA(Utility)/OCPUA Client(UtilityMode)(dev).lvlib/public + Allow debugging + false + 1 + Container true true 2 @@ -208,15 +240,15 @@ /My Computer/Server.vi Exclude VI - 24 + 27 RT CompactRIO Target - 10.144.41.243 - OS,VxWorks;CPU,PowerPC;DeviceCode,7527;TARGET_TYPE,RT; - 7527 + 10.144.41.239 + OS,VxWorks;CPU,PowerPC;DeviceCode,7459;TARGET_TYPE,RT; + 7459 901x true 5000 diff --git a/src/OPCUA XML/subVIs/GetItemInfo.vi b/src/OPCUA XML/subVIs/GetItemInfo.vi index 80dad60..ae35d52 100644 Binary files a/src/OPCUA XML/subVIs/GetItemInfo.vi and b/src/OPCUA XML/subVIs/GetItemInfo.vi differ diff --git a/src/OPCUA XML/subVIs/SetInitialValue.vi b/src/OPCUA XML/subVIs/SetInitialValue.vi index dc5ac1e..1174bf0 100644 Binary files a/src/OPCUA XML/subVIs/SetInitialValue.vi and b/src/OPCUA XML/subVIs/SetInitialValue.vi differ diff --git a/src/OPCUA XML/subVIs/UACreateServer.vi b/src/OPCUA XML/subVIs/UACreateServer.vi index f085b36..e0dd380 100644 Binary files a/src/OPCUA XML/subVIs/UACreateServer.vi and b/src/OPCUA XML/subVIs/UACreateServer.vi differ diff --git a/src/OPCUA XML/subVIs/UAGetClientCerts.vi b/src/OPCUA XML/subVIs/UAGetClientCerts.vi index 928612e..5445569 100644 Binary files a/src/OPCUA XML/subVIs/UAGetClientCerts.vi and b/src/OPCUA XML/subVIs/UAGetClientCerts.vi differ diff --git a/src/OPCUA XML/subVIs/UAPublishNode.vi b/src/OPCUA XML/subVIs/UAPublishNode.vi index 9735d45..505a2b0 100644 Binary files a/src/OPCUA XML/subVIs/UAPublishNode.vi and b/src/OPCUA XML/subVIs/UAPublishNode.vi differ diff --git a/src/OPCUA XML/subVIs/UAPublishStructure.vi b/src/OPCUA XML/subVIs/UAPublishStructure.vi index 87da7ce..de457bb 100644 Binary files a/src/OPCUA XML/subVIs/UAPublishStructure.vi and b/src/OPCUA XML/subVIs/UAPublishStructure.vi differ diff --git a/src/OPCUA(Utility)/Client/OCPUA Client(UtilityMode)(dev).lvlib b/src/OPCUA(Utility)/Client/OCPUA Client(UtilityMode)(dev).lvlib index 72e9bce..4b0d497 100644 --- a/src/OPCUA(Utility)/Client/OCPUA Client(UtilityMode)(dev).lvlib +++ b/src/OPCUA(Utility)/Client/OCPUA Client(UtilityMode)(dev).lvlib @@ -39,7 +39,9 @@ - - - + + + + + diff --git a/src/OPCUA(Utility)/Server/OPCUA Server(UtilityMode)(dev).lvlib b/src/OPCUA(Utility)/Server/OPCUA Server(UtilityMode)(dev).lvlib index a7c7640..fa1261a 100644 --- a/src/OPCUA(Utility)/Server/OPCUA Server(UtilityMode)(dev).lvlib +++ b/src/OPCUA(Utility)/Server/OPCUA Server(UtilityMode)(dev).lvlib @@ -39,11 +39,13 @@ - - - - - - - + + + + + + + + + diff --git a/storage/nevstop_lib_opcua_xml-1.2.1.4.vip b/storage/nevstop_lib_opcua_xml-1.2.1.4.vip deleted file mode 100644 index f6fb141..0000000 Binary files a/storage/nevstop_lib_opcua_xml-1.2.1.4.vip and /dev/null differ diff --git a/storage/nevstop_lib_opcua_xml-1.2.2.5.vip b/storage/nevstop_lib_opcua_xml-1.2.2.5.vip new file mode 100644 index 0000000..8ad5a91 Binary files /dev/null and b/storage/nevstop_lib_opcua_xml-1.2.2.5.vip differ diff --git a/vipb/.vipb b/vipb/.vipb index 1189350..82895e6 100644 --- a/vipb/.vipb +++ b/vipb/.vipb @@ -1,7 +1,7 @@ - + nevstop_lib_opcua_xml - 1.2.1.5 + 1.2.2.6 false . _VIP @@ -32,7 +32,8 @@ https://github.com/nevstop/LabVIEW-OPCUA-XML-Library - 1.2.1 修改Connect Server Auto.vi 的部分连线为 optional + 1.2.2 修复bug. 1)初始值发布问题 2)uint32 array 发布为datatime 问题 +1.2.1 修改Connect Server Auto.vi 的部分连线为 optional @@ -269,7 +270,7 @@ OPCUAXML.llb\Connect OPCUA Server Auto.vi - 48536FBD9B11B5EECC8D159C8D2D2D94 + 8C3364A3C17FF2A9165C5D674B571270 0 @@ -332,7 +333,7 @@ OPCUA(ServerUtility).llb\ServerRefnum.vi - 243E92657AE23F34D52130F6F4AB6206 + F8A31CB312D2981B969595329D4C0356 0 @@ -395,7 +396,7 @@ OPCUA(ClientUtility).llb\ClientRefnum.vi - CBEA022D0F00360E9ACB215C4F79857E + 28DC959303D4AF4F1C8F5CE6F4C88C06 \ No newline at end of file diff --git a/vipb/OPCUA(ClientUtility).llb b/vipb/OPCUA(ClientUtility).llb index c2bb87b..e1ae6dc 100644 Binary files a/vipb/OPCUA(ClientUtility).llb and b/vipb/OPCUA(ClientUtility).llb differ diff --git a/vipb/OPCUA(ServerUtility).llb b/vipb/OPCUA(ServerUtility).llb index f5b4878..4fb1cae 100644 Binary files a/vipb/OPCUA(ServerUtility).llb and b/vipb/OPCUA(ServerUtility).llb differ diff --git a/vipb/OPCUAXML.llb b/vipb/OPCUAXML.llb index bb58d1d..ffe496f 100644 Binary files a/vipb/OPCUAXML.llb and b/vipb/OPCUAXML.llb differ