compile ok .ㅠㅠ

This commit is contained in:
chi
2025-05-26 10:21:17 +09:00
parent 57dc6de740
commit 77a6aefb44
27 changed files with 780 additions and 204 deletions

View File

@@ -35,10 +35,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test_Narumi", "TestProject\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommUtil", "SubProject\CommUtil\arCommUtil.csproj", "{14E8C9A5-013E-49BA-B435-FFFFFF7DD623}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AGV4", "Project\AGV4.csproj", "{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol", "SubProject\EnigProtocol\enigprotocol\ENIGProtocol.csproj", "{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4", "Project\AGV4.csproj", "{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -211,18 +211,6 @@ Global
{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
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.ActiveCfg = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.Build.0 = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.ActiveCfg = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.Build.0 = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.Build.0 = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.ActiveCfg = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.Build.0 = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.ActiveCfg = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.Build.0 = Release|Any CPU
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -235,6 +223,18 @@ Global
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x64.Build.0 = Release|Any CPU
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x86.ActiveCfg = Release|Any CPU
{BCFD982A-C7BF-42EF-B0D3-0648B0EC5234}.Release|x86.Build.0 = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.ActiveCfg = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x64.Build.0 = Debug|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.ActiveCfg = Debug|x86
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Debug|x86.Build.0 = Debug|x86
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|Any CPU.Build.0 = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.ActiveCfg = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x64.Build.0 = Release|Any CPU
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.ActiveCfg = Release|x86
{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -1,63 +1,556 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D6B3880D-7D5C-44E2-B6A5-CF6D881A8A38}</ProjectGuid>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<PlatformTarget>x64</PlatformTarget>
<BaseOutputPath>S:\Amkor\AGV4</BaseOutputPath>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<UseResourceDedicatedThread>true</UseResourceDedicatedThread>
<RootNamespace>Project</RootNamespace>
<AssemblyName>Amkor</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
<PublishUrl>게시\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<UpdateEnabled>false</UpdateEnabled>
<UpdateMode>Foreground</UpdateMode>
<UpdateInterval>7</UpdateInterval>
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<NoWin32Manifest>False</NoWin32Manifest>
<SignAssembly>False</SignAssembly>
<DelaySign>False</DelaySign>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
<NoStdLib>False</NoStdLib>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<OutputPath>..\..\..\..\..\Amkor\AGV4\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<NoWarn>IDE1006</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>..\..\..\ManualMapEditor\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>icons8-split-64.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<TargetZone>LocalIntranet</TargetZone>
</PropertyGroup>
<PropertyGroup>
<GenerateManifests>false</GenerateManifests>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\Amkor\OTP2DReading\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<StartAction>Project</StartAction>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<BaseAddress>4194304</BaseAddress>
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\StateMachine\StateMachine.csproj" />
<ProjectReference Include="..\SubProject\AGVMapControl\AGVMapControl.csproj" />
<ProjectReference Include="..\SubProject\AGV\NARUMI.csproj" />
<ProjectReference Include="..\SubProject\AGVControl\agvControl.csproj" />
<ProjectReference Include="..\SubProject\arCtl\arControl.csproj" />
<ProjectReference Include="..\SubProject\BMS\BMS.csproj" />
<ProjectReference Include="..\SubProject\CommData\CommData.csproj" />
<ProjectReference Include="..\SubProject\Patch\SWPatch.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="icons8-split-64.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Update="sample.route">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="arCommUtil">
<HintPath>..\DLL\arCommUtil.dll</HintPath>
<Reference Include="Microsoft.Speech, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<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>
<Private>True</Private>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression.FileSystem" />
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Winsock Orcas">
<HintPath>..\DLL\Winsock Orcas.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
<PackageReference Include="System.IO.Ports" Version="9.0.4" />
<PackageReference Include="System.Management" Version="9.0.4" />
<PackageReference Include="System.Speech" Version="9.0.4" />
<Compile Include="Class\EEMStatus.cs" />
<Compile Include="Class\Lang.cs" />
<Compile Include="CtlAuto.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="CtlAuto.Designer.cs">
<DependentUpon>CtlAuto.cs</DependentUpon>
</Compile>
<Compile Include="CtlPos.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="CtlPos.Designer.cs">
<DependentUpon>CtlPos.cs</DependentUpon>
</Compile>
<Compile Include="Class\CParser.cs" />
<Compile Include="Class\EnumData.cs" />
<Compile Include="Class\CResult.cs" />
<Compile Include="DataSet1.cs">
<DependentUpon>DataSet1.xsd</DependentUpon>
</Compile>
<Compile Include="DataSet1.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>DataSet1.xsd</DependentUpon>
</Compile>
<Compile Include="Device\CFlag.cs" />
<Compile Include="Device\Xbee.cs" />
<Compile Include="Device\Socket.cs" />
<Compile Include="Dialog\fCounter.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fCounter.Designer.cs">
<DependentUpon>fCounter.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fUpdateForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fUpdateForm.Designer.cs">
<DependentUpon>fUpdateForm.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fLog.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fLog.Designer.cs">
<DependentUpon>fLog.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fJobSelect.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fJobSelect.Designer.cs">
<DependentUpon>fJobSelect.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fSystem.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fSystem.Designer.cs">
<DependentUpon>fSystem.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\DriveDetector.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fVolume.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fVolume.Designer.cs">
<DependentUpon>fVolume.cs</DependentUpon>
</Compile>
<Compile Include="MessageWindow\fMessageWindow.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="MessageWindow\fMessageWindow.Designer.cs">
<DependentUpon>fMessageWindow.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fTouchKey.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fTouchKey.Designer.cs">
<DependentUpon>fTouchKey.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fTouchKeyFull.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fTouchKeyFull.Designer.cs">
<DependentUpon>fTouchKeyFull.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fTouchNumDot.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fTouchNumDot.Designer.cs">
<DependentUpon>fTouchNumDot.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fPassword.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fPassword.Designer.cs">
<DependentUpon>fPassword.cs</DependentUpon>
</Compile>
<Compile Include="Dialog\fErrorException.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Dialog\fErrorException.Designer.cs">
<DependentUpon>fErrorException.cs</DependentUpon>
</Compile>
<Compile Include="fMain.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="fMain.Designer.cs">
<DependentUpon>fMain.cs</DependentUpon>
</Compile>
<Compile Include="Manager\DataBaseManager.cs" />
<Compile Include="MessageWindow\MessageWindow.cs" />
<Compile Include="MessageWindow\CMessageData.cs" />
<Compile Include="MethodExtentions.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PUB.cs" />
<Compile Include="CSetting.cs" />
<Compile Include="StateMachine\Display\GetErrorMessage.cs" />
<Compile Include="StateMachine\Step\_SM_RUN_CHGOFF.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_GOCHARGECHECK.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_GOCHARGE.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_READY.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_RESET.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_GOHOME.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_GOUP.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_GODOWN.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_SYNC.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_POSCHK.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN_INIT.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_DIO.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_Flag.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_STEP_CLOSE.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_BMS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_AGV.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_SPS.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_Loop.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\Step\_SM_RUN.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\_TMDisplay.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="StateMachine\DisplayTextHandler.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Util.cs" />
<Compile Include="Util_FG.cs" />
<Compile Include="ViewForm\fBms.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fBms.Designer.cs">
<DependentUpon>fBms.cs</DependentUpon>
</Compile>
<Compile Include="ViewForm\fAuto.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fAuto.Designer.cs">
<DependentUpon>fAuto.cs</DependentUpon>
</Compile>
<Compile Include="ViewForm\fAgv.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fAgv.Designer.cs">
<DependentUpon>fAgv.cs</DependentUpon>
</Compile>
<Compile Include="ViewForm\fFlag.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fFlag.Designer.cs">
<DependentUpon>fFlag.cs</DependentUpon>
</Compile>
<Compile Include="ViewForm\fIO.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fIO.Designer.cs">
<DependentUpon>fIO.cs</DependentUpon>
</Compile>
<Compile Include="fSetup.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="fSetup.Designer.cs">
<DependentUpon>fSetup.cs</DependentUpon>
</Compile>
<Compile Include="ViewForm\fManual.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ViewForm\fManual.Designer.cs">
<DependentUpon>fManual.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="Dialog\fCounter.resx">
<DependentUpon>fCounter.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fUpdateForm.resx">
<DependentUpon>fUpdateForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fLog.resx">
<DependentUpon>fLog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fJobSelect.resx">
<DependentUpon>fJobSelect.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fSystem.resx">
<DependentUpon>fSystem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fVolume.resx">
<DependentUpon>fVolume.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MessageWindow\fMessageWindow.resx">
<DependentUpon>fMessageWindow.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fTouchKey.resx">
<DependentUpon>fTouchKey.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fTouchKeyFull.resx">
<DependentUpon>fTouchKeyFull.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fTouchNumDot.resx">
<DependentUpon>fTouchNumDot.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fPassword.resx">
<DependentUpon>fPassword.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Dialog\fErrorException.resx">
<DependentUpon>fErrorException.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="fMain.resx">
<DependentUpon>fMain.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
</EmbeddedResource>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="ViewForm\fBms.resx">
<DependentUpon>fBms.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ViewForm\fAuto.resx">
<DependentUpon>fAuto.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ViewForm\fAgv.resx">
<DependentUpon>fAgv.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ViewForm\fFlag.resx">
<DependentUpon>fFlag.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ViewForm\fIO.resx">
<DependentUpon>fIO.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="fSetup.resx">
<DependentUpon>fSetup.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ViewForm\fManual.resx">
<DependentUpon>fManual.cs</DependentUpon>
</EmbeddedResource>
<None Include="app.config" />
<None Include="DataSet1.xsc">
<DependentUpon>DataSet1.xsd</DependentUpon>
</None>
<None Include="DataSet1.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>DataSet1.Designer.cs</LastGenOutput>
</None>
<None Include="DataSet1.xss">
<DependentUpon>DataSet1.xsd</DependentUpon>
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<None Include="sample.route">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="ReadMe.txt" />
<Content Include="icons8-layers-30.ico" />
<Content Include="icons8-split-64.ico" />
<None Include="Resources\ChargeH.png" />
<None Include="Resources\icons8-charge-empty-battery-96.png" />
<None Include="Resources\icons8-automatic-gearbox-warning-80.png" />
<None Include="Resources\icons8-speed-80.png" />
<None Include="Resources\icons8-charged-battery-80.png" />
<None Include="Resources\icons8-checked-radio-button-48.png" />
<None Include="Resources\icons8-save-40.png" />
<None Include="Resources\icons8-unavailable-40.png" />
<None Include="Resources\icons8-new-40.png" />
<None Include="Resources\icons8-running-40.png" />
<None Include="Resources\icons8-no-running-40.png" />
<None Include="Resources\icons8-exercise-40.png" />
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
<Visible>False</Visible>
<ProductName>Microsoft .NET Framework 4%28x86 및 x64%29</ProductName>
<Install>true</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
<Visible>False</Visible>
<ProductName>.NET Framework 3.5 SP1</ProductName>
<Install>false</Install>
</BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
<Visible>False</Visible>
<ProductName>Windows Installer 4.5</ProductName>
<Install>true</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\StateMachine\StateMachine.csproj">
<Project>{bbc9bccf-6262-4355-9cc2-37ff678ac499}</Project>
<Name>StateMachine</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\AGVControl\agvControl.csproj">
<Project>{8cb883c0-99c3-4dd4-b017-f9b92010a806}</Project>
<Name>agvControl</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\AGV\NARUMI.csproj">
<Project>{8bae0eac-3d25-402f-9a65-2ba1ecfe28b7}</Project>
<Name>NARUMI</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\arCtl\arControl.csproj">
<Project>{f31c242c-1b15-4518-9733-48558499fe4b}</Project>
<Name>arControl</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\arFrameControl\arFrameControl.csproj">
<Project>{a16c9667-5241-4313-888e-548375f85d29}</Project>
<Name>arFrameControl</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\BMS\BMS.csproj">
<Project>{7a94c30c-6772-4f71-bf9c-0df071a1bc70}</Project>
<Name>BMS</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\CommData\CommData.csproj">
<Project>{14e8c9a5-013e-49ba-b435-efefc77dd623}</Project>
<Name>CommData</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\CommUtil\arCommUtil.csproj">
<Project>{14e8c9a5-013e-49ba-b435-ffffff7dd623}</Project>
<Name>arCommUtil</Name>
</ProjectReference>
<ProjectReference Include="..\SubProject\EnigProtocol\enigprotocol\ENIGProtocol.csproj">
<Project>{bcfd982a-c7bf-42ef-b0d3-0648b0ec5234}</Project>
<Name>ENIGProtocol</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>rem xcopy "$(TargetDir)*.exe" "\\192.168.1.80\Amkor\AGV2" /Y
rem xcopy "$(TargetDir)*.dll" "\\192.168.1.80\Amkor\AGV2" /Y</PostBuildEvent>
</PropertyGroup>
</Project>

View File

@@ -0,0 +1,63 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<PlatformTarget>x64</PlatformTarget>
<BaseOutputPath>S:\Amkor\AGV4</BaseOutputPath>
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<UseResourceDedicatedThread>true</UseResourceDedicatedThread>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\StateMachine\StateMachine.csproj" />
<ProjectReference Include="..\SubProject\AGVMapControl\AGVMapControl.csproj" />
<ProjectReference Include="..\SubProject\AGV\NARUMI.csproj" />
<ProjectReference Include="..\SubProject\AGVControl\agvControl.csproj" />
<ProjectReference Include="..\SubProject\arCtl\arControl.csproj" />
<ProjectReference Include="..\SubProject\BMS\BMS.csproj" />
<ProjectReference Include="..\SubProject\CommData\CommData.csproj" />
<ProjectReference Include="..\SubProject\Patch\SWPatch.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<None Update="icons8-split-64.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Update="sample.route">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<Reference Include="arCommUtil">
<HintPath>..\DLL\arCommUtil.dll</HintPath>
</Reference>
<Reference Include="Winsock Orcas">
<HintPath>..\DLL\Winsock Orcas.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.2" />
<PackageReference Include="System.IO.Ports" Version="9.0.4" />
<PackageReference Include="System.Management" Version="9.0.4" />
<PackageReference Include="System.Speech" Version="9.0.4" />
</ItemGroup>
</Project>

View File

@@ -59,7 +59,7 @@ namespace Project.Device
{
try
{
this.Open();
base.Open();
return true;
}
catch (Exception ex)

View File

@@ -125,20 +125,26 @@ namespace Project.Dialog
Util.MsgE("실행파일 amkor.exe 가 없습니다.");
return;
}
var zipfile = new ZipArchive(new MemoryStream(), ZipArchiveMode.Create);
zipfile.CreateEntryFromFile(file_exe, "amkor.exe");
foreach (var filedll in files_dll)
zipfile.CreateEntryFromFile(filedll.FullName, filedll.Name);
var veri = Application.ProductVersion.Split('.');
var newfilename = "Patch_AGV_" + veri[0] + veri[1]+ veri[2] + "_" +
veri[3] + ".zip";
var entry = zipfile.CreateEntry(newfilename);
using (var entryStream = entry.Open())
using (var fileStream = new FileStream(newfilename, FileMode.Open))
{
fileStream.CopyTo(entryStream);
}
var newfilename = "Patch_AGV_" + veri[0] + veri[1] + veri[2] + "_" + veri[3] + ".zip";
// 임시 폴더 생성
var tempDir = Path.Combine(Path.GetTempPath(), "PatchTemp");
if (Directory.Exists(tempDir))
Directory.Delete(tempDir, true);
Directory.CreateDirectory(tempDir);
// 파일 복사
File.Copy(file_exe, Path.Combine(tempDir, "amkor.exe"));
foreach (var filedll in files_dll)
File.Copy(filedll.FullName, Path.Combine(tempDir, filedll.Name));
// 압축 파일 생성
ZipFile.CreateFromDirectory(tempDir, newfilename);
// 임시 폴더 삭제
Directory.Delete(tempDir, true);
Util.MsgI("다음 패치 파일이 생성됨\n" + newfilename);
}

View File

@@ -4,11 +4,14 @@ using System.Net;
using System.Management;
using System.Data;
using AR;
using System.Speech.Synthesis;
using System.Media;
using System.Runtime.InteropServices;
using Microsoft.Data.SqlClient;
using System.Windows.Forms;
using System;
using Microsoft.Speech.Synthesis;
using System.Threading.Tasks;
using System.Data.SqlClient;
using System.Linq;
namespace Project
{
@@ -185,10 +188,6 @@ namespace Project
public static void init()
{
// 전역 예외 처리기 등록
Application.ThreadException += Application_ThreadException;
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
Application.ApplicationExit += Application_ApplicationExit;
Result = new CResult();
@@ -243,46 +242,7 @@ namespace Project
else PUB.PatchVersion = string.Empty;
}
private static void Application_ThreadException(object sender, ThreadExceptionEventArgs e)
{
try
{
string errorMessage = $"Thread Exception: {e.Exception.Message}\nStack Trace: {e.Exception.StackTrace}";
log.AddE(errorMessage);
MessageBox.Show($"프로그램 오류가 발생했습니다.\n{errorMessage}", "오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
catch
{
// 로깅 실패 시 무시
}
}
private static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
{
try
{
Exception ex = e.ExceptionObject as Exception;
string errorMessage = $"Unhandled Exception: {ex?.Message}\nStack Trace: {ex?.StackTrace}";
log.AddE(errorMessage);
MessageBox.Show($"프로그램 오류가 발생했습니다.\n{errorMessage}", "오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
catch
{
// 로깅 실패 시 무시
}
}
private static void Application_ApplicationExit(object sender, EventArgs e)
{
try
{
log.Add("프로그램 종료", "Application_ApplicationExit 이벤트 발생");
}
catch
{
// 로깅 실패 시 무시
}
}
public static Boolean CheckManualChargeMode(bool Prompt = true )
{

View File

@@ -1,36 +0,0 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.5.2.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4 - Backup", "AGV4 - Backup.csproj", "{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4", "AGV4.csproj", "{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGV4.net8", "AGV4.net8.csproj", "{FD3A068E-BC6F-1C35-9239-C435C411B769}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5669835E-EAF0-9E3E-A4CF-78CDCE6C6C9F}.Release|Any CPU.Build.0 = Release|Any CPU
{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6D0CF7CE-1916-3231-E152-64E6C2B57D2B}.Release|Any CPU.Build.0 = Release|Any CPU
{FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD3A068E-BC6F-1C35-9239-C435C411B769}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD3A068E-BC6F-1C35-9239-C435C411B769}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {31175F6D-6217-4F37-BF84-FA16ACCCBAC0}
EndGlobalSection
EndGlobal

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
// 이러한 특성 값을 변경하세요.
[assembly: AssemblyTitle("(OTP) 2D Reading System")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Amkor K4")]
[assembly: AssemblyProduct("(OTP) 2D Reading System")]
[assembly: AssemblyCopyright("Copyright ©Amkor-EET 2020")]
[assembly: AssemblyTrademark("EET")]
[assembly: AssemblyCulture("")]
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
[assembly: ComVisible(false)]
// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
[assembly: Guid("65f3e762-800c-772e-862f-b444642ec59f")]
// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
//
// 주 버전
// 부 버전
// 빌드 번호
// 수정 버전
//
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("25.01.10.1030")]
[assembly: AssemblyFileVersion("25.01.10.1030")]

View File

@@ -1,4 +1,8 @@
namespace Project.ViewForm
using System;
using System.Drawing;
using System.Windows.Forms;
namespace Project.ViewForm
{
partial class fAuto
{

View File

@@ -10,13 +10,12 @@ using System.Windows.Forms;
using Project.StateMachine;
using COMM;
using AR;
using Microsoft.IdentityModel.Tokens;
namespace Project.ViewForm
{
public partial class fAuto : Form
{
AGVMapControl.MapControl mapctl;
AGVControl.MapControl mapctl;
public fAuto()
{
InitializeComponent();
@@ -27,7 +26,7 @@ namespace Project.ViewForm
this.ctlAuto1.Scean = CtlAuto.eScean.Progress;
else
this.ctlAuto1.Scean = CtlAuto.eScean.Normal;
this.mapctl = new AGVMapControl.MapControl();
this.mapctl = new AGVControl.MapControl();
this.mapctl.Dock = DockStyle.Fill;
this.mapctl.Visible = true;
this.mapctl.Font = this.panel1.Font;
@@ -43,8 +42,28 @@ namespace Project.ViewForm
this.timer1.Start();
PUB.AGV.DataReceive += AGV_DataReceive;
var fn = new System.IO.FileInfo( AR.UTIL.CurrentPath+ "\\sample.route");
if (fn.Exists) this.mapctl.LoadFromFile(fn.FullName);
//auto load
var path = new System.IO.DirectoryInfo("route");
if (path.Exists == false) path.Create();
var files = path.GetFiles("*.route");
var fn = string.Empty;
if (files.Any() == false)
{
fn = AR.UTIL.MakePath("sample.route");
}
else if (files.Count() == 1)
{
fn = files.First().FullName;
}
if(fn.isEmpty()==false)
{
var fi = new System.IO.FileInfo(AR.UTIL.CurrentPath + "\\sample.route");
if (fi.Exists)
{
PUB.log.Add($"autoload : {fi.FullName}");
this.mapctl.LoadFromFile(fi.FullName);
}
}
}
private void AGV_DataReceive(object sender, arDev.Narumi.DataEventArgs e)
{

View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -7,8 +7,7 @@
</sectionGroup>
</configSections>
<connectionStrings>
<add name="AGV4.Properties.Settings.CS" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
<add name="AGV4.Properties.Settings.CS" connectionString="Data Source=K4FASQL.kr.ds.amkor.com,50150;Initial Catalog=EE;Persist Security Info=True;User ID=eeadm;Password=uJnU8a8q&amp;DJ+ug-D;Encrypt=False;TrustServerCertificate=True" providerName="System.Data.SqlClient" />
</connectionStrings>
<userSettings>
<AGV4.Properties.Settings>
@@ -26,4 +25,13 @@ asdf</value>
</setting>
</Project.Properties.Settings>
</userSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -1,4 +1,7 @@
namespace Project
using System.Drawing;
using System.Windows.Forms;
namespace Project
{
partial class fMain
{

View File

@@ -1,4 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Ionic.Zip" version="1.9.1.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="13.0.3" 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" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net48" />
</packages>

View File

@@ -1,4 +1,4 @@
namespace AGVMapControl
namespace AGVControl
{
partial class MapControl
{

View File

@@ -1,11 +1,15 @@
using System.Collections.Immutable;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Design;
using System.Drawing.Drawing2D;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using System.Windows.Forms;
using AGVMapControl.Models;
using AGVControl.Models;
namespace AGVMapControl
namespace AGVControl
{
public partial class MapControl : Control
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System.Collections.Generic;
using System.Linq;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class AGV
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class CustomLine
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class MagnetLine
{

View File

@@ -1,7 +1,7 @@
using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class MapData
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public enum BranchDirection
{

View File

@@ -1,7 +1,7 @@
using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class MapText
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class RFIDLine
{

View File

@@ -1,7 +1,7 @@
using System.Drawing;
using System;
using System.Collections.Generic;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class RFIDPoint
{

View File

@@ -2,7 +2,7 @@ using System.Drawing;
using System.Collections.Generic;
using System.Linq;
namespace AGVMapControl.Models
namespace AGVControl.Models
{
public class ToolBarItem
{

View File

@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AGVControl</RootNamespace>
<AssemblyName>AGVControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
@@ -57,6 +57,21 @@
<Compile Include="GuideSensor.Designer.cs">
<DependentUpon>GuideSensor.cs</DependentUpon>
</Compile>
<Compile Include="MapControl.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="MapControl.Designer.cs">
<DependentUpon>MapControl.cs</DependentUpon>
</Compile>
<Compile Include="Models\AGV.cs" />
<Compile Include="Models\CustomLine.cs" />
<Compile Include="Models\MagnetLine.cs" />
<Compile Include="Models\MapData.cs" />
<Compile Include="Models\MapElements.cs" />
<Compile Include="Models\MapText.cs" />
<Compile Include="Models\RFIDLine.cs" />
<Compile Include="Models\RFIDPoint.cs" />
<Compile Include="Models\ToolBarItem.cs" />
<Compile Include="MyRadioButton.cs">
<SubType>Component</SubType>
</Compile>
@@ -77,5 +92,16 @@
<DependentUpon>ValueSelect.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="MapControl.resx">
<DependentUpon>MapControl.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CommUtil\arCommUtil.csproj">
<Project>{14e8c9a5-013e-49ba-b435-ffffff7dd623}</Project>
<Name>arCommUtil</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -1,16 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<Reference Include="arCommUtil">
<HintPath>..\..\DLL\arCommUtil.dll</HintPath>
</Reference>
</ItemGroup>
</Project>