diff --git a/FuelcellStation.lvlps b/FuelcellStation.lvlps index 2f18874..8121064 100644 --- a/FuelcellStation.lvlps +++ b/FuelcellStation.lvlps @@ -1,5 +1,5 @@ [Ʈ _] -ProjectExplorer.ClassicPosition[String] = "288,579,842,1077" +ProjectExplorer.ClassicPosition[String] = "151,925,705,1423" [AB_Cache_{842FAEA2-113E-46F8-9831-6C67398DFD47}] Cache_Path[Path] Line0001 = "/C/Users/yjlim/AppData/Local/Temp/AB_Cache_{842FAE" diff --git a/FuelcellStation.lvproj b/FuelcellStation.lvproj index d3ec977..046d6cc 100644 --- a/FuelcellStation.lvproj +++ b/FuelcellStation.lvproj @@ -44,11 +44,6 @@ true - - - - - 2 @@ -361,6 +356,8 @@ + + @@ -368,11 +365,14 @@ + + + @@ -383,6 +383,7 @@ + @@ -407,6 +408,7 @@ true + @@ -425,6 +427,7 @@ true + @@ -481,12 +484,14 @@ + + @@ -509,6 +514,7 @@ + @@ -642,7 +648,7 @@ relativeToCommon true {1CB3712C-3CFD-4B2D-A4F7-96AE7826056A} - 54 + 80 1 Fuelcell Station.exe ../builds/NI_AB_PROJECTNAME/SydneyUniv_F24182/Fuelcell Station.exe diff --git a/Modules/Conversions/Param2Value BP.vi b/Modules/Conversions/Param2Value BP.vi index b1d3d81..b91fe30 100644 Binary files a/Modules/Conversions/Param2Value BP.vi and b/Modules/Conversions/Param2Value BP.vi differ diff --git a/Modules/Conversions/Param2Value MASS.vi b/Modules/Conversions/Param2Value MASS.vi index 1486163..a18fab6 100644 Binary files a/Modules/Conversions/Param2Value MASS.vi and b/Modules/Conversions/Param2Value MASS.vi differ diff --git a/Modules/Conversions/Protocol BP In.vi b/Modules/Conversions/Protocol BP In.vi index 16eb4bf..8fbd0ff 100644 Binary files a/Modules/Conversions/Protocol BP In.vi and b/Modules/Conversions/Protocol BP In.vi differ diff --git a/Modules/Conversions/Protocol HumTemp In.vi b/Modules/Conversions/Protocol HumTemp In.vi index 87bb01e..f2baeab 100644 Binary files a/Modules/Conversions/Protocol HumTemp In.vi and b/Modules/Conversions/Protocol HumTemp In.vi differ diff --git a/Modules/Conversions/Protocol MASS In.vi b/Modules/Conversions/Protocol MASS In.vi index c4b0390..dda0106 100644 Binary files a/Modules/Conversions/Protocol MASS In.vi and b/Modules/Conversions/Protocol MASS In.vi differ diff --git a/Modules/Functions/IO Gen_PhyCH.vi b/Modules/Functions/IO Gen_PhyCH.vi index 0adf5da..10d6517 100644 Binary files a/Modules/Functions/IO Gen_PhyCH.vi and b/Modules/Functions/IO Gen_PhyCH.vi differ diff --git a/Modules/Functions/Size Initialze(Right Fix).vi b/Modules/Functions/Size Initialze(Right Fix).vi index 77527e3..cd44349 100644 Binary files a/Modules/Functions/Size Initialze(Right Fix).vi and b/Modules/Functions/Size Initialze(Right Fix).vi differ diff --git a/Modules/Functions/Size Initialze.vi b/Modules/Functions/Size Initialze.vi index f944fca..c370c32 100644 Binary files a/Modules/Functions/Size Initialze.vi and b/Modules/Functions/Size Initialze.vi differ diff --git a/Modules/GUI Prtc-Functions/LOAD_Fn_Disp Ctrl.vi b/Modules/GUI Prtc-Functions/LOAD_Fn_Disp Ctrl.vi index b7813d8..808e649 100644 Binary files a/Modules/GUI Prtc-Functions/LOAD_Fn_Disp Ctrl.vi and b/Modules/GUI Prtc-Functions/LOAD_Fn_Disp Ctrl.vi differ diff --git a/Modules/GUI Prtc-Functions/LOAD_Run_Constant.vi b/Modules/GUI Prtc-Functions/LOAD_Run_Constant.vi index ab45692..7000a36 100644 Binary files a/Modules/GUI Prtc-Functions/LOAD_Run_Constant.vi and b/Modules/GUI Prtc-Functions/LOAD_Run_Constant.vi differ diff --git a/Modules/GUI Prtc-Functions/LOAD_Run_Trip.vi b/Modules/GUI Prtc-Functions/LOAD_Run_Trip.vi index 4ef364c..26b96c9 100644 Binary files a/Modules/GUI Prtc-Functions/LOAD_Run_Trip.vi and b/Modules/GUI Prtc-Functions/LOAD_Run_Trip.vi differ diff --git a/Modules/GUI Prtc-Functions/LOAD_Run_Trip_Stoic.vi b/Modules/GUI Prtc-Functions/LOAD_Run_Trip_Stoic.vi index 69b6c43..e74fb32 100644 Binary files a/Modules/GUI Prtc-Functions/LOAD_Run_Trip_Stoic.vi and b/Modules/GUI Prtc-Functions/LOAD_Run_Trip_Stoic.vi differ diff --git a/Modules/GUI Prtc-Functions/PRTC_Fn_Check Item.vi b/Modules/GUI Prtc-Functions/PRTC_Fn_Check Item.vi index b06bc79..aac8b3b 100644 Binary files a/Modules/GUI Prtc-Functions/PRTC_Fn_Check Item.vi and b/Modules/GUI Prtc-Functions/PRTC_Fn_Check Item.vi differ diff --git a/Modules/GUI Sub-Functions/CFG_Fn_INI Read Engineer.vi b/Modules/GUI Sub-Functions/CFG_Fn_INI Read Engineer.vi index d4064c6..10b51f1 100644 Binary files a/Modules/GUI Sub-Functions/CFG_Fn_INI Read Engineer.vi and b/Modules/GUI Sub-Functions/CFG_Fn_INI Read Engineer.vi differ diff --git a/Modules/GUI Sub-Functions/CFG_Fn_INI Read User.vi b/Modules/GUI Sub-Functions/CFG_Fn_INI Read User.vi index d1f41cc..76a6bba 100644 Binary files a/Modules/GUI Sub-Functions/CFG_Fn_INI Read User.vi and b/Modules/GUI Sub-Functions/CFG_Fn_INI Read User.vi differ diff --git a/Modules/GUI Sub-Functions/Chart_Update.vi b/Modules/GUI Sub-Functions/Chart_Update.vi index 96163ef..c276d5e 100644 Binary files a/Modules/GUI Sub-Functions/Chart_Update.vi and b/Modules/GUI Sub-Functions/Chart_Update.vi differ diff --git a/Modules/GUI Sub-Functions/MASS_Calc.vi b/Modules/GUI Sub-Functions/MASS_Calc.vi index 9d1bfa6..83f446c 100644 Binary files a/Modules/GUI Sub-Functions/MASS_Calc.vi and b/Modules/GUI Sub-Functions/MASS_Calc.vi differ diff --git a/Modules/GUI/GUI SET BP.vi b/Modules/GUI/GUI SET BP.vi index b577d7e..c201384 100644 Binary files a/Modules/GUI/GUI SET BP.vi and b/Modules/GUI/GUI SET BP.vi differ diff --git a/Modules/GUI/GUI SET HumTemp.vi b/Modules/GUI/GUI SET HumTemp.vi index 97f87aa..473f593 100644 Binary files a/Modules/GUI/GUI SET HumTemp.vi and b/Modules/GUI/GUI SET HumTemp.vi differ diff --git a/Modules/GUI/GUI SET LOAD.vi b/Modules/GUI/GUI SET LOAD.vi index f115f4a..6aa7838 100644 Binary files a/Modules/GUI/GUI SET LOAD.vi and b/Modules/GUI/GUI SET LOAD.vi differ diff --git a/Modules/GUI/GUI SET MASS.vi b/Modules/GUI/GUI SET MASS.vi index 39c534e..89b1113 100644 Binary files a/Modules/GUI/GUI SET MASS.vi and b/Modules/GUI/GUI SET MASS.vi differ diff --git a/Modules/GUI/GUI SET StartUp.vi b/Modules/GUI/GUI SET StartUp.vi index cd1dc60..3de0828 100644 Binary files a/Modules/GUI/GUI SET StartUp.vi and b/Modules/GUI/GUI SET StartUp.vi differ diff --git a/Modules/GUI/GUI SET TANK.vi b/Modules/GUI/GUI SET TANK.vi index 6bc412f..9bfca0a 100644 Binary files a/Modules/GUI/GUI SET TANK.vi and b/Modules/GUI/GUI SET TANK.vi differ diff --git a/Modules/GUI/GUI SYS CFG.vi b/Modules/GUI/GUI SYS CFG.vi index b9fdc66..a32507b 100644 Binary files a/Modules/GUI/GUI SYS CFG.vi and b/Modules/GUI/GUI SYS CFG.vi differ diff --git a/Modules/GUI/GUI SYS CheckHardware.vi b/Modules/GUI/GUI SYS CheckHardware.vi index f0ce9fa..f79d191 100644 Binary files a/Modules/GUI/GUI SYS CheckHardware.vi and b/Modules/GUI/GUI SYS CheckHardware.vi differ diff --git a/Modules/GUI/GUI SYS DEV.vi b/Modules/GUI/GUI SYS DEV.vi index 429d43a..74fa2c9 100644 Binary files a/Modules/GUI/GUI SYS DEV.vi and b/Modules/GUI/GUI SYS DEV.vi differ diff --git a/Modules/IO 3rd Party/KOLLIBRIK.vi b/Modules/IO 3rd Party/KOLLIBRIK.vi index c7943df..eeffafa 100644 Binary files a/Modules/IO 3rd Party/KOLLIBRIK.vi and b/Modules/IO 3rd Party/KOLLIBRIK.vi differ diff --git a/Modules/IO 3rd Party/VAISALA.vi b/Modules/IO 3rd Party/VAISALA.vi index ef2ad6f..e467b88 100644 Binary files a/Modules/IO 3rd Party/VAISALA.vi and b/Modules/IO 3rd Party/VAISALA.vi differ diff --git a/Modules/IO Libraries/Graph Update.vi b/Modules/IO Libraries/Graph Update.vi index e0f1d00..148612e 100644 Binary files a/Modules/IO Libraries/Graph Update.vi and b/Modules/IO Libraries/Graph Update.vi differ diff --git a/Modules/IO Libraries/I-V Show Update.vi b/Modules/IO Libraries/I-V Show Update.vi index 22effd9..dfc4a34 100644 Binary files a/Modules/IO Libraries/I-V Show Update.vi and b/Modules/IO Libraries/I-V Show Update.vi differ diff --git a/Modules/IO Libraries/LOAD_Faith.vi b/Modules/IO Libraries/LOAD_Faith.vi index 2fbee06..2389396 100644 Binary files a/Modules/IO Libraries/LOAD_Faith.vi and b/Modules/IO Libraries/LOAD_Faith.vi differ diff --git a/Modules/IO Libraries/LOAD_Kikusui.llb b/Modules/IO Libraries/LOAD_Kikusui.llb index caf322f..8b7ec7d 100644 Binary files a/Modules/IO Libraries/LOAD_Kikusui.llb and b/Modules/IO Libraries/LOAD_Kikusui.llb differ diff --git a/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi b/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi index 1f44f75..88cd811 100644 Binary files a/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi and b/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi differ diff --git a/Modules/IO Sub-Functions/Generate Out (Analog).vi b/Modules/IO Sub-Functions/Generate Out (Analog).vi index a35de0e..27e39e1 100644 Binary files a/Modules/IO Sub-Functions/Generate Out (Analog).vi and b/Modules/IO Sub-Functions/Generate Out (Analog).vi differ diff --git a/Modules/IO Sub-Functions/Generate Out (Digital).vi b/Modules/IO Sub-Functions/Generate Out (Digital).vi index 01d6321..b71b1df 100644 Binary files a/Modules/IO Sub-Functions/Generate Out (Digital).vi and b/Modules/IO Sub-Functions/Generate Out (Digital).vi differ diff --git a/Modules/IO Sub-Functions/Generate Out (MC9).vi b/Modules/IO Sub-Functions/Generate Out (MC9).vi index 2c2c061..da0f01f 100644 Binary files a/Modules/IO Sub-Functions/Generate Out (MC9).vi and b/Modules/IO Sub-Functions/Generate Out (MC9).vi differ diff --git a/Modules/IO Sub-Functions/OUT Extra AO.vi b/Modules/IO Sub-Functions/OUT Extra AO.vi index 24b49ad..db1dabe 100644 Binary files a/Modules/IO Sub-Functions/OUT Extra AO.vi and b/Modules/IO Sub-Functions/OUT Extra AO.vi differ diff --git a/Modules/IO Sub-Functions/OUT Extra DO.vi b/Modules/IO Sub-Functions/OUT Extra DO.vi index 0f75d6c..e05d99c 100644 Binary files a/Modules/IO Sub-Functions/OUT Extra DO.vi and b/Modules/IO Sub-Functions/OUT Extra DO.vi differ diff --git a/Modules/IO Sub-Functions/OUT Extra TEMP.vi b/Modules/IO Sub-Functions/OUT Extra TEMP.vi index edf203f..0d32faf 100644 Binary files a/Modules/IO Sub-Functions/OUT Extra TEMP.vi and b/Modules/IO Sub-Functions/OUT Extra TEMP.vi differ diff --git a/Modules/IO Sub-Functions/OUT From BP Calc.vi b/Modules/IO Sub-Functions/OUT From BP Calc.vi index 059f5d0..d72886a 100644 Binary files a/Modules/IO Sub-Functions/OUT From BP Calc.vi and b/Modules/IO Sub-Functions/OUT From BP Calc.vi differ diff --git a/Modules/IO Sub-Functions/OUT From BP.vi b/Modules/IO Sub-Functions/OUT From BP.vi index cebe9a1..e2fb698 100644 Binary files a/Modules/IO Sub-Functions/OUT From BP.vi and b/Modules/IO Sub-Functions/OUT From BP.vi differ diff --git a/Modules/IO Sub-Functions/OUT From MASS.vi b/Modules/IO Sub-Functions/OUT From MASS.vi index e181db5..d0fe471 100644 Binary files a/Modules/IO Sub-Functions/OUT From MASS.vi and b/Modules/IO Sub-Functions/OUT From MASS.vi differ diff --git a/Modules/IO Sub-Functions/OUT From PH.vi b/Modules/IO Sub-Functions/OUT From PH.vi index 4cb7294..de5c640 100644 Binary files a/Modules/IO Sub-Functions/OUT From PH.vi and b/Modules/IO Sub-Functions/OUT From PH.vi differ diff --git a/Modules/IO Sub-Functions/OUT To HW.vi b/Modules/IO Sub-Functions/OUT To HW.vi index f83ed96..d978b73 100644 Binary files a/Modules/IO Sub-Functions/OUT To HW.vi and b/Modules/IO Sub-Functions/OUT To HW.vi differ diff --git a/Modules/IO Sub-Functions/OUT To LOG.vi b/Modules/IO Sub-Functions/OUT To LOG.vi index 32c9272..0a3a13f 100644 Binary files a/Modules/IO Sub-Functions/OUT To LOG.vi and b/Modules/IO Sub-Functions/OUT To LOG.vi differ diff --git a/Modules/IO/CalcMassSum.vi b/Modules/IO/CalcMassSum.vi index 4e1d9c6..96a6281 100644 Binary files a/Modules/IO/CalcMassSum.vi and b/Modules/IO/CalcMassSum.vi differ diff --git a/Modules/IO/DAQmx AI Open.vi b/Modules/IO/DAQmx AI Open.vi index cf10ac5..ca8f1e9 100644 Binary files a/Modules/IO/DAQmx AI Open.vi and b/Modules/IO/DAQmx AI Open.vi differ diff --git a/Modules/IO/DAQmx AI Run.vi b/Modules/IO/DAQmx AI Run.vi index cbe4d3e..965a3b2 100644 Binary files a/Modules/IO/DAQmx AI Run.vi and b/Modules/IO/DAQmx AI Run.vi differ diff --git a/Modules/IO/DAQmx AO.vi b/Modules/IO/DAQmx AO.vi index 2e93a7e..e5eb68f 100644 Binary files a/Modules/IO/DAQmx AO.vi and b/Modules/IO/DAQmx AO.vi differ diff --git a/Modules/IO/DAQmx DO.vi b/Modules/IO/DAQmx DO.vi index 88c8447..b5e39d3 100644 Binary files a/Modules/IO/DAQmx DO.vi and b/Modules/IO/DAQmx DO.vi differ diff --git a/Modules/IO/OFFLINE MDL.vi b/Modules/IO/OFFLINE MDL.vi index a8f5889..a1660c1 100644 Binary files a/Modules/IO/OFFLINE MDL.vi and b/Modules/IO/OFFLINE MDL.vi differ diff --git a/Modules/IO/Temp hyNux Get.vi b/Modules/IO/Temp hyNux Get.vi index 99704d8..176fe4d 100644 Binary files a/Modules/IO/Temp hyNux Get.vi and b/Modules/IO/Temp hyNux Get.vi differ diff --git a/Modules/IO/Temp hyNux Set.vi b/Modules/IO/Temp hyNux Set.vi index 0a2582c..9b23660 100644 Binary files a/Modules/IO/Temp hyNux Set.vi and b/Modules/IO/Temp hyNux Set.vi differ diff --git a/Modules/Init Global Variables.vi b/Modules/Init Global Variables.vi index bd01013..c4f3bd6 100644 Binary files a/Modules/Init Global Variables.vi and b/Modules/Init Global Variables.vi differ diff --git a/Modules/LOG/Global Error.vi b/Modules/LOG/Global Error.vi index f03d656..2ca409c 100644 Binary files a/Modules/LOG/Global Error.vi and b/Modules/LOG/Global Error.vi differ diff --git a/Modules/LOG/Log Message Write.vi b/Modules/LOG/Log Message Write.vi index 824b6ae..ad5c4db 100644 Binary files a/Modules/LOG/Log Message Write.vi and b/Modules/LOG/Log Message Write.vi differ diff --git a/Modules/LOG/Log To Chart.vi b/Modules/LOG/Log To Chart.vi index f77c875..e46e8e9 100644 Binary files a/Modules/LOG/Log To Chart.vi and b/Modules/LOG/Log To Chart.vi differ diff --git a/Modules/Solo-Loop/SL Chart.vi b/Modules/Solo-Loop/SL Chart.vi index 7086c9b..784f736 100644 Binary files a/Modules/Solo-Loop/SL Chart.vi and b/Modules/Solo-Loop/SL Chart.vi differ diff --git a/Modules/Solo-Loop/SL Detection4Shutdown.vi b/Modules/Solo-Loop/SL Detection4Shutdown.vi index 79a65bc..69bf6a6 100644 Binary files a/Modules/Solo-Loop/SL Detection4Shutdown.vi and b/Modules/Solo-Loop/SL Detection4Shutdown.vi differ diff --git a/Modules/Solo-Loop/SL IMP Write.vi b/Modules/Solo-Loop/SL IMP Write.vi index 74d2839..d79849f 100644 Binary files a/Modules/Solo-Loop/SL IMP Write.vi and b/Modules/Solo-Loop/SL IMP Write.vi differ diff --git a/Modules/Solo-Loop/SL IO.vi b/Modules/Solo-Loop/SL IO.vi index 10c6af4..825061e 100644 Binary files a/Modules/Solo-Loop/SL IO.vi and b/Modules/Solo-Loop/SL IO.vi differ diff --git a/Modules/Solo-Loop/SL Log Write.vi b/Modules/Solo-Loop/SL Log Write.vi index 0cbf628..dad530b 100644 Binary files a/Modules/Solo-Loop/SL Log Write.vi and b/Modules/Solo-Loop/SL Log Write.vi differ diff --git a/Modules/Solo-Loop/SL PRTC Write.vi b/Modules/Solo-Loop/SL PRTC Write.vi index 24a737f..d464277 100644 Binary files a/Modules/Solo-Loop/SL PRTC Write.vi and b/Modules/Solo-Loop/SL PRTC Write.vi differ diff --git a/Modules/Solo-Loop/SL Shutdown.vi b/Modules/Solo-Loop/SL Shutdown.vi index 33ceff2..01f3996 100644 Binary files a/Modules/Solo-Loop/SL Shutdown.vi and b/Modules/Solo-Loop/SL Shutdown.vi differ diff --git a/Modules/Solo-Loop/SL Timer.vi b/Modules/Solo-Loop/SL Timer.vi index 0e30b43..8374480 100644 Binary files a/Modules/Solo-Loop/SL Timer.vi and b/Modules/Solo-Loop/SL Timer.vi differ diff --git a/System/global.vi b/System/global.vi index 9e50f33..04ef872 100644 Binary files a/System/global.vi and b/System/global.vi differ diff --git a/_Projects/Params/SydneyUniv_F24182.LogList b/_Projects/Params/SydneyUniv_F24182.LogList index 9d26af4..6bdc27e 100644 --- a/_Projects/Params/SydneyUniv_F24182.LogList +++ b/_Projects/Params/SydneyUniv_F24182.LogList @@ -3,7 +3,7 @@ 2 Log Basic -111 +109 Log Info. 3 @@ -393,7 +393,7 @@ 3 Name -[Dewpoint]Anode RH +[Dewpoint]Anode Dewpoint Type @@ -409,23 +409,7 @@ 3 Name -[Dewpoint]Anode Temp - - -Type -Dewpoint - - -Port -0.1 - - - -Log Info. -3 - -Name -[Dewpoint]Cathode RH +[Dewpoint]Cathode Dewpoint Type @@ -441,22 +425,6 @@ 3 Name -[Dewpoint]Cathode Temp - - -Type -Dewpoint - - -Port -1.1 - - - -Log Info. -3 - -Name [Pressure] H2 Supply diff --git a/_Projects/SydneyUniv.2_F24182.vi b/_Projects/SydneyUniv.2_F24182.vi index fd688fe..8e0a040 100644 Binary files a/_Projects/SydneyUniv.2_F24182.vi and b/_Projects/SydneyUniv.2_F24182.vi differ