diff --git a/Cs_HMI/AGVLogic/AGVNavigationCore/Models/VirtualAGV.cs b/Cs_HMI/AGVLogic/AGVNavigationCore/Models/VirtualAGV.cs index af428dd..0cb21db 100644 --- a/Cs_HMI/AGVLogic/AGVNavigationCore/Models/VirtualAGV.cs +++ b/Cs_HMI/AGVLogic/AGVNavigationCore/Models/VirtualAGV.cs @@ -280,6 +280,7 @@ namespace AGVNavigationCore.Models public bool SetCurrentNodeMarkStop() { if (_currentNode == null) return false; + if (_currentPath == null) return false; var 미완료된처음노드 = _currentPath.DetailedPath.Where(t => t.IsPass == false).OrderBy(t => t.seq).FirstOrDefault(); if (미완료된처음노드 == null) return false; 미완료된처음노드.IsPass = true; diff --git a/Cs_HMI/Data/NewMap_3.json b/Cs_HMI/Data/NewMap_3.json index 2603738..599d695 100644 --- a/Cs_HMI/Data/NewMap_3.json +++ b/Cs_HMI/Data/NewMap_3.json @@ -1080,9 +1080,9 @@ { "Id": "cd9f8434-f223-4532-9b3e-5b44c738abbb", "Type": 3, - "Position": "686, 196", - "X": 686, - "Y": 196, + "Position": "694, 224", + "X": 694, + "Y": 224, "Rotation": 90 }, { @@ -1130,6 +1130,6 @@ "BackgroundColorArgb": -14671840, "ShowGrid": false }, - "CreatedDate": "2025-12-14T08:13:36.810Z", + "CreatedDate": "2025-12-15T12:47:11.915Z", "Version": "1.3" } \ No newline at end of file diff --git a/Cs_HMI/Project/Device/Xbee.cs b/Cs_HMI/Project/Device/Xbee.cs index 4e99c9f..67e72fd 100644 --- a/Cs_HMI/Project/Device/Xbee.cs +++ b/Cs_HMI/Project/Device/Xbee.cs @@ -94,19 +94,14 @@ namespace Project.Device var cmd = e.ReceivedPacket.Command.ToString("X2"); var id = e.ReceivedPacket.ID.ToString("X2"); PUB.logxbee.Add("RX", $"{hexstrRaw}\nID:{id},CMD:{cmd},DATA:{hexstr}"); - ProtocReceived?.Invoke(this, e); - - - - } + private void Proto_OnMessage(object sender, EEProtocol.MessageEventArgs e) { MessageReceived?.Invoke(this, new MessageArgs(e.IsError, e.Message)); } - private void Xbee_DataReceived(object sender, System.IO.Ports.SerialDataReceivedEventArgs e) { var dev = sender as System.IO.Ports.SerialPort; @@ -114,6 +109,7 @@ namespace Project.Device dev.Read(buffer, 0, buffer.Length); proto.ProcessReceivedData(buffer); } + /// /// 이동완료 신호 전송 ///