From e8e37daeef9b1f455c6cac0bef186e702c8adca0 Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Fri, 12 May 2023 09:58:52 +0800 Subject: [PATCH] =?UTF-8?q?rev=20phase=E5=80=BC=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java | 10 +++++----- .../basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index 9c1e50b4b..8d2af4734 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -434,19 +434,19 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic } data = NDCAgvService.sendAgvOneModeInst(phase, index, 0); last_error = error; - } else if (phase == 0x71) { + } else if (phase == 0x70) { //x坐标 x = ikey; - } else if (phase == 0x72) { + } else if (phase == 0x71) { //y坐标 y = ikey; - } else if (phase == 0x73) { + } else if (phase == 0x72) { //车辆角度 angle = ikey; - } else if (phase == 0x74) { + } else if (phase == 0x73) { //agv电量 electric_qty = ikey; - } else if (phase == 0x75) { + } else if (phase == 0x74) { //三色灯状态 status = ikey; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index b73ac7526..ee99e3442 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -687,19 +687,19 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic } data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); last_error = error; - } else if (phase == 0x71) { + } else if (phase == 0x70) { //x坐标 x = ikey; - } else if (phase == 0x72) { + } else if (phase == 0x71) { //y坐标 y = ikey; - } else if (phase == 0x73) { + } else if (phase == 0x72) { //车辆角度 angle = ikey; - } else if (phase == 0x74) { + } else if (phase == 0x73) { //agv电量 electric_qty = ikey; - } else if (phase == 0x75) { + } else if (phase == 0x74) { //三色灯状态 status = ikey; }