Merge branch 'dev_robotaxi-d-app-module_290_220715_2.9.0' into dev_robotaxi-d-app-module-videoprocess

2022-07-19 19:25:07 +08:00
parent b7b547e015 b07f09687a
commit 238f0ff05e
1 changed files with 2 additions and 2 deletions
--- a/libraries/mogo-adas-data/src/main/proto/message_pad.proto
+++ b/libraries/mogo-adas-data/src/main/proto/message_pad.proto
@@ -120,11 +120,11 @@ message GnssInfo
 // message definition for MessageType: MsgTypeAutopilotState
 message AutopilotState
 {
-    uint32 state = 1; //0: 不可用(abandoned), 1:ready, 2:自动驾驶中
+    uint32 state = 1; //0: 不可用(abandoned), 1:ready, 2:自动驾驶中,3:平行驾驶
    uint32 camera = 2; //camera节点状态 1:开启，0:关闭
    uint32 radar = 3; //雷达节点状态 1:开启，0:关闭
    uint32 rtk = 4; //RTK节点状态 1:开启，0:关闭
-    uint32 autopilotMode = 5; //自动驾驶状态 0: 非自动驾驶，1: 自动驾驶
+    uint32 autopilotMode = 5; //自动驾驶状态 0: 非自动驾驶，1: 自动驾驶，2平行驾驶
    double speed = 6; //惯导车速 m/s
    string reason = 7; //不可用原因(abandoned)
 }