From b53dff5d5ee6ab0d4ab138e14be643843869d00d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 十一月 2020 11:12:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index afabb67..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;
@@ -85,7 +86,7 @@
}
Thread.sleep(500);
} catch (Exception e) {
- e.printStackTrace();
+// e.printStackTrace();
}
}
@@ -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