From a9bb3217e651fda406a5fffae356fc990f4ef511 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 07 一月 2023 10:51:41 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/MelsecCrnThread.java |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 84ed59e..9beeb30 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -86,12 +86,12 @@
                         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
                         command.setAckFinish((short) 1);  // 浠诲姟瀹屾垚纭浣�
                         command.setTaskMode(CrnTaskModeType.NONE); // 浠诲姟妯″紡
-                        command.setSourcePosX((short)0);     // 婧愬簱浣嶆帓
-                        command.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
-                        command.setSourcePosZ((short)0);     // 婧愬簱浣嶅眰
-                        command.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
-                        command.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
-                        command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
+//                        command.setSourcePosX((short)0);     // 婧愬簱浣嶆帓
+//                        command.setSourcePosY((short)0);     // 婧愬簱浣嶅垪
+//                        command.setSourcePosZ((short)0);     // 婧愬簱浣嶅眰
+//                        command.setDestinationPosX((short)0);     // 鐩爣搴撲綅鎺�
+//                        command.setDestinationPosY((short)0);     // 鐩爣搴撲綅鍒�
+//                        command.setDestinationPosZ((short)0);     // 鐩爣搴撲綅灞�
                         write(command);
                         break;
                     default:
@@ -161,7 +161,7 @@
 //                flag1=1;
 //                System.out.println("===");
 //            }
-            OperateResultExOne<byte[]> result = melsecMcNet.Read("D20", (short) 70);
+            OperateResultExOne<byte[]> result = melsecMcNet.Read("D1035", (short) 56);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
                     crnProtocol = new CrnProtocol();
@@ -298,11 +298,11 @@
         array[7] = command.getDestinationPosY();
         array[8] = command.getDestinationPosZ();
         array[9] = command.getCommand();
-        OperateResult result = melsecMcNet.Write("D0", array);
+        OperateResult result = melsecMcNet.Write("D1001", array);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
-            result = melsecMcNet.Write("D9", commandFinish);
+            result = melsecMcNet.Write("D1010", commandFinish);
         }
 
         try {
@@ -348,12 +348,22 @@
      * 蹇冭烦
      */
     private void heartbeat(){
-        if (heartBeatVal == 1) {
-            heartBeatVal = 2;
+        if (heartBeatVal >= 30000) {
+            heartBeatVal = -30000;
         } else {
-            heartBeatVal = 1;
+            heartBeatVal =(short) (heartBeatVal+1);
         }
-        OperateResult write = melsecMcNet.Write("D10", heartBeatVal);
+        OperateResult write = melsecMcNet.Write("D1011", heartBeatVal);
+//        OperateResult write1 = melsecMcNet.Write("D1001", (short) 0);
+//        OperateResult write2 = melsecMcNet.Write("D1002", (short) 0);
+//        OperateResult write3 = melsecMcNet.Write("D1003", (short) 0);
+//        OperateResult write4 = melsecMcNet.Write("D1004", (short) 0);
+//        OperateResult write5 = melsecMcNet.Write("D1005", (short) 0);
+//        OperateResult write6 = melsecMcNet.Write("D1006", (short) 0);
+//        OperateResult write7 = melsecMcNet.Write("D1007", (short) 0);
+//        OperateResult write8 = melsecMcNet.Write("D1008", (short) 0);
+//        OperateResult write9 = melsecMcNet.Write("D1009", (short) 0);
+//        OperateResult write10 = melsecMcNet.Write("D1010", (short) 0);
         if (!write.IsSuccess) {
             log.error("鍫嗗灈鏈簆lc蹇冭烦閫氳澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
         }

--
Gitblit v1.9.1