From 0956cd2d3f2840f2f26855f05a83165d63dd7ba1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 28 十一月 2022 15:34:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 15 +++++++++++++--
1 files changed, 13 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 912044c..557a8fb 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -38,6 +38,11 @@
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
+ /**
+ * 鍫嗗灈鏈烘槸鍚﹀湪鍥炲師鐐硅繍鍔ㄤ腑鏍囪
+ */
+ private boolean backHpFlag = false;
+
public SiemensCrnThread(CrnSlave slave) {
this.slave = slave;
}
@@ -79,6 +84,9 @@
command.setDestinationPosY((short)0); // 鐩爣搴撲綅鍒�
command.setDestinationPosZ((short)0); // 鐩爣搴撲綅灞�
write(command);
+ break;
+ case 4:
+ siemensNet.Write("DB100.20", (short)task.getData());
break;
default:
break;
@@ -142,7 +150,7 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 70);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 50);
if (result.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
@@ -174,6 +182,9 @@
// 澶嶄綅淇″彿
if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
if (resetFlag) {
+ if(crnProtocol.getTaskNo()==9999){
+ backHpFlag = false;
+ }
CrnCommand crnCommand = new CrnCommand();
crnCommand.setAckFinish((short)1);
if (write(crnCommand)) {
@@ -242,7 +253,7 @@
if (command.getAckFinish() == 0) {
short commandFinish = 1;
- result = siemensNet.Write("DB100.22", commandFinish);
+ result = siemensNet.Write("DB100.18", commandFinish);
}
try {
--
Gitblit v1.9.1