From 6585cce69ba2c1ce69d2cbe0a3cdf8ddea0f8568 Mon Sep 17 00:00:00 2001
From: jiangyifei <jiangyifei@gmail.com>
Date: Thu, 22 Feb 2018 13:44:57 -0800
Subject: [PATCH] dreamview: added planning, third party perception and
 relative map into modules UI.

---
 modules/dreamview/conf/hmi.conf | 37 +++++++++++++++++++++++++++++++--
 scripts/planning_navigation.sh  | 26 +++++++++++++++++++++++
 2 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100755 scripts/planning_navigation.sh

diff --git a/modules/dreamview/conf/hmi.conf b/modules/dreamview/conf/hmi.conf
index ef17ccbbe1..077ce5360e 100644
--- a/modules/dreamview/conf/hmi.conf
+++ b/modules/dreamview/conf/hmi.conf
@@ -224,9 +224,9 @@ modules {
   }
 }
 modules {
-  key: "navigation_planning"
+  key: "navigation_pyplanning"
   value: {
-    display_name: "Planning"
+    display_name: "PY Planning"
     supported_commands {
       key: "start"
       value: "supervisorctl start navigation_planning &"
@@ -265,6 +265,36 @@ modules {
     }
   }
 }
+modules {
+  key: "navigation_planning"
+  value: {
+    display_name: "Navi Planning"
+    supported_commands {
+      key: "start"
+      value: "scripts/planning_navigation.sh start"
+    }
+    supported_commands {
+      key: "stop"
+      value: "scripts/planning_navigation.sh stop"
+    }
+  }
+}
+
+modules {
+  key: "relative_map"
+  value: {
+    display_name: "Relative Map"
+    supported_commands {
+      key: "start"
+      value: "scripts/relative_map.sh start"
+    }
+    supported_commands {
+      key: "stop"
+      value: "scripts/relative_map.sh stop"
+    }
+  }
+}
+
 hardware {
   key: "GPS"
   value: {
@@ -387,9 +417,12 @@ modes {
     live_modules: "GPS"
     live_modules: "mobileye"
     live_modules: "localization"
+    live_modules: "relative_map"
+    live_modules: "navigation_pyplanning"
     live_modules: "navigation_planning"
     live_modules: "navigation_control"
     live_modules: "navigation_perception"
+    live_modules: "third_party_perception"
     live_modules: "record_bag"
     live_hardware: "GPS"
     live_hardware: "CAN"
diff --git a/scripts/planning_navigation.sh b/scripts/planning_navigation.sh
new file mode 100755
index 0000000000..19eb351c0b
--- /dev/null
+++ b/scripts/planning_navigation.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+###############################################################################
+# Copyright 2017 The Apollo Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###############################################################################
+
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+source "${DIR}/apollo_base.sh"
+
+# run function from apollo_base.sh
+# run command_name module_name
+run planning "$@" --use_navigation_mode
-- 
GitLab