Compare commits

...

11 Commits

Author SHA1 Message Date
backuppc
82bca1c90b .. 2025-12-10 17:30:25 +09:00
backuppc
4f360f33a7 agv 정보 전송 수정 2025-11-14 15:03:41 +09:00
backuppc
6c8ed6d2f2 프로토콜 문서 업데이트 - AGV Status 명령어 정의 수정
- LastTag 필드 크기 수정: 4바이트 → 6바이트 (실제 구현 반영)
- CurrentPath 필드 제거 (실제 구현에 없음)
- 총 13바이트 데이터 구조 명시

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-12 17:36:12 +09:00
JiWoong 이지웅 Lee
ac8077d06b . 2025-11-10 15:22:18 +09:00
JiWoong 이지웅 Lee
986412338f (jwlee) DeviceAlias Enum 추가함. 2025-11-10 15:08:30 +09:00
backuppc
070aa848c9 remove readme.md 2025-11-05 14:33:28 +09:00
backuppc
1eb59a0127 .. 2025-11-05 14:28:32 +09:00
backuppc
77a9d40662 .net standard 2.0 -> net fx 4.0 class 2025-07-03 11:03:07 +09:00
chi
cc7b742a61 .. 2025-06-20 16:38:14 +09:00
chi
f127a7b5b2 Merge branch 'master' of https://gitlab.com/amk4/enigprotocol 2025-05-27 16:35:52 +09:00
Arin(asus)
0936d075b9 .. 2025-05-25 23:23:00 +09:00
11 changed files with 438 additions and 280 deletions

View File

@@ -1,14 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageReference Include="xunit" Version="2.9.3" />
@@ -21,13 +24,10 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\enigprotocol\enigprotocol.csproj" />
</ItemGroup>
<ItemGroup>
<Using Include="Xunit" />
</ItemGroup>
</Project>

View File

