From d022fc437728829a65b74a53048a84ea17245917 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 05 一月 2022 13:34:52 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |   82 ++++++++++------------------------------
 1 files changed, 21 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 7975bcb..f95f4ae 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -115,35 +115,32 @@
      */
     private void readStatus(){
         try {
-
-            /* 鏂规硶1 */
-            OperateResultExOne<byte[]> result = melsecMcNet.Read("D2231", (short) 70);
+            OperateResultExOne<byte[]> result = melsecMcNet.Read("D20", (short) 70);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
                     crnProtocol = new CrnProtocol();
                 }
                 crnProtocol.setMode(melsecMcNet.getByteTransform().TransInt16(result.Content, 0));
-                crnProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 4));
-                crnProtocol.setStatus(melsecMcNet.getByteTransform().TransInt16(result.Content, 6));
-                crnProtocol.setBay(melsecMcNet.getByteTransform().TransInt16(result.Content, 8));
-                crnProtocol.setLevel(melsecMcNet.getByteTransform().TransInt16(result.Content, 10));
-                crnProtocol.setForkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 12));
-                crnProtocol.setLiftPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 14));
-                crnProtocol.setWalkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 16));
-//               crnProtocol.setTaskFinish(melsecMcNet.getByteTransform().TransInt16(result.Content, 18));
-                crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
-                crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
-                crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransBool(result.Content, 26, 2));
-                crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
-                crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 30));
-                crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
-                crnProtocol.setXSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 34));
-                crnProtocol.setYSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 38));
-                crnProtocol.setZSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 42));
-                crnProtocol.setXDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 46));
-                crnProtocol.setYDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 50));
-                crnProtocol.setXDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 54));
-                crnProtocol.setYDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 62));
+                crnProtocol.setTaskNo(melsecMcNet.getByteTransform().TransInt16(result.Content, 2));
+                crnProtocol.setStatus(melsecMcNet.getByteTransform().TransInt16(result.Content, 4));
+                crnProtocol.setBay(melsecMcNet.getByteTransform().TransInt16(result.Content, 6));
+                crnProtocol.setLevel(melsecMcNet.getByteTransform().TransInt16(result.Content, 8));
+                crnProtocol.setForkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 10));
+                crnProtocol.setLiftPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 12));
+                crnProtocol.setWalkPos(melsecMcNet.getByteTransform().TransInt16(result.Content, 14));
+                crnProtocol.setLoaded(melsecMcNet.getByteTransform().TransInt16(result.Content, 16));
+                crnProtocol.setAlarm(melsecMcNet.getByteTransform().TransInt16(result.Content, 18));
+                crnProtocol.setTemp1(melsecMcNet.getByteTransform().TransInt16(result.Content, 20));
+                crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
+                crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
+                crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
+                crnProtocol.setXSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 28));
+                crnProtocol.setYSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 32));
+                crnProtocol.setZSpeed(melsecMcNet.getByteTransform().TransSingle(result.Content, 36));
+                crnProtocol.setXDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 40));
+                crnProtocol.setYDistance(melsecMcNet.getByteTransform().TransSingle(result.Content, 44));
+                crnProtocol.setXDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 48));
+                crnProtocol.setYDuration(melsecMcNet.getByteTransform().TransSingle(result.Content, 52));
 
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -170,30 +167,6 @@
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆憑1}鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
                 throw new CoolException(MessageFormat.format( "鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
             }
-            /* 鏂规硶2 */
-//            crnProtocol.setMode(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setTaskNo(melsecMcNet.ReadInt16("D2233").Content);
-//            crnProtocol.setStatus(melsecMcNet.ReadInt16("D2234").Content);
-//            crnProtocol.setBay(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setLevel(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setForkPos(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setLiftPos(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setWalkPos(melsecMcNet.ReadInt16("D2231").Content);
-////            crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
-//            crnProtocol.setLoaded(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setAlarm(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setError1(melsecMcNet.ReadBool("D2231", (short) 2).Content);
-//            crnProtocol.setTemp1(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setTemp2(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setTemp3(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setTemp4(melsecMcNet.ReadInt16("D2231").Content);
-//            crnProtocol.setXSpeed(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setYSpeed(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setZSpeed(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setXDistance(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setYDistance(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setXDuration(melsecMcNet.ReadFloat("D2231").Content);
-//            crnProtocol.setYDuration(melsecMcNet.ReadFloat("D2231").Content);
         } catch (Exception e) {
             e.printStackTrace();
             OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
@@ -382,19 +355,6 @@
 //        command.setDestinationPosZ((short) 0);     // 鐩爣搴撲綅灞�
 //        crnThread.write(command);
 
-        // 7.鍧愭爣绉昏   鐩爣鍙�   pass
-        CrnCommand command = new CrnCommand();
-        command.setCrnNo(1); // 鍫嗗灈鏈虹紪鍙�
-        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-        command.setTaskMode(CrnTaskModeType.OFFSET_MOVE); // 浠诲姟妯″紡
-        command.setSourcePosX((short) 0);     // 婧愬簱浣嶆帓
-        command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
-        command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
-        command.setDestinationPosX((short) 1);     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosY((short) 3);     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosZ((short) 3);     // 鐩爣搴撲綅灞�
-        crnThread.write(command);
 
         // 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
 //        if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr

--
Gitblit v1.9.1