diff --git a/Cs_HMI/AGVCSharp.sln b/Cs_HMI/AGVCSharp.sln index eb6340b..2722584 100644 --- a/Cs_HMI/AGVCSharp.sln +++ b/Cs_HMI/AGVCSharp.sln @@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sub", "Sub", "{C423C39A-44E EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{7AF32085-E7A6-4D06-BA6E-C6B1EBAEA99A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arFrameControl", "SubProject\arFrameControl\arFrameControl.csproj", "{A16C9667-5241-4313-888E-548375F85D29}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "arFrameControl", "SubProject\arFrameControl\arFrameControl.csproj", "{A16C9667-5241-4313-888E-548375F85D29}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StateMachine", "StateMachine\StateMachine.csproj", "{BBC9BCCF-6262-4355-9CC2-37FF678AC499}" EndProject @@ -32,17 +32,15 @@ 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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommData", "SubProject\CommData\CommData.csproj", "{14E8C9A5-013E-49BA-B435-EFEFC77DD623}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommUtil", "SubProject\CommUtil\arCommUtil.csproj", "{14E8C9A5-013E-49BA-B435-FFFFFF7DD623}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol", "..\..\Protocol\enigprotocol\ENIGProtocol.csproj", "{16BD025D-CB0F-4A4B-A452-8FE629F02F0C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVMapControl", "SubProject\AGVMapControl\AGVMapControl.csproj", "{D37909BE-DCD9-4408-AF06-28F92C69F83D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AGVMapControl", "SubProject\AGVMapControl\AGVMapControl.csproj", "{D37909BE-DCD9-4408-AF06-28F92C69F83D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -209,18 +207,6 @@ Global {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 - {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}.Debug|x64.ActiveCfg = Debug|Any CPU - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x64.Build.0 = Debug|Any CPU - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x86.ActiveCfg = Debug|x86 - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x86.Build.0 = Debug|x86 - {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 - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x64.ActiveCfg = Release|Any CPU - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x64.Build.0 = Release|Any CPU - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x86.ActiveCfg = Release|x86 - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x86.Build.0 = Release|x86 {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 @@ -261,7 +247,6 @@ Global {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} - {14E8C9A5-013E-49BA-B435-FFFFFF7DD623} = {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} EndGlobalSection diff --git a/Cs_HMI/DLL/arCommUtil.dll b/Cs_HMI/DLL/arCommUtil.dll new file mode 100644 index 0000000..8d1e3d1 Binary files /dev/null and b/Cs_HMI/DLL/arCommUtil.dll differ diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index 02b62a6..d09ab11 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -7,7 +7,7 @@ true enable x64 - D:\Amkor\AGV4 + S:\Amkor\AGV4 true true @@ -23,7 +23,6 @@ - @@ -49,6 +48,9 @@ + + ..\DLL\arCommUtil.dll + ..\DLL\Winsock Orcas.dll diff --git a/Cs_HMI/SubProject/AGV/NARUMI.csproj b/Cs_HMI/SubProject/AGV/NARUMI.csproj index 407d24e..55af1d5 100644 --- a/Cs_HMI/SubProject/AGV/NARUMI.csproj +++ b/Cs_HMI/SubProject/AGV/NARUMI.csproj @@ -34,6 +34,9 @@ false + + ..\..\DLL\arCommUtil.dll + @@ -59,10 +62,6 @@ {14e8c9a5-013e-49ba-b435-efefc77dd623} CommData - - {14e8c9a5-013e-49ba-b435-ffffff7dd623} - arCommUtil - \ No newline at end of file diff --git a/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj b/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj index effcb7c..0da287e 100644 --- a/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj +++ b/Cs_HMI/SubProject/AGVMapControl/AGVMapControl.csproj @@ -8,7 +8,9 @@ - + + ..\..\DLL\arCommUtil.dll + diff --git a/Cs_HMI/SubProject/Patch/SWPatch.csproj b/Cs_HMI/SubProject/Patch/SWPatch.csproj index 1b52077..27441f2 100644 --- a/Cs_HMI/SubProject/Patch/SWPatch.csproj +++ b/Cs_HMI/SubProject/Patch/SWPatch.csproj @@ -18,7 +18,7 @@ true full false - ..\..\..\..\..\..\Amkor\AGV3\ + ..\..\..\..\..\Amkor\AGV4\ DEBUG;TRACE prompt 4