Amkor/ENIG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

..

Browse Source
This commit is contained in:
tindevil
2025-12-15 22:06:53 +09:00
parent a7f938ff19
commit 67a48531ad
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cs_HMI/AGVLogic/AGVNavigationCore/Models/VirtualAGV.cs
View File

@@ -280,6 +280,7 @@ namespace AGVNavigationCore.Models
public bool SetCurrentNodeMarkStop() public bool SetCurrentNodeMarkStop()
{ {
if (_currentNode == null) return false; if (_currentNode == null) return false;
if (_currentPath == null) return false;
var 미완료된처음노드 = _currentPath.DetailedPath.Where(t => t.IsPass == false).OrderBy(t => t.seq).FirstOrDefault(); var 미완료된처음노드 = _currentPath.DetailedPath.Where(t => t.IsPass == false).OrderBy(t => t.seq).FirstOrDefault();
if (미완료된처음노드 == null) return false; if (미완료된처음노드 == null) return false;
미완료된처음노드.IsPass = true; 미완료된처음노드.IsPass = true;

8
Cs_HMI/Data/NewMap_3.json
View File

@@ -1080,9 +1080,9 @@
{ {
"Id": "cd9f8434-f223-4532-9b3e-5b44c738abbb", "Id": "cd9f8434-f223-4532-9b3e-5b44c738abbb",
"Type": 3, "Type": 3,
"Position": "686, 196", "Position": "694, 224",
"X": 686, "X": 694,
"Y": 196, "Y": 224,
"Rotation": 90 "Rotation": 90
}, },
{ {
@@ -1130,6 +1130,6 @@
"BackgroundColorArgb": -14671840, "BackgroundColorArgb": -14671840,
"ShowGrid": false "ShowGrid": false
}, },
"CreatedDate": "2025-12-14T08:13:36.810Z", "CreatedDate": "2025-12-15T12:47:11.915Z",
"Version": "1.3" "Version": "1.3"
} }

8
Cs_HMI/Project/Device/Xbee.cs
View File

@@ -94,19 +94,14 @@ namespace Project.Device
var cmd = e.ReceivedPacket.Command.ToString("X2"); var cmd = e.ReceivedPacket.Command.ToString("X2");
var id = e.ReceivedPacket.ID.ToString("X2"); var id = e.ReceivedPacket.ID.ToString("X2");
PUB.logxbee.Add("RX", $"{hexstrRaw}\nID:{id},CMD:{cmd},DATA:{hexstr}"); PUB.logxbee.Add("RX", $"{hexstrRaw}\nID:{id},CMD:{cmd},DATA:{hexstr}");
ProtocReceived?.Invoke(this, e); ProtocReceived?.Invoke(this, e);
} }
private void Proto_OnMessage(object sender, EEProtocol.MessageEventArgs e) private void Proto_OnMessage(object sender, EEProtocol.MessageEventArgs e)
{ {
MessageReceived?.Invoke(this, new MessageArgs(e.IsError, e.Message)); MessageReceived?.Invoke(this, new MessageArgs(e.IsError, e.Message));
} }
private void Xbee_DataReceived(object sender, System.IO.Ports.SerialDataReceivedEventArgs e) private void Xbee_DataReceived(object sender, System.IO.Ports.SerialDataReceivedEventArgs e)
{ {
var dev = sender as System.IO.Ports.SerialPort; var dev = sender as System.IO.Ports.SerialPort;
@@ -114,6 +109,7 @@ namespace Project.Device
dev.Read(buffer, 0, buffer.Length); dev.Read(buffer, 0, buffer.Length);
proto.ProcessReceivedData(buffer); proto.ProcessReceivedData(buffer);
} }
/// <summary> /// <summary>
/// 이동완료 신호 전송 /// 이동완료 신호 전송
/// </summary> /// </summary>