Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
48d4dd88
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
48d4dd88
编写于
9月 12, 2018
作者:
J
jmtao
提交者:
Jiangtao Hu
9月 12, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
planning: add planning conf
上级
105101b4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
53 addition
and
2 deletion
+53
-2
modules/planning/conf/planning_conf.pb.txt
modules/planning/conf/planning_conf.pb.txt
+12
-0
modules/planning/planning_component.cc
modules/planning/planning_component.cc
+7
-2
modules/planning/planning_component.h
modules/planning/planning_component.h
+2
-0
modules/planning/proto/BUILD
modules/planning/proto/BUILD
+15
-0
modules/planning/proto/planning_conf.proto
modules/planning/proto/planning_conf.proto
+17
-0
未找到文件。
modules/planning/conf/planning_conf.pb.txt
0 → 100644
浏览文件 @
48d4dd88
planning_enable: true
chassis_channel: "/apollo/canbus/chassis"
localization_channel: "/apollo/localization/pose"
monitor_channel: "/apollo/monitor"
perception_obstacle_channel: "/apollo/perception/obstacles"
planning_pad_channel: "/apollo/planning/pad"
planning_trajectory_channel: "/apollo/planning"
prediction_channel: "/apollo/prediction"
relative_map_channel: "/apollo/relative_map"
routing_request_channel: "/apollo/routing_request"
routing_response_channel: "/apollo/perception/obstacles"
traffic_light_detection_channel: "/apollo/routing_response"
\ No newline at end of file
modules/planning/planning_component.cc
浏览文件 @
48d4dd88
...
...
@@ -27,9 +27,14 @@ using apollo::perception::TrafficLightDetection;
using
apollo
::
routing
::
RoutingResponse
;
bool
PlanningComponent
::
Init
()
{
if
(
!
GetProtoConfig
(
&
planning_conf_
))
{
AERROR
<<
"Unable to load planning conf file: "
<<
ConfigFilePath
();
return
false
;
}
planning_base_
=
std
::
unique_ptr
<
PlanningBase
>
(
new
StdPlanning
());
routing_reader_
=
node_
->
CreateReader
<
RoutingResponse
>
(
"/apollo/routing_response"
,
planning_conf_
.
routing_response_channel
()
,
[
this
](
const
std
::
shared_ptr
<
RoutingResponse
>&
routing
)
{
ADEBUG
<<
"Received routing data: run routing callback."
;
std
::
lock_guard
<
std
::
mutex
>
lock
(
mutex_
);
...
...
@@ -37,7 +42,7 @@ bool PlanningComponent::Init() {
});
traffic_light_reader_
=
node_
->
CreateReader
<
TrafficLightDetection
>
(
"/apollo/perception/traffic_light"
,
planning_conf_
.
traffic_light_detection_channel
()
,
[
this
](
const
std
::
shared_ptr
<
TrafficLightDetection
>&
traffic_light
)
{
ADEBUG
<<
"Received chassis data: run chassis callback."
;
std
::
lock_guard
<
std
::
mutex
>
lock
(
mutex_
);
...
...
modules/planning/planning_component.h
浏览文件 @
48d4dd88
...
...
@@ -27,6 +27,7 @@
#include "modules/canbus/proto/chassis.pb.h"
#include "modules/localization/proto/localization.pb.h"
#include "modules/perception/proto/traffic_light_detection.pb.h"
#include "modules/planning/proto/planning_conf.pb.h"
#include "modules/planning/proto/planning.pb.h"
#include "modules/prediction/proto/prediction_obstacle.pb.h"
#include "modules/routing/proto/routing.pb.h"
...
...
@@ -54,6 +55,7 @@ class PlanningComponent final
localization_estimate
)
override
;
private:
PlanningConf
planning_conf_
;
std
::
shared_ptr
<
cybertron
::
Reader
<
perception
::
TrafficLightDetection
>>
traffic_light_reader_
;
std
::
shared_ptr
<
cybertron
::
Reader
<
routing
::
RoutingResponse
>>
routing_reader_
;
...
...
modules/planning/proto/BUILD
浏览文件 @
48d4dd88
...
...
@@ -17,6 +17,7 @@ proto_library(
],
deps
=
[
":decision_proto_lib"
,
":planning_conf_proto_lib"
,
":planning_internal_proto_lib"
,
"//modules/canbus/proto:canbus_proto_lib"
,
"//modules/common/proto:common_proto_lib"
,
...
...
@@ -143,6 +144,20 @@ proto_library(
],
)
cc_proto_library
(
name
=
"planning_conf_proto"
,
deps
=
[
":planning_conf_proto_lib"
,
],
)
proto_library
(
name
=
"planning_conf_proto_lib"
,
srcs
=
[
"planning_conf.proto"
,
],
)
cc_proto_library
(
name
=
"planning_config_proto"
,
deps
=
[
...
...
modules/planning/proto/planning_conf.proto
0 → 100644
浏览文件 @
48d4dd88
syntax
=
"proto2"
;
package
apollo
.
planning
;
message
PlanningConf
{
optional
bool
planning_enable
=
1
[
default
=
true
];
optional
string
chassis_channel
=
2
;
optional
string
localization_channel
=
3
;
optional
string
monitor_channel
=
4
;
optional
string
perception_obstacle_channel
=
5
;
optional
string
planning_pad_channel
=
6
;
optional
string
planning_trajectory_channel
=
7
;
optional
string
prediction_channel
=
8
;
optional
string
relative_map_channel
=
9
;
optional
string
routing_request_channel
=
10
;
optional
string
routing_response_channel
=
11
;
optional
string
traffic_light_detection_channel
=
12
;
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录