From d9d35401bf3153e96dafc00b83db13ed554c6d5c Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期四, 11 八月 2022 09:26:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 4999239..84ed59e 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -24,7 +24,6 @@
import com.zy.core.model.protocol.CrnProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import java.text.MessageFormat;
import java.util.Date;
@@ -125,13 +124,13 @@
crnProtocol.setWalkPos((short)0);
crnProtocol.setLoaded((short)0);
crnProtocol.setAlarm((short)0);
- crnProtocol.setXSpeed(0F);
- crnProtocol.setYSpeed(0F);
- crnProtocol.setZSpeed(0F);
- crnProtocol.setXDistance(0F);
- crnProtocol.setYDistance(0F);
- crnProtocol.setXDuration(0F);
- crnProtocol.setYDuration(0F);
+ crnProtocol.setxSpeed((short)0);
+ crnProtocol.setySpeed((short)0);
+ crnProtocol.setzSpeed((short)0);
+ crnProtocol.setxDistance((short)0);
+ crnProtocol.setyDistance((short)0);
+ crnProtocol.setxDuration((short)0);
+ crnProtocol.setyDuration((short)0);
}
@Override
@@ -182,13 +181,13 @@
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));
+ crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
+ crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
+ crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
+ crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
+ crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
+ crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1