diff --git a/FuelcellStation.lvlps b/FuelcellStation.lvlps index 8121064..b9dc888 100644 --- a/FuelcellStation.lvlps +++ b/FuelcellStation.lvlps @@ -1,5 +1,5 @@ [프로젝트 윈도우_데이터] -ProjectExplorer.ClassicPosition[String] = "151,925,705,1423" +ProjectExplorer.ClassicPosition[String] = "220,272,774,770" [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 046d6cc..35e6db9 100644 --- a/FuelcellStation.lvproj +++ b/FuelcellStation.lvproj @@ -428,6 +428,7 @@ true + @@ -499,6 +500,8 @@ + + @@ -648,7 +651,7 @@ relativeToCommon true {1CB3712C-3CFD-4B2D-A4F7-96AE7826056A} - 80 + 93 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 b91fe30..5f27539 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 a18fab6..30ab97f 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 8fbd0ff..456fa7f 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 f2baeab..ed130a7 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 dda0106..e61d711 100644 Binary files a/Modules/Conversions/Protocol MASS In.vi and b/Modules/Conversions/Protocol MASS In.vi differ diff --git a/Modules/Functions/CVM Count.vi b/Modules/Functions/CVM Count.vi new file mode 100644 index 0000000..c9604d7 Binary files /dev/null and b/Modules/Functions/CVM Count.vi differ diff --git a/Modules/Functions/IO Gen_PhyCH.vi b/Modules/Functions/IO Gen_PhyCH.vi index 10d6517..77d543b 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 cd44349..c60b1ff 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 c370c32..16a2939 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 808e649..4e17bf1 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 7000a36..0e35d9f 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 26b96c9..105d3dd 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 e74fb32..1a53a30 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 aac8b3b..4ee4f2d 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 10b51f1..141d2a1 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 76a6bba..4b51364 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 c276d5e..32e5e78 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/E.Line Temp_Chk Comm..vi b/Modules/GUI Sub-Functions/E.Line Temp_Chk Comm..vi new file mode 100644 index 0000000..377228d Binary files /dev/null and b/Modules/GUI Sub-Functions/E.Line Temp_Chk Comm..vi differ diff --git a/Modules/GUI Sub-Functions/MASS_Calc.vi b/Modules/GUI Sub-Functions/MASS_Calc.vi index 83f446c..6b129c3 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 c201384..98d28fd 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 Extension LineTemp.vi b/Modules/GUI/GUI SET Extension LineTemp.vi new file mode 100644 index 0000000..4ba497d Binary files /dev/null and b/Modules/GUI/GUI SET Extension LineTemp.vi differ diff --git a/Modules/GUI/GUI SET HumTemp.vi b/Modules/GUI/GUI SET HumTemp.vi index 473f593..173acfa 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 6aa7838..f49a843 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 89b1113..24638c6 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 3de0828..78a1521 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 9bfca0a..fb2f2c4 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 a32507b..b1c7647 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 f79d191..0444a7b 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 74fa2c9..1a2d3c2 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 eeffafa..c19a64e 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/Serial Com_NX4.vi b/Modules/IO 3rd Party/Serial Com_NX4.vi new file mode 100644 index 0000000..27da027 Binary files /dev/null and b/Modules/IO 3rd Party/Serial Com_NX4.vi differ diff --git a/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_read.vi b/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_read.vi new file mode 100644 index 0000000..1834d62 Binary files /dev/null and b/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_read.vi differ diff --git a/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_set.vi b/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_set.vi new file mode 100644 index 0000000..24ecd4d Binary files /dev/null and b/Modules/IO 3rd Party/Temp_Hyyoung/NX4-hanyoung_temp_set.vi differ diff --git a/Modules/IO 3rd Party/VAISALA.vi b/Modules/IO 3rd Party/VAISALA.vi index e467b88..4c0e874 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 148612e..ebbc497 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 dfc4a34..85f5d95 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 2389396..266862f 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 8b7ec7d..2b1e7dd 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 88cd811..8ca7e51 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 27e39e1..b069fe1 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 b71b1df..bf71932 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 da0f01f..9c72ba3 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 db1dabe..fc18208 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 e05d99c..c0eb09c 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 0d32faf..5be1cab 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 d72886a..75d595e 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 e2fb698..b7a2d50 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 d0fe471..ec5db16 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 de5c640..5ca8e26 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 d978b73..7c36848 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 0a3a13f..4856550 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 96a6281..2b465d9 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 ca8f1e9..617024d 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 965a3b2..b3fbd1a 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 e5eb68f..74279ed 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 b5e39d3..d01eac7 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 a1660c1..0ca04d2 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 176fe4d..c1fdd76 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 NX4 Get.vi b/Modules/IO/Temp hyNux NX4 Get.vi new file mode 100644 index 0000000..98ba16a Binary files /dev/null and b/Modules/IO/Temp hyNux NX4 Get.vi differ diff --git a/Modules/IO/Temp hyNux NX4 Set.vi b/Modules/IO/Temp hyNux NX4 Set.vi new file mode 100644 index 0000000..e6181a1 Binary files /dev/null and b/Modules/IO/Temp hyNux NX4 Set.vi differ diff --git a/Modules/IO/Temp hyNux Set.vi b/Modules/IO/Temp hyNux Set.vi index 9b23660..817d864 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 c4f3bd6..6601317 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 2ca409c..36ca363 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 ad5c4db..de0a6e7 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 e46e8e9..f55c84f 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 784f736..d21e725 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 69bf6a6..cd83b82 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 d79849f..4f4215c 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 825061e..a6a9c9c 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 dad530b..fe1ae81 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 d464277..9d6aa21 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 01f3996..c2d8276 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 8374480..f83b163 100644 Binary files a/Modules/Solo-Loop/SL Timer.vi and b/Modules/Solo-Loop/SL Timer.vi differ diff --git a/NX4-hanyoung_temp_read.vi b/NX4-hanyoung_temp_read.vi new file mode 100644 index 0000000..ea05fa1 Binary files /dev/null and b/NX4-hanyoung_temp_read.vi differ diff --git a/NX4-hanyoung_temp_set.vi b/NX4-hanyoung_temp_set.vi new file mode 100644 index 0000000..e1ba94b Binary files /dev/null and b/NX4-hanyoung_temp_set.vi differ diff --git a/Serial Com_NX4.vi b/Serial Com_NX4.vi new file mode 100644 index 0000000..27da027 Binary files /dev/null and b/Serial Com_NX4.vi differ diff --git a/System/global.vi b/System/global.vi index 04ef872..f1471d5 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 6bdc27e..c55d667 100644 --- a/_Projects/Params/SydneyUniv_F24182.LogList +++ b/_Projects/Params/SydneyUniv_F24182.LogList @@ -3,7 +3,7 @@ 2 Log Basic -109 +118 Log Info. 3 @@ -1641,7 +1641,7 @@ 3 Name -[HFR]CH 0 +[HFR]]Frequency Type @@ -1649,7 +1649,7 @@ Port -0.0 +Frequency @@ -1657,7 +1657,7 @@ 3 Name -[HFR]CH 1 +[HFR]Amplitude Type @@ -1665,7 +1665,7 @@ Port -0.1 +Amplitude @@ -1673,7 +1673,7 @@ 3 Name -[HFR]CH 2 +[HFR]Impedance 0 Type @@ -1681,7 +1681,7 @@ Port -0.2 +Re(Z).0 @@ -1689,7 +1689,7 @@ 3 Name -[HFR]CH 3 +[HFR]Reactance 0 Type @@ -1697,7 +1697,7 @@ Port -0.3 +Im(Z).0 @@ -1705,7 +1705,7 @@ 3 Name -[HFR]CH 4 +[HFR]Impedance 1 Type @@ -1713,7 +1713,7 @@ Port -0.4 +Re(Z).1 @@ -1721,7 +1721,7 @@ 3 Name -[HFR]CH 5 +[HFR]Reactance 1 Type @@ -1729,7 +1729,7 @@ Port -0.5 +Im(Z).1 @@ -1737,7 +1737,7 @@ 3 Name -[HFR]CH 6 +[HFR]Impedance 2 Type @@ -1745,7 +1745,151 @@ Port -0.6 +Re(Z).2 + + + +Log Info. +3 + +Name +[HFR]Reactance 2 + + +Type +HFR + + +Port +Im(Z).2 + + + +Log Info. +3 + +Name +[HFR]Impedance 3 + + +Type +HFR + + +Port +Re(Z).3 + + + +Log Info. +3 + +Name +[HFR]Reactance 3 + + +Type +HFR + + +Port +Im(Z).3 + + + +Log Info. +3 + +Name +[HFR]Impedance 4 + + +Type +HFR + + +Port +Re(Z).4 + + + +Log Info. +3 + +Name +[HFR]Reactance 4 + + +Type +HFR + + +Port +Im(Z).4 + + + +Log Info. +3 + +Name +[HFR]Impedance 5 + + +Type +HFR + + +Port +Re(Z).5 + + + +Log Info. +3 + +Name +[HFR]Reactance 5 + + +Type +HFR + + +Port +Im(Z).5 + + + +Log Info. +3 + +Name +[HFR]Impedance 6 + + +Type +HFR + + +Port +Re(Z).6 + + + +Log Info. +3 + +Name +[HFR]Reactance 6 + + +Type +HFR + + +Port +Im(Z).6 diff --git a/_Projects/SydneyUniv.2_F24182.vi b/_Projects/SydneyUniv.2_F24182.vi index 8e0a040..f5eab79 100644 Binary files a/_Projects/SydneyUniv.2_F24182.vi and b/_Projects/SydneyUniv.2_F24182.vi differ