From cfee9013159152736fcf74011abcf8ff1108ffbb Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 23 六月 2024 19:38:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/MainProcess.java | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/core/MainProcess.java b/src/main/java/com/zy/core/MainProcess.java
index 5f71ad7..ed1dee1 100644
--- a/src/main/java/com/zy/core/MainProcess.java
+++ b/src/main/java/com/zy/core/MainProcess.java
@@ -36,6 +36,9 @@
thread = new Thread(() -> {
while (!Thread.currentThread().isInterrupted()) {
try {
+ k++; if (k>10) k=0;
+ i++; if (i>5) i=0;
+ j++; if (j>5) j=0;
// 闂撮殧
Thread.sleep(1000);
@@ -76,34 +79,6 @@
mainService.storeFinishedTwo();
}
- /************************************RGV璋冨害************************************/
- i++;
- k++;
- if (i<5) {
-// // RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂
-// if (i == 7) {
-// try{
-// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-// if (rgvIoExecuteSign){
-// k = 0;
-// } else if (k>8){
-// k = 0;
-// mainService.rgvRunWrkMastEmptyStaAvoidance();//閬胯
-// }
-// }catch (Exception e){
-// log.error("RGV ===>> 灏忚溅浠诲姟浣滀笟涓嬪彂寮傚父"+e);
-// }
-// }else {
-// //绌挎鏉�
-//// boolean rgvIoExecuteSign = mainService.rgvIoExecute(i); //7鐓滄槦鐗逛緵锛屽乏鍙崇Щ鍔�
-//
-// }
- }else {
- i = 0;
- }
-// //瀹屾垚灏忚溅浠诲姟
- mainService.rgvCompleteWrkMastSta();
- /************************************RGV璋冨害************************************/
// // 寮傚父淇℃伅璁板綍
// mainService.recErr();
@@ -118,6 +93,18 @@
// 鍏朵粬 ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅
mainService.ledReset();
+ /************************************JAR璋冨害************************************/
+ //JarWrkMastExecute浠诲姟鍒涘缓 //纭寲缃�
+ mainService.jarWrkMastExecuteGenerate(k);
+ //Jar浠诲姟鍒涘缓 //瀹屾垚
+ mainService.jarMastGenerate();
+
+
+
+
+ /************************************JAR璋冨害************************************/
+
+
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.9.1