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/enums/CrnStatusType.java | 18 ++++--
src/main/java/com/zy/core/enums/CrnLiftPosType.java | 8 +-
src/main/java/com/zy/core/thread/CrnThread.java | 82 +++++++--------------------
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 21 ++-----
src/main/java/com/zy/core/enums/CrnModeType.java | 7 +-
5 files changed, 45 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/zy/core/enums/CrnLiftPosType.java b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
index 62bbf5e..bd2514d 100644
--- a/src/main/java/com/zy/core/enums/CrnLiftPosType.java
+++ b/src/main/java/com/zy/core/enums/CrnLiftPosType.java
@@ -2,12 +2,10 @@
public enum CrnLiftPosType {
- _DOWN(4, "鍙屼几浣嶄綆浣�"),
- _UP(3, "鍙屼几浣嶉珮浣�"),
- DOWN(2, "鍗曚几浣嶄綆浣�"), // 涓嬪畾浣�
- UP(1, "鍗曚几浣嶉珮浣�"), // 涓婂畾浣�
- NONE(0, "涓嶅湪瀹氫綅"), // 涓嶅湪瀹氫綅
ERROR(-1, "鏈煡"), // 涓嶅湪瀹氫綅
+ DOWN(0, "涓嬪畾浣�"), //
+ UP(1, "涓婂畾浣�"), //
+ NONE(2, "涓嶅湪瀹氫綅"), // 涓嶅湪瀹氫綅
;
public Integer id;
diff --git a/src/main/java/com/zy/core/enums/CrnModeType.java b/src/main/java/com/zy/core/enums/CrnModeType.java
index 0b75045..4b9601e 100644
--- a/src/main/java/com/zy/core/enums/CrnModeType.java
+++ b/src/main/java/com/zy/core/enums/CrnModeType.java
@@ -2,11 +2,10 @@
public enum CrnModeType {
- NONE(0, "鏈�夋嫨"),
- AUTO(1, "鑷姩"),
+ STOP(0, "缁翠慨"),
+ HAND(1, "鎵嬪姩"),
HALF_AUTO(2, "鍗婅嚜鍔�"),
- HAND(3, "鎵嬪姩"),
- STOP(4, "缁翠慨"),
+ AUTO(3, "鑷姩"),
;
public Integer id;
diff --git a/src/main/java/com/zy/core/enums/CrnStatusType.java b/src/main/java/com/zy/core/enums/CrnStatusType.java
index 035deee..af3b713 100644
--- a/src/main/java/com/zy/core/enums/CrnStatusType.java
+++ b/src/main/java/com/zy/core/enums/CrnStatusType.java
@@ -2,12 +2,18 @@
public enum CrnStatusType {
- IDLE(0, "绌洪棽锛屾棤浠诲姟"),
- NONE_MOVING(1, "鏃犺揣琛岃蛋"),
- FETCHING(2, "鍙栬揣"),
- MOVING(3, "鏈夎揣琛岃蛋"),
- PUTTING(4, "鏀捐揣"),
- PUT_COMPLETE(5, "鏀捐揣瀹屾垚"),
+ IDLE(0, "绌洪棽"),
+ FETCH_MOVING(1, "鍙栬揣琛岃蛋"),
+ FETCH_WAITING(2, "鍙栬揣绛夊緟"),
+ FETCHING(3, "鍙栬揣涓�"),
+ PUT_MOVING(4, "鏀捐揣璧拌"),
+ PUT_WAITING(5, "鏀捐揣绛夊緟"),
+ PUTTING(6, "鏀捐揣涓�"),
+ ORIGIN_GO(7, "鍥炲師鐐�"),
+ ORIGIN_BACK(8, "鍥炲弽鍘熺偣"),
+ MOVING(9, "璧拌涓�"),
+ WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ SOS(99, "鎶ヨ"),
;
public Integer id;
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index d804f6e..a47b9c0 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -108,7 +108,7 @@
*/
private Short alarm1;
- private boolean[] temp1;
+ private Short temp1;
private CrnTemp1 crnTemp1;
@@ -235,21 +235,12 @@
this.status = CrnStatusType.get(type).id.shortValue();
}
- public void setTemp1(boolean[] temp1) {
+ public Short getTemp1() {
+ return temp1;
+ }
+
+ public void setTemp1(Short temp1) {
this.temp1 = temp1;
- this.crnTemp1 = new CrnTemp1();
- this.crnTemp1.liftLimitSwitchErr = temp1[0];
- this.crnTemp1.liftBrakeErr = temp1[1];
- this.crnTemp1.liftDiastimeterFau = temp1[2];
- this.crnTemp1.stop = temp1[3];
- this.crnTemp1.warn = temp1[4];
- this.crnTemp1.overHighErr = temp1[5];
- this.crnTemp1.leftOverWidthErr = temp1[6];
- this.crnTemp1.rightOverWidthErr = temp1[7];
- this.crnTemp1.leftOverLenErr = temp1[8];
- this.crnTemp1.rightOverLenErr = temp1[9];
- this.crnTemp1.pakinThenLoadedErr = temp1[10];
- this.crnTemp1.pakOutThenNoneErr = temp1[11];
}
/**
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