From f507a6487e14549b8b80866c86c0828acf9e4b71 Mon Sep 17 00:00:00 2001 From: LGram16 Date: Fri, 12 Dec 2025 20:00:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=86=8C=EC=8A=A4=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AGVEmulator/AGVEmulator.csproj | 13 +++--- AGVEmulator/AGVEmulator.sln | 43 +++++++++++++++++++ AGVEmulator/fMain.cs | 5 ++- .../AGVNavigationCore.csproj | 6 +-- .../AGVNavigationCore/packages.config | 4 +- Cs_HMI/Project/AGV4.csproj | 9 ++-- Cs_HMI/Project/PUB.cs | 15 +++++-- Cs_HMI/Project/packages.config | 2 +- Cs_HMI/SubProject/arCtl | 1 - 9 files changed, 76 insertions(+), 22 deletions(-) create mode 100644 AGVEmulator/AGVEmulator.sln delete mode 160000 Cs_HMI/SubProject/arCtl diff --git a/AGVEmulator/AGVEmulator.csproj b/AGVEmulator/AGVEmulator.csproj index 83f6feb..5a22417 100644 --- a/AGVEmulator/AGVEmulator.csproj +++ b/AGVEmulator/AGVEmulator.csproj @@ -36,16 +36,13 @@ - ..\arControl.Net4.dll - - - ..\arFrameControl.dll + ..\Cs_HMI\DLL\arControl.Net4.dll - ..\ArLog.Net4.dll + ..\Cs_HMI\DLL\ArLog.Net4.dll - ..\ArSetting.Net4.dll + ..\Cs_HMI\DLL\ArSetting.Net4.dll @@ -130,6 +127,10 @@ {c5f7a8b2-8d3e-4a1b-9c6e-7f4d5e2a9b1c} AGVNavigationCore + + {14e8c9a5-013e-49ba-b435-ffffff7dd623} + arCommUtil + {9365803b-933d-4237-93c7-b502c855a71c} ENIGProtocol diff --git a/AGVEmulator/AGVEmulator.sln b/AGVEmulator/AGVEmulator.sln new file mode 100644 index 0000000..692f388 --- /dev/null +++ b/AGVEmulator/AGVEmulator.sln @@ -0,0 +1,43 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36804.6 d17.14 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVEmulator", "AGVEmulator.csproj", "{9312AB43-72F6-4365-A266-E767215FA7F5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVNavigationCore", "..\Cs_HMI\AGVLogic\AGVNavigationCore\AGVNavigationCore.csproj", "{C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENIGProtocol", "..\Cs_HMI\SubProject\ENIGProtocol\enigprotocol\ENIGProtocol.csproj", "{9365803B-933D-4237-93C7-B502C855A71C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommUtil", "..\Cs_HMI\SubProject\CommUtil\arCommUtil.csproj", "{14E8C9A5-013E-49BA-B435-FFFFFF7DD623}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {9312AB43-72F6-4365-A266-E767215FA7F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9312AB43-72F6-4365-A266-E767215FA7F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9312AB43-72F6-4365-A266-E767215FA7F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9312AB43-72F6-4365-A266-E767215FA7F5}.Release|Any CPU.Build.0 = Release|Any CPU + {C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C}.Release|Any CPU.Build.0 = Release|Any CPU + {9365803B-933D-4237-93C7-B502C855A71C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9365803B-933D-4237-93C7-B502C855A71C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9365803B-933D-4237-93C7-B502C855A71C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9365803B-933D-4237-93C7-B502C855A71C}.Release|Any CPU.Build.0 = Release|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C353381B-16D4-4298-A97E-6DE0FC4A66B2} + EndGlobalSection +EndGlobal diff --git a/AGVEmulator/fMain.cs b/AGVEmulator/fMain.cs index 6f4bfc4..51f6fdd 100644 --- a/AGVEmulator/fMain.cs +++ b/AGVEmulator/fMain.cs @@ -84,7 +84,7 @@ namespace AGVEmulator rtCAL.ColorList = logcolor; rtAGVPro.ColorList = logcolor; - this.FormClosed += Form1_FormClosed; + //this.FormClosed += Form1_FormClosed; BMS = new DevBMS(); AGV = new DevAGV(); @@ -678,7 +678,8 @@ private void UpdateVisualAGV() } UpdateVisualAGV(); - + } + } private void button14_Click(object sender, EventArgs e) { //agv 정지 diff --git a/Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj b/Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj index 5b614e9..94c9aef 100644 --- a/Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj +++ b/Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj @@ -48,6 +48,9 @@ + + ..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll + @@ -58,9 +61,6 @@ - - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - diff --git a/Cs_HMI/AGVLogic/AGVNavigationCore/packages.config b/Cs_HMI/AGVLogic/AGVNavigationCore/packages.config index 8b1a8d0..8f8cd00 100644 --- a/Cs_HMI/AGVLogic/AGVNavigationCore/packages.config +++ b/Cs_HMI/AGVLogic/AGVNavigationCore/packages.config @@ -1,4 +1,4 @@ - + - + \ No newline at end of file diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index 378687c..d5bd2c9 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -42,7 +42,7 @@ Full False ..\..\..\..\..\Amkor\AGV4\ - DEBUG;TRACE + TRACE;DEBUG;NOSPEECH prompt 4 false @@ -116,8 +116,7 @@ C:\Program Files (x86)\Microsoft SDKs\Speech\v11.0\Assembly\Microsoft.Speech.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - True + ..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll @@ -187,7 +186,9 @@ - + + Component + Form diff --git a/Cs_HMI/Project/PUB.cs b/Cs_HMI/Project/PUB.cs index 48f61b6..94daf8b 100644 --- a/Cs_HMI/Project/PUB.cs +++ b/Cs_HMI/Project/PUB.cs @@ -8,7 +8,11 @@ using System.Media; using System.Runtime.InteropServices; using System.Windows.Forms; using System; + +#if SPEECH using Microsoft.Speech.Synthesis; +#endif + using System.Threading.Tasks; using System.Data.SqlClient; using System.Linq; @@ -69,8 +73,9 @@ namespace Project /// 디버그모니터용 소켓(데이터를 전송만 한다) /// public static Device.Socket sock_debug; - +#if SPEECH private static SpeechSynthesizer voice; +#endif public static SoundPlayer mplayer; [DllImport("winmm.dll")] @@ -108,6 +113,7 @@ namespace Project Console.WriteLine("speech disabled"); return; } +#if SPEECH if (force) voice.SpeakAsyncCancelAll(); if (voice.State == SynthesizerState.Ready) @@ -117,6 +123,9 @@ namespace Project if (logcate.isEmpty()) logcate = "SPEAK"; PUB.log.Add(logcate, m); } +#else + PUB.log.Add($"스피치컴파일상수OFF"); +#endif } /// @@ -228,7 +237,7 @@ namespace Project PUB.mplayer.SoundLocation = PUB.setting.musicfile; SetVolume(PUB.setting.musicvol); } - +#if SPEECH voice = new SpeechSynthesizer(); try { @@ -256,7 +265,7 @@ namespace Project // 음성 설정 실패 시 기본값 사용 } voice.SetOutputToDefaultAudioDevice(); - +#endif var file_version = System.IO.Path.Combine(UTIL.CurrentPath, "version.txt"); if (System.IO.File.Exists(file_version)) { diff --git a/Cs_HMI/Project/packages.config b/Cs_HMI/Project/packages.config index 1187d29..23fab69 100644 --- a/Cs_HMI/Project/packages.config +++ b/Cs_HMI/Project/packages.config @@ -1,6 +1,6 @@  - + diff --git a/Cs_HMI/SubProject/arCtl b/Cs_HMI/SubProject/arCtl deleted file mode 160000 index 768d71e..0000000 --- a/Cs_HMI/SubProject/arCtl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 768d71ebcad77e9035f35e6b75f2402166bcfa89