From cab64d20dcecb77d579fd065b32384264c8fddbf Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 08 九月 2020 14:50:40 +0800
Subject: [PATCH] #
---
src/main/webapp/views/crn.html | 5 -
src/main/java/com/zy/core/thread/CrnThread.java | 267 ++++++++++++++++++++--------------------------------
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 4
3 files changed, 105 insertions(+), 171 deletions(-)
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 c2f073a..aa5ff92 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -282,8 +282,8 @@
public BasCrnp toSqlModel(BasCrnp basCrnp){
- if (alarm!=null) {
- basCrnp.setCrnErr(alarm.longValue());
+ if (alarm1!=null) {
+ basCrnp.setCrnErr(alarm1.longValue());
}
basCrnp.setWrkNo(taskNo.intValue());
return basCrnp;
diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 9a4f4ea..48943b1 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -2,11 +2,11 @@
import HslCommunication.Core.Types.OperateResult;
import HslCommunication.Core.Types.OperateResultExOne;
-import HslCommunication.Profinet.Melsec.MelsecMcNet;
+import HslCommunication.Profinet.Siemens.SiemensPLCS;
+import HslCommunication.Profinet.Siemens.SiemensS7Net;
import com.alibaba.fastjson.JSON;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.service.BasCrnpService;
import com.zy.core.ThreadHandler;
@@ -33,7 +33,7 @@
@Slf4j
public class CrnThread implements Runnable, ThreadHandler {
- private MelsecMcNet melsecMcNet;
+ private SiemensS7Net siemensNet;
private CrnSlave slave;
private CrnProtocol crnProtocol;
private boolean resetFlag = false;
@@ -94,17 +94,19 @@
@Override
public boolean connect() {
boolean result = false;
- melsecMcNet = new MelsecMcNet(slave.getIp(), slave.getPort());
- OperateResult connect = melsecMcNet.ConnectServer();
+ siemensNet = new SiemensS7Net(SiemensPLCS.S300, slave.getIp());
+ siemensNet.setRack(slave.getRack().byteValue());
+ siemensNet.setSlot(slave.getSlot().byteValue());
+ OperateResult connect = siemensNet.ConnectServer();
if(connect.IsSuccess){
result = true;
- OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ OutputQueue.CRN.offer(MessageFormat.format( "銆恵0}銆戝爢鍨涙満plc杩炴帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.info("鍫嗗灈鏈簆lc杩炴帴鎴愬姛 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
} else {
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] ", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝爢鍨涙満plc杩炴帴澶辫触锛侊紒锛� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍫嗗灈鏈簆lc杩炴帴澶辫触锛侊紒锛� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
- melsecMcNet.ConnectClose();
+ siemensNet.ConnectClose();
return result;
}
@@ -112,163 +114,100 @@
* 璇诲彇鐘舵��
*/
private void readStatus(){
- try {
-
- /* 鏂规硶1 */
- OperateResultExOne<byte[]> result = melsecMcNet.Read("D2231", (short) 62);
- 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.setError1(melsecMcNet.getByteTransform().TransBool(result.Content, 24, 2));
- 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, 58));
-
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 澶嶄綅淇″彿
- if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
- if (resetFlag) {
- if (melsecMcNet.Write("D2218", (short) 1).IsSuccess) {
- resetFlag = false;
- }
- }
- }
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
- BasCrnp basCrnp = new BasCrnp();
- basCrnp.setCrnNo(slave.getId());
- if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
- log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
-
- } else {
- 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()));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB8.18", (short) 56);
+ if (result.IsSuccess) {
+ if (null == crnProtocol) {
+ crnProtocol = new CrnProtocol();
}
- /* 鏂规硶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()));
- log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
+ crnProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
+ crnProtocol.setTaskNo(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ crnProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ crnProtocol.setBay(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ crnProtocol.setLevel(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ crnProtocol.setForkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+// crnProtocol.setTaskFinish(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+ crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+ crnProtocol.setAlarm1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+ // 寮傚父淇℃伅
+ crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
+ crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
+ crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
+ 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));
+ crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+ crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+ crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
+ crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
+ crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
+ crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
+
+ // 澶嶄綅淇″彿
+ if (crnProtocol.getStatusType().equals(CrnStatusType.WAITING)) {
+ if (resetFlag) {
+ CrnCommand crnCommand = new CrnCommand();
+ crnCommand.setAckFinish((short)1);
+ if (write(crnCommand)) {
+ resetFlag = false;
+ }
+
+ }
+ }
+
+ // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
+ BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);
+ BasCrnp basCrnp = new BasCrnp();
+ basCrnp.setCrnNo(slave.getId());
+ if (!basCrnpService.updateById(crnProtocol.toSqlModel(basCrnp))){
+ log.error("鍫嗗灈鏈簆lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
+
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戣鍙栧爢鍨涙満plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("璇诲彇鍫嗗灈鏈簆lc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ }
}
/**
* 鍐欏叆鏁版嵁
*/
- private void write(CrnCommand command){
+ private boolean write(CrnCommand command){
if (null == command) {
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
- return;
+ return false;
}
command.setCrnNo(slave.getId());
- /* 鏂规硶 1 */
- do {
- if (command.getDestinationPosZ() != null) {
- if (!melsecMcNet.Write("D2202", command.getDestinationPosZ()).IsSuccess) { break; }
- }
- if (command.getDestinationPosY() != null) {
- if (!melsecMcNet.Write("D2204", command.getDestinationPosY()).IsSuccess) { break; }
- }
- if (command.getDestinationPosX() != null) {
- if (!melsecMcNet.Write("D2208", command.getDestinationPosX()).IsSuccess) { break; }
- }
- if (command.getSourcePosZ() != null) {
- if (!melsecMcNet.Write("D2210", command.getSourcePosZ()).IsSuccess) { break; }
- }
- if (command.getSourcePosY() != null) {
- if (!melsecMcNet.Write("D2212", command.getSourcePosY()).IsSuccess) { break; }
- }
- if (command.getDestinationPosX() != null) {
- if (!melsecMcNet.Write("D2214", command.getSourcePosX()).IsSuccess) { break; }
- }
- if (command.getTaskMode() != null) {
- if (!melsecMcNet.Write("D2216", command.getTaskMode()).IsSuccess) { break; }
- }
- if (command.getTaskNo() != null) {
- if (!melsecMcNet.Write("D2217", command.getTaskNo()).IsSuccess) { break; }
- }
- if (command.getAckFinish() != null) {
- if (!melsecMcNet.Write("D2218", command.getAckFinish()).IsSuccess) { break; }
- }
-
+ short[] array = new short[9];
+ array[0] = command.getAckFinish();
+ array[1] = command.getTaskNo();
+ array[2] = command.getTaskMode();
+ array[3] = command.getSourcePosX();
+ array[4] = command.getSourcePosY();
+ array[5] = command.getSourcePosZ();
+ array[6] = command.getDestinationPosX();
+ array[7] = command.getDestinationPosY();
+ array[8] = command.getDestinationPosZ();
+ OperateResult result = siemensNet.Write("DB8.0", array);
+ if (result.IsSuccess) {
log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), JSON.toJSON(command));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] >>>>> 鍛戒护涓嬪彂锛� {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(command)));
-
- return;
- } while (false);
-
-
- System.out.println(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort()));
- log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
-
-
-
- /* 鏂规硶 2 */
-// melsecMcNet.Write("D2218", command.getAckFinish());
-// melsecMcNet.Write("D2217", command.getTaskNo());
-// melsecMcNet.Write("D2216", command.getTaskMode());
-// melsecMcNet.Write("D2214", command.getSourcePosX());
-// melsecMcNet.Write("D2212", command.getSourcePosY());
-// melsecMcNet.Write("D2210", command.getSourcePosZ());
-// melsecMcNet.Write("D2208", command.getDestinationPosX());
-// melsecMcNet.Write("D2204", command.getDestinationPosY());
-// melsecMcNet.Write("D2202", command.getDestinationPosZ());
-
+ return true;
+ } else {
+ OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆戝啓鍏ュ爢鍨涙満plc鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
+ log.error("鍐欏叆鍫嗗灈鏈簆lc鏁版嵁澶辫触 ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
+ return false;
+ }
}
@Override
public void close() {
- melsecMcNet.ConnectClose();
+ siemensNet.ConnectClose();
}
-
/******************************************************************************************/
/**************************************** 娴嬭瘯涓撶敤 *****************************************/
@@ -276,14 +215,14 @@
public static void main(String[] args) throws InterruptedException {
CrnSlave slave = new CrnSlave();
slave.setId(1);
- slave.setIp("192.168.3.39");
- slave.setPort(5015);
+ slave.setIp("192.168.6.9");
slave.setRack(0);
slave.setSlot(0);
CrnThread crnThread = new CrnThread(slave);
crnThread.connect();
crnThread.readStatus();
System.out.println(JSON.toJSONString(crnThread.crnProtocol));
+ Thread.sleep(3000L);
// 1.鍏ュ簱 婧愬拰鐩爣閮藉彂
// CrnCommand command = new CrnCommand();
@@ -356,19 +295,19 @@
// 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);
+// // 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) 2); // 鐩爣搴撲綅鎺�
+// command.setDestinationPosY((short) 1); // 鐩爣搴撲綅鍒�
+// command.setDestinationPosZ((short) 1); // 鐩爣搴撲綅灞�
+// crnThread.write(command);
// 鍙湁鍑虹幇鎸囧畾寮傚父鎵嶈繘琛屽浣�
// if (crnThread.crnProtocol.getCrnError2().leftTakeNoneErr
diff --git a/src/main/webapp/views/crn.html b/src/main/webapp/views/crn.html
index bc1fd92..e2d5ed8 100644
--- a/src/main/webapp/views/crn.html
+++ b/src/main/webapp/views/crn.html
@@ -27,11 +27,6 @@
<span> </span>
<input id="crn1" disabled="disabled">
</div>
- <div class="crn-command-item">
- <label>2#</label>
- <span> </span>
- <input id="crn2" disabled="disabled">
- </div>
</div>
<!-- 鍫嗗灈鏈虹姸鎬佷綅淇℃伅 -->
<div class="crn-state">
--
Gitblit v1.9.1