diff --git a/BenchTop.vi b/BenchTop.vi index d087786..e536576 100644 Binary files a/BenchTop.vi and b/BenchTop.vi differ diff --git a/Modules/Conversions/Param2Value BP.vi b/Modules/Conversions/Param2Value BP.vi index 573433b..a33aca7 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 e2400e3..ed24d3e 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 09105a4..21e62e5 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 BP Out.vi b/Modules/Conversions/Protocol BP Out.vi index 1cbf8e6..ffa0d40 100644 Binary files a/Modules/Conversions/Protocol BP Out.vi and b/Modules/Conversions/Protocol BP Out.vi differ diff --git a/Modules/Conversions/Protocol HFR In.vi b/Modules/Conversions/Protocol HFR In.vi new file mode 100644 index 0000000..47fb520 Binary files /dev/null and b/Modules/Conversions/Protocol HFR In.vi differ diff --git a/Modules/Conversions/Protocol HFR Out.vi b/Modules/Conversions/Protocol HFR Out.vi new file mode 100644 index 0000000..b129c07 Binary files /dev/null and b/Modules/Conversions/Protocol HFR Out.vi differ diff --git a/Modules/Conversions/Protocol HumTemp In.vi b/Modules/Conversions/Protocol HumTemp In.vi index a1b458a..9baf02c 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 HumTemp Out.vi b/Modules/Conversions/Protocol HumTemp Out.vi index 767d76d..63b0c7c 100644 Binary files a/Modules/Conversions/Protocol HumTemp Out.vi and b/Modules/Conversions/Protocol HumTemp Out.vi differ diff --git a/Modules/Conversions/Protocol MASS In.vi b/Modules/Conversions/Protocol MASS In.vi index 51688d2..97bedf4 100644 Binary files a/Modules/Conversions/Protocol MASS In.vi and b/Modules/Conversions/Protocol MASS In.vi differ diff --git a/Modules/Conversions/Protocol MASS Out.vi b/Modules/Conversions/Protocol MASS Out.vi index e634210..3d761a4 100644 Binary files a/Modules/Conversions/Protocol MASS Out.vi and b/Modules/Conversions/Protocol MASS Out.vi differ diff --git a/Modules/Functions/IO Gen_PhyCH.vi b/Modules/Functions/IO Gen_PhyCH.vi index 4e1a916..fdf5d4a 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 4a1dcf0..6024d7b 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 b12dddd..8943e80 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 6c495d9..8379b50 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 b440445..dd995bc 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 22c0620..480ed09 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 23d14c9..c4b21fc 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 c8bb264..ae19e8e 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 f41f8fe..e82d8a5 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 73c86a1..3b34a69 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/MASS_Calc.vi b/Modules/GUI Sub-Functions/MASS_Calc.vi index 0a82064..8e2d960 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 Protocol.vi b/Modules/GUI/GUI Protocol.vi index 704cb24..edc4c9b 100644 Binary files a/Modules/GUI/GUI Protocol.vi and b/Modules/GUI/GUI Protocol.vi differ diff --git a/Modules/GUI/GUI SET BP.vi b/Modules/GUI/GUI SET BP.vi index 9a11191..76b445f 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 efc7bd6..4df303e 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 e2c6910..387ceb9 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 2a99dd4..d738d3e 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 2afaac6..8887c1c 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 f2a793b..4016b23 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 a3f31cf..3862ec8 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 cec2018..1c63810 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 14ccbdd..48e5ca9 100644 Binary files a/Modules/GUI/GUI SYS DEV.vi and b/Modules/GUI/GUI SYS DEV.vi differ diff --git a/Modules/IO Libraries/LOAD_Kikusui.llb b/Modules/IO Libraries/LOAD_Kikusui.llb index 05e1fbf..34167b3 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/Generate Out (Analog).vi b/Modules/IO Sub-Functions/Generate Out (Analog).vi index 189afeb..b7d3281 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 c315af7..07801ea 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 8619e20..d1466cc 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 f181d2a..dcdf03c 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 14bcb38..eecfe21 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 2c1f312..4ef4140 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 488389b..cc51a96 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 842e796..264c4ff 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 5cbcbfd..c9f9972 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 To HW.vi b/Modules/IO Sub-Functions/OUT To HW.vi index 6b53940..8e581cc 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 8f6bcdd..cd4a083 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 34e706b..354f7b8 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 d4fc62d..9b32754 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 be94ce2..eaaaa4f 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 05aa791..4c0d79e 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 d5e6d75..c2bf18b 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 ada3f6c..759758b 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 43777a1..6e4ad4c 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 1b41a90..2c90ba6 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 99ff183..765269a 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 5e1edaa..ebbf468 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 13334a8..d305401 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 dd9c78f..b283caa 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 61e3558..8c096a4 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 b1be6f8..abbea9d 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 new file mode 100644 index 0000000..5e9462d Binary files /dev/null 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 74993c4..1f6f894 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 da3bfa7..cdccde2 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 bb78e29..ce8b512 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 933216d..94deaeb 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 cef4c21..744dd56 100644 Binary files a/Modules/Solo-Loop/SL Timer.vi and b/Modules/Solo-Loop/SL Timer.vi differ diff --git a/SingleStation.lvproj b/SingleStation.lvproj index bf9eaf6..754190b 100644 --- a/SingleStation.lvproj +++ b/SingleStation.lvproj @@ -37,6 +37,7 @@ + 2 @@ -436,6 +437,8 @@ + + @@ -459,6 +462,7 @@ + @@ -713,7 +717,7 @@ relativeToCommon true {E87D9D28-4567-4352-8872-CE70743C81F6} - 109 + 153 1 Single Station.exe ../builds/NI_AB_PROJECTNAME/Brillante_2402/Single Station.exe diff --git a/System/DBG_WIN.vi b/System/DBG_WIN.vi index c445bef..ea95439 100644 Binary files a/System/DBG_WIN.vi and b/System/DBG_WIN.vi differ diff --git a/System/global.vi b/System/global.vi index c4fe182..2f9b432 100644 Binary files a/System/global.vi and b/System/global.vi differ diff --git a/TypeDef(Controls)/USM HFR Value.ctl b/TypeDef(Controls)/USM HFR Value.ctl new file mode 100644 index 0000000..d647d30 Binary files /dev/null and b/TypeDef(Controls)/USM HFR Value.ctl differ diff --git a/_Params/Brillante.LogList b/_Params/Brillante.LogList index 860ded7..f224e6f 100644 --- a/_Params/Brillante.LogList +++ b/_Params/Brillante.LogList @@ -3,7 +3,7 @@ 2 Log Basic -15 +19 Log Info. 3 @@ -244,6 +244,70 @@ 0.0.3 + +Log Info. +3 + +Name +[HFR] Frequency [Hz] + + +Type +HFR + + +Port +Frequency + + + +Log Info. +3 + +Name +[HFR] Amplitude [%] + + +Type +HFR + + +Port +Amplitude + + + +Log Info. +3 + +Name +[HFR] Re(Z) [mcm2] + + +Type +HFR + + +Port +Re(Z) + + + +Log Info. +3 + +Name +[HFR] Im(Z) [mcm2] + + +Type +HFR + + +Port +Im(Z) + + Log Additional diff --git a/_Params/Brillante.Params b/_Params/Brillante.Params index 0b76ecd..96d3b01 100644 --- a/_Params/Brillante.Params +++ b/_Params/Brillante.Params @@ -526,15 +526,24 @@ Range Heater -1 +2 Heater 0.5 + +Heater +0.8 + Heater Offset -1 +2 + +Offset +Range +0.00000000000000 + Offset Range