From a10daf057d11b14608652bcd3f8afe8a287b77a8 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期六, 12 十月 2024 09:35:43 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/MainProcess.java | 46 ++-------------------------------------------- 1 files changed, 2 insertions(+), 44 deletions(-) diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java index de7ccb0..4174523 100644 --- a/src/main/java/com/zy/core/MainProcess.java +++ b/src/main/java/com/zy/core/MainProcess.java @@ -26,6 +26,7 @@ private Thread thread; // 棰戠巼 private int i = 0; + private int k = 0; private boolean rgcWrk = true; /** @@ -46,14 +47,8 @@ // 婕旂ず // mainService.crnDemoOfLocMove1(); - //鍒锋柊RGV鍦板浘 - mainService.refreshRgvMap(); - - // 鍏ュ嚭搴撴ā寮忓垏鎹㈠嚱鏁� -// mainService.ioConvert(); - // 鎷f枡銆佸苟鏉裤�佺洏鐐瑰啀鍏ュ簱 -// mainService.stnToCrnStnPick(3); + mainService.stnToCrnStnPick(3); mainService.stnToCrnStnPick2(); // 鍏ュ簱 ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。 @@ -79,43 +74,6 @@ mainService.ledReset(); mainService.outOfDevp(11); - - if (i>10){ - //绌烘墭鐩樿嚜鍔ㄥ嚭搴� - mainService.autoEmptyOut(); - //绌烘墭鐩樿嚜鍔ㄥ叆搴� - mainService.autoEmptyIn(); - i=0; - } - i++; - - // 鍏朵粬 ===>> 鍏ュ嚭搴撴ā寮忓垏鎹� -// i++; -// if (i > 1) { -// mainService.ioConvert(); -// i = 0; -// } - - /////////////////////////////////////RGV璋冨害///////////////////////////////////// -// - //瀹屾垚灏忚溅浠诲姟 - mainService.rgvCompleteWrkMastSta(); - -// //鎵ц灏忚溅绌烘澘鎼繍浠诲姟 -// mainService.rgvRunWrkMastEmptyStaPut();//鏀� -// mainService.rgvRunWrkMastEmptyStaTake();//鍙� -// if (rgcWrk){ -// //鎵ц灏忚溅璐х墿鎼繍浠诲姟 - mainService.rgvRunWrkMastFullSta(); -// rgcWrk = false; -// }else { -// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯 -// rgcWrk = true; -// } - - - /////////////////////////////////////RGV璋冨害///////////////////////////////////// - } catch (Exception e) { e.printStackTrace(); } -- Gitblit v1.9.1