@@ -1,30 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34714.143
# Visual Studio Express 15 for Windows Desktop
VisualStudioVersion = 15.0.28307.1000
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol", "enigprotocol\ENIGProtocol.csproj", "{B6FCA1B0-C9D1-4159-AB86-25E4BC598C01}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleProject", "sample\SampleProject.csproj", "{FAB31C8A-7DCF-4152-8A82-76F3C10BABA4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ENIGProtocol.Tests", "ENIGProtocol.Tests\ENIGProtocol.Tests.csproj", "{3A677629-1F08-49B2-BC75-58282E439FD4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "솔루션 항목", "솔루션 항목", "{0A11874A-E5C6-4170-9787-1FFF7AF0D289}"
ProjectSection(SolutionItems) = preProject
.gitignore = .gitignore
ReadMe.MD = ReadMe.MD
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleProject", "sample\SampleProject.csproj", "{FAB31C8A-7DCF-4152-8A82-76F3C10BABA4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENIGProtocol.Tests", "ENIGProtocol.Tests\ENIGProtocol.Tests.csproj", "{3A677629-1F08-49B2-BC75-58282E439FD4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ENIGProtocol", "enigprotocol\ENIGProtocol.csproj", "{499D8912-4B96-41E5-A70D-CFE797883D65}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B6FCA1B0-C9D1-4159-AB86-25E4BC598C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B6FCA1B0-C9D1-4159-AB86-25E4BC598C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B6FCA1B0-C9D1-4159-AB86-25E4BC598C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B6FCA1B0-C9D1-4159-AB86-25E4BC598C01}.Release|Any CPU.Build.0 = Release|Any CPU
{FAB31C8A-7DCF-4152-8A82-76F3C10BABA4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FAB31C8A-7DCF-4152-8A82-76F3C10BABA4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FAB31C8A-7DCF-4152-8A82-76F3C10BABA4}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,6 +29,10 @@ Global
{3A677629-1F08-49B2-BC75-58282E439FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A677629-1F08-49B2-BC75-58282E439FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A677629-1F08-49B2-BC75-58282E439FD4}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{499D8912-4B96-41E5-A70D-CFE797883D65}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -41,23 +41,41 @@ This README provides a comprehensive overview of the `ENIGProtocol` library, mak
public enum DeviceType : byte
{
ACS = 0,
AGV1 = 10,
AGV2 = 11,
BUFFER1 = 20,
BUFFER2 = 21,
BUFFER3 = 22,
BUFFER4 = 23,
BUFFER5 = 24,
AGV1 = 10+1,
AGV2 = 10+2,
BUFFER1 = 20+1,
BUFFER2 = 20+2,
BUFFER3 = 20+3,
BUFFER4 = 20+4,
BUFFER5 = 20+5,
DOOR = 30,
}
```
public enum DeviceAlias : byte
{
B1 = 20 + 1, //BUFFER1 ~ 5
B2 = 20 + 2,
B3 = 20 + 3,
B4 = 20 + 4,
B5 = 20 + 5,
C1 = 40 + 1, //충전소 1
C2 = 40 + 2, //충전소 2
C3 = 40 + 3, //충전소 3
C4 = 40 + 4, //충전소 4
E1 = 90 + 1, //장비1 (SSOTRON Loader)
E2 = 90 + 2, //장비2 (TOPS ENIG)
E3 = 90 + 3, //장비3 (SSOTRON DIVERTER)
}
//11번 AGV야! BUFFER1로 이동해라!
//0x02 0x03 0x0B 0x6B 0x42 0x31 {CRC} 0x03
### 기본 패킷 구조
```
[STX][LEN][ID][CMD][DATA][CRC16][ETX]
```
- **STX (Start of Text)**: 0x02
- **ID (Client ID)**: 데이터 길이 (1바이트) : 디바이스식별코드(=DeviceType)
- **LEN (Length)**: 데이터 길이 (1바이트) = {CMD+DATA}
- **ID (Client ID)**: 데이터 길이 (1바이트) : 디바이스식별코드(=DeviceType)
- **CMD (Command)**: 명령어 코드 (1바이트)
- **DATA**: 명령어에 따른 데이터 (가변 길이)
- **CRC16**: 데이터 무결성 검사 (2바이트)
@@ -81,17 +99,20 @@ public enum DeviceType : byte
3. **AGV**
- H -> E | Move : cmd(100) : 대상태그까지 이동(자동이동)
- Target[1] = {DeviceType}
- TagID[4] = 0000
- TagID[4] = "0000"
- H -> E | Stop : cmd(101) : 멈춤
- H -> E | Reset : cmd(102) : 오류 소거
- H -> E | Charge On: cmd(103) : 충전실행(충전기 이동 후 자동 충전 진행)
- H -> E | SetCurrent : cmd(103) : 현재위치설정
- Target[1] = {DeviceType}
- Action[1] : 0=Charge Off, 1=Charge On
- TagID[4] = "0000"
- H -> E | MoveManual : cmd(104) : 메뉴얼이동
- Target[1] = {DeviceType}
- Direction[1] : 0=Backward, 1=Forward, 2=TurnLeft, 3=TurnRight
- Speed[1] : 0=Slow, 1=Normal, 2=Fast
- Runtime[1] : 0 second
- H -> E | MarkStop : cmd(105) : 마크센서스톱
- Target[1] = {DeviceType}
@@ -99,6 +120,21 @@ public enum DeviceType : byte
- Target[1] = {DeviceType}
- Action[1] : 0=STOP, 1=UP, 2=DOWN
- H -> E | Move : cmd(107) : 대상별칭까지 이동(자동이동)
- Target[1] = {DeviceType}
- AliasName[n] = ".....
- H -> E | MoveAuto : cmd(108) : 자동이동
- Target[1] = {DeviceType}
- MotDirection[1] : 0=Backward, 1=Forward
- MagnetDirection[1] : 0=Straight,1=Left, 2=Right
- Speed[1] : 0=Slow, 1=Normal, 2=Fast
- H -> E | Charge On: cmd(109) : 충전실행(충전기 이동 후 자동 충전 진행)
- Target[1] = {DeviceType}
- Action[1] : 0=Charge Off, 1=Charge On
- E -> H | Move Complete : cmd(1) : 목적지이동완료 후 전송
- TagID[4] : "0000"
- E -> H | TagID Received : cmd(2) : 태그값 인식시 전송

View File

@@ -4,14 +4,41 @@ using System.Text;
namespace ENIGProtocol
{
public enum AGVCommands
/// <summary>
/// host -> eq
/// </summary>
public enum AGVCommandHE : byte
{
Goto = 100,
Stop = 101,
Reset,
SetCurrent,
Manual,
MarkStop,
LiftControl
Reset = 102,
SetCurrent = 103,
Manual = 104,
MarkStop = 105,
LiftControl = 106,
GotoAlias = 107,
AutoMove=108,
ChargeControl=109,
}
/// <summary>
/// eq -> host
/// </summary>
public enum AGVCommandEH : byte
{
Error = 1,
Arrived = 2,
ReadRFID = 3,
Status = 9,
}
public enum AGVErrorCode : byte
{
PredictFix,
TurnTimeout,
TurnError,
EmptyNode,
Goto,
ManualMode,
}
}

View File

@@ -178,14 +178,16 @@ namespace ENIG
OnDataReceived?.Invoke(this, new DataEventArgs { ReceivedPacket = packet });
return true;
}
catch
catch(Exception ex)
{
RaiseMessage(ex.Message, true);
return false;
}
}
// 데이터 수신 처리 메서드 (시리얼 포트에서 데이터를 받았을 때 호출)
private List<byte> buffer = new List<byte>();
private int ProtocolParseError = 0;
public void ProcessReceivedData(byte[] data)
{
buffer.AddRange(data);
@@ -216,7 +218,12 @@ namespace ENIG
byte[] packetData = buffer.Take(expectedLength).ToArray();
buffer.RemoveRange(0, expectedLength);
ParsePacket(packetData);
var parseOK = ParsePacket(packetData);
if(parseOK==false) //분석이 실패되었다면 해당 데이터는 삭제한다.
{
ProtocolParseError += 1;
if (ProtocolParseError > 3) buffer.Clear();
} else ProtocolParseError = 0;
}
}
}

View File

@@ -1,7 +1,56 @@
<Project Sdk="Microsoft.NET.Sdk">
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{9365803B-933D-4237-93C7-B502C855A71C}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>enigprotocol</RootNamespace>
<AssemblyName>enigprotocol</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Commands.cs" />
<Compile Include="EEProtocol.cs" />
<Compile Include="EventArgs.cs" />
<Compile Include="Packet.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include=".gitignore" />
<None Include="ReadMe.MD" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

View File

@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해
// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면
// 이러한 특성 값을 변경하세요.
[assembly: AssemblyTitle("enigprotocol")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("enigprotocol")]
[assembly: AssemblyCopyright("Copyright © 2025")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에
// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면
// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요.
[assembly: ComVisible(false)]
// 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다.
[assembly: Guid("9365803b-933d-4237-93c7-b502c855a71c")]
// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다.
//
// 주 버전
// 부 버전
// 빌드 번호
// 수정 버전
//
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

View File

@@ -41,13 +41,13 @@ This README provides a comprehensive overview of the `ENIGProtocol` library, mak
public enum DeviceType : byte
{
ACS = 0,
AGV1 = 10,
AGV2 = 11,
BUFFER1 = 20,
BUFFER2 = 21,
BUFFER3 = 22,
BUFFER4 = 23,
BUFFER5 = 24,
AGV1 = 10+1,
AGV2 = 10+2,
BUFFER1 = 20+1,
BUFFER2 = 20+2,
BUFFER3 = 20+3,
BUFFER4 = 20+4,
BUFFER5 = 20+5,
DOOR = 30,
}
```
@@ -56,8 +56,8 @@ public enum DeviceType : byte
[STX][LEN][ID][CMD][DATA][CRC16][ETX]
```
- **STX (Start of Text)**: 0x02
- **LEN (Length)**: 데이터 길이 (1바이트) = {ID+CMD+DATA}
- **ID (Client ID)**: 데이터 길이 (1바이트) : 디바이스식별코드(=DeviceType)
- **LEN (Length)**: 데이터 길이 (1바이트) = {CMD+DATA}
- **CMD (Command)**: 명령어 코드 (1바이트)
- **DATA**: 명령어에 따른 데이터 (가변 길이)
- **CRC16**: 데이터 무결성 검사 (2바이트)
@@ -81,7 +81,10 @@ public enum DeviceType : byte
3. **AGV**
- H -> E | Move : cmd(100) : 대상태그까지 이동(자동이동)
- Target[1] = {DeviceType}
- TagID[4] = 0000
- TagID[4] = "0000"
- H -> E | Move : cmd(107) : 대상별칭까지 이동(자동이동)
- Target[1] = {DeviceType}
- AliasName[n] = "....."
- H -> E | Stop : cmd(101) : 멈춤
- H -> E | Reset : cmd(102) : 오류 소거
- H -> E | Charge On: cmd(103) : 충전실행(충전기 이동 후 자동 충전 진행)
@@ -104,16 +107,16 @@ public enum DeviceType : byte
- E -> H | TagID Received : cmd(2) : 태그값 인식시 전송
- TagID[4] : "0000"
- E -> H | Status : cmd(3)
- E -> H | Status : cmd(3) - 총 12바이트
- Mode[1] : 0=manual, 1=auto
- RunSt[1] : 0=stop, 1=run, 2=error
- Diection[1] : 0=straight, 1=left, 2=right, 3=markstop
MotDirection[1] : 0:Forward, 1:Backward, 0xFF:unknown
- MagDiection[1] : 0=straight, 1=left, 2=right , 0xFF:unknown
- Inposition[1] : 0=off, 1=on : 목적위치에 도달완료 시 설정 이동 이동시 OFF됨
- ChargeSt[1] : 0=off, 1=on
- CartSt[1] : 0=off, 1=on, 2=unknown
- LiftSt[1] : 0=down , 1=up, 2=unknown
- LastTag[4] : "0000"
- CurrentPath[1] : Path ID , 0=미설정, 1~255(순차증가)
- LastTag[4] : "0000" (ASCII 4바이트)
4. **Door**
- H -> E | cmd(1): 출입문 열기

View File

@@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\enigprotocol\ENIGProtocol.csproj">
<Project>{b6fca1b0-c9d1-4159-ab86-25e4bc598c01}</Project>
<Project>{499d8912-4b96-41e5-a70d-cfe797883d65}</Project>
<Name>ENIGProtocol</Name>
</ProjectReference>
</ItemGroup>