From cafad6f98cdfc84c270e944ab06d71a19baff1b0 Mon Sep 17 00:00:00 2001 From: "Arin(asus)" Date: Sun, 25 May 2025 23:23:00 +0900 Subject: [PATCH] .. --- Cs_HMI/AGVCSharp.sln | 47 +++++---------- Cs_HMI/Project/AGV4.csproj | 1 - Cs_HMI/SubProject/AGV/NARUMI.csproj | 2 +- .../SubProject/AGVControl/agvControl.csproj | 2 +- Cs_HMI/SubProject/BMS/BMS.csproj | 2 +- Cs_HMI/SubProject/CommData/CommData.csproj | 55 +++++++++++++++-- .../CommData/Properties/AssemblyInfo.cs | 2 +- .../CommData/Properties/Settings.Designer.cs | 26 ++++++++ .../CommData/Properties/Settings.settings | 6 ++ .../MSSQLCommand/MSSQLCommand.csproj | 47 --------------- Cs_HMI/SubProject/MSSQLCommand/Monitor.cs | 22 ------- .../MSSQLCommand/Properties/AssemblyInfo.cs | 36 ----------- .../arFrameControl/Properties/AssemblyInfo.cs | 4 +- .../arFrameControl/arFrameControl.csproj | 59 +++++++++++++++---- 14 files changed, 150 insertions(+), 161 deletions(-) create mode 100644 Cs_HMI/SubProject/CommData/Properties/Settings.Designer.cs create mode 100644 Cs_HMI/SubProject/CommData/Properties/Settings.settings delete mode 100644 Cs_HMI/SubProject/MSSQLCommand/MSSQLCommand.csproj delete mode 100644 Cs_HMI/SubProject/MSSQLCommand/Monitor.cs delete mode 100644 Cs_HMI/SubProject/MSSQLCommand/Properties/AssemblyInfo.cs diff --git a/Cs_HMI/AGVCSharp.sln b/Cs_HMI/AGVCSharp.sln index 2722584..9ec9f26 100644 --- a/Cs_HMI/AGVCSharp.sln +++ b/Cs_HMI/AGVCSharp.sln @@ -1,5 +1,4 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.9.34714.143 MinimumVisualStudioVersion = 10.0.40219.1 @@ -32,15 +31,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SWPatch", "SubProject\Patch EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NARUMI", "SubProject\AGV\NARUMI.csproj", "{8BAE0EAC-3D25-402F-9A65-2BA1ECFE28B7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommData", "SubProject\CommData\CommData.csproj", "{14E8C9A5-013E-49BA-B435-EFEFC77DD623}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommData", "SubProject\CommData\CommData.csproj", "{14E8C9A5-013E-49BA-B435-EFEFC77DD623}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Narumi", "TestProject\Test_Narumi\Test_Narumi.csproj", "{EB77976F-4DE4-46A5-8B25-D07226204C32}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MSSQLCommand", "SubProject\MSSQLCommand\MSSQLCommand.csproj", "{AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol", "..\..\Protocol\enigprotocol\ENIGProtocol.csproj", "{16BD025D-CB0F-4A4B-A452-8FE629F02F0C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AGVMapControl", "SubProject\AGVMapControl\AGVMapControl.csproj", "{D37909BE-DCD9-4408-AF06-28F92C69F83D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENIGProtocol", "SubProject\protocol\enigprotocol\ENIGProtocol.csproj", "{499D8912-4B96-41E5-A70D-CFE797883D65}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -196,29 +193,6 @@ Global {EB77976F-4DE4-46A5-8B25-D07226204C32}.Release|x64.Build.0 = Release|Any CPU {EB77976F-4DE4-46A5-8B25-D07226204C32}.Release|x86.ActiveCfg = Release|Any CPU {EB77976F-4DE4-46A5-8B25-D07226204C32}.Release|x86.Build.0 = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Debug|x64.ActiveCfg = Debug|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Debug|x64.Build.0 = Debug|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Debug|x86.ActiveCfg = Debug|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Debug|x86.Build.0 = Debug|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|x64.ActiveCfg = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|x64.Build.0 = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|x86.ActiveCfg = Release|Any CPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC}.Release|x86.Build.0 = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|x64.ActiveCfg = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|x64.Build.0 = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|x86.ActiveCfg = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Debug|x86.Build.0 = Debug|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|Any CPU.Build.0 = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|x64.ActiveCfg = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|x64.Build.0 = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|x86.ActiveCfg = Release|Any CPU - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C}.Release|x86.Build.0 = Release|Any CPU {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -231,6 +205,18 @@ Global {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Release|x64.Build.0 = Release|Any CPU {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Release|x86.ActiveCfg = Release|Any CPU {D37909BE-DCD9-4408-AF06-28F92C69F83D}.Release|x86.Build.0 = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|x64.ActiveCfg = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|x64.Build.0 = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|x86.ActiveCfg = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Debug|x86.Build.0 = Debug|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|Any CPU.Build.0 = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|x64.ActiveCfg = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|x64.Build.0 = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|x86.ActiveCfg = Release|Any CPU + {499D8912-4B96-41E5-A70D-CFE797883D65}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -246,9 +232,8 @@ Global {8BAE0EAC-3D25-402F-9A65-2BA1ECFE28B7} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {14E8C9A5-013E-49BA-B435-EFEFC77DD623} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {EB77976F-4DE4-46A5-8B25-D07226204C32} = {7AF32085-E7A6-4D06-BA6E-C6B1EBAEA99A} - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC} = {C423C39A-44E7-4F09-B2F7-7943975FF948} - {16BD025D-CB0F-4A4B-A452-8FE629F02F0C} = {C423C39A-44E7-4F09-B2F7-7943975FF948} {D37909BE-DCD9-4408-AF06-28F92C69F83D} = {C423C39A-44E7-4F09-B2F7-7943975FF948} + {499D8912-4B96-41E5-A70D-CFE797883D65} = {C423C39A-44E7-4F09-B2F7-7943975FF948} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index d09ab11..24b4566 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -14,7 +14,6 @@ - diff --git a/Cs_HMI/SubProject/AGV/NARUMI.csproj b/Cs_HMI/SubProject/AGV/NARUMI.csproj index 55af1d5..b1b1492 100644 --- a/Cs_HMI/SubProject/AGV/NARUMI.csproj +++ b/Cs_HMI/SubProject/AGV/NARUMI.csproj @@ -9,7 +9,7 @@ Properties arDevice Narumi - v4.8 + v4.0 512 true diff --git a/Cs_HMI/SubProject/AGVControl/agvControl.csproj b/Cs_HMI/SubProject/AGVControl/agvControl.csproj index 1857bcc..fc19cbd 100644 --- a/Cs_HMI/SubProject/AGVControl/agvControl.csproj +++ b/Cs_HMI/SubProject/AGVControl/agvControl.csproj @@ -9,7 +9,7 @@ Properties AGVControl AGVControl - v4.8 + v4.0 512 true diff --git a/Cs_HMI/SubProject/BMS/BMS.csproj b/Cs_HMI/SubProject/BMS/BMS.csproj index e8ca0f5..8b9baea 100644 --- a/Cs_HMI/SubProject/BMS/BMS.csproj +++ b/Cs_HMI/SubProject/BMS/BMS.csproj @@ -9,7 +9,7 @@ Properties arDevice BMS - v4.8 + v4.0 512 true diff --git a/Cs_HMI/SubProject/CommData/CommData.csproj b/Cs_HMI/SubProject/CommData/CommData.csproj index 56dafec..0134e49 100644 --- a/Cs_HMI/SubProject/CommData/CommData.csproj +++ b/Cs_HMI/SubProject/CommData/CommData.csproj @@ -1,20 +1,65 @@  - + - netstandard2.0 + Debug + AnyCPU + 8.0.30703 + 2.0 + {14E8C9A5-013E-49BA-B435-EFEFC77DD623} + Library VarData VarData - false - false + v4.0 + 512 + DEBUG;TRACE + + + + true + full + false + bin\Debug\ + TRACE;DEBUG + prompt + 4 + false + + + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false - + + + + + + + + True + True + Settings.settings + + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + \ No newline at end of file diff --git a/Cs_HMI/SubProject/CommData/Properties/AssemblyInfo.cs b/Cs_HMI/SubProject/CommData/Properties/AssemblyInfo.cs index 428bb8c..911c60c 100644 --- a/Cs_HMI/SubProject/CommData/Properties/AssemblyInfo.cs +++ b/Cs_HMI/SubProject/CommData/Properties/AssemblyInfo.cs @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. -[assembly: Guid("14e8c9a5-013e-49ba-b435-efefc77dd623")] +[assembly: Guid("14e8c9a5-013e-49ba-b435-efefc77dd613")] // 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. // diff --git a/Cs_HMI/SubProject/CommData/Properties/Settings.Designer.cs b/Cs_HMI/SubProject/CommData/Properties/Settings.Designer.cs new file mode 100644 index 0000000..48e6dca --- /dev/null +++ b/Cs_HMI/SubProject/CommData/Properties/Settings.Designer.cs @@ -0,0 +1,26 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 도구를 사용하여 생성되었습니다. +// 런타임 버전:4.0.30319.42000 +// +// 파일 내용을 변경하면 잘못된 동작이 발생할 수 있으며, 코드를 다시 생성하면 +// 이러한 변경 내용이 손실됩니다. +// +//------------------------------------------------------------------------------ + +namespace VarData.Properties { + + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.11.0.0")] + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + + public static Settings Default { + get { + return defaultInstance; + } + } + } +} diff --git a/Cs_HMI/SubProject/CommData/Properties/Settings.settings b/Cs_HMI/SubProject/CommData/Properties/Settings.settings new file mode 100644 index 0000000..049245f --- /dev/null +++ b/Cs_HMI/SubProject/CommData/Properties/Settings.settings @@ -0,0 +1,6 @@ + + + + + + diff --git a/Cs_HMI/SubProject/MSSQLCommand/MSSQLCommand.csproj b/Cs_HMI/SubProject/MSSQLCommand/MSSQLCommand.csproj deleted file mode 100644 index d05c1f0..0000000 --- a/Cs_HMI/SubProject/MSSQLCommand/MSSQLCommand.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - - - Debug - AnyCPU - {AAF68D20-4590-4AB0-BB91-E0DD04C91DEC} - Library - Properties - MSSQLCommand - MSSQLCommand - v4.0 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Cs_HMI/SubProject/MSSQLCommand/Monitor.cs b/Cs_HMI/SubProject/MSSQLCommand/Monitor.cs deleted file mode 100644 index a912cbc..0000000 --- a/Cs_HMI/SubProject/MSSQLCommand/Monitor.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace MSSQLCommand -{ - public class Monitor - { - /// - /// Connection String - /// - public string CS { get; private set; } - - public Monitor(string ip, string id, string pass, string db) - { - //ConnectionString = $"Data Source =10.131.15.18;Initial Catalog=EE;Persist Security Info=True;User ID=eeuser;Password=Amkor123!"; - CS = $"Data Source={ip};Initial Catalog={db};Persist Security Info=True;User ID={id};Password={pass}"; - } - - } -} diff --git a/Cs_HMI/SubProject/MSSQLCommand/Properties/AssemblyInfo.cs b/Cs_HMI/SubProject/MSSQLCommand/Properties/AssemblyInfo.cs deleted file mode 100644 index 040a91a..0000000 --- a/Cs_HMI/SubProject/MSSQLCommand/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 -// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 -// 이러한 특성 값을 변경하세요. -[assembly: AssemblyTitle("MSSQLCommand")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("MSSQLCommand")] -[assembly: AssemblyCopyright("Copyright © 2023")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 -// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 -// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. -[assembly: ComVisible(false)] - -// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. -[assembly: Guid("aaf68d20-4590-4ab0-bb91-e0dd04c91dec")] - -// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. -// -// 주 버전 -// 부 버전 -// 빌드 번호 -// 수정 버전 -// -// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 -// 기본값으로 할 수 있습니다. -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Cs_HMI/SubProject/arFrameControl/Properties/AssemblyInfo.cs b/Cs_HMI/SubProject/arFrameControl/Properties/AssemblyInfo.cs index a63a2d8..2f3b48f 100644 --- a/Cs_HMI/SubProject/arFrameControl/Properties/AssemblyInfo.cs +++ b/Cs_HMI/SubProject/arFrameControl/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("arFrameControl")] -[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyCopyright("Copyright © 2024")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -20,7 +20,7 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. -[assembly: Guid("9fa3ef10-3c75-40a2-b3e6-a37900b26d0e")] +[assembly: Guid("a16c9667-5241-4313-888e-548375f85d29")] // 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. // diff --git a/Cs_HMI/SubProject/arFrameControl/arFrameControl.csproj b/Cs_HMI/SubProject/arFrameControl/arFrameControl.csproj index 17d1664..9a65059 100644 --- a/Cs_HMI/SubProject/arFrameControl/arFrameControl.csproj +++ b/Cs_HMI/SubProject/arFrameControl/arFrameControl.csproj @@ -1,14 +1,47 @@ - - - - net8.0-windows - true - arFrame.Control - arFrameControl - false - - - - - + + + + + Debug + AnyCPU + {A16C9667-5241-4313-888E-548375F85D29} + Library + Properties + arFrameControl + arFrameControl + v4.0 + 512 + true + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + \ No newline at end of file