diff --git a/AGVLogic/EnigProtocol/enigprotocol/Commands.cs b/AGVLogic/EnigProtocol/enigprotocol/Commands.cs index 3377d38..a4ac3fb 100644 --- a/AGVLogic/EnigProtocol/enigprotocol/Commands.cs +++ b/AGVLogic/EnigProtocol/enigprotocol/Commands.cs @@ -73,6 +73,7 @@ namespace ENIGProtocol BUFFER_NOT_COMPLETE, MARK_STOP_FAIL, LIDAR_STOP, + NOT_BUFFERPOINT, } public static class AGVUtility @@ -109,6 +110,7 @@ namespace ENIGProtocol case AGVErrorCode.NOTSET_CHARGEPOINT: return "충전기 노드 미설정"; case AGVErrorCode.ALREADY_CHARGE: return "이미 충전 중 상태임"; case AGVErrorCode.CHARGE_RETRY_OVER: return $"충전명령 재전송 횟수 초과"; + case AGVErrorCode.NOT_BUFFERPOINT: return "현재 위치가 버퍼가 아닙니다"; default: return ecode.ToString(); } } diff --git a/Document/MPLAB-PICkit-5-In-Circuit-Debugger-User-Guide-DS50003525.pdf b/Document/MPLAB-PICkit-5-In-Circuit-Debugger-User-Guide-DS50003525.pdf deleted file mode 100644 index f83f257..0000000 Binary files a/Document/MPLAB-PICkit-5-In-Circuit-Debugger-User-Guide-DS50003525.pdf and /dev/null differ diff --git a/Document/NewMap.json b/Document/NewMap.json deleted file mode 100644 index 5799617..0000000 --- a/Document/NewMap.json +++ /dev/null @@ -1,1005 +0,0 @@ -{ - "Nodes": [ - { - "Id": "N001", - "Text": "Unloader", - "Position": "298, 270", - "Type": 0, - "StationType": 3, - "ConnectedNodes": [ - "12", - "14" - ], - "RfidId": 1, - "NodeTextForeColor": "White", - "NodeTextFontSize": 30, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N010", - "Text": "Cleaner", - "Position": "298, 446", - "Type": 0, - "StationType": 2, - "ConnectedNodes": [ - "5", - "15" - ], - "RfidId": 11, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 1, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N014", - "Text": "Loader", - "Position": "520, 653", - "Type": 0, - "StationType": 1, - "ConnectedNodes": [ - "6", - "16" - ], - "RfidId": 8, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N019", - "Text": "Chg #1", - "Position": "402, 375", - "Type": 0, - "StationType": 5, - "ConnectedNodes": [], - "RfidId": 15, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 1, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N026", - "Text": "Chg #2", - "Position": "541, 570", - "Type": 0, - "StationType": 5, - "ConnectedNodes": [], - "RfidId": 19, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 1, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N018", - "Text": "", - "Position": "213, 630", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N030", - "N005", - "1" - ], - "RfidId": 34, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N005", - "Text": "", - "Position": "113, 629", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N018", - "N020", - "N029" - ], - "RfidId": 33, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N020", - "Text": "", - "Position": "38, 626", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N005", - "N021", - "N028" - ], - "RfidId": 32, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N021", - "Text": "", - "Position": "-54, 626", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N020", - "N027", - "11" - ], - "RfidId": 31, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N027", - "Text": "Buf #1", - "Position": "-76, 676", - "Type": 0, - "StationType": 4, - "ConnectedNodes": [ - "N021" - ], - "RfidId": 41, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N028", - "Text": "Buf #2", - "Position": "12, 676", - "Type": 0, - "StationType": 4, - "ConnectedNodes": [ - "N020" - ], - "RfidId": 40, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N029", - "Text": "Buf #3", - "Position": "89, 674", - "Type": 0, - "StationType": 4, - "ConnectedNodes": [ - "N005" - ], - "RfidId": 39, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "N030", - "Text": "Buf #4", - "Position": "183, 675", - "Type": 0, - "StationType": 4, - "ConnectedNodes": [ - "N018" - ], - "RfidId": 38, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": true, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "1", - "Text": "", - "Position": "285, 628", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N018", - "2" - ], - "RfidId": 2, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "2", - "Text": "", - "Position": "354, 628", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "1", - "3" - ], - "RfidId": 4, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "3", - "Text": "", - "Position": "400, 578", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "2", - "4" - ], - "RfidId": 3, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "4", - "Text": "", - "Position": "400, 499", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "3", - "5" - ], - "RfidId": 5, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "5", - "Text": "", - "Position": "462, 451", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N010", - "4", - "6", - "7" - ], - "RfidId": 6, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "6", - "Text": "", - "Position": "518, 519", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N014", - "5" - ], - "RfidId": 13, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "7", - "Text": "", - "Position": "517, 400", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "5", - "8" - ], - "RfidId": 7, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "8", - "Text": "", - "Position": "474, 353", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "7", - "9", - "13" - ], - "RfidId": 9, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "9", - "Text": "", - "Position": "517, 311", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "8", - "10" - ], - "RfidId": 10, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "10", - "Text": "", - "Position": "458, 268", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "9", - "12" - ], - "RfidId": 12, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "12", - "Text": "", - "Position": "389, 270", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "N001", - "10" - ], - "RfidId": 16, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - }, - { - "Id": "13", - "Text": "", - "Position": "350, 353", - "Type": 0, - "StationType": 0, - "ConnectedNodes": [ - "8" - ], - "RfidId": 17, - "NodeTextForeColor": "", - "NodeTextFontSize": 7, - "AliasName": "", - "SpeedLimit": 0, - "CanDocking": false, - "DockDirection": 0, - "CanTurnLeft": true, - "CanTurnRight": true, - "DisableCross": false, - "IsActive": true - } - ], - "Labels": [ - { - "Id": "11", - "Type": 1, - "Text": "Label", - "Position": "-120, 625", - "ForeColor": "White", - "BackColor": "Transparent", - "FontFamily": "Arial", - "FontSize": 7, - "FontStyle": 0, - "Padding": 5 - }, - { - "Id": "14", - "Type": 1, - "Text": "Label", - "Position": "224, 272", - "ForeColor": "White", - "BackColor": "Transparent", - "FontFamily": "Arial", - "FontSize": 7, - "FontStyle": 0, - "Padding": 5 - }, - { - "Id": "15", - "Type": 1, - "Text": "Label", - "Position": "247, 449", - "ForeColor": "White", - "BackColor": "Transparent", - "FontFamily": "Arial", - "FontSize": 7, - "FontStyle": 0, - "Padding": 5 - }, - { - "Id": "16", - "Type": 1, - "Text": "Label", - "Position": "517, 721", - "ForeColor": "White", - "BackColor": "Transparent", - "FontFamily": "Arial", - "FontSize": 7, - "FontStyle": 0, - "Padding": 5 - }, - { - "Id": "LBL001", - "Type": 1, - "Text": "Amkor Technology Korea", - "Position": "180, 105", - "ForeColor": "White", - "BackColor": "MidnightBlue", - "FontFamily": "Arial", - "FontSize": 20, - "FontStyle": 0, - "Padding": 5 - } - ], - "Images": [ - { - "Id": "IMG001", - "Type": 2, - "Name": "Image", - "Position": "633, 310", - "ImagePath": "", - "ImageBase64": "", - "Scale": "1, 1", - "Opacity": 1, - "Rotation": 0 - } - ], - "Magnets": [ - { - "Id": "5a0edec2-7ac3-4c99-bbb4-8debde0c1d07", - "Type": 4, - "P1": { - "X": 358.5378151260505, - "Y": 628.438429217841 - }, - "P2": { - "X": -119.57759581805529, - "Y": 626.7844959888976 - }, - "ControlPoint": null - }, - { - "Id": "def7c4b9-86db-42eb-aae6-0c6c9bedcc30", - "Type": 4, - "P1": { - "X": -75.0847526191485, - "Y": 716.1415561436951 - }, - "P2": { - "X": -73.1298113651053, - "Y": 561.6311923370746 - }, - "ControlPoint": null - }, - { - "Id": "624327ee-be0f-4373-b60a-786a93c1eabf", - "Type": 4, - "P1": { - "X": 12.69302515862924, - "Y": 717.2526672548062 - }, - "P2": { - "X": 11.870188634894689, - "Y": 560.2502399561221 - }, - "ControlPoint": null - }, - { - "Id": "f1e885ae-55f7-42e9-b3aa-648541e97da0", - "Type": 4, - "P1": { - "X": 90.47080293640698, - "Y": 716.1415561436951 - }, - "P2": { - "X": 89.72733149203751, - "Y": 560.9169066227888 - }, - "ControlPoint": null - }, - { - "Id": "dc3e8061-2c99-4f24-ac9b-4020dd91fa8b", - "Type": 4, - "P1": { - "X": 185.470802936407, - "Y": 725.0304450325839 - }, - "P2": { - "X": 181.87018863489462, - "Y": 563.059763765646 - }, - "ControlPoint": null - }, - { - "Id": "f4c97a5a-2c2c-4b5e-9dd5-332b1670b827", - "Type": 4, - "P1": { - "X": 343.98784548784573, - "Y": 353.9221611721613 - }, - "P2": { - "X": 472.59413991107186, - "Y": 353.73144759338567 - }, - "ControlPoint": null - }, - { - "Id": "a5424add-e8c9-483c-a5db-733dca1b8f57", - "Type": 4, - "P1": { - "X": 519.3272283272282, - "Y": 720.2549019607841 - }, - "P2": { - "X": 516.1655684825004, - "Y": 309.44573330767145 - }, - "ControlPoint": null - }, - { - "Id": "0bbb27a4-2355-4294-9f2d-a40e4d3d2930", - "Type": 4, - "P1": { - "X": 249.6240475640633, - "Y": 449.77059623383167 - }, - "P2": { - "X": 518.0855860256017, - "Y": 452.84751931075476 - }, - "ControlPoint": null - }, - { - "Id": "92527d4a-8e63-404f-86e8-37568bd4790e", - "Type": 4, - "P1": { - "X": 225.77789371790945, - "Y": 271.3090577722932 - }, - "P2": { - "X": 463.6655684825004, - "Y": 269.44573330767145 - }, - "ControlPoint": null - }, - { - "Id": "0db9553a-f203-478d-8c17-e07f00987828", - "Type": 4, - "P1": { - "X": 463.41452991452985, - "Y": 270.2549019607843 - }, - "P2": { - "X": 515.0811965811965, - "Y": 310.25490196078425 - }, - "ControlPoint": { - "X": 517.8589743589743, - "Y": 266.3660130718954 - } - }, - { - "Id": "0650b2cb-57f9-44ec-9787-fab878cf2b47", - "Type": 4, - "P1": { - "X": 473.41452991452985, - "Y": 353.032679738562 - }, - "P2": { - "X": 515.6367521367521, - "Y": 399.1437908496731 - }, - "ControlPoint": { - "X": 521.7478632478632, - "Y": 351.3660130718954 - } - }, - { - "Id": "7007db10-b61b-4726-9775-417951454ddf", - "Type": 4, - "P1": { - "X": 465.08119658119654, - "Y": 450.2549019607842 - }, - "P2": { - "X": 518.2491858425353, - "Y": 519.0597150914111 - }, - "ControlPoint": { - "X": 522.8589743589743, - "Y": 450.8104575163398 - } - }, - { - "Id": "4ef4bfd0-8fc4-48a5-a490-92b35c7fd1c3", - "Type": 4, - "P1": { - "X": 473.3084256253576, - "Y": 351.58859045052856 - }, - "P2": { - "X": 515.4512827682147, - "Y": 309.8028761648143 - }, - "ControlPoint": { - "X": 519.0227113396433, - "Y": 358.01716187909994 - } - }, - { - "Id": "7d18ae7e-7926-4cf4-8dd6-861462e31352", - "Type": 4, - "P1": { - "X": 464.73699705392903, - "Y": 450.5171618790999 - }, - "P2": { - "X": 516.5227113396433, - "Y": 402.6600190219571 - }, - "ControlPoint": { - "X": 516.1655684825004, - "Y": 454.44573330767133 - } - }, - { - "Id": "532be14d-170e-45c5-adcf-0d555b83b010", - "Type": 4, - "P1": { - "X": 399.76697627462613, - "Y": 521.7210880257198 - }, - "P2": { - "X": 462.6173982141941, - "Y": 449.66152357736206 - }, - "ControlPoint": { - "X": 391.9923982141941, - "Y": 447.16152357736206 - } - }, - { - "Id": "086955e0-0542-4ab5-9ccf-8880e749722a", - "Type": 4, - "P1": { - "X": 399.0526905603404, - "Y": 523.5068023114342 - }, - "P2": { - "X": 400.1113258122239, - "Y": 580.622765294022 - }, - "ControlPoint": null - }, - { - "Id": "2ac7d720-a6df-4174-be74-15ddfe96459b", - "Type": 4, - "P1": { - "X": 353.8613258122239, - "Y": 629.3727652940219 - }, - "P2": { - "X": 400.1113258122239, - "Y": 576.872765294022 - }, - "ControlPoint": { - "X": 404.4863258122239, - "Y": 630.6227652940219 - } - } - ], - "Marks": [ - { - "Id": "2cb51787-c8cf-4ddb-97f0-b71f519d47dc", - "Type": 3, - "Position": "520, 690", - "X": 520, - "Y": 690, - "Rotation": -178.01940688369234 - }, - { - "Id": "f704ebe0-1653-4559-b06f-1eaecafbefba", - "Type": 3, - "Position": "-74, 624", - "X": -74, - "Y": 624, - "Rotation": 90 - }, - { - "Id": "d5b27365-79a2-4351-84c3-6767941ec0be", - "Type": 3, - "Position": "12, 625", - "X": 12, - "Y": 625, - "Rotation": 90 - }, - { - "Id": "0367cafb-9f85-4440-b6b4-c802a58e6181", - "Type": 3, - "Position": "91, 625", - "X": 91, - "Y": 625, - "Rotation": 89.2872271068898 - }, - { - "Id": "1f4ab2c9-07f8-4675-802d-9b4824b55198", - "Type": 3, - "Position": "183, 622", - "X": 183, - "Y": 622, - "Rotation": 88.40516772072262 - }, - { - "Id": "15fddfa4-ff74-48ff-b922-4aacdce1960b", - "Type": 3, - "Position": "275, 269", - "X": 275, - "Y": 269, - "Rotation": 91.71222012905176 - }, - { - "Id": "4b699847-36d4-471c-b990-4ad37967c2dc", - "Type": 3, - "Position": "89, 697", - "X": 89, - "Y": 697, - "Rotation": 0.3824344779617803 - }, - { - "Id": "a9f68317-f1c2-47d8-b029-348b5428be9f", - "Type": 3, - "Position": "183, 699", - "X": 183, - "Y": 699, - "Rotation": -1.3380194104322385 - }, - { - "Id": "fe227205-2a65-4ba9-bb4a-4efb4ed0a7b0", - "Type": 3, - "Position": "9, 699", - "X": 9, - "Y": 699, - "Rotation": 0.8431103833306963 - }, - { - "Id": "5dd29191-798c-480c-b066-7947bfcc4fb7", - "Type": 3, - "Position": "-74, 697", - "X": -74, - "Y": 697, - "Rotation": 1.659829660758831 - }, - { - "Id": "649729f0-ff04-4e11-8869-f6a39d815427", - "Type": 3, - "Position": "-71, 596", - "X": -71, - "Y": 596, - "Rotation": 0 - }, - { - "Id": "2bb9a821-f86b-4190-a182-64abe2c940ed", - "Type": 3, - "Position": "10, 601", - "X": 10, - "Y": 601, - "Rotation": 0 - }, - { - "Id": "821598e1-091a-4884-96fe-6ed5f43c4f62", - "Type": 3, - "Position": "91, 598", - "X": 91, - "Y": 598, - "Rotation": 0 - }, - { - "Id": "66c1bbee-89a8-45a9-b585-ddfd59768f6b", - "Type": 3, - "Position": "184, 596", - "X": 184, - "Y": 596, - "Rotation": 0 - }, - { - "Id": "06a10f46-bda8-4b0f-9e7a-63d66bd2f7e4", - "Type": 3, - "Position": "381, 355", - "X": 381, - "Y": 355, - "Rotation": 91.24536426676838 - }, - { - "Id": "835b8982-042b-4e2e-a83b-19b32e55cd5b", - "Type": 3, - "Position": "519, 550", - "X": 519, - "Y": 550, - "Rotation": 0 - } - ], - "Settings": { - "BackgroundColorArgb": -14671840, - "ShowGrid": false - }, - "CreatedDate": "2025-12-23T04:16:13.079Z", - "Version": "1.3" -} \ No newline at end of file diff --git a/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_IN.cs b/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_IN.cs index 0b69f12..473de25 100644 --- a/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_IN.cs +++ b/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_IN.cs @@ -41,6 +41,17 @@ namespace Project return false; } else if (PUB.sm.RunStepSeq == idx++) + { + //버퍼 노드 여부 확인 + if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.StationType.Buffer) + { + SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_BUFFERPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 버퍼가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})"); + return false; + } + PUB.sm.UpdateRunStepSeq(); + return false; + } + else if (PUB.sm.RunStepSeq == idx++) { //카트감지 if (PUB.NextWorkCmd == ENIGProtocol.AGVCommandHE.PickOnEnter) diff --git a/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_OUT.cs b/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_OUT.cs index 117b26e..4bbc427 100644 --- a/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_OUT.cs +++ b/HMI/Project/StateMachine/Step/_SM_RUN_BUFFER_OUT.cs @@ -43,6 +43,17 @@ namespace Project return false; } else if (PUB.sm.RunStepSeq == idx++) + { + //버퍼 노드 여부 확인 + if (PUB._virtualAGV.CurrentNode.StationType != AGVNavigationCore.Models.StationType.Buffer) + { + SetRunStepError(ENIGProtocol.AGVErrorCode.NOT_BUFFERPOINT, $"[{funcname}-{PUB.sm.RunStepSeq}] 현재 위치가 버퍼가 아닙니다({PUB._virtualAGV.CurrentNode.StationType})"); + return false; + } + PUB.sm.UpdateRunStepSeq(); + return false; + } + else if (PUB.sm.RunStepSeq == idx++) { //회전이없다면 오류처리한다. if(PUB._virtualAGV.Turn != AGVNavigationCore.Models.AGVTurn.L90) diff --git a/HMI/SubProject/tts/App.config b/HMI/TestProject/tts/App.config similarity index 100% rename from HMI/SubProject/tts/App.config rename to HMI/TestProject/tts/App.config diff --git a/HMI/SubProject/tts/Helper.cs b/HMI/TestProject/tts/Helper.cs similarity index 100% rename from HMI/SubProject/tts/Helper.cs rename to HMI/TestProject/tts/Helper.cs diff --git a/HMI/SubProject/tts/Program.cs b/HMI/TestProject/tts/Program.cs similarity index 100% rename from HMI/SubProject/tts/Program.cs rename to HMI/TestProject/tts/Program.cs diff --git a/HMI/SubProject/tts/Properties/AssemblyInfo.cs b/HMI/TestProject/tts/Properties/AssemblyInfo.cs similarity index 100% rename from HMI/SubProject/tts/Properties/AssemblyInfo.cs rename to HMI/TestProject/tts/Properties/AssemblyInfo.cs diff --git a/HMI/SubProject/tts/Properties/Resources.Designer.cs b/HMI/TestProject/tts/Properties/Resources.Designer.cs similarity index 100% rename from HMI/SubProject/tts/Properties/Resources.Designer.cs rename to HMI/TestProject/tts/Properties/Resources.Designer.cs diff --git a/HMI/SubProject/tts/Properties/Resources.resx b/HMI/TestProject/tts/Properties/Resources.resx similarity index 100% rename from HMI/SubProject/tts/Properties/Resources.resx rename to HMI/TestProject/tts/Properties/Resources.resx diff --git a/HMI/SubProject/tts/Properties/Settings.Designer.cs b/HMI/TestProject/tts/Properties/Settings.Designer.cs similarity index 100% rename from HMI/SubProject/tts/Properties/Settings.Designer.cs rename to HMI/TestProject/tts/Properties/Settings.Designer.cs diff --git a/HMI/SubProject/tts/Properties/Settings.settings b/HMI/TestProject/tts/Properties/Settings.settings similarity index 100% rename from HMI/SubProject/tts/Properties/Settings.settings rename to HMI/TestProject/tts/Properties/Settings.settings diff --git a/HMI/SubProject/tts/Supertonic.WinForms.csproj b/HMI/TestProject/tts/Supertonic.WinForms.csproj similarity index 100% rename from HMI/SubProject/tts/Supertonic.WinForms.csproj rename to HMI/TestProject/tts/Supertonic.WinForms.csproj diff --git a/HMI/SubProject/tts/Supertonic.WinForms.sln b/HMI/TestProject/tts/Supertonic.WinForms.sln similarity index 100% rename from HMI/SubProject/tts/Supertonic.WinForms.sln rename to HMI/TestProject/tts/Supertonic.WinForms.sln diff --git a/HMI/SubProject/tts/fMain.Designer.cs b/HMI/TestProject/tts/fMain.Designer.cs similarity index 100% rename from HMI/SubProject/tts/fMain.Designer.cs rename to HMI/TestProject/tts/fMain.Designer.cs diff --git a/HMI/SubProject/tts/fMain.cs b/HMI/TestProject/tts/fMain.cs similarity index 100% rename from HMI/SubProject/tts/fMain.cs rename to HMI/TestProject/tts/fMain.cs diff --git a/HMI/SubProject/tts/fMain.resx b/HMI/TestProject/tts/fMain.resx similarity index 100% rename from HMI/SubProject/tts/fMain.resx rename to HMI/TestProject/tts/fMain.resx