Skip to content

Commit

Permalink
oct_bug_fix (#9)
Browse files Browse the repository at this point in the history
* #8 change palette and show error input

* empty string to get the default value #7

* mass compile

* update vipb
  • Loading branch information
nevstop authored Oct 27, 2023
1 parent 9c35f58 commit 54898f3
Show file tree
Hide file tree
Showing 16 changed files with 15 additions and 7 deletions.
1 change: 1 addition & 0 deletions CSM-MassData-Parameter-Support.lvproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<Item Name="src" Type="Folder">
<Item Name="CSM MassData Parameter Support.lvlib" Type="Library" URL="../MassData-Parameter/CSM MassData Parameter Support.lvlib"/>
</Item>
<Item Name="CSM-MassData-Parameter-Support.vipb" Type="Document" URL="../CSM-MassData-Parameter-Support.vipb"/>
<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"/>
Expand Down
13 changes: 10 additions & 3 deletions CSM-MassData-Parameter-Support.vipb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-08-12 17:59:50" Modified_Date="2023-10-24 13:14:44" Creator="yaoli" Comments="" ID="d9bda21d6dc8f117f0c06ba1d2f3035c">
<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-08-12 17:59:50" Modified_Date="2023-10-27 22:09:39" Creator="yaoli" Comments="" ID="a949043fa7b0b78c35d04c0399b347c7">
<Library_General_Settings>
<Package_File_Name>NEVSTOP_lib_CSM_MassData_Parameter_Support</Package_File_Name>
<Library_Version>0.1.0.12</Library_Version>
Expand All @@ -17,7 +17,7 @@
</Library_General_Settings>
<Advanced_Settings>
<Package_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2023.10.2.123812</Additional_External_Dependencies>
<Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2023.10.27.161251</Additional_External_Dependencies>
<Package_Conflicts>nevstop_lib_jki_state_machine++ &gt;=2023.8.5.2239</Package_Conflicts>
</Package_Dependencies>
<Custom_Action_VIs>
Expand All @@ -35,7 +35,11 @@
<Copyright/>
<Packager>NEVSTOP</Packager>
<URL>https://github.com/NEVSTOP-LAB/JKISMPP-MassData-Parameter-Support</URL>
<Release_Notes>[add] add open source license: Apache License 2.0 </Release_Notes>
<Release_Notes>[critical] change palette to 4x1x1x4 for better line alignment
[critical] change vi name with 'CSM -' prefix
[add] add open source license: Apache License 2.0
[fix] show error in control
[fix] empty string will be convert to defaul value of input type</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -144,6 +148,9 @@
<Exclusions>
<Path>CSM-MassData-Parameter-Support.lvproj</Path>
</Exclusions>
<Exclusions>
<Path>LICENSE</Path>
</Exclusions>
<Place_Folder_Contents>
<Path/>
</Place_Folder_Contents>
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 removed MassData-Parameter/CSM MassData Parameter Status.vi
Binary file not shown.
8 changes: 4 additions & 4 deletions MassData-Parameter/CSM MassData Parameter Support.lvlib
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<Item Name="FGV-MassData.vi" Type="VI" URL="../_support/FGV-MassData.vi"/>
<Item Name="Operation-FGV-MassData.ctl" Type="VI" URL="../_support/Operation-FGV-MassData.ctl"/>
</Item>
<Item Name="CSM Config MassData Parameter Cache Size.vi" Type="VI" URL="../CSM Config MassData Parameter Cache Size.vi"/>
<Item Name="CSM Convert Argument to MassData.vim" Type="VI" URL="../CSM Convert Argument to MassData.vim"/>
<Item Name="CSM Convert MassData to Argument.vim" Type="VI" URL="../CSM Convert MassData to Argument.vim"/>
<Item Name="CSM MassData Parameter Status.vi" Type="VI" URL="../CSM MassData Parameter Status.vi"/>
<Item Name="CSM - Config MassData Parameter Cache Size.vi" Type="VI" URL="../CSM - Config MassData Parameter Cache Size.vi"/>
<Item Name="CSM - Convert Argument to MassData.vim" Type="VI" URL="../CSM - Convert Argument to MassData.vim"/>
<Item Name="CSM - Convert MassData to Argument.vim" Type="VI" URL="../CSM - Convert MassData to Argument.vim"/>
<Item Name="CSM - MassData Parameter Status.vi" Type="VI" URL="../CSM - MassData Parameter Status.vi"/>
</Library>
Binary file modified MassData-Parameter/dir.mnu
Binary file not shown.
Binary file modified example/Application/DataSimulateModule.vi
Binary file not shown.
Binary file modified example/Application/Main.vi
Binary file not shown.
Binary file modified example/MassData Parameter Support Demo 2.vi
Binary file not shown.
Binary file modified example/MassData Parameter Support Demo.vi
Binary file not shown.

0 comments on commit 54898f3

Please sign in to comment.