소스정리

AGVEmulator/AGVEmulator.csproj

@@ -36,16 +36,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="arControl.Net4">
-      <HintPath>..\arControl.Net4.dll</HintPath>
+      <HintPath>..\Cs_HMI\DLL\arControl.Net4.dll</HintPath>
-    </Reference>
-    <Reference Include="arFrameControl">
-      <HintPath>..\arFrameControl.dll</HintPath>
     </Reference>
     <Reference Include="ArLog.Net4">
-      <HintPath>..\ArLog.Net4.dll</HintPath>
+      <HintPath>..\Cs_HMI\DLL\ArLog.Net4.dll</HintPath>
     </Reference>
     <Reference Include="ArSetting.Net4">
-      <HintPath>..\ArSetting.Net4.dll</HintPath>
+      <HintPath>..\Cs_HMI\DLL\ArSetting.Net4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -130,6 +127,10 @@
       <Project>{c5f7a8b2-8d3e-4a1b-9c6e-7f4d5e2a9b1c}</Project>
       <Name>AGVNavigationCore</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Cs_HMI\SubProject\CommUtil\arCommUtil.csproj">
+      <Project>{14e8c9a5-013e-49ba-b435-ffffff7dd623}</Project>
+      <Name>arCommUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Cs_HMI\SubProject\EnigProtocol\enigprotocol\ENIGProtocol.csproj">
       <Project>{9365803b-933d-4237-93c7-b502c855a71c}</Project>
       <Name>ENIGProtocol</Name>

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

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 정지

Cs_HMI/AGVLogic/AGVNavigationCore/AGVNavigationCore.csproj

@@ -48,6 +48,9 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -58,9 +61,6 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Controls\AGVState.cs" />

Cs_HMI/AGVLogic/AGVNavigationCore/packages.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
 </packages>

Cs_HMI/Project/AGV4.csproj

@@ -42,7 +42,7 @@
     <DebugType>Full</DebugType>
     <Optimize>False</Optimize>
     <OutputPath>..\..\..\..\..\Amkor\AGV4\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NOSPEECH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -116,8 +116,7 @@
       <HintPath>C:\Program Files (x86)\Microsoft SDKs\Speech\v11.0\Assembly\Microsoft.Speech.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.13.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -187,7 +186,9 @@
     <Compile Include="Device\BMS.cs" />
     <Compile Include="Device\BMSInformationEventArgs.cs" />
     <Compile Include="Device\CFlag.cs" />
-    <Compile Include="Device\xbee.cs" />
+    <Compile Include="Device\xbee.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Device\Socket.cs" />
     <Compile Include="Dialog\fCounter.cs">
       <SubType>Form</SubType>

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
         /// 디버그모니터용 소켓(데이터를 전송만 한다)
         /// </summary>
         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
         }
 
         /// <summary>
@@ -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))
             {

Cs_HMI/Project/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
+  <package id="Newtonsoft.Json" version="13.0.4" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.IO.Compression.ZipFile" version="4.3.0" targetFramework="net48" />
   <package id="System.Memory" version="4.5.4" targetFramework="net48" />