Skip to content

Dev202505 #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.aliases
*.lvlps
*.vip
*.vip
*.lvcsm
Binary file modified API-String-Arugments-Support/API String - Is Supported Datatype.vi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<Item Name="String to 1D Array 2.vi" Type="VI" URL="../_Support/StringAnalyze/String to 1D Array 2.vi"/>
<Item Name="Strip brackets with Option.vi" Type="VI" URL="../_Support/StringAnalyze/Strip brackets with Option.vi"/>
<Item Name="Strip brackets.vi" Type="VI" URL="../_Support/StringAnalyze/Strip brackets.vi"/>
<Item Name="Cluster API String Mode.vi" Type="VI" URL="../_Support/StringAnalyze/Cluster API String Mode.vi"/>
</Item>
<Item Name="API String to 1D Array.vi" Type="VI" URL="../_Support/API String to 1D Array.vi"/>
<Item Name="Cluster API String to 1D Array(Splite Nested Cluster).vi" Type="VI" URL="../_Support/Cluster API String to 1D Array(Splite Nested Cluster).vi"/>
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 2 additions & 0 deletions CSM API String Arguments Support.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,12 @@
</Item>
<Item Name="API String Arguments Support.lvlib" Type="Library" URL="../API-String-Arugments-Support/API String Arguments Support.lvlib"/>
<Item Name="CSM API String Arguments Support.vipb" Type="Document" URL="../CSM API String Arguments Support.vipb"/>
<Item Name="README(CN).md" Type="Document" URL="../README(CN).md"/>
<Item Name="README.md" Type="Document" URL="../README.md"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="user.lib" Type="Folder">
<Item Name="Communicable State Machine.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib"/>
<Item Name="CSM Shared.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/_Shared/CSM Shared.lvlib"/>
</Item>
<Item Name="vi.lib" Type="Folder">
<Item Name="Add State(s) to Queue__JKI_lib_State_Machine.vi" Type="VI" URL="/&lt;vilib&gt;/addons/_JKI Toolkits/State Machine/_JKI_lib_State_Machine.llb/Add State(s) to Queue__JKI_lib_State_Machine.vi"/>
Expand Down
13 changes: 7 additions & 6 deletions CSM API String Arguments Support.vipb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-08-12 17:59:50" Modified_Date="2025-04-18 22:27:53" Creator="yaoli" Comments="" ID="574ba11473b356b6114608dc813706b6">
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-08-12 17:59:50" Modified_Date="2025-05-29 11:00:19" Creator="yaoli" Comments="" ID="2302af123033a34bb8a5d5dd877919ef">
<Library_General_Settings>
<Package_File_Name>NEVSTOP_lib_CSM_API_String_Arguments_Support</Package_File_Name>
<Library_Version>2025.4.0.2</Library_Version>
<Library_Version>2025.5.0.2</Library_Version>
<Auto_Increment_Version>false</Auto_Increment_Version>
<Library_Source_Folder>.</Library_Source_Folder>
<Library_Output_Folder>vip</Library_Output_Folder>
Expand All @@ -18,7 +18,7 @@
<Advanced_Settings>
<Package_Dependencies>
<Additional_External_Dependencies>labview_open_source_lib_epoch_datetime &gt;=1.2.0.6</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2024.11.22.234443</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2025.5.27.213756</Additional_External_Dependencies>
<Package_Conflicts>nevstop_lib_jki_state_machine++ &gt;=2023.8.5.2239</Package_Conflicts>
</Package_Dependencies>
<Custom_Action_VIs>
Expand Down Expand Up @@ -53,9 +53,10 @@ More information for the supported datatype format, please visit: https://github
<Copyright/>
<Packager>NEVSTOP</Packager>
<URL>https://github.com/NEVSTOP-LAB/CSM-API-String-Arugments-Support</URL>
<Release_Notes>[update] #80 when any cluster element has no name, use no-tag mode automatically for "Data To API String Arguments.vi"
[update] for cluster datatype, now the ref cluster is not required to have the same order as input cluster
[add] add API String - Is Supported Datatype.vi for checking datatype</Release_Notes>
<Release_Notes>[add] add support of Refnum/UserDefinedRefnumTag Datatype, which could be described as string.
[update] #85 Map/Set Datatype will not report error "[Error: 1](Unexpected Datatype)" thanks @wulei
[fix] #82 No Tag Mode Cluster string like "c:/abcde.txt;True" will now be converted correctly
[fix] #84 No Tag Mode Cluster String like "https://github.com/NEVSTOP-LAB" will have more chance be correctly parsed.</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down
Binary file modified Example/Get Module Configuration Example/SubModule.vi
Binary file not shown.
6 changes: 3 additions & 3 deletions README(CN).md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
- 路径(Path)
- 布尔(Boolean)
- 标签(Tag)
- Refnum(IVI/VISA)
- Refnum(IVI/VISA/UserDefinedRefnumTag)
- 整数(I8,I16,I32,I64,U8,U16,U32,U64)
- 浮点数(DBL/SGL)
- 复数(DBL/SGL)
Expand All @@ -29,12 +29,12 @@
- 簇(Cluster)
- 其他(使用CSM-Hexstr)

