Skip to content

Commit

Permalink
Dev202407 (#54)
Browse files Browse the repository at this point in the history
* [add] add CSM - Broadcast Data As API String.vim in utility palette

* [add] add utility vi for conversion between 'indexed enum' and number.

* delete Get Strings from Enum__csm.vi

* [update] update some VI icons

* [important] #51 Enum type support is enhanced.

* update palette title

* [important] #55 Cluster type support is enhanced. Leaf element's name could be used as tag name in tag-value pair mode.

* [fix] Fix bug that Binary Number is not corrected converted to number. e.g. 0b1 -x-> -1. This is wrong.

---------

Co-authored-by: NEVSTOP <nevstop>
  • Loading branch information
nevstop authored Jul 29, 2024
1 parent 565cade commit 488487d
Show file tree
Hide file tree
Showing 42 changed files with 299 additions and 279 deletions.
Binary file modified API-String-Arugments-Support/API String - Add Boolean Strings.vi
Binary file not shown.
Binary file modified API-String-Arugments-Support/API String - Float Precision.vi
Binary file not shown.
Binary file modified API-String-Arugments-Support/API String - List Boolean Strings.vi
Binary file not shown.
Binary file not shown.
Binary file modified API-String-Arugments-Support/API String - Set Float Precision.vi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Item Name="CSM - Convert HexStr to Data.vim" Type="VI" URL="../CSM - Convert HexStr to Data.vim"/>
<Item Name="CSM - Query CSM VI Ref By API String.vi" Type="VI" URL="../CSM - Query CSM VI Ref By API String.vi"/>
<Item Name="CSM - Query Internal Data Names By API String.vi" Type="VI" URL="../CSM - Query Internal Data Names By API String.vi"/>
<Item Name="CSM - Broadcast Data As API String.vim" Type="VI" URL="../CSM - Broadcast Data As API String.vim"/>
</Item>
<Item Name="Support" Type="Folder">
<Item Name="Convert API String Arguments to Data(variant).vi" Type="VI" URL="../_Support/Convert API String Arguments to Data(variant).vi"/>
Expand All @@ -31,6 +32,9 @@
<Item Name="String To Float_csm.vi" Type="VI" URL="../_Support/String To Float_csm.vi"/>
<Item Name="String To Number(I64)_csm.vi" Type="VI" URL="../_Support/String To Number(I64)_csm.vi"/>
<Item Name="Strip Tag in Tag Value Pair.vi" Type="VI" URL="../_Support/Strip Tag in Tag Value Pair.vi"/>
<Item Name="String To Indexed Enum_csm.vi" Type="VI" URL="../_Support/String To Indexed Enum_csm.vi"/>
<Item Name="Indexed Enum to Numeric_csm.vim" Type="VI" URL="../_Support/Indexed Enum to Numeric_csm.vim"/>
<Item Name="Numeric to Indexed Enum_csm.vim" Type="VI" URL="../_Support/Numeric to Indexed Enum_csm.vim"/>
</Item>
<Item Name="Configure" Type="Folder">
<Item Name="API String - Add Boolean Strings.vi" Type="VI" URL="../API String - Add Boolean Strings.vi"/>
Expand Down
Binary file not shown.
Binary file modified API-String-Arugments-Support/CSM-Utility.mnu
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified API-String-Arugments-Support/Utility.mnu
Binary file not shown.
Binary file modified API-String-Arugments-Support/_Support/Boolean Strings.vi
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 modified API-String-Arugments-Support/_Support/Float Precision.vi
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 modified API-String-Arugments-Support/_Support/String To Float_csm.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified API-String-Arugments-Support/_Support/String to Boolean_csm.vi
Binary file not shown.
Binary file not shown.
9 changes: 0 additions & 9 deletions CSM API String Arguments Support.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,7 @@
<Item Name="README.md" Type="Document" URL="../README.md"/>
<Item Name="Dependencies" Type="Dependencies">
<Item Name="user.lib" Type="Folder">
<Item Name="Build Error Cluster__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/error/error.llb/Build Error Cluster__ogtk.vi"/>
<Item Name="Communicable State Machine.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/Communicable State Machine.lvlib"/>
<Item Name="Get Header from TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Header from TD__ogtk.vi"/>
<Item Name="Get PString__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get PString__ogtk.vi"/>
<Item Name="Get Strings from Enum TD__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Strings from Enum TD__ogtk.vi"/>
<Item Name="Get Strings from Enum__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Get Strings from Enum__ogtk.vi"/>
<Item Name="Type Descriptor Enumeration__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Enumeration__ogtk.ctl"/>
<Item Name="Type Descriptor Header__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor Header__ogtk.ctl"/>
<Item Name="Type Descriptor__ogtk.ctl" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Type Descriptor__ogtk.ctl"/>
<Item Name="Variant to Header Info__ogtk.vi" Type="VI" URL="/&lt;userlib&gt;/_OpenG.lib/lvdata/lvdata.llb/Variant to Header Info__ogtk.vi"/>
</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
542 changes: 272 additions & 270 deletions CSM API String Arguments Support.vipb

Large diffs are not rendered by default.

Binary file modified Example/String to Enum Example.vi
Binary file not shown.
Binary file modified Example/String(Float with Unit) To Float Example.vi
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Example/Supported Datatype Examples/Test Cases - Cluster.vi
Binary file not shown.
23 changes: 23 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,29 @@ No time string format included in string, ISO8601 UTC standard is used.

### Enum

Indexed Enum is defined as Enum Strings composed with [number] [separator] [enum String].

> hex Number, -- as separator
>
> - 0x01 -- boolean
> - 0x02 -- string
> - 0x04 -- dbl
> - 0x08 -- number
>
> binary Number, -- as separator
>
> - 0b0001 __ boolean
> - 0b0010 __ string
> - 0b0100 __ dbl
> - 0b1000 __ number
>
> Decided Number, == as separator
>
> - 1 == boolean
> - 2 == string
> - 4 == dbl
> - 8 == number
_**Condition1**_

Enum = {AAA,BBBB,CCCC}
Expand Down
Binary file modified _test/Untitled 1.vi
Binary file not shown.
Binary file modified _test/remove zero.vi
Binary file not shown.
Binary file modified _test/test Enum.vi
Binary file not shown.

0 comments on commit 488487d

Please sign in to comment.