Skip to content

Commit 43157ac

Browse files
committed
Merge branch 'feature/error_propagation' into develop
2 parents 72caf66 + e6c67d3 commit 43157ac

138 files changed

Lines changed: 714 additions & 443 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Install Error Codes.vi

7.73 KB
Binary file not shown.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2023 LS Andrea Vaccaro, Instruments AG
1+
Copyright 2024 LS Andrea Vaccaro, Instruments AG
22

33
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
44

README.md

Lines changed: 89 additions & 131 deletions
Large diffs are not rendered by default.

WebSocket Actor Release Notes.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ WebSocket Actor Release Notes
22
v1.1.0
33
- Implemented Keepalive functionality whereby a WebSocket client/server checks if the peer is still responding ("Alive") by sending WebSockets Ping messages to the peer on a certain time interval. The peer will answer with a WebSockets Pong message. If the answer is not received within a certain amount timeout the client/server will drop the connection.
44
- Implemented secure WebSocket capabilities.
5+
- Implemented custom error generation, handling and reporting
6+
- Improved the structure and usability of the function palette, now all actors have the same color icon
57
v1.0.0
68
- First public release

WebSocket Actor.lvlps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[ProjectWindow_Data]
2-
ProjectExplorer.ClassicPosition[String] = "127,777,953,1296"
2+
ProjectExplorer.ClassicPosition[String] = "37,777,915,1296"

WebSocket Actor.lvproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,23 @@
2323
<Item Name="LV WebSockets.lvlib" Type="Library" URL="/&lt;vilib&gt;/LS Instruments AG/LV-WebSockets/LV WebSockets.lvlib"/>
2424
</Item>
2525
<Item Name="VIPM" Type="Folder">
26+
<Item Name="Install Error Codes.vi" Type="VI" URL="../Install Error Codes.vi"/>
2627
<Item Name="WebSocket-Actor.vipb" Type="Document" URL="../WebSocket-Actor.vipb"/>
2728
<Item Name="WebSocket-Actor.vipc" Type="Document" URL="../WebSocket-Actor.vipc"/>
2829
</Item>
2930
<Item Name="README.md" Type="Document" URL="../README.md"/>
3031
<Item Name="WebSocket Actor Release Notes.txt" Type="Document" URL="../WebSocket Actor Release Notes.txt"/>
3132
<Item Name="WebSocket Actors.lvlib" Type="Library" URL="../WebSocket Actor/WebSocket Actors.lvlib"/>
33+
<Item Name="WebSocket-Actors-errors.txt" Type="Document" URL="../WebSocket-Actors-errors.txt"/>
3234
<Item Name="Dependencies" Type="Dependencies">
3335
<Item Name="user.lib" Type="Folder">
36+
<Item Name="MGI Append String to Error Source.vi" Type="VI" URL="/&lt;userlib&gt;/_MGI/Error Handling/MGI Append String to Error Source.vi"/>
3437
<Item Name="openg_error.lvlib" Type="Library" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/openg_error.lvlib"/>
3538
<Item Name="openg_time.lvlib" Type="Library" URL="/&lt;userlib&gt;/_OpenG.lib/time/time.llb/openg_time.lvlib"/>
3639
</Item>
3740
<Item Name="vi.lib" Type="Folder">
3841
<Item Name="Actor Framework.lvlib" Type="Library" URL="/&lt;vilib&gt;/ActorFramework/Actor Framework.lvlib"/>
42+
<Item Name="Application Directory.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/file.llb/Application Directory.vi"/>
3943
<Item Name="BuildHelpPath.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/BuildHelpPath.vi"/>
4044
<Item Name="Check Special Tags.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Check Special Tags.vi"/>
4145
<Item Name="Clear Errors.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Clear Errors.vi"/>
@@ -61,8 +65,10 @@
6165
<Item Name="Longest Line Length in Pixels.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Longest Line Length in Pixels.vi"/>
6266
<Item Name="LVBoundsTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVBoundsTypeDef.ctl"/>
6367
<Item Name="LVRectTypeDef.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/miscctls.llb/LVRectTypeDef.ctl"/>
68+
<Item Name="NI_FileType.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/lvfile.llb/NI_FileType.lvlib"/>
6469
<Item Name="NI_SystemLogging.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/SystemLogging/NI_SystemLogging.lvlib"/>
6570
<Item Name="Not Found Dialog.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Not Found Dialog.vi"/>
71+
<Item Name="Report Error Msg.lvclass" Type="LVClass" URL="/&lt;vilib&gt;/ActorFramework/Report Error Msg/Report Error Msg.lvclass"/>
6672
<Item Name="Search and Replace Pattern.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Search and Replace Pattern.vi"/>
6773
<Item Name="Set Bold Text.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set Bold Text.vi"/>
6874
<Item Name="Set String Value.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Set String Value.vi"/>
Binary file not shown.

WebSocket Actor/Keepalive Heartbeat Messages/Report Pong Msg/Report Pong Msg.lvclass

Lines changed: 16 additions & 12 deletions
Large diffs are not rendered by default.
Binary file not shown.
124 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)