### 字符串(String)/路径(Path)/Refnum(IVI/VISA)/标签(Tag)
### 字符串(String)/路径(Path)/Refnum(IVI/VISA/UserDefinedRefnumTag)/标签(Tag)

字符串/路径遵循CSM的规则。'->|' '->' '-@' '-&' '>>' ',' ';' 在传递之前应该被替换为 %[Hex] 字符串。效果与使用 **CSM AdvanceAPI\CSM Make String Arguments Safe.vi** 相同。

> [!NOTE]
> LabVIEW 的 Refnum(IVI/VISA) 和标签(Tag) 也支持,规则与 String 类型相同。
> LabVIEW 的 Refnum(IVI/VISA/UserDefinedRefnumTag) 和标签(Tag) 也支持,规则与 String 类型相同。

### 布尔(Boolean)

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Two more templates which include "Data: Get Configuration", "Data: Set Configura
- String
- Path
- Tag
- Refnum(IVI/VISA)
- Refnum(IVI/VISA/UserDefinedRefnumTag)
- Boolean
- Integer(I8,I16,I32,I64,U8,U16,U32,U64)
- Float(DBL/SGL)
Expand All @@ -28,12 +28,12 @@ Two more templates which include "Data: Get Configuration", "Data: Set Configura
- Cluster
- Other(use CSM-Hexstr)

### String/Path/Refnum(IVI/VISA)/Tag
### String/Path/Refnum(IVI/VISA/UserDefinedRefnumTag)/Tag

For String/Path datatype, CSM Key words '->|' '->' '-@' '-&' '>>' ',' ';' will be replaced with %[Hex] String before passing, which is as same as using **CSM AdvanceAPI\CSM Make String Arguments Safe.vi**.

> [!NOTE]
> Refnum(IVI/VISA) and Tag also support, and the rule is the same as String type.
> Refnum(IVI/VISA/UserDefinedRefnumTag) and Tag also support, and the rule is the same as String type.

### Boolean

Expand Down
Binary file modified Template/CSM Module Template(+Configuration).vi
Binary file not shown.
Binary file modified Template/CSM User Interface(UI) Module Template(+Configuration).vi
Binary file not shown.
Binary file modified _test/Untitled 1.vi
Binary file not shown.
Binary file removed _test/Untitled 12.vi
Binary file not shown.

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified testcases/testcase-Supported-Datatype/testcases/test - Cluster.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified testcases/testcase-Supported-Datatype/testcases/test - Enum.vi
Binary file not shown.
Binary file modified testcases/testcase-Supported-Datatype/testcases/test - Refnum.vi
Binary file not shown.
Binary file not shown.
Binary file modified testcases/testcase-Supported-Datatype/testcases/test - Tag.vi
Binary file not shown.
Binary file modified testcases/testcase-Supported-Datatype/testcases/test - float.vi
Binary file not shown.
Binary file not shown.
Loading