[update] update CSM framework to latest version.

[update] minor issue: #16 #14
NEVSTOP-LAB · Sep 28, 2024 · 1e1e29d · 1e1e29d
1 parent 0deb1d8
commit 1e1e29d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/Acquisition/Acquisition.vi b/Acquisition/Acquisition.vi
diff --git a/Algorithm/Algorithm.vi b/Algorithm/Algorithm.vi
diff --git a/CSM Continuous Meausrement and Logging Example.vipb b/CSM Continuous Meausrement and Logging Example.vipb
@@ -1,7 +1,7 @@
-<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2024-08-29 11:25:29" Creator="liyao" Comments="" ID="325c010e47fdf11ca5ce906ff5d02a8f">
+<VI_Package_Builder_Settings Version="2020.1" Created_Date="2023-09-27 14:21:53" Modified_Date="2024-09-28 12:20:11" Creator="liyao" Comments="" ID="1fd7e6c73b8568b01d7249b1979195d0">
   <Library_General_Settings>
     <Package_File_Name/>
-    <Library_Version>2024.8.0.1</Library_Version>
+    <Library_Version>2024.9.0.1</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>.</Library_Source_Folder>
     <Library_Output_Folder>vip</Library_Output_Folder>
@@ -17,9 +17,9 @@
   </Library_General_Settings>
   <Advanced_Settings>
     <Package_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2024.8.27.230559</Additional_External_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2024.8.27.163103</Additional_External_Dependencies>
-      <Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2024.8.28.152007</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_communicable_state_machine &gt;=2024.9.23.201943</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_csm_api_string_arguments_support &gt;=2024.9.27.173704</Additional_External_Dependencies>
+      <Additional_External_Dependencies>nevstop_lib_csm_ini_static_variable_support &gt;=2024.9.13.182855</Additional_External_Dependencies>
       <Additional_External_Dependencies>nevstop_lib_csm_massdata_parameter_support &gt;=2024.7.30.95006</Additional_External_Dependencies>
       <Package_Conflicts>nevstop_lib_jki_state_machine++ &gt;=2023.9.9.235144</Package_Conflicts>
     </Package_Dependencies>
@@ -45,9 +45,7 @@ More information, please visit: https://github.com/NEVSTOP-LAB/CSM-Continuous-Me
       <Packager>NEVSTOP</Packager>
       <URL>https://github.com/NEVSTOP-LAB/CSM-Continuous-Meausrement-and-Logging</URL>
       <Release_Notes>[update] update CSM framework to latest version.
-[update] add "VI Reference" Case to every CSM Modules
-[update] add demonstration to show how to use CSM file logger add-on.
-[update] add demonstration to show usecase of CSM Watchdog add-on.</Release_Notes>
+[update] minor issue: #16 #14</Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -230,7 +228,6 @@ More information, please visit: https://github.com/NEVSTOP-LAB/CSM-Continuous-Me
       <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>

diff --git a/CSM Continuous Meausrement and Logging.ini b/CSM Continuous Meausrement and Logging.ini
@@ -1,12 +1,19 @@
 [Config]
 Hardware.Resource = ""
-Hardware.SignalType = "Square with Noise"
+Hardware.SignalType = "Sine Wave"
 Logging.BasePath = "D:\\data"
 
 [LabVIEW]
 State = "Idle"
 
 [LogFilterRules]
-Global.State = 
+Global.State =
 Global.StateType = State - Complete
-Acquisition.StateType = State - Complete
+Acquisition.StateType = State - Complete
+
+[FileLogger]
+Enable = TRUE
+AutoExit = FALSE
+Limit.FileSize = 5M
+Limit.FileNum = 3
+Timestamp.Format = %<%Y/%m/%d %H:%M:%S%3u>T
diff --git a/CSM Continuous Meausrement and Logging.lvproj b/CSM Continuous Meausrement and Logging.lvproj
@@ -155,8 +155,9 @@
 				<Item Name="API String Arguments Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/API-String-Arugments-Support/API String Arguments Support.lvlib"/>
 				<Item Name="INI-Static-Variable-Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/INI-Static-Variable-Support.lvlib"/>
 				<Item Name="LabVIEW-Config.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/INI-Static-Variable-Support/LabVIEW-Config/LabVIEW-Config.lvlib"/>
-				<Item Name="CSM MassData Parameter Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/MassData-Parameter/CSM MassData Parameter Support.lvlib"/>
 				<Item Name="CSM File Logger.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Logger/CSM File Logger.lvlib"/>
+				<Item Name="CSM Watchdog.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/Watchdog/CSM Watchdog.lvlib"/>
+				<Item Name="CSM MassData Parameter Support.lvlib" Type="Library" URL="/&lt;userlib&gt;/_NEVSTOP/Communicable State Machine(CSM)/addons/MassData-Parameter/CSM MassData Parameter Support.lvlib"/>
 			</Item>
 			<Item Name="lvanlys.dll" Type="Document" URL="/&lt;resource&gt;/lvanlys.dll"/>
 		</Item>

diff --git a/Logging/Logging.vi b/Logging/Logging.vi
diff --git a/UI/UI(Launcher).vi b/UI/UI(Launcher).vi