diff --git a/Cs_HMI/Project/ViewForm/fAuto.cs b/Cs_HMI/Project/ViewForm/fAuto.cs index 41fbf47..609abbe 100644 --- a/Cs_HMI/Project/ViewForm/fAuto.cs +++ b/Cs_HMI/Project/ViewForm/fAuto.cs @@ -215,7 +215,15 @@ namespace Project.ViewForm private void fAuto_VisibleChanged(object sender, EventArgs e) { this.timer1.Enabled = this.Visible; - if (timer1.Enabled) timer1.Start(); + if (timer1.Enabled) + { + timer1.Start(); + // 화면이 보일 때 Run 모드로 강제 설정 + if (PUB._mapCanvas.Mode != AGVNavigationCore.Controls.UnifiedAGVCanvas.CanvasMode.Run) + { + PUB._mapCanvas.Mode = AGVNavigationCore.Controls.UnifiedAGVCanvas.CanvasMode.Run; + } + } else timer1.Stop(); } diff --git a/Cs_HMI/Project/ViewForm/fAuto.cs.new b/Cs_HMI/Project/ViewForm/fAuto.cs.new deleted file mode 100644 index 3d40426..0000000 --- a/Cs_HMI/Project/ViewForm/fAuto.cs.new +++ /dev/null @@ -1,55 +0,0 @@ - private void HandleRunModeClick(MapNode targetNode) - { - if (targetNode == null) return; - - ENIGProtocol.AGVCommandHE targetCmd = ENIGProtocol.AGVCommandHE.Move; - string confirmMsg = ""; - - if (targetNode.StationType == StationType.Charger) - { - if (MessageBox.Show($"[{targetNode.Id}] 충전기로 이동하여 충전을 진행하시겠습니까?", "작업 확인", MessageBoxButtons.YesNo) == DialogResult.Yes) - { - targetCmd = ENIGProtocol.AGVCommandHE.Charger; - ExecuteManualCommand(targetNode, targetCmd); - } - return; - } - else if (targetNode.isDockingNode) - { - // Loader, Unloader, Buffer, Cleaner - // Custom Dialog needed for PickOn / PickOff - // For now, let's use a simple MessageBox or just a ContextMenu like logic? - // User said: "click -> PickOn/Off selection -> Execute" - // A context menu at cursor position is good for selection. - - ContextMenuStrip menu = new ContextMenuStrip(); - - var pickOn = new ToolStripMenuItem("Pick On (Move & Pick)"); - pickOn.Click += (s, args) => ExecuteManualCommand(targetNode, ENIGProtocol.AGVCommandHE.PickOn); - menu.Items.Add(pickOn); - - var pickOff = new ToolStripMenuItem("Pick Off (Move & Drop)"); - pickOff.Click += (s, args) => ExecuteManualCommand(targetNode, ENIGProtocol.AGVCommandHE.PickOff); - menu.Items.Add(pickOff); - - menu.Show(Cursor.Position); - return; - } - else - { - // Normal Node - if (MessageBox.Show($"[{targetNode.Id}] 노드로 이동하시겠습니까?", "이동 확인", MessageBoxButtons.YesNo) == DialogResult.Yes) - { - targetCmd = ENIGProtocol.AGVCommandHE.Move; // Or PickOff as default move? usually just Move logic inside ExecuteManualCommand handles GOTO. - // But ExecuteManualCommand takes AGVCommandHE. - // Let's check ENIGProtocol.AGVCommandHE. - // If not present, we might need to modify ExecuteManualCommand or just pass PickOff as dummy? - // Actually ExecuteManualCommand uses 'cmd' for log and 'PUB.NextWorkCmd'. - // If 'Move', just GOTO. - // Let's assume 'Move' exists or we use 'PickOff' (Move & Drop often implies MoveTo). - // Or we check `ENIGProtocol.AGVCommandHE`. - ExecuteManualCommand(targetNode, ENIGProtocol.AGVCommandHE.Move); - } - return; - } - } diff --git a/Cs_HMI/SubProject/AGV/Narumi.cs b/Cs_HMI/SubProject/AGV/Narumi.cs index f65e041..48d588f 100644 --- a/Cs_HMI/SubProject/AGV/Narumi.cs +++ b/Cs_HMI/SubProject/AGV/Narumi.cs @@ -229,7 +229,7 @@ namespace arDev private void RevSTS(Dataframe frame) { LastSTS = frame.DataString; - string rcvdNow = frame.DataString; + string rcvdNow = frame.DataString.Replace("\0",""); byte[] bRcvData = frame.Buffer; var encoding = System.Text.Encoding.Default; try @@ -267,7 +267,7 @@ namespace arDev nDataTemp = Convert.ToByte(rcvdNow.Substring(idx, 2), 16); signal1.SetValue(nDataTemp); idx += 2; - if(idx < rcvdNow.Length-2) + if(idx <= rcvdNow.Length-2) { nDataTemp = Convert.ToByte(rcvdNow.Substring(idx, 2), 16); signal2.SetValue(nDataTemp); diff --git a/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-pic다운로드메뉴얼.msg b/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-pic다운로드메뉴얼.msg deleted file mode 100644 index 0c65996..0000000 Binary files a/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-pic다운로드메뉴얼.msg and /dev/null differ diff --git a/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프토토콜+펌웨어파일.msg b/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프토토콜+펌웨어파일.msg deleted file mode 100644 index 29296ac..0000000 Binary files a/Document/RE_ _이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프토토콜+펌웨어파일.msg and /dev/null differ diff --git a/Document/_이노텍_ RFID 헥사파일 송부건.msg b/Document/_이노텍_ RFID 헥사파일 송부건.msg deleted file mode 100644 index dce1763..0000000 Binary files a/Document/_이노텍_ RFID 헥사파일 송부건.msg and /dev/null differ diff --git a/Document/_이노텍_ 리프트형 AGV 펌웨어 송부건.msg b/Document/_이노텍_ 리프트형 AGV 펌웨어 송부건.msg deleted file mode 100644 index 98ee848..0000000 Binary files a/Document/_이노텍_ 리프트형 AGV 펌웨어 송부건.msg and /dev/null differ diff --git a/Document/_이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프로토콜.msg b/Document/_이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프로토콜.msg deleted file mode 100644 index 7307f8f..0000000 Binary files a/Document/_이노텍_ 통신 프로토콜 송부건 (AGV_V350_LF)-프로토콜.msg and /dev/null differ diff --git a/Document/teset.pptx b/Document/teset.pptx deleted file mode 100644 index 03fb514..0000000 Binary files a/Document/teset.pptx and /dev/null differ diff --git a/Document/~$PICkit 프로그램 다운로드 매뉴얼.pptx b/Document/~$PICkit 프로그램 다운로드 매뉴얼.pptx deleted file mode 100644 index c805eb5..0000000 Binary files a/Document/~$PICkit 프로그램 다운로드 매뉴얼.pptx and /dev/null differ diff --git a/Document/리듐인산철 통신프로토콜정리 .xlsx b/Document/리듐인산철 통신프로토콜정리 .xlsx deleted file mode 100644 index 993980d..0000000 Binary files a/Document/리듐인산철 통신프로토콜정리 .xlsx and /dev/null differ diff --git a/Document/통신 프로토콜_AGV_V350_LF_24.11.20.xlsx b/Document/통신 프로토콜_AGV_V350_LF_24.11.20.xlsx deleted file mode 100644 index 651b78c..0000000 Binary files a/Document/통신 프로토콜_AGV_V350_LF_24.11.20.xlsx and /dev/null differ diff --git a/Document/통신 프로토콜_AGV_V350_LF_25.01.10.xlsx b/Document/통신 프로토콜_AGV_V350_LF_25.01.10.xlsx deleted file mode 100644 index 91da91a..0000000 Binary files a/Document/통신 프로토콜_AGV_V350_LF_25.01.10.xlsx and /dev/null differ diff --git a/Document/통신 프로토콜_AGV_V350_LF_25.01.10_r2.xlsx b/Document/통신 프로토콜_AGV_V350_LF_25.01.10_r2.xlsx deleted file mode 100644 index 2ede3bf..0000000 Binary files a/Document/통신 프로토콜_AGV_V350_LF_25.01.10_r2.xlsx and /dev/null differ