From 81bd0388494d45463de42cd91bd8c33f10f0030a Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 17 六月 2021 10:27:21 +0800
Subject: [PATCH] 1. 新增用电量数据的接收协议 2. 调整socket接收模块的代码结构
---
src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt b/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
index da16a68..a2f5f43 100644
--- a/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
+++ b/src/main/kotlin/com/flightfeather/uav/socket/eunm/FactorType.kt
@@ -14,10 +14,15 @@
PM10(7, "PM10",3),
TEMPERATURE(8,"TEMPERATURE",3),
HUMIDITY(9, "HUMIDITY",3),
- VOC(10, "VOC",3),
- NOI(11, "NOI",3),//璐熸哀绂诲瓙
- LNG(12,"LNG",3),//缁忓害
- LAT(13,"LAT",3);//绾害
+ VOC(10, "VOC",6),
+ NOI(11, "NOI",6),//璐熸哀绂诲瓙
+ LNG(12,"LNG",6),//缁忓害
+ LAT(13,"LAT",5),//绾害
+ VELOCITY(14, "VELOCITY", 3),//閫熷害
+ TIME(15, "TIME", 6),//鏃堕棿
+ WIND_SPEED(16, "WIND_SPEED", 3),
+ WIND_DIRECTION(17, "WIND_DIRECTION", 2),
+ HEIGHT(18, "HEIGHT", 3);
companion object {
@@ -35,6 +40,11 @@
NOI.value -> NOI
LNG.value -> LNG
LAT.value -> LAT
+ VELOCITY.value -> VELOCITY
+ TIME.value -> TIME
+ WIND_SPEED.value -> WIND_SPEED
+ WIND_DIRECTION.value -> WIND_DIRECTION
+ HEIGHT.value -> HEIGHT
else -> null
}
}
--
Gitblit v1.9.3