From 74c96c72625aff6613d69c7168e1a7d76da22870 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期五, 24 六月 2022 17:18:31 +0800
Subject: [PATCH] add taskuuid
---
src/protos/aerial.proto | 230 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 133 insertions(+), 97 deletions(-)
diff --git a/src/protos/aerial.proto b/src/protos/aerial.proto
index c03a45b..d3ff8e6 100644
--- a/src/protos/aerial.proto
+++ b/src/protos/aerial.proto
@@ -1,125 +1,159 @@
syntax = "proto3";
-enum SysCommand {
- UNKOWN_COMMAND = 0; // 鏈煡鍛戒护
- SYS_COMMAND = 1; // 绯荤粺鍛戒护
- SENSOR_COMMAND = 2; // 浼犳劅鍣ㄥ懡浠�
- FIVE_G_COMMAND = 3; // 閫氳5G妯″潡鍛戒护
- CAMERA_COMMAND = 4; // 鎽勫儚澶村弬鏁板懡浠�
- IO_COMMAND = 5; // 澶栬IO鍙ｆ搷浣滃懡浠�
- SYS_PARAMS_COMMAND = 6; // 绯荤粺鍙傛暟鑾峰彇
- WIFI_COMMAND = 7; // 璁惧WIFI鍙傛暟璁剧疆
- KERNEL_COMMAND = 8; // 鏍稿績璁＄畻鍙傛暟璁�
- DEVICE_COMMAND = 9; // 宸ヤ綔璁惧鍙傛暟璁剧疆
- MICRO_WAVE_COMMAND = 10; // 姣背娉�
-}
+// enum SysCommand {
+// UNKOWN_COMMAND = 0; // 鏈煡鍛戒护
+// SYS_COMMAND = 1; // 绯荤粺鍛戒护
+// SENSOR_COMMAND = 2; // 浼犳劅鍣ㄥ懡浠�
+// FIVE_G_COMMAND = 3; // 閫氳5G妯″潡鍛戒护
+// CAMERA_COMMAND = 4; // 鎽勫儚澶村弬鏁板懡浠�
+// IO_COMMAND = 5; // 澶栬IO鍙ｆ搷浣滃懡浠�
+// SYS_PARAMS_COMMAND = 6; // 绯荤粺鍙傛暟鑾峰彇
+// WIFI_COMMAND = 7; // 璁惧WIFI鍙傛暟璁剧疆
+// KERNEL_COMMAND = 8; // 鏍稿績璁＄畻鍙傛暟璁�
+// DEVICE_COMMAND = 9; // 宸ヤ綔璁惧鍙傛暟璁剧疆
+// MICRO_WAVE_COMMAND = 10; // 姣背娉�
+// }
-enum SubCommand {
- option allow_alias = true;
+// enum SubCommand {
+// option allow_alias = true;
- UNKOWN_SUB_COMMAND = 0; // 鏈煡瀛愬懡浠�
+// UNKOWN_SUB_COMMAND = 0; // 鏈煡瀛愬懡浠�
- // 绯荤粺鍛戒护
- POWER_ON_SUB_COMMAND = 1; // 寮�鏈�
- POWER_OFF_SUB_COMMAND = 2; // 鍏虫満
+// // 绯荤粺鍛戒护
+// POWER_ON_SUB_COMMAND = 1; // 寮�鏈�
+// POWER_OFF_SUB_COMMAND = 2; // 鍏虫満
- // 浼犳劅鍣ㄥ懡浠�
- SENSOR_INIT_SUB_COMMAND = 1; // 浼犳劅鍣ㄥ垵濮嬪寲
- SENSOR_REQURE_SUB_COMMAND = 2; // 浼犳劅鍣ㄥ弬鏁拌幏鍙�
- RTK_SETTING_SUB_COMMAND = 3; // RTK澶栬鍙傛暟璁剧疆
- RTK_REQURE_SUB_COMMAND = 4; // RTK澶栬鏁版嵁鑾峰彇
+// // 浼犳劅鍣ㄥ懡浠�
+// SENSOR_INIT_SUB_COMMAND = 1; // 浼犳劅鍣ㄥ垵濮嬪寲
+// SENSOR_REQURE_SUB_COMMAND = 2; // 浼犳劅鍣ㄥ弬鏁拌幏鍙�
+// RTK_SETTING_SUB_COMMAND = 3; // RTK澶栬鍙傛暟璁剧疆
+// RTK_REQURE_SUB_COMMAND = 4; // RTK澶栬鏁版嵁鑾峰彇
- // 閫氳5G妯″潡鍛戒护
- FIVE_G_INIT_SUB_COMMAND = 1; // 5G妯″潡鍙傛暟鍒濆鍖�
- FIVE_G_SEND_IMAGE_SUB_COMMAND = 2; // 5G閫氳鍥惧儚鏁版嵁鍙戦��
- FIVE_G_REQURE_SUB_COMMAND = 3; // 5G閫氳鎺ユ敹
+// // 閫氳5G妯″潡鍛戒护
+// FIVE_G_INIT_SUB_COMMAND = 1; // 5G妯″潡鍙傛暟鍒濆鍖�
+// FIVE_G_SEND_IMAGE_SUB_COMMAND = 2; // 5G閫氳鍥惧儚鏁版嵁鍙戦��
+// FIVE_G_REQURE_SUB_COMMAND = 3; // 5G閫氳鎺ユ敹
- // 鎽勫儚澶村弬鏁板懡浠�
- CAMERA_NUMBER_SUB_COMMAND = 1; // 璁惧鎽勫儚澶翠釜鏁�
- CAMERA_RESOLUTION_SUB_COMMAND = 2; // 璁惧鎽勫儚澶村伐浣滃垎杈ㄧ巼
- CAMERA_FRAME_RATE_SUB_COMMAND = 3; // 鎽勫儚澶村伐浣滃抚鐜�
- CAMERA_OTHER_PARAMS_SUB_COMMAND = 4; // 鎽勫儚澶村伐浣滃叾浠栧弬鏁�
+// // 鎽勫儚澶村弬鏁板懡浠�
+// CAMERA_NUMBER_SUB_COMMAND = 1; // 璁惧鎽勫儚澶翠釜鏁�
+// CAMERA_RESOLUTION_SUB_COMMAND = 2; // 璁惧鎽勫儚澶村伐浣滃垎杈ㄧ巼
+// CAMERA_FRAME_RATE_SUB_COMMAND = 3; // 鎽勫儚澶村伐浣滃抚鐜�
+// CAMERA_OTHER_PARAMS_SUB_COMMAND = 4; // 鎽勫儚澶村伐浣滃叾浠栧弬鏁�
- // 澶栬IO鍙ｆ搷浣滃懡浠�
- CAMERA_DUST_REMOVAL_START_SUB_COMMAND = 1; // 鎽勫儚澶撮櫎灏樺惎鍔�
- CAMERA_CONTROL_START_SUB_COMMAND = 2; // 澶栬鎺у埗鏁版嵁鍚姩锛�18璺帶鍒讹級
+// // 澶栬IO鍙ｆ搷浣滃懡浠�
+// CAMERA_DUST_REMOVAL_START_SUB_COMMAND = 1; // 鎽勫儚澶撮櫎灏樺惎鍔�
+// CAMERA_CONTROL_START_SUB_COMMAND = 2; // 澶栬鎺у埗鏁版嵁鍚姩锛�18璺帶鍒讹級
- // 绯荤粺鍙傛暟鑾峰彇
- CPU_FREQUENCY_SUB_COMMAND = 1; // CPU涓婚宸ヤ綔鏁版嵁
- CPU_KERNAL_TEMP_SUB_COMMAND = 2; // CPU鏍稿績娓╁害鏁版嵁
- CPU_BETTERY_DATA_SUB_COMMAND = 3; // 鐢垫睜渚涚數鐢甸噺鏁版嵁
+// // 绯荤粺鍙傛暟鑾峰彇
+// CPU_FREQUENCY_SUB_COMMAND = 1; // CPU涓婚宸ヤ綔鏁版嵁
+// CPU_KERNAL_TEMP_SUB_COMMAND = 2; // CPU鏍稿績娓╁害鏁版嵁
+// CPU_BETTERY_DATA_SUB_COMMAND = 3; // 鐢垫睜渚涚數鐢甸噺鏁版嵁
- // 璁惧WIFI鍙傛暟璁剧疆
- WIFI_HOTSPOT_SETTING_SUB_COMMAND = 1; // WIFI鐑偣璁剧疆
- WIFI_HOTSPOT_START_STOP_SUB_COMMAND = 2; // WIFI鐑偣寮�鍚拰鍏抽棴
+// // 璁惧WIFI鍙傛暟璁剧疆
+// WIFI_HOTSPOT_SETTING_SUB_COMMAND = 1; // WIFI鐑偣璁剧疆
+// WIFI_HOTSPOT_START_STOP_SUB_COMMAND = 2; // WIFI鐑偣寮�鍚拰鍏抽棴
- // 鏍稿績璁＄畻鍙傛暟璁剧疆
- POINT_CLOUD_ACCURACY_SUB_COMMAND = 1; // 鐐逛簯璁＄畻绮惧害
- SPLICING_PARAMS_SUB_COMMAND = 2; // 鎷兼帴鍙傛暟
- MAP_INTERFACE_PLATFORM_SUB_COMMAND = 3; // 鍦板浘鎺ュ彛骞冲彴
- DATA_STORE_BACKUP_SUB_COMMAND = 4; // 鏁版嵁瀛樺偍澶囦唤
+// // 鏍稿績璁＄畻鍙傛暟璁剧疆
+// POINT_CLOUD_ACCURACY_SUB_COMMAND = 1; // 鐐逛簯璁＄畻绮惧害
+// SPLICING_PARAMS_SUB_COMMAND = 2; // 鎷兼帴鍙傛暟
+// MAP_INTERFACE_PLATFORM_SUB_COMMAND = 3; // 鍦板浘鎺ュ彛骞冲彴
+// DATA_STORE_BACKUP_SUB_COMMAND = 4; // 鏁版嵁瀛樺偍澶囦唤
- // 宸ヤ綔璁惧鍙傛暟璁剧疆
- SYSTEM_TIMER_SUB_COMMAND = 1; // 绯荤粺宸ヤ綔瀹氭椂
- SYSTEM_COORD_HEIGHT_SUB_COMMAND = 2; // 宸ヤ綔鍖哄煙鍧愭爣涓庨珮搴�
- TRIGGER_CONDITION_SUB_COMMAND = 3; // 宸ヤ綔瑙﹀彂鏉′欢
- GRAVITY_FAILURE_SUB_COMMAND = 4; // 閲嶅姏鍔犻�熷害澶辨晥鍙傛暟
- NINE_AXIS_FAILURE_SUB_COMMAND = 5; // 涔濊酱鍔犻�熷害澶辨晥鍙傛暟
+// // 宸ヤ綔璁惧鍙傛暟璁剧疆
+// SYSTEM_TIMER_SUB_COMMAND = 1; // 绯荤粺宸ヤ綔瀹氭椂
+// SYSTEM_COORD_HEIGHT_SUB_COMMAND = 2; // 宸ヤ綔鍖哄煙鍧愭爣涓庨珮搴�
+// TRIGGER_CONDITION_SUB_COMMAND = 3; // 宸ヤ綔瑙﹀彂鏉′欢
+// GRAVITY_FAILURE_SUB_COMMAND = 4; // 閲嶅姏鍔犻�熷害澶辨晥鍙傛暟
+// NINE_AXIS_FAILURE_SUB_COMMAND = 5; // 涔濊酱鍔犻�熷害澶辨晥鍙傛暟
- // 姣背娉�
- MICRO_WAVE_SUB_COMMAND = 1; // 姣背娉�
+// // 姣背娉�
+// MICRO_WAVE_SUB_COMMAND = 1; // 姣背娉�
+// }
+
+// message DataField {
+// int32 length = 1; // 鏁版嵁闀垮害
+// bytes data = 2; // 鏁版嵁鍐呭
+// int32 checksum = 3; // 鏍￠獙鐮�
+// }
+
+// message CapturedData {
+// int64 capture_time = 1; // 閲囬泦鏃堕棿
+// string capture_device =2; // 閲囬泦璁惧
+// int32 capture_port = 3; // 閲囬泦璁惧搴忓彿
+// DataField DataField = 4;
+// string data_type = 5; // 鏁版嵁绫诲瀷 image udp
+// }
+
+// message DataMessage{
+// int64 sending_time = 1;
+// string sending_device = 2;
+// string target_device = 3;
+// CapturedData CapturedData = 5;
+// }
+
+// message StateData {
+// int64 state_time = 1;
+// string state_device = 2;
+// DataField DataField = 4;
+// }
+
+// message StateMessage {
+// int64 sending_time = 1;
+// string sending_device = 2;
+// string target_device = 3;
+// CapturedData StatedData = 5;
+// }
+
+// message CommandData {
+// SysCommand SysCommand = 1;
+// SubCommand SubCommand = 2;
+// }
+
+// message CommandMessage {
+// int64 sending_time = 1;
+// string sending_device = 2;
+// string target_device = 3;
+// CommandData CommandData =4;
+// }
+
+enum SysCommand{
+ UNKOWN_COMMAND = 0;
+ CAMERA_COMMAND = 1;
+ MICROWAVE_COMMAND = 2;
+ DUSTCLEANER_COMMAND = 3;
+
}
-message DataField {
- int32 length = 1; // 鏁版嵁闀垮害
- bytes data = 2; // 鏁版嵁鍐呭
- int32 checksum = 3; // 鏍￠獙鐮�
+enum SubCommand{
+ UNKOWN_SUBCOMMAND = 0;
+
+ // camera params
+ ONE_TIME_CAPTURE = 1;
+
+ // microwave params
+ ONE_CIRCLE_SCAN = 2;
+
+ // dust cleaner params
+ ONE_CLEAN_SCAN = 4;
+
}
-message CapturedData {
- int64 capture_time = 1; // 閲囬泦鏃堕棿
- string capture_device =2; // 閲囬泦璁惧
- int32 capture_port = 3; // 閲囬泦璁惧搴忓彿
- DataField DataField = 4;
- string data_type = 5; // 鏁版嵁绫诲瀷 image udp
-}
-message DataMessage{
- int64 sending_time = 1;
- string sending_device = 2;
- string target_device = 3;
- CapturedData CapturedData = 5;
-}
-
-message StateData {
- int64 state_time = 1;
- string state_device = 2;
- DataField DataField = 4;
-}
-
-message StateMessage {
- int64 sending_time = 1;
- string sending_device = 2;
- string target_device = 3;
- CapturedData StatedData = 5;
-}
-
-message CommandData {
- SysCommand SysCommand = 1;
- SubCommand SubCommand = 2;
-}
-
-message CommandMessage {
- int64 sending_time = 1;
- string sending_device = 2;
- string target_device = 3;
- CommandData CommandData =4;
+message CommandMessage{
+ string source = 1;
+ string generatetime = 2;
+ SysCommand syscommand = 3;
+ SubCommand subcommand = 4;
+ string targetclient = 5;
+ string returnserver = 6;
+ string taskuuid = 7;
}
message LogsMessage{
string source = 1;
string timestamp = 2;
string context = 3;
+ optional string taskuuid = 4;
}
@@ -135,6 +169,7 @@
}
repeated ImageItems Image = 3;
+ optional string taskuuid = 4;
}
@@ -156,6 +191,7 @@
}
repeated PointCloudItem Plydata = 3;
+ optional string taskuuid = 4;
// enum ref_system
// {
--
Gitblit v1.9.1