From a549d6bbd7cb6f2a0dda1234c1b4df072a9e1d61 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期一, 18 十月 2021 09:34:05 +0800
Subject: [PATCH] 1. 新增车载、无人机和网格化三个单独的实时数据存储表 2. 新增数据转存方法，后续待补充转换中的数据预处理逻辑
---
src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
index 47017e0..9b22dbf 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/UAVByteDataDecoder.kt
@@ -16,8 +16,8 @@
const val BASE_LENGTH = DataPackageDecoder.HEAD_BYTES + DataPackageDecoder.COMMAND_UNIT_BYTES +
DataPackageDecoder.DEVICE_CODE_BYTES + DataPackageDecoder.DATA_LENGTH + DataPackageDecoder.BCC_BYTES
const val HEAD1 = 0x01.toByte()
- const val COMMAND_1 = 0x01.toByte()
- const val COMMAND_2 = 0x01.toByte()
+ const val COMMAND_1 = 0x04.toByte()
+ const val COMMAND_2 = 0x05.toByte()
const val HEAD_LENGTH = DataPackageDecoder.HEAD_BYTES + DataPackageDecoder.COMMAND_UNIT_BYTES +
DataPackageDecoder.DEVICE_CODE_BYTES
}
@@ -46,7 +46,7 @@
val b = ByteArray(HEAD_LENGTH)
it.readBytes(b)
if (b[0] == HEAD1 &&
- (b[1] == COMMAND_1 || b[2] == COMMAND_2)) {
+ (b[1] == COMMAND_1 || b[1] == COMMAND_2)) {
b.forEach {b ->
dataList.add(b)
}
--
Gitblit v1.9.3