From 61694606d640cac824c36ee5bca709b6cc0ecb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十一月 2020 16:44:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 3d84147..6bdec69 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -5,6 +5,7 @@
import HslCommunication.Profinet.Siemens.SiemensPLCS;
import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
+import com.core.common.Arith;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnp;
@@ -137,9 +138,11 @@
crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
- crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+ float xSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 34);
+ crnProtocol.setXSpeed((float) Arith.multiplys(3, xSpeed, 1.15));
crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
- crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ float zSpeed = siemensNet.getByteTransform().TransSingle(result.Content, 42);
+ crnProtocol.setZSpeed((float) Arith.multiplys(3, zSpeed, 5));
crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
--
Gitblit v1.9.1