diff --git a/Modules/Conversions/Param2Value BP.vi b/Modules/Conversions/Param2Value BP.vi index 57d3335..179a071 100644 Binary files a/Modules/Conversions/Param2Value BP.vi and b/Modules/Conversions/Param2Value BP.vi differ diff --git a/Modules/Conversions/Protocol BP In.vi b/Modules/Conversions/Protocol BP In.vi index fca6a0d..e68492e 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 5a02472..21fd15c 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 1e1c9c0..f923179 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..d1d15d5 Binary files /dev/null and b/Modules/Functions/CVM Count.vi differ diff --git a/Modules/Functions/Size Initialze(Right Fix).vi b/Modules/Functions/Size Initialze(Right Fix).vi index 496ac2f..6ac6c61 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 46611e6..f2e0dff 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 54bb2d9..f3c327c 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 9ff2e10..ceb4a86 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 02e0276..2091401 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 7b458c5..3ca5a70 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 b00e0e1..2fe8a79 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 Prtc-Functions/Power Supply_Fn_Disp Ctrl.vi b/Modules/GUI Prtc-Functions/Power Supply_Fn_Disp Ctrl.vi index 3b86485..8d84d4d 100644 Binary files a/Modules/GUI Prtc-Functions/Power Supply_Fn_Disp Ctrl.vi and b/Modules/GUI Prtc-Functions/Power Supply_Fn_Disp Ctrl.vi differ diff --git a/Modules/GUI Prtc-Functions/Power Supply_Run_Constant.vi b/Modules/GUI Prtc-Functions/Power Supply_Run_Constant.vi index 4989500..700b97d 100644 Binary files a/Modules/GUI Prtc-Functions/Power Supply_Run_Constant.vi and b/Modules/GUI Prtc-Functions/Power Supply_Run_Constant.vi differ diff --git a/Modules/GUI Prtc-Functions/Power Supply_Run_Trip.vi b/Modules/GUI Prtc-Functions/Power Supply_Run_Trip.vi index 4d5a15f..f6757b1 100644 Binary files a/Modules/GUI Prtc-Functions/Power Supply_Run_Trip.vi and b/Modules/GUI Prtc-Functions/Power Supply_Run_Trip.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 42724b4..30b4bbf 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 a15868f..17a87a1 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/GUI Protocol.vi b/Modules/GUI/GUI Protocol.vi index 58d1092..a5e15e6 100644 Binary files a/Modules/GUI/GUI Protocol.vi and b/Modules/GUI/GUI Protocol.vi differ diff --git a/Modules/GUI/GUI SET ACTIONS.vi b/Modules/GUI/GUI SET ACTIONS.vi index 5457f4c..8b1fa29 100644 Binary files a/Modules/GUI/GUI SET ACTIONS.vi and b/Modules/GUI/GUI SET ACTIONS.vi differ diff --git a/Modules/GUI/GUI SET BP.vi b/Modules/GUI/GUI SET BP.vi index af778e6..d78d716 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 1bcaa5c..f566cac 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 1b6e18b..de8deec 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 97d0a54..98adf27 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 efb79a0..dc99e4e 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 9660fa9..e5d23dd 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 f4f5735..31c8e47 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 2f20ef0..7158de6 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 2e24a7c..d2b090b 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 new file mode 100644 index 0000000..5793603 Binary files /dev/null and b/Modules/IO 3rd Party/KOLLIBRIK.vi differ diff --git a/Modules/IO Libraries/LOAD_Kikusui.llb b/Modules/IO Libraries/LOAD_Kikusui.llb index e188178..61a322a 100644 Binary files a/Modules/IO Libraries/LOAD_Kikusui.llb and b/Modules/IO Libraries/LOAD_Kikusui.llb differ diff --git a/Modules/IO Libraries/Powersupply_Kikusui.vi b/Modules/IO Libraries/Powersupply_Kikusui.vi index 0c7e068..87363c6 100644 Binary files a/Modules/IO Libraries/Powersupply_Kikusui.vi and b/Modules/IO Libraries/Powersupply_Kikusui.vi differ diff --git a/Modules/IO Sub-Functions/CRC.vi b/Modules/IO Sub-Functions/CRC.vi new file mode 100644 index 0000000..ae21a03 Binary files /dev/null and b/Modules/IO Sub-Functions/CRC.vi differ diff --git a/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi b/Modules/IO Sub-Functions/Data parsing(KOLLIBRIK).vi new file mode 100644 index 0000000..5831fc8 Binary files /dev/null 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 98550b5..b6052ca 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 df7e332..a2f129d 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 83d816d..f585639 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 c22d857..4fe0ea1 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 de055a9..0b20d02 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 cce2592..f52ddec 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 ACTIONS.vi b/Modules/IO Sub-Functions/OUT From ACTIONS.vi index b2d604f..1566681 100644 Binary files a/Modules/IO Sub-Functions/OUT From ACTIONS.vi and b/Modules/IO Sub-Functions/OUT From ACTIONS.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 0b6c456..7334dc1 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 336035c..7a4b09c 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 018cb2c..ed084bc 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 2da2754..2c1f626 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 6628d56..6f82668 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 06d9cc0..0cabed6 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 16928ce..da4aaf2 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 31e4431..e138a43 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 f7bf8aa..6f54092 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 3ae6ce0..f060723 100644 Binary files a/Modules/IO/DAQmx AO.vi and b/Modules/IO/DAQmx AO.vi differ diff --git a/Modules/IO/DAQmx DI Open.vi b/Modules/IO/DAQmx DI Open.vi index 5eb2caf..07419c8 100644 Binary files a/Modules/IO/DAQmx DI Open.vi and b/Modules/IO/DAQmx DI Open.vi differ diff --git a/Modules/IO/DAQmx DI Run.vi b/Modules/IO/DAQmx DI Run.vi index 753e0a7..6b7cd1b 100644 Binary files a/Modules/IO/DAQmx DI Run.vi and b/Modules/IO/DAQmx DI Run.vi differ diff --git a/Modules/IO/DAQmx DO.vi b/Modules/IO/DAQmx DO.vi index 9ff2cd3..9eaae60 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 9684598..99ee5c8 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 37bc189..a536dc7 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 1513a6a..8e347b4 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 506c713..e3e569c 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 390cc1b..62d97d6 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 959aea5..5d12148 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 e6032b2..121269f 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 28222f7..bc00b5b 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 5c40dd1..750d81e 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 0d532ed..78c5291 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 d83b768..bc71f1a 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 16879ee..834d811 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 043f0a8..c082126 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 539f19d..2498114 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 ed0fae4..5e8150c 100644 Binary files a/Modules/Solo-Loop/SL Timer.vi and b/Modules/Solo-Loop/SL Timer.vi differ diff --git a/System/DBG_WIN.vi b/System/DBG_WIN.vi index d681b45..d002fac 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 fcb1285..9393ffd 100644 Binary files a/System/global.vi and b/System/global.vi differ diff --git a/WETS.lvlps b/WETS.lvlps index 406ee61..a0eef8d 100644 --- a/WETS.lvlps +++ b/WETS.lvlps @@ -1,5 +1,5 @@ [Ʈ _] -ProjectExplorer.ClassicPosition[String] = "161,2065,942,2554" +ProjectExplorer.ClassicPosition[String] = "196,2122,977,2611" [AB_Cache_{DBB57CD7-163A-46D5-86E9-368436C4345A}] Cache_Path[Path] Line0001 = "/C/Users/CwPark/AppData/Local/Temp/AB_Cache_{DBB57" diff --git a/WETS.lvproj b/WETS.lvproj index 3f433f1..3a5f73a 100644 --- a/WETS.lvproj +++ b/WETS.lvproj @@ -67,6 +67,7 @@ + 2 @@ -345,12 +346,16 @@ + + + + @@ -384,6 +389,7 @@ + @@ -392,6 +398,7 @@ + @@ -426,7 +433,7 @@ true - + @@ -477,6 +484,7 @@ + @@ -881,7 +889,11 @@ {F2301F6E-7BFE-4E8A-B824-DB312F771EDE} NI-VISA 설정 지원 21.5 {123307D2-8A89-48BC-A4E7-18C51BDCCED4} - 8 + _deployment_ + {C15EE05C-24AC-474A-AF06-D697AA846143} + NI-VISA Configuration Support 22.5 + {093EECCF-DE2B-4226-B7E5-B1FD4028A783} + 9 (주)싸이텍코리아 true ../builds/Single Station/Setup @@ -891,7 +903,7 @@ Setup.exe 18 Single Station - 1.0.15 + 1.0.16 32-bit 22318008 (주)싸이텍코리아 @@ -904,15 +916,15 @@ 1 {BE388D34-98A2-4EF8-9249-5CA1284C7480} {BE388D34-98A2-4EF8-9249-5CA1284C7480} - Single Station.exe + WETS.exe 0 - Single Station + WETS Single Station 1 - {5FCAE768-BD55-478C-A22B-B22B8BEF07D2} + {B2841A9F-1683-410C-BEAB-4FEE90EDFF57} 1 - LT메탈(CO추가)_F23138 - /내 컴퓨터/빌드 스펙/LT메탈(CO추가)_F23138 + Test Station + /내 컴퓨터/빌드 스펙/Test Station EXE 1 @@ -1268,7 +1280,7 @@ relativeToCommon true {99314F52-BFA9-4BA4-9999-FBE333B1F3AB} - 23 + 30 1 WETS.exe ../builds/NI_AB_PROJECTNAME/Test Station/WETS.exe diff --git a/_Projects/SE1K-PE_Param.vi b/_Projects/SE1K-PE_Param.vi index 9355c00..91d25f3 100644 Binary files a/_Projects/SE1K-PE_Param.vi and b/_Projects/SE1K-PE_Param.vi differ diff --git a/_Projects/Test Station.vi b/_Projects/Test Station.vi index b63c413..0179e15 100644 Binary files a/_Projects/Test Station.vi and b/_Projects/Test Station.vi differ