Skip to content

Commit

Permalink
Merge branch 'release/3.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
@francois-normandin
francois-normandin committed Apr 13, 2022
2 parents 62672f8 + 67d45c3 commit f4c85af
Show file tree
Hide file tree
Showing 13 changed files with 38 additions and 30 deletions.
23 changes: 13 additions & 10 deletions MQTT Connection.vipb
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2020-10-30 19:02:55" Creator="normandinf" Comments="" ID="54a2c37dbecde289d320f51ba90939c6">
<VI_Package_Builder_Settings Version="2018" Created_Date="2019-04-01 18:34:00" Modified_Date="2022-04-13 07:36:37" Creator="normandinf" Comments="" ID="a0878265406fa9c4dbb2242eea756c2c">
<Library_General_Settings>
<Package_File_Name>LabVIEW_Open_Source_Project_lib_MQTT_Connection</Package_File_Name>
<Library_Version>3.1.3.22</Library_Version>
<Library_Version>3.1.4.23</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>source</Library_Source_Folder>
<Library_Output_Folder>.</Library_Output_Folder>
Expand All @@ -17,10 +17,12 @@
</Library_General_Settings>
<Advanced_Settings>
<Package_Dependencies>
<External_Dependencies>labview_open_source_lib_serializer &gt;= 1.1.0.12</External_Dependencies>
<External_Dependencies>labview_open_source_project_lib_mqtt_control_packets &gt;= 3.1.2.8</External_Dependencies>
<Direct_Dependencies>labview_open_source_lib_serializer-1.1.0.12</Direct_Dependencies>
<Direct_Dependencies>labview_open_source_project_lib_mqtt_control_packets-3.1.2.8</Direct_Dependencies>
<External_Dependencies>labview_open_source_lib_data_manipulation &gt;= 1.5.0.15</External_Dependencies>
<External_Dependencies>labview_open_source_lib_serializer &gt;= 1.2.1.16</External_Dependencies>
<External_Dependencies>labview_open_source_project_lib_mqtt_control_packets &gt;= 3.1.3.9</External_Dependencies>
<Direct_Dependencies>labview_open_source_lib_data_manipulation-1.5.0.15</Direct_Dependencies>
<Direct_Dependencies>labview_open_source_lib_serializer-1.2.1.16</Direct_Dependencies>
<Direct_Dependencies>labview_open_source_project_lib_mqtt_control_packets-3.1.3.9</Direct_Dependencies>
</Package_Dependencies>
<Custom_Action_VIs>
<Pre-Build_VI>Pre-Build Custom Action.vi</Pre-Build_VI>
Expand Down Expand Up @@ -48,8 +50,8 @@ These classes can be used as the basis for client and server by providing a clea
<Copyright/>
<Packager/>
<URL>https://github.com/LabVIEW-Open-Source/MQTT-Connection</URL>
<Release_Notes>- Subscription and TopicFilter classes have been moved to Server library
[MQTT-6.0.0-1] Added error 55031 for Protocol Violation of type "Text Frame received over Websockets"</Release_Notes>
<Release_Notes>[Fix: 4] setConnected now executes even with upstream error
[Fix: 6] session process will not hang if some loops terminate.</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -203,6 +205,7 @@ These classes can be used as the basis for client and server by providing a clea
<close_labview_before_install>false</close_labview_before_install>
<restart_labview_after_install>false</restart_labview_after_install>
<skip_mass_compile_after_install>false</skip_mass_compile_after_install>
<install_into_global_environment>false</install_into_global_environment>
</LabVIEW>
<VI_Docs>
<Edit_VI_Description>false</Edit_VI_Description>
Expand Down Expand Up @@ -386,7 +389,7 @@ These classes can be used as the basis for client and server by providing a clea
<Path>source\MQTT_Connection\Connection\isConnected.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>D87E64420DB5E36D491EE78F819998CF</GUID>
<GUID>F15E33A7F3B8519ECBF28CC8301F8FAC</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
<Library_Palette_Definition>
Expand Down Expand Up @@ -619,7 +622,7 @@ These classes can be used as the basis for client and server by providing a clea
<Path>source\MQTT_Base\Base Class\isSessionConnected.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>F40E2B07D91BD6FA7FF7738FE6A67679</GUID>
<GUID>5A0A979301DD829E8540BDF77ACD8F35</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
Binary file modified MQTT Connection.vipc
View file
Binary file not shown.
45 changes: 25 additions & 20 deletions MQTT-Connection.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,40 @@
<Item Name="MQTT_Connection.lvlib" Type="Library" URL="../source/MQTT_Connection/MQTT_Connection.lvlib"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="vi.lib" Type="Folder">
<Item Name="MQTT_Control_Packets.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/MQTT_Control_Packets.lvlib"/>
<Property Name="NI.SortType" Type="Int">1</Property>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="Connection.TCP_GOSPL.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Connection/Connection.TCP/Connection.TCP_GOSPL.lvlib"/>
<Item Name="Connection_GOSPL.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Connection/Connection/Connection_GOSPL.lvlib"/>
<Item Name="Default MQTT Packet (Empty).vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/ControlPacket/Default MQTT Packet (Empty).vi"/>
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
<Item Name="MD5Checksum string.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum string.vi"/>
<Item Name="MD5Checksum format message-digest.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum format message-digest.vi"/>
<Item Name="Get Type Code from I16 Array And Pos.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Get Type Code from I16 Array And Pos.vi"/>
<Item Name="KVP Parser.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/KVP Parser.vi"/>
<Item Name="MD5Checksum core.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum core.vi"/>
<Item Name="MD5Checksum format message-digest.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum format message-digest.vi"/>
<Item Name="MD5Checksum pad.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum pad.vi"/>
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
<Item Name="Default MQTT Packet (Empty).vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/ControlPacket/Default MQTT Packet (Empty).vi"/>
<Item Name="OpenSerializer.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/OpenSerializer/OpenSerializer.lvlib"/>
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
<Item Name="MD5Checksum string.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/MD5Checksum.llb/MD5Checksum string.vi"/>
<Item Name="MQTT_Control_Packets.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/MQTT Control Packets/Control Packets/MQTT_Control_Packets.lvlib"/>
<Item Name="OpenConvert.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Conversions/OpenConvert.lvlib"/>
<Item Name="OpenDescriptor.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/TypeDescriptor/OpenDescriptor.lvlib"/>
<Item Name="TD_Length.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Length.ctl"/>
<Item Name="Type Descriptor I16.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16.ctl"/>
<Item Name="Type Descriptor I16 Array.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16 Array.ctl"/>
<Item Name="OpenScalar.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Scalar/OpenScalar.lvlib"/>
<Item Name="OpenSerializer.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/OpenSerializer/OpenSerializer.lvlib"/>
<Item Name="OpenVariant.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Variant/OpenVariant.lvlib"/>
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
<Item Name="TD_Compare Types.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Compare Types.vi"/>
<Item Name="TD_Create Array.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Create Array.vi"/>
<Item Name="TD_Create Cluster.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Create Cluster.vi"/>
<Item Name="TD_Get Array Information.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Get Array Information.vi"/>
<Item Name="TD_Refnum Kind.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Refnum Kind.ctl"/>
<Item Name="TD_Get Cluster Information.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Get Cluster Information.vi"/>
<Item Name="TD_Get Ref Info.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Get Ref Info.vi"/>
<Item Name="TD_Length.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Length.ctl"/>
<Item Name="TD_Refnum Kind.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Refnum Kind.ctl"/>
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="Type Code.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Code.ctl"/>
<Item Name="Type Descriptor I16 Array.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16 Array.ctl"/>
<Item Name="Type Descriptor I16.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Descriptor I16.ctl"/>
<Item Name="Type Enum.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Type Enum.ctl"/>
<Item Name="Get Type Code from I16 Array And Pos.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/Get Type Code from I16 Array And Pos.vi"/>
<Item Name="TD_Create Array.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Create Array.vi"/>
<Item Name="OpenVariant.lvlib" Type="Library" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/Variant/OpenVariant.lvlib"/>
<Item Name="TD_Create Cluster.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Create Cluster.vi"/>
<Item Name="VariantType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/VariantDataType/VariantType.lvlib"/>
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
<Item Name="TD_Get Cluster Information.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Get Cluster Information.vi"/>
<Item Name="TD_Compare Types.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/GetType.llb/TD_Compare Types.vi"/>
<Item Name="Space Constant.vi" Type="VI" URL="/&lt;vilib&gt;/dlg_ctls.llb/Space Constant.vi"/>
<Item Name="KVP Parser.vi" Type="VI" URL="/&lt;vilib&gt;/LabVIEW Open Source Project/Data Manipulation/KVP Parser.vi"/>
</Item>
</Item>
<Item Name="Build Specifications" Type="Build"/>
Expand Down
Binary file modified source/MQTT_Base/Base Class/Decode Publish Package.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/Get Serializer.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/Launch Async Process.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/Set Serializer.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/Stop.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/isActive.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Base Class/isSessionConnected.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Base/Session/process.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Connection/Connection/Connect.vi
View file
Binary file not shown.
Binary file modified source/MQTT_Connection/Connection/setConnected.vi
View file
Binary file not shown.

0 comments on commit f4c85af

Please sign in to comment.