project_boditech_vidas_a8000_v3
/
a8k_app
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

将错误码和应用错误码统一为A8kEcode

tags/v0
zhaohe 1 year ago
parent
3dd226b6f8 b3020c2a06
commit
4d071ee892
4 changed files with 17 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pom.xml
  2. 18
      src/main/java/a8k/a8k_can_protocol/A8kPacket.java
  3. 5
      src/main/java/a8k/controller/SamplesPreProcessModuleCtrlController.java
  4. 4
      src/main/java/a8k/controller/TmpTestController.java

2
pom.xml
View File

@ -20,7 +20,7 @@
<dependency> <dependency>
<groupId>com.iflytop</groupId> <groupId>com.iflytop</groupId>
<artifactId>uf</artifactId> <artifactId>uf</artifactId>
<version>0.0.63</version>
<version>0.0.64</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains</groupId> <groupId>org.jetbrains</groupId>

18
src/main/java/a8k/a8k_can_protocol/A8kPacket.java
View File

@ -35,17 +35,15 @@ public class A8kPacket {
public static final int PACKET_TYPE_ERROR_ACK = 2; public static final int PACKET_TYPE_ERROR_ACK = 2;
public static final int PACKET_TYPE_EVENT = 3; public static final int PACKET_TYPE_EVENT = 3;
public static final int CMD_OVERTIME = 300;
public static final int CMD_OVERTIME = 100;
public A8kPacket(byte[] cmd) { public A8kPacket(byte[] cmd) {
raw = new byte[cmd.length]; raw = new byte[cmd.length];
System.arraycopy(cmd, 0, raw, 0, cmd.length); System.arraycopy(cmd, 0, raw, 0, cmd.length);
} }
public void setPacketIndex(int packetIndex) { public void setPacketIndex(int packetIndex) {
ByteArray.setU16bit(raw,0,packetIndex); ByteArray.setU16bit(raw,0,packetIndex);
} }
public int getPacketIndex() { public int getPacketIndex() {
return ByteArray.readU16bit(raw, 0); return ByteArray.readU16bit(raw, 0);
} }
@ -84,23 +82,23 @@ public class A8kPacket {
if (packetType == PACKET_TYPE_CMD) { if (packetType == PACKET_TYPE_CMD) {
if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) { if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) {
ret = String.format("[CMD ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
ret = String.format("[CMD ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
} else { } else {
ret = String.format("[CMD ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
ret = String.format("[CMD ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
} }
} else if (packetType == PACKET_TYPE_ACK) { } else if (packetType == PACKET_TYPE_ACK) {
if (cmdIdInfo.receiptAttachType == CmdIdInfo.ATTACH_IS_INT32) { if (cmdIdInfo.receiptAttachType == CmdIdInfo.ATTACH_IS_INT32) {
ret = String.format("[ACK ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
ret = String.format("[ACK ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
} else { } else {
ret = String.format("[ACK ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
ret = String.format("[ACK ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
} }
} else if (packetType == PACKET_TYPE_ERROR_ACK) { } else if (packetType == PACKET_TYPE_ERROR_ACK) {
ret = String.format("[EACK ] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), A8kEcode.toString(getContentI32(0)));
ret = String.format("[EACK ] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), A8kEcode.toString(getContentI32(0)));
} else if (packetType == PACKET_TYPE_EVENT) { } else if (packetType == PACKET_TYPE_EVENT) {
if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) { if (cmdIdInfo.cmdAttachType == CmdIdInfo.ATTACH_IS_INT32) {
ret = String.format("[EVENT] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
ret = String.format("[EVENT] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), formatInt32ATTACH(getCmdContent()));
} else { } else {
ret = String.format("[EVENT] PI:0x%x (cmd:%s mid:%d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
ret = String.format("[EVENT] [%x] (%s %d :[%s])", getPacketIndex(), cmdIdInfo.name, getModuleId(), ByteArray.toByteString(getCmdContent()));
} }
} else { } else {
ret = String.format("Unknown packet type: %d", packetType); ret = String.format("Unknown packet type: %d", packetType);

5
src/main/java/a8k/controller/SamplesPreProcessModuleCtrlController.java
View File

@ -9,6 +9,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@Controller @Controller
@ -20,7 +22,8 @@ public class SamplesPreProcessModuleCtrlController extends UfApiControllerBase {
@PostMapping("/api/sample-pre-process-module-ctrl/execute-service-method") @PostMapping("/api/sample-pre-process-module-ctrl/execute-service-method")
@ResponseBody @ResponseBody
public UfApiResponse executeServiceMethod( @RequestBody Map<String,Object> params ) throws NoSuchMethodException {
public UfApiResponse executeServiceMethod( @RequestBody Map<String,Object> params )
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Object service = this.samplesPreProcessModuleCtrlService; Object service = this.samplesPreProcessModuleCtrlService;
String methodName = (String)params.get("method"); String methodName = (String)params.get("method");
List<Object> methodArgs = (List<Object>)params.get("params"); List<Object> methodArgs = (List<Object>)params.get("params");

4
src/main/java/a8k/controller/TmpTestController.java
View File

@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import java.lang.reflect.InvocationTargetException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -33,7 +34,8 @@ public class TmpTestController {
@PostMapping("/api/tmp-test/execute-service-method") @PostMapping("/api/tmp-test/execute-service-method")
@ResponseBody @ResponseBody
public String executeServiceMethod(@RequestBody Map<String, Object> params) throws NoSuchMethodException {
public String executeServiceMethod(@RequestBody Map<String, Object> params)
throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Object service = this.motorTubeRackMoveCtrlService; Object service = this.motorTubeRackMoveCtrlService;
String methodName = (String) params.get("method"); String methodName = (String) params.get("method");
List<Object> methodArgs = (List<Object>) params.get("params"); List<Object> methodArgs = (List<Object>) params.get("params");

Write Preview
Loading…
Cancel
Save