diff --git a/FcLibrary/INI Read.vi b/FcLibrary/INI Read.vi index 434d8ac..83adfee 100644 Binary files a/FcLibrary/INI Read.vi and b/FcLibrary/INI Read.vi differ diff --git a/FcLibrary/Num2Time.vi b/FcLibrary/Num2Time.vi new file mode 100644 index 0000000..b2bdc57 Binary files /dev/null and b/FcLibrary/Num2Time.vi differ diff --git a/FcLibrary/Text Compare.vi b/FcLibrary/Text Compare.vi new file mode 100644 index 0000000..fe0ac12 Binary files /dev/null and b/FcLibrary/Text Compare.vi differ diff --git a/Modules/CheckHardware.vi b/Modules/CheckHardware.vi index 69c4cae..25cdfa2 100644 Binary files a/Modules/CheckHardware.vi and b/Modules/CheckHardware.vi differ diff --git a/Modules/DEV MODE.vi b/Modules/DEV MODE.vi index c2a12c2..5f389ba 100644 Binary files a/Modules/DEV MODE.vi and b/Modules/DEV MODE.vi differ diff --git a/Modules/Drivers/Temp_Hyyoung/hyyoung_temp_read.vi b/Modules/Drivers/Temp_Hyyoung/hyyoung_temp_read.vi index b631062..aa7b22a 100644 Binary files a/Modules/Drivers/Temp_Hyyoung/hyyoung_temp_read.vi and b/Modules/Drivers/Temp_Hyyoung/hyyoung_temp_read.vi differ diff --git a/Modules/IO/ALL IN (Aperiodic).vi b/Modules/IO/ALL IN (Aperiodic).vi index 8e03263..ce0fbb4 100644 Binary files a/Modules/IO/ALL IN (Aperiodic).vi and b/Modules/IO/ALL IN (Aperiodic).vi differ diff --git a/Modules/IO/ALL OUT (Aperiodic).vi b/Modules/IO/ALL OUT (Aperiodic).vi index f6beb6e..7d9ade0 100644 Binary files a/Modules/IO/ALL OUT (Aperiodic).vi and b/Modules/IO/ALL OUT (Aperiodic).vi differ diff --git a/Modules/IO/ALL OUT (Periodic).vi b/Modules/IO/ALL OUT (Periodic).vi index 5112a81..0e39ba3 100644 Binary files a/Modules/IO/ALL OUT (Periodic).vi and b/Modules/IO/ALL OUT (Periodic).vi differ diff --git a/Modules/IO/COM Hyyoung Get.vi b/Modules/IO/COM Hyyoung Get.vi index cc6093c..17c5fc1 100644 Binary files a/Modules/IO/COM Hyyoung Get.vi and b/Modules/IO/COM Hyyoung Get.vi differ diff --git a/Modules/IO/COM Hyyoung Set.vi b/Modules/IO/COM Hyyoung Set.vi index 44d9d0a..184793d 100644 Binary files a/Modules/IO/COM Hyyoung Set.vi and b/Modules/IO/COM Hyyoung Set.vi differ diff --git a/Modules/IO/DAQmx AI Open.vi b/Modules/IO/DAQmx AI Open.vi index 8e66c70..a0dc532 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 78f325c..e7f1517 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 bd2fd47..0a0459e 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 0fa0283..098c8ef 100644 Binary files a/Modules/IO/DAQmx DO.vi and b/Modules/IO/DAQmx DO.vi differ diff --git a/Modules/IO/Generate Out (Analog).vi b/Modules/IO/Generate Out (Analog).vi index 394fab3..4bcb107 100644 Binary files a/Modules/IO/Generate Out (Analog).vi and b/Modules/IO/Generate Out (Analog).vi differ diff --git a/Modules/IO/Generate Out (Digital).vi b/Modules/IO/Generate Out (Digital).vi index 971679c..9fd356a 100644 Binary files a/Modules/IO/Generate Out (Digital).vi and b/Modules/IO/Generate Out (Digital).vi differ diff --git a/Modules/IO/Generate Out (MC9).vi b/Modules/IO/Generate Out (MC9).vi index f9d7566..6b1058e 100644 Binary files a/Modules/IO/Generate Out (MC9).vi and b/Modules/IO/Generate Out (MC9).vi differ diff --git a/Modules/IO/Generate Phy IO.vi b/Modules/IO/Generate Phy IO.vi index 6291d3b..49072b5 100644 Binary files a/Modules/IO/Generate Phy IO.vi and b/Modules/IO/Generate Phy IO.vi differ diff --git a/Modules/IO/OUT From BP.vi b/Modules/IO/OUT From BP.vi index b15d050..0d539a4 100644 Binary files a/Modules/IO/OUT From BP.vi and b/Modules/IO/OUT From BP.vi differ diff --git a/Modules/IO/OUT From MASS.vi b/Modules/IO/OUT From MASS.vi index cd0239d..6df6adc 100644 Binary files a/Modules/IO/OUT From MASS.vi and b/Modules/IO/OUT From MASS.vi differ diff --git a/Modules/IO/Shutdown.vi b/Modules/IO/Shutdown.vi index bcc24c5..2d62189 100644 Binary files a/Modules/IO/Shutdown.vi and b/Modules/IO/Shutdown.vi differ diff --git a/Modules/Init Global Variables.vi b/Modules/Init Global Variables.vi index d1b41ac..31e5919 100644 Binary files a/Modules/Init Global Variables.vi and b/Modules/Init Global Variables.vi differ diff --git a/Modules/LOG/Log To Chart.vi b/Modules/LOG/Log To Chart.vi index 97c39e7..a493c5c 100644 Binary files a/Modules/LOG/Log To Chart.vi and b/Modules/LOG/Log To Chart.vi differ diff --git a/Modules/LOG/Log To Save.vi b/Modules/LOG/Log To Save.vi index 61287c4..88ac6cd 100644 Binary files a/Modules/LOG/Log To Save.vi and b/Modules/LOG/Log To Save.vi differ diff --git a/Modules/USM BP/GUI BP.vi b/Modules/USM BP/GUI BP.vi index 191d155..320bd19 100644 Binary files a/Modules/USM BP/GUI BP.vi and b/Modules/USM BP/GUI BP.vi differ diff --git a/Modules/USM BP/Param2Value BP.vi b/Modules/USM BP/Param2Value BP.vi index 83a861e..f47e48a 100644 Binary files a/Modules/USM BP/Param2Value BP.vi and b/Modules/USM BP/Param2Value BP.vi differ diff --git a/Modules/USM BP/Protocol BP In.vi b/Modules/USM BP/Protocol BP In.vi index a3cbaa5..dca8bc3 100644 Binary files a/Modules/USM BP/Protocol BP In.vi and b/Modules/USM BP/Protocol BP In.vi differ diff --git a/Modules/USM BP/Protocol BP Out.vi b/Modules/USM BP/Protocol BP Out.vi index f4d0527..9c6202c 100644 Binary files a/Modules/USM BP/Protocol BP Out.vi and b/Modules/USM BP/Protocol BP Out.vi differ diff --git a/Modules/USM HUM/GUI HumTemp.vi b/Modules/USM HUM/GUI HumTemp.vi index 5e19157..c66bb70 100644 Binary files a/Modules/USM HUM/GUI HumTemp.vi and b/Modules/USM HUM/GUI HumTemp.vi differ diff --git a/Modules/USM HUM/Protocol HumTemp In.vi b/Modules/USM HUM/Protocol HumTemp In.vi index 8a4c274..b935ca7 100644 Binary files a/Modules/USM HUM/Protocol HumTemp In.vi and b/Modules/USM HUM/Protocol HumTemp In.vi differ diff --git a/Modules/USM HUM/Protocol HumTemp Out.vi b/Modules/USM HUM/Protocol HumTemp Out.vi index 58ad209..d670fab 100644 Binary files a/Modules/USM HUM/Protocol HumTemp Out.vi and b/Modules/USM HUM/Protocol HumTemp Out.vi differ diff --git a/Modules/USM LOAD/LOAD Run_Constant.vi b/Modules/USM LOAD/LOAD Run_Constant.vi new file mode 100644 index 0000000..b957e96 Binary files /dev/null and b/Modules/USM LOAD/LOAD Run_Constant.vi differ diff --git a/Modules/USM LOAD/LOAD Run_Trip.vi b/Modules/USM LOAD/LOAD Run_Trip.vi new file mode 100644 index 0000000..c1c9f7f Binary files /dev/null and b/Modules/USM LOAD/LOAD Run_Trip.vi differ diff --git a/Modules/USM LOAD/LOAD Stoic_Trip.vi b/Modules/USM LOAD/LOAD Stoic_Trip.vi new file mode 100644 index 0000000..c713d79 Binary files /dev/null and b/Modules/USM LOAD/LOAD Stoic_Trip.vi differ diff --git a/Modules/USM LOAD/Load In.vi b/Modules/USM LOAD/Load In.vi index dce0336..8f55b27 100644 Binary files a/Modules/USM LOAD/Load In.vi and b/Modules/USM LOAD/Load In.vi differ diff --git a/Modules/USM LOAD/Load Out.vi b/Modules/USM LOAD/Load Out.vi index 3c8ca59..0201b60 100644 Binary files a/Modules/USM LOAD/Load Out.vi and b/Modules/USM LOAD/Load Out.vi differ diff --git a/Modules/USM LOAD/Protocol LOAD Out.vi b/Modules/USM LOAD/Protocol LOAD Out.vi new file mode 100644 index 0000000..478022d Binary files /dev/null and b/Modules/USM LOAD/Protocol LOAD Out.vi differ diff --git a/Modules/USM LOAD/Protocol Load In.vi b/Modules/USM LOAD/Protocol Load In.vi new file mode 100644 index 0000000..e288b6e Binary files /dev/null and b/Modules/USM LOAD/Protocol Load In.vi differ diff --git a/Modules/USM LOAD/USM Disp Ctrl.vi b/Modules/USM LOAD/USM Disp Ctrl.vi index 6ce0db5..bec184f 100644 Binary files a/Modules/USM LOAD/USM Disp Ctrl.vi and b/Modules/USM LOAD/USM Disp Ctrl.vi differ diff --git a/Modules/USM LOAD/USM LOAD Value (Prtc).ctl b/Modules/USM LOAD/USM LOAD Value (Prtc).ctl new file mode 100644 index 0000000..55fecb1 Binary files /dev/null and b/Modules/USM LOAD/USM LOAD Value (Prtc).ctl differ diff --git a/Modules/USM LOAD/USM LOAD Value.ctl b/Modules/USM LOAD/USM LOAD Value.ctl index 03fa562..3a6e7b7 100644 Binary files a/Modules/USM LOAD/USM LOAD Value.ctl and b/Modules/USM LOAD/USM LOAD Value.ctl differ diff --git a/Modules/USM MASS/Calc MASS.vi b/Modules/USM MASS/Calc MASS.vi index f43b2fe..2b32a53 100644 Binary files a/Modules/USM MASS/Calc MASS.vi and b/Modules/USM MASS/Calc MASS.vi differ diff --git a/Modules/USM MASS/GUI MASS.vi b/Modules/USM MASS/GUI MASS.vi index 7b29898..b9c178e 100644 Binary files a/Modules/USM MASS/GUI MASS.vi and b/Modules/USM MASS/GUI MASS.vi differ diff --git a/Modules/USM MASS/Protocol MASS In.vi b/Modules/USM MASS/Protocol MASS In.vi index 2271b1e..5307f53 100644 Binary files a/Modules/USM MASS/Protocol MASS In.vi and b/Modules/USM MASS/Protocol MASS In.vi differ diff --git a/Modules/USM MASS/Protocol MASS Out.vi b/Modules/USM MASS/Protocol MASS Out.vi index 5977561..ea4822d 100644 Binary files a/Modules/USM MASS/Protocol MASS Out.vi and b/Modules/USM MASS/Protocol MASS Out.vi differ diff --git a/Modules/USM Protocol/Check Category.vi b/Modules/USM Protocol/Check Category.vi new file mode 100644 index 0000000..46438a5 Binary files /dev/null and b/Modules/USM Protocol/Check Category.vi differ diff --git a/Modules/USM Protocol/GUI Protocol.vi b/Modules/USM Protocol/GUI Protocol.vi index 04e0c90..5af1b6d 100644 Binary files a/Modules/USM Protocol/GUI Protocol.vi and b/Modules/USM Protocol/GUI Protocol.vi differ diff --git a/Modules/USM Protocol/Protocol Delay In.vi b/Modules/USM Protocol/Protocol Delay In.vi new file mode 100644 index 0000000..542a3e9 Binary files /dev/null and b/Modules/USM Protocol/Protocol Delay In.vi differ diff --git a/Modules/USM Protocol/Protocol Delay Out.vi b/Modules/USM Protocol/Protocol Delay Out.vi new file mode 100644 index 0000000..55eb496 Binary files /dev/null and b/Modules/USM Protocol/Protocol Delay Out.vi differ diff --git a/Modules/USM Protocol/Protocol Loop In.vi b/Modules/USM Protocol/Protocol Loop In.vi new file mode 100644 index 0000000..2f66fac Binary files /dev/null and b/Modules/USM Protocol/Protocol Loop In.vi differ diff --git a/Modules/USM Protocol/Protocol Loop Out.vi b/Modules/USM Protocol/Protocol Loop Out.vi new file mode 100644 index 0000000..2b0efd2 Binary files /dev/null and b/Modules/USM Protocol/Protocol Loop Out.vi differ diff --git a/Modules/USM StartUp/USM StartUp.vi b/Modules/USM StartUp/USM StartUp.vi index 3e4aa33..5ba1a0f 100644 Binary files a/Modules/USM StartUp/USM StartUp.vi and b/Modules/USM StartUp/USM StartUp.vi differ diff --git a/Modules/Update Status.vi b/Modules/Update Status.vi index dee83f2..1af0d47 100644 Binary files a/Modules/Update Status.vi and b/Modules/Update Status.vi differ diff --git a/OfflineModel.vi b/OfflineModel.vi index 62d65c3..c017528 100644 Binary files a/OfflineModel.vi and b/OfflineModel.vi differ diff --git a/SingleStation.aliases b/SingleStation.aliases index 5ae5f6e..6db040f 100644 --- a/SingleStation.aliases +++ b/SingleStation.aliases @@ -1,3 +1,3 @@ [ ǻ] - ǻ = "169.254.52.77" + ǻ = "172.21.0.1" diff --git a/SingleStation.lvlps b/SingleStation.lvlps index 8c0eaa7..3770a0f 100644 --- a/SingleStation.lvlps +++ b/SingleStation.lvlps @@ -1,3 +1,3 @@ [Ʈ _] -ProjectExplorer.ClassicPosition[String] = "233,27,923,525" +ProjectExplorer.ClassicPosition[String] = "300,1,990,499" diff --git a/SingleStation.lvproj b/SingleStation.lvproj index fd27bd7..ccfcae3 100644 --- a/SingleStation.lvproj +++ b/SingleStation.lvproj @@ -11,20 +11,32 @@ true true false + + + + + + + + + + + + @@ -243,6 +255,7 @@ + @@ -297,7 +310,6 @@ - @@ -316,6 +328,7 @@ + @@ -350,10 +363,12 @@ + + + - @@ -362,7 +377,6 @@ - diff --git a/System/global.vi b/System/global.vi index 1f9ff8f..dfabfec 100644 Binary files a/System/global.vi and b/System/global.vi differ diff --git a/_Params/Generate Params.vi b/_Params/Generate Params.vi index e51adc3..b16fbe8 100644 Binary files a/_Params/Generate Params.vi and b/_Params/Generate Params.vi differ diff --git a/_Params/연세대2301.Log.Param b/_Params/연세대2301.Log.Param index 41a7912..2eb3605 100644 --- a/_Params/연세대2301.Log.Param +++ b/_Params/연세대2301.Log.Param @@ -1,6 +1,6 @@ Param.Log -9 +13 Log Info. 3 @@ -145,4 +145,68 @@ 0.0.3 + +Log Info. +3 + +Name +[Load] Current + + +Type +Load + + +Port +Current + + + +Log Info. +3 + +Name +[Load] Votage + + +Type +Load + + +Port +Voltage + + + +Log Info. +3 + +Name +[Load] Power + + +Type +Load + + +Port +Power + + + +Log Info. +3 + +Name +[Load] I Density + + +Type +Load + + +Port +I Density + + diff --git a/ini/setting.ini b/ini/setting.ini index f18dc59..cceea19 100644 --- a/ini/setting.ini +++ b/ini/setting.ini @@ -9,7 +9,8 @@ Log File Name PostFix = "Log" Memo = "- Title : \0A- Operater : \0A- Sample : \0A- Comment : " [Time] -Sample Time = "0.100000" +Sample Time = "1.00000" +Stoic Pre-Time = "1.50" [Driver] Com Port = "COM4" @@ -20,6 +21,9 @@ H2 = "7.60" Air = "18.11" O2 = "3.80" +[Param] +Cell Size = "25" + [PID] AnBP.Pp = "0.7" AnBP.Pn = "0.01" diff --git a/단국대.vi b/단국대.vi index fe4385b..69cae1a 100644 Binary files a/단국대.vi and b/단국대.vi differ diff --git a/연세대2301.vi b/연세대2301.vi index 6c4074e..3121b31 100644 Binary files a/연세대2301.vi and b/연세대2301.vi differ diff --git a/웰덱스.vi b/웰덱스.vi index f126a50..2cc7d10 100644 Binary files a/웰덱스.vi and b/웰덱스.vi differ