diff --git a/Cs_HMI/AGVCSharp.sln b/Cs_HMI/AGVCSharp.sln index 94f2190..c754bb6 100644 --- a/Cs_HMI/AGVCSharp.sln +++ b/Cs_HMI/AGVCSharp.sln @@ -36,6 +36,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVMapEditor", "AGVLogic\AG EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AGVSimulator", "AGVLogic\AGVSimulator\AGVSimulator.csproj", "{B2C3D4E5-0000-0000-0000-000000000000}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "arCommUtil", "SubProject\commutil\arCommUtil.csproj", "{14E8C9A5-013E-49BA-B435-FFFFFF7DD623}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -166,6 +168,18 @@ Global {B2C3D4E5-0000-0000-0000-000000000000}.Release|x64.Build.0 = Release|Any CPU {B2C3D4E5-0000-0000-0000-000000000000}.Release|x86.ActiveCfg = Release|Any CPU {B2C3D4E5-0000-0000-0000-000000000000}.Release|x86.Build.0 = Release|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x64.ActiveCfg = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x64.Build.0 = Debug|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x86.ActiveCfg = Debug|x86 + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Debug|x86.Build.0 = Debug|x86 + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|Any CPU.Build.0 = Release|Any CPU + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623}.Release|x64.ActiveCfg = Release|Any CPU + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -178,6 +192,7 @@ Global {C5F7A8B2-8D3E-4A1B-9C6E-7F4D5E2A9B1C} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB} {A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB} {B2C3D4E5-0000-0000-0000-000000000000} = {E5C75D32-5AD6-44DD-8F27-E32023206EBB} + {14E8C9A5-013E-49BA-B435-FFFFFF7DD623} = {C423C39A-44E7-4F09-B2F7-7943975FF948} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {B5B1FD72-356F-4840-83E8-B070AC21C8D9} diff --git a/Cs_HMI/AGVLogic/AGVSimulator/Forms/SimulatorForm.cs b/Cs_HMI/AGVLogic/AGVSimulator/Forms/SimulatorForm.cs index cec4ccc..05ea7f1 100644 --- a/Cs_HMI/AGVLogic/AGVSimulator/Forms/SimulatorForm.cs +++ b/Cs_HMI/AGVLogic/AGVSimulator/Forms/SimulatorForm.cs @@ -342,9 +342,11 @@ namespace AGVSimulator.Forms if(targetNode.Type == NodeType.Buffer) { var lastDetailPath = advancedResult.DetailedPath.Last(); - if(lastDetailPath.NodeId == targetNode.NodeId) + if(lastDetailPath.NodeId == targetNode.NodeId) //마지막노드 재확인 { - + //버퍼에 도킹할때에는 마지막 노드에서 멈추고 시퀀스를 적용해야한다 + advancedResult.DetailedPath = advancedResult.DetailedPath.Take(advancedResult.DetailedPath.Count - 1).ToList(); + Console.WriteLine("최종위치가 버퍼이므로 마지막 RFID에서 멈추도록 합니다"); } } diff --git a/Cs_HMI/Data/NewMap.agvmap b/Cs_HMI/Data/NewMap.agvmap index 48daf5c..58fd837 100644 --- a/Cs_HMI/Data/NewMap.agvmap +++ b/Cs_HMI/Data/NewMap.agvmap @@ -5,6 +5,7 @@ "Name": "UNLOADER", "Position": "65, 229", "Type": 2, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N002" @@ -12,8 +13,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 3, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:44.9548285+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -44,6 +44,7 @@ "Name": "N002", "Position": "190, 230", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N003", @@ -52,8 +53,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:48.2957516+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -84,6 +84,7 @@ "Name": "N003", "Position": "296, 266", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N004", @@ -92,8 +93,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:49.2226656+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -124,6 +124,7 @@ "Name": "N004", "Position": "388, 330", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N022", @@ -134,8 +135,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:50.1681027+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -166,6 +166,7 @@ "Name": "N006", "Position": "530, 220", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N007", @@ -174,8 +175,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:51.1111368+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -206,6 +206,7 @@ "Name": "N007", "Position": "589, 184", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N019", @@ -214,8 +215,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:51.9266982+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -246,6 +246,7 @@ "Name": "N008", "Position": "282, 452", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N009", @@ -254,8 +255,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:53.9595825+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -286,6 +286,7 @@ "Name": "N009", "Position": "183, 465", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N010", @@ -294,8 +295,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:54.5035702+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -325,7 +325,8 @@ "NodeId": "N010", "Name": "TOPS", "Position": "52, 466", - "Type": 2, + "Type": 3, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N009" @@ -333,8 +334,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 2, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:55.0563237+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -365,6 +365,7 @@ "Name": "N011", "Position": "481, 399", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N012", @@ -374,8 +375,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:55.8875335+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -406,6 +406,7 @@ "Name": "N012", "Position": "559, 464", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N013", @@ -414,8 +415,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:56.3678144+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -446,6 +446,7 @@ "Name": "N013", "Position": "640, 513", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N014", @@ -454,8 +455,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:56.8390845+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -485,7 +485,8 @@ "NodeId": "N014", "Name": "LOADER", "Position": "728, 573", - "Type": 2, + "Type": 1, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N013" @@ -493,8 +494,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 1, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:34:57.2549726+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -524,7 +524,8 @@ "NodeId": "N019", "Name": "CHARGER #2", "Position": "679, 199", - "Type": 3, + "Type": 5, + "CanDocking": true, "DockDirection": 1, "ConnectedNodes": [ "N007" @@ -532,8 +533,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 5, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:35:56.5359098+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -564,6 +564,7 @@ "Name": "N022", "Position": "461, 267", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N023", @@ -573,8 +574,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T08:36:48.0311551+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -605,6 +605,7 @@ "Name": "N023", "Position": "418, 206", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N024", @@ -613,8 +614,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T09:41:36.8738794+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -645,6 +645,7 @@ "Name": "N024", "Position": "476, 141", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N025", @@ -653,8 +654,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T09:41:37.4551853+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -685,6 +685,7 @@ "Name": "N025", "Position": "548, 99", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N026", @@ -693,8 +694,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T09:41:38.0142374+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -724,7 +724,8 @@ "NodeId": "N026", "Name": "CHARGER #1", "Position": "670, 88", - "Type": 3, + "Type": 5, + "CanDocking": true, "DockDirection": 1, "ConnectedNodes": [ "N025" @@ -732,8 +733,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 5, + "NodeAlias": "", "CreatedDate": "2025-09-11T09:41:38.5834487+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -763,14 +763,14 @@ "NodeId": "LBL001", "Name": "Amkor Technology Korea", "Position": "183, 103", - "Type": 4, - "DockDirection": 0, + "Type": 6, + "CanDocking": false, + "DockDirection": 2, "ConnectedNodes": [], "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T11:08:22.4048927+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -800,14 +800,14 @@ "NodeId": "IMG001", "Name": "logo", "Position": "633, 310", - "Type": 5, - "DockDirection": 0, + "Type": 7, + "CanDocking": false, + "DockDirection": 1, "ConnectedNodes": [], "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-11T11:08:44.7897541+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -838,6 +838,7 @@ "Name": "", "Position": "448, 476", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N016", @@ -846,8 +847,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:47.8065756+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -878,6 +878,7 @@ "Name": "", "Position": "425, 524", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N017", @@ -886,8 +887,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:48.6628848+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -918,6 +918,7 @@ "Name": "", "Position": "389, 559", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N018", @@ -926,8 +927,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:49.8138877+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -958,6 +958,7 @@ "Name": "", "Position": "315, 562", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N030", @@ -967,8 +968,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:50.6790623+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -999,6 +999,7 @@ "Name": "", "Position": "227, 560", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N020", @@ -1008,8 +1009,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:51.5267199+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1040,6 +1040,7 @@ "Name": "", "Position": "142, 557", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N021", @@ -1049,8 +1050,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:52.3666114+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1081,6 +1081,7 @@ "Name": "", "Position": "60, 559", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N027", @@ -1089,8 +1090,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:53.0958619+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1120,7 +1120,8 @@ "NodeId": "N027", "Name": "BUF1", "Position": "61, 645", - "Type": 2, + "Type": 4, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N021" @@ -1128,8 +1129,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 4, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:54.7345704+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1159,7 +1159,8 @@ "NodeId": "N028", "Name": "BUF2", "Position": "141, 643", - "Type": 2, + "Type": 4, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N020" @@ -1167,8 +1168,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 4, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:55.5263512+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1198,7 +1198,8 @@ "NodeId": "N029", "Name": "BUF3", "Position": "229, 638", - "Type": 2, + "Type": 4, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N005" @@ -1206,8 +1207,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 4, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:56.6623294+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1237,7 +1237,8 @@ "NodeId": "N030", "Name": "BUF4", "Position": "316, 638", - "Type": 2, + "Type": 4, + "CanDocking": true, "DockDirection": 2, "ConnectedNodes": [ "N018" @@ -1245,8 +1246,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": true, - "StationId": "", - "StationType": 4, + "NodeAlias": "", "CreatedDate": "2025-09-12T17:22:57.5510908+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1277,6 +1277,7 @@ "Name": "", "Position": "337, 397", "Type": 0, + "CanDocking": false, "DockDirection": 0, "ConnectedNodes": [ "N004", @@ -1285,8 +1286,7 @@ "CanTurnLeft": true, "CanTurnRight": true, "DisableCross": false, - "StationId": "", - "StationType": null, + "NodeAlias": "", "CreatedDate": "2025-09-15T11:18:40.5366059+09:00", "ModifiedDate": "2025-12-09T08:41:57.1293017+09:00", "IsActive": true, @@ -1317,6 +1317,6 @@ "BackgroundColorArgb": -14671840, "ShowGrid": false }, - "CreatedDate": "2025-12-09T11:45:02.0324252+09:00", + "CreatedDate": "2025-12-09T17:00:29.7458276+09:00", "Version": "1.1" } \ No newline at end of file diff --git a/Cs_HMI/Project/AGV4.csproj b/Cs_HMI/Project/AGV4.csproj index 8a89e0b..af3f021 100644 --- a/Cs_HMI/Project/AGV4.csproj +++ b/Cs_HMI/Project/AGV4.csproj @@ -99,7 +99,7 @@ Auto - + False ..\DLL\arCommUtil.dll @@ -195,6 +195,12 @@ fCounter.cs + + Form + + + fQuestionBox.cs + Form diff --git a/Cs_HMI/Project/fMain.cs b/Cs_HMI/Project/fMain.cs index 61ce600..282a972 100644 --- a/Cs_HMI/Project/fMain.cs +++ b/Cs_HMI/Project/fMain.cs @@ -39,6 +39,7 @@ namespace Project InitializeComponent(); VAR.Init(128); PUB.initCore(); + UTIL.MessgeBoxLegacyMode = false; this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); @@ -416,6 +417,11 @@ namespace Project void func_sw_start(bool Prompt = false) { + if(PUB.sm.Step == eSMStep.SYNC) + { + UTIL.MsgE("초기화 중에는 사용할 수 없습니다\n초기화가 완료 된 후 시도하세요"); + return; + } if (VAR.BOOL[eVarBool.FLAG_AUTORUN] == false) //자동상태가 아니라면 { PUB.AGV.AGVErrorReset(); @@ -423,16 +429,12 @@ namespace Project { if (UTIL.MsgQ("AGV상태를 자동으로 전환 할까요?") != DialogResult.Yes) return; } + //충전상태확인 if (PUB.CheckManualChargeMode() == false) return; PUB.popup.needClose = true; PUB.sm.bPause = false; PUB.sm.SetNewStep(eSMStep.RUN); - - if (PUB.Result.CurrentPos == ePosition.NONE || PUB.Result.TargetPos == ePosition.NONE) - { - PUB.sm.SetNewRunStep(ERunStep.GOHOME); - } PUB.Speak(Lang.자동전환); } else diff --git a/Cs_HMI/Project/fSetup.Designer.cs b/Cs_HMI/Project/fSetup.Designer.cs index 1cc1fd5..2313378 100644 --- a/Cs_HMI/Project/fSetup.Designer.cs +++ b/Cs_HMI/Project/fSetup.Designer.cs @@ -39,6 +39,7 @@ this.btAutoCharge = new arCtl.arLabel(); this.btSpeaker = new arCtl.arLabel(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.button8 = new System.Windows.Forms.Button(); this.vcGDS = new AGVControl.ValueSelect(); this.label7 = new System.Windows.Forms.Label(); this.vcXBID = new AGVControl.ValueSelect(); @@ -205,7 +206,6 @@ this.bt1 = new arCtl.arLabel(); this.bt0 = new arCtl.arLabel(); this.btSave = new arCtl.arLabel(); - this.button8 = new System.Windows.Forms.Button(); this.tabControl1.SuspendLayout(); this.tabPage6.SuspendLayout(); this.panel1.SuspendLayout(); @@ -485,6 +485,19 @@ this.tabPage1.TabIndex = 0; this.tabPage1.Text = "AGV"; // + // button8 + // + this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button8.Font = new System.Drawing.Font("궁서체", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.button8.Location = new System.Drawing.Point(480, 509); + this.button8.Name = "button8"; + this.button8.Size = new System.Drawing.Size(147, 54); + this.button8.TabIndex = 82; + this.button8.Tag = "SCH"; + this.button8.Text = "TurnGDS"; + this.button8.UseVisualStyleBackColor = true; + this.button8.Click += new System.EventHandler(this.button8_Click); + // // vcGDS // this.vcGDS.BackColorButton = System.Drawing.Color.White; @@ -506,6 +519,7 @@ this.vcGDS.Tag = "SDH"; this.vcGDS.Text = "1000"; this.vcGDS.Value = 1000D; + this.vcGDS.ButtonClick += new System.EventHandler(this.vcChargeLow_ButtonClick); // // label7 // @@ -3394,19 +3408,6 @@ this.btSave.TextVisible = true; this.btSave.Click += new System.EventHandler(this.btSave_Click); // - // button8 - // - this.button8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.button8.Font = new System.Drawing.Font("궁서체", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.button8.Location = new System.Drawing.Point(480, 509); - this.button8.Name = "button8"; - this.button8.Size = new System.Drawing.Size(147, 54); - this.button8.TabIndex = 82; - this.button8.Tag = "SCH"; - this.button8.Text = "TurnGDS"; - this.button8.UseVisualStyleBackColor = true; - this.button8.Click += new System.EventHandler(this.button8_Click); - // // fSetup // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Cs_HMI/Project/fSetup.cs b/Cs_HMI/Project/fSetup.cs index 9e4c44b..ba3abc7 100644 --- a/Cs_HMI/Project/fSetup.cs +++ b/Cs_HMI/Project/fSetup.cs @@ -679,7 +679,9 @@ namespace Project private void button8_Click(object sender, EventArgs e) { var value = (ushort)vcGDS.Value; - PUB.AGV.TurnGDSCenterScope(value); + var rlt = PUB.AGV.TurnGDSCenterScope(value); + if (rlt == false) UTIL.MsgE("Error"); + else UTIL.MsgI("OK"); } } } diff --git a/Cs_HMI/SubProject/AGV/Command.cs b/Cs_HMI/SubProject/AGV/Command.cs index 2307e44..6ebec1d 100644 --- a/Cs_HMI/SubProject/AGV/Command.cs +++ b/Cs_HMI/SubProject/AGV/Command.cs @@ -274,7 +274,7 @@ namespace arDev break; case eAgvCmd.TurnGDSCenterScope: if (param.isEmpty()) param = "1000"; - cmdString = "SGS{param}"; + cmdString = $"SGS{param}"; retval = AddCommand(cmdString); break; case eAgvCmd.BackTrunResumeTime: diff --git a/Cs_HMI/SubProject/CommUtil b/Cs_HMI/SubProject/CommUtil index 632b087..ed05439 160000 --- a/Cs_HMI/SubProject/CommUtil +++ b/Cs_HMI/SubProject/CommUtil @@ -1 +1 @@ -Subproject commit 632b087c5be6b94ee953a374a25992aa54d56c7c +Subproject commit ed05439991fdddba2d7123b7a89a89245bcd044c