From 350a7d7e4b11cdf8948b473ad2ed0495ab323b11 Mon Sep 17 00:00:00 2001 From: luoqi06 Date: Tue, 20 Feb 2018 21:28:27 -0800 Subject: [PATCH] Drivers : move conti_radar to radar folder --- modules/drivers/proto/BUILD | 2 +- modules/drivers/proto/conti_radar.proto | 2 +- modules/drivers/{ => radar}/conti_radar/BUILD | 4 ++-- .../{ => radar}/conti_radar/README_cn.md | 2 +- .../{ => radar}/conti_radar/conf/adapter.conf | 0 .../conti_radar/conf/conti_radar.conf | 4 ++-- .../conti_radar/conf/conti_radar_conf.pb.txt | 0 .../conti_radar/conti_radar_canbus.cc | 4 ++-- .../conti_radar/conti_radar_canbus.h | 10 +++++----- .../conti_radar_message_manager.cc | 20 +++++++++---------- .../conti_radar/conti_radar_message_manager.h | 8 ++++---- .../drivers/{ => radar}/conti_radar/main.cc | 2 +- .../{ => radar}/conti_radar/proto/BUILD | 0 .../conti_radar/proto/conti_radar_conf.proto | 0 .../{ => radar}/conti_radar/protocol/BUILD | 0 .../protocol/cluster_general_info_701.cc | 4 ++-- .../protocol/cluster_general_info_701.h | 7 +++---- .../protocol/cluster_list_status_600.cc | 2 +- .../protocol/cluster_list_status_600.h | 4 ++-- .../protocol/cluster_quality_info_702.cc | 4 ++-- .../protocol/cluster_quality_info_702.h | 4 ++-- .../conti_radar/protocol/const_vars.h | 6 +++--- .../protocol/object_extended_info_60d.cc | 4 ++-- .../protocol/object_extended_info_60d.h | 4 ++-- .../protocol/object_general_info_60b.cc | 4 ++-- .../protocol/object_general_info_60b.h | 4 ++-- .../protocol/object_list_status_60a.cc | 2 +- .../protocol/object_list_status_60a.h | 4 ++-- .../protocol/object_quality_info_60c.cc | 4 ++-- .../protocol/object_quality_info_60c.h | 4 ++-- .../conti_radar/protocol/radar_config_200.cc | 2 +- .../conti_radar/protocol/radar_config_200.h | 6 +++--- .../conti_radar/protocol/radar_state_201.cc | 2 +- .../conti_radar/protocol/radar_state_201.h | 4 ++-- modules/monitor/conf/monitor_conf.pb.txt | 2 +- modules/tools/supervisord/dev.conf | 2 +- modules/tools/supervisord/release.conf | 2 +- scripts/conti_radar.sh | 2 +- 38 files changed, 70 insertions(+), 71 deletions(-) rename modules/drivers/{ => radar}/conti_radar/BUILD (92%) rename modules/drivers/{ => radar}/conti_radar/README_cn.md (88%) rename modules/drivers/{ => radar}/conti_radar/conf/adapter.conf (100%) rename modules/drivers/{ => radar}/conti_radar/conf/conti_radar.conf (52%) rename modules/drivers/{ => radar}/conti_radar/conf/conti_radar_conf.pb.txt (100%) rename modules/drivers/{ => radar}/conti_radar/conti_radar_canbus.cc (96%) rename modules/drivers/{ => radar}/conti_radar/conti_radar_canbus.h (91%) rename modules/drivers/{ => radar}/conti_radar/conti_radar_message_manager.cc (87%) rename modules/drivers/{ => radar}/conti_radar/conti_radar_message_manager.h (88%) rename modules/drivers/{ => radar}/conti_radar/main.cc (93%) rename modules/drivers/{ => radar}/conti_radar/proto/BUILD (100%) rename modules/drivers/{ => radar}/conti_radar/proto/conti_radar_conf.proto (100%) rename modules/drivers/{ => radar}/conti_radar/protocol/BUILD (100%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_general_info_701.cc (96%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_general_info_701.h (88%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_list_status_600.cc (97%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_list_status_600.h (91%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_quality_info_702.cc (96%) rename modules/drivers/{ => radar}/conti_radar/protocol/cluster_quality_info_702.h (92%) rename modules/drivers/{ => radar}/conti_radar/protocol/const_vars.h (94%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_extended_info_60d.cc (96%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_extended_info_60d.h (92%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_general_info_60b.cc (96%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_general_info_60b.h (92%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_list_status_60a.cc (96%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_list_status_60a.h (91%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_quality_info_60c.cc (97%) rename modules/drivers/{ => radar}/conti_radar/protocol/object_quality_info_60c.h (93%) rename modules/drivers/{ => radar}/conti_radar/protocol/radar_config_200.cc (99%) rename modules/drivers/{ => radar}/conti_radar/protocol/radar_config_200.h (94%) rename modules/drivers/{ => radar}/conti_radar/protocol/radar_state_201.cc (97%) rename modules/drivers/{ => radar}/conti_radar/protocol/radar_state_201.h (93%) diff --git a/modules/drivers/proto/BUILD b/modules/drivers/proto/BUILD index bdb28add0d..507aead9f3 100644 --- a/modules/drivers/proto/BUILD +++ b/modules/drivers/proto/BUILD @@ -16,6 +16,6 @@ proto_library( ], deps = [ "//modules/common/proto:header_proto_lib", - "//modules/drivers/conti_radar/proto:conti_radar_proto_lib", + "//modules/drivers/radar/conti_radar/proto:conti_radar_proto_lib", ], ) diff --git a/modules/drivers/proto/conti_radar.proto b/modules/drivers/proto/conti_radar.proto index 2478e2e9cf..4e6b58734b 100644 --- a/modules/drivers/proto/conti_radar.proto +++ b/modules/drivers/proto/conti_radar.proto @@ -3,7 +3,7 @@ syntax = "proto2"; package apollo.drivers; import "modules/common/proto/header.proto"; -import "modules/drivers/conti_radar/proto/conti_radar_conf.proto"; +import "modules/drivers/radar/conti_radar/proto/conti_radar_conf.proto"; message ClusterListStatus_600 { optional int32 near = 1 [default = 0]; diff --git a/modules/drivers/conti_radar/BUILD b/modules/drivers/radar/conti_radar/BUILD similarity index 92% rename from modules/drivers/conti_radar/BUILD rename to modules/drivers/radar/conti_radar/BUILD index 9eb02cfe64..8cd5c4035b 100644 --- a/modules/drivers/conti_radar/BUILD +++ b/modules/drivers/radar/conti_radar/BUILD @@ -16,7 +16,7 @@ cc_library( "//modules/drivers/canbus/can_client:can_client_factory", "//modules/drivers/canbus/can_comm:can_sender", "//modules/drivers/canbus/can_comm:message_manager_base", - "//modules/drivers/conti_radar/protocol:drivers_conti_radar_protocol", + "//modules/drivers/radar/conti_radar/protocol:drivers_conti_radar_protocol", ], ) @@ -50,7 +50,7 @@ cc_library( "//modules/drivers/canbus/can_client:can_client_factory", "//modules/drivers/canbus/can_comm:can_receiver", "//modules/drivers/canbus/can_comm:message_manager_base", - "//modules/drivers/conti_radar/protocol:drivers_conti_radar_protocol", + "//modules/drivers/radar/conti_radar/protocol:drivers_conti_radar_protocol", ], ) diff --git a/modules/drivers/conti_radar/README_cn.md b/modules/drivers/radar/conti_radar/README_cn.md similarity index 88% rename from modules/drivers/conti_radar/README_cn.md rename to modules/drivers/radar/conti_radar/README_cn.md index 21bed5f3bd..ec51cb57d2 100644 --- a/modules/drivers/conti_radar/README_cn.md +++ b/modules/drivers/radar/conti_radar/README_cn.md @@ -2,7 +2,7 @@ 该驱动基于ROS开发，支持continental ARS。 ### 配置 -radar的默认配置: [conf/conti_radar_conf.pb.txt](https://github.com/ApolloAuto/apollo/blob/master/modules/drivers/conti_radar/conf/conti_radar_conf.pb.txt) +radar的默认配置: [conf/conti_radar_conf.pb.txt](https://github.com/ApolloAuto/apollo/blob/master/modules/drivers/radar/conti_radar/conf/conti_radar_conf.pb.txt) radar启动时，会先根据上述配置文件，向can卡发送指令，对radar进行配置。当接收到的radar状态信息与用户配置信息一致时，才开始解析数据并发送消息。 ### 运行 diff --git a/modules/drivers/conti_radar/conf/adapter.conf b/modules/drivers/radar/conti_radar/conf/adapter.conf similarity index 100% rename from modules/drivers/conti_radar/conf/adapter.conf rename to modules/drivers/radar/conti_radar/conf/adapter.conf diff --git a/modules/drivers/conti_radar/conf/conti_radar.conf b/modules/drivers/radar/conti_radar/conf/conti_radar.conf similarity index 52% rename from modules/drivers/conti_radar/conf/conti_radar.conf rename to modules/drivers/radar/conti_radar/conf/conti_radar.conf index 042d51120d..1df12391cc 100644 --- a/modules/drivers/conti_radar/conf/conti_radar.conf +++ b/modules/drivers/radar/conti_radar/conf/conti_radar.conf @@ -1,7 +1,7 @@ --flagfile=modules/common/data/global_flagfile.txt --alsologtostderr=1 ---sensor_conf_file=modules/drivers/conti_radar/conf/conti_radar_conf.pb.txt ---adapter_config_filename=modules/drivers/conti_radar/conf/adapter.conf +--sensor_conf_file=modules/drivers/radar/conti_radar/conf/conti_radar_conf.pb.txt +--adapter_config_filename=modules/drivers/radar/conti_radar/conf/adapter.conf --node_namespace=/apollo/drivers/conti_radar --sensor_node_name=conti_radar --canbus_driver_name=conti_radar diff --git a/modules/drivers/conti_radar/conf/conti_radar_conf.pb.txt b/modules/drivers/radar/conti_radar/conf/conti_radar_conf.pb.txt similarity index 100% rename from modules/drivers/conti_radar/conf/conti_radar_conf.pb.txt rename to modules/drivers/radar/conti_radar/conf/conti_radar_conf.pb.txt diff --git a/modules/drivers/conti_radar/conti_radar_canbus.cc b/modules/drivers/radar/conti_radar/conti_radar_canbus.cc similarity index 96% rename from modules/drivers/conti_radar/conti_radar_canbus.cc rename to modules/drivers/radar/conti_radar/conti_radar_canbus.cc index 8504d6a0bb..684580753c 100644 --- a/modules/drivers/conti_radar/conti_radar_canbus.cc +++ b/modules/drivers/radar/conti_radar/conti_radar_canbus.cc @@ -18,8 +18,8 @@ * @file */ -#include "modules/drivers/conti_radar/conti_radar_canbus.h" -#include "modules/drivers/conti_radar/conti_radar_message_manager.h" +#include "modules/drivers/radar/conti_radar/conti_radar_canbus.h" +#include "modules/drivers/radar/conti_radar/conti_radar_message_manager.h" #include "modules/drivers/proto/conti_radar.pb.h" /** diff --git a/modules/drivers/conti_radar/conti_radar_canbus.h b/modules/drivers/radar/conti_radar/conti_radar_canbus.h similarity index 91% rename from modules/drivers/conti_radar/conti_radar_canbus.h rename to modules/drivers/radar/conti_radar/conti_radar_canbus.h index 5dcba99de9..56ba58fe3f 100644 --- a/modules/drivers/conti_radar/conti_radar_canbus.h +++ b/modules/drivers/radar/conti_radar/conti_radar_canbus.h @@ -18,8 +18,8 @@ * @file */ -#ifndef MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ -#define MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ #include #include @@ -44,8 +44,8 @@ #include "modules/drivers/canbus/proto/can_card_parameter.pb.h" #include "modules/drivers/canbus/proto/sensor_canbus_conf.pb.h" #include "modules/drivers/canbus/sensor_gflags.h" -#include "modules/drivers/conti_radar/conti_radar_message_manager.h" -#include "modules/drivers/conti_radar/protocol/radar_config_200.h" +#include "modules/drivers/radar/conti_radar/conti_radar_message_manager.h" +#include "modules/drivers/radar/conti_radar/protocol/radar_config_200.h" #include "modules/drivers/proto/conti_radar.pb.h" /** @@ -123,4 +123,4 @@ class ContiRadarCanbus : public apollo::common::ApolloApp { } // namespace drivers } // namespace apollo -#endif // MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ +#endif // MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_CANBUS_H_ diff --git a/modules/drivers/conti_radar/conti_radar_message_manager.cc b/modules/drivers/radar/conti_radar/conti_radar_message_manager.cc similarity index 87% rename from modules/drivers/conti_radar/conti_radar_message_manager.cc rename to modules/drivers/radar/conti_radar/conti_radar_message_manager.cc index 90594b85a7..72849f8922 100644 --- a/modules/drivers/conti_radar/conti_radar_message_manager.cc +++ b/modules/drivers/radar/conti_radar/conti_radar_message_manager.cc @@ -19,16 +19,16 @@ * @brief The class of ContiRadarMessageManager */ -#include "modules/drivers/conti_radar/conti_radar_message_manager.h" - -#include "modules/drivers/conti_radar/protocol/cluster_general_info_701.h" -#include "modules/drivers/conti_radar/protocol/cluster_list_status_600.h" -#include "modules/drivers/conti_radar/protocol/cluster_quality_info_702.h" -#include "modules/drivers/conti_radar/protocol/object_extended_info_60d.h" -#include "modules/drivers/conti_radar/protocol/object_general_info_60b.h" -#include "modules/drivers/conti_radar/protocol/object_list_status_60a.h" -#include "modules/drivers/conti_radar/protocol/object_quality_info_60c.h" -#include "modules/drivers/conti_radar/protocol/radar_state_201.h" +#include "modules/drivers/radar/conti_radar/conti_radar_message_manager.h" + +#include "modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.h" +#include "modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.h" +#include "modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.h" +#include "modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.h" +#include "modules/drivers/radar/conti_radar/protocol/object_general_info_60b.h" +#include "modules/drivers/radar/conti_radar/protocol/object_list_status_60a.h" +#include "modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.h" +#include "modules/drivers/radar/conti_radar/protocol/radar_state_201.h" namespace apollo { namespace drivers { diff --git a/modules/drivers/conti_radar/conti_radar_message_manager.h b/modules/drivers/radar/conti_radar/conti_radar_message_manager.h similarity index 88% rename from modules/drivers/conti_radar/conti_radar_message_manager.h rename to modules/drivers/radar/conti_radar/conti_radar_message_manager.h index 4ab62d4a46..5413cb5101 100644 --- a/modules/drivers/conti_radar/conti_radar_message_manager.h +++ b/modules/drivers/radar/conti_radar/conti_radar_message_manager.h @@ -18,14 +18,14 @@ * @file conti_radar_message_manager.h * @brief The class of ContiRadarMessageManager */ -#ifndef MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ -#define MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ #include #include "modules/drivers/canbus/can_client/can_client_factory.h" #include "modules/drivers/canbus/can_comm/can_sender.h" #include "modules/drivers/canbus/can_comm/message_manager.h" -#include "modules/drivers/conti_radar/protocol/radar_config_200.h" +#include "modules/drivers/radar/conti_radar/protocol/radar_config_200.h" #include "modules/drivers/proto/conti_radar.pb.h" #include "modules/common/adapters/adapter_manager.h" @@ -65,4 +65,4 @@ class ContiRadarMessageManager : public MessageManager { } // namespace drivers } // namespace apollo -#endif // MODULES_DRIVERS_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ +#endif // MODULES_DRIVERS_RADAR_CONTI_RADAR_CONTI_RADAR_MESSAGE_MANAGER_H_ diff --git a/modules/drivers/conti_radar/main.cc b/modules/drivers/radar/conti_radar/main.cc similarity index 93% rename from modules/drivers/conti_radar/main.cc rename to modules/drivers/radar/conti_radar/main.cc index 4b088cca06..343f86ea42 100644 --- a/modules/drivers/conti_radar/main.cc +++ b/modules/drivers/radar/conti_radar/main.cc @@ -15,7 +15,7 @@ *****************************************************************************/ #include "modules/common/apollo_app.h" -#include "modules/drivers/conti_radar/conti_radar_canbus.h" +#include "modules/drivers/radar/conti_radar/conti_radar_canbus.h" using ::apollo::drivers::conti_radar::ContiRadarCanbus; APOLLO_MAIN(ContiRadarCanbus); diff --git a/modules/drivers/conti_radar/proto/BUILD b/modules/drivers/radar/conti_radar/proto/BUILD similarity index 100% rename from modules/drivers/conti_radar/proto/BUILD rename to modules/drivers/radar/conti_radar/proto/BUILD diff --git a/modules/drivers/conti_radar/proto/conti_radar_conf.proto b/modules/drivers/radar/conti_radar/proto/conti_radar_conf.proto similarity index 100% rename from modules/drivers/conti_radar/proto/conti_radar_conf.proto rename to modules/drivers/radar/conti_radar/proto/conti_radar_conf.proto diff --git a/modules/drivers/conti_radar/protocol/BUILD b/modules/drivers/radar/conti_radar/protocol/BUILD similarity index 100% rename from modules/drivers/conti_radar/protocol/BUILD rename to modules/drivers/radar/conti_radar/protocol/BUILD diff --git a/modules/drivers/conti_radar/protocol/cluster_general_info_701.cc b/modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.cc similarity index 96% rename from modules/drivers/conti_radar/protocol/cluster_general_info_701.cc rename to modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.cc index 2892f3b4d2..9190d0b990 100644 --- a/modules/drivers/conti_radar/protocol/cluster_general_info_701.cc +++ b/modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.cc @@ -14,14 +14,14 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/cluster_general_info_701.h" +#include "modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.h" #include "glog/logging.h" #include "modules/common/time/time.h" #include "modules/drivers/canbus/common/byte.h" #include "modules/drivers/canbus/common/canbus_consts.h" -#include "modules/drivers/conti_radar/protocol/const_vars.h" +#include "modules/drivers/radar/conti_radar/protocol/const_vars.h" namespace apollo { namespace drivers { diff --git a/modules/drivers/conti_radar/protocol/cluster_general_info_701.h b/modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.h similarity index 88% rename from modules/drivers/conti_radar/protocol/cluster_general_info_701.h rename to modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.h index 49c27c2836..4a83c1a828 100644 --- a/modules/drivers/conti_radar/protocol/cluster_general_info_701.h +++ b/modules/drivers/radar/conti_radar/protocol/cluster_general_info_701.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" @@ -53,5 +53,4 @@ class ClusterGeneralInfo701 } // namespace conti_radar } // namespace drivers } // namespace apollo - -#endif // MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H_ +#endif // MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSTER_GENERAL_INFO_701_H diff --git a/modules/drivers/conti_radar/protocol/cluster_list_status_600.cc b/modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.cc similarity index 97% rename from modules/drivers/conti_radar/protocol/cluster_list_status_600.cc rename to modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.cc index f88d10af8b..8231d4b19b 100644 --- a/modules/drivers/conti_radar/protocol/cluster_list_status_600.cc +++ b/modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/cluster_list_status_600.h" +#include "modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.h" #include "glog/logging.h" diff --git a/modules/drivers/conti_radar/protocol/cluster_list_status_600.h b/modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.h similarity index 91% rename from modules/drivers/conti_radar/protocol/cluster_list_status_600.h rename to modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.h index 367c52537d..68d2562d48 100644 --- a/modules/drivers/conti_radar/protocol/cluster_list_status_600.h +++ b/modules/drivers/radar/conti_radar/protocol/cluster_list_status_600.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSTER_LIST_STATUS_600_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSTER_LIST_STATUS_600_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSTER_LIST_STATUS_600_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSTER_LIST_STATUS_600_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/cluster_quality_info_702.cc b/modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.cc similarity index 96% rename from modules/drivers/conti_radar/protocol/cluster_quality_info_702.cc rename to modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.cc index eae778e6f9..b8c0c56ad9 100644 --- a/modules/drivers/conti_radar/protocol/cluster_quality_info_702.cc +++ b/modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.cc @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/cluster_quality_info_702.h" -#include "modules/drivers/conti_radar/protocol/const_vars.h" +#include "modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.h" +#include "modules/drivers/radar/conti_radar/protocol/const_vars.h" #include "glog/logging.h" diff --git a/modules/drivers/conti_radar/protocol/cluster_quality_info_702.h b/modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.h similarity index 92% rename from modules/drivers/conti_radar/protocol/cluster_quality_info_702.h rename to modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.h index 9a83698cec..c2b4063de1 100644 --- a/modules/drivers/conti_radar/protocol/cluster_quality_info_702.h +++ b/modules/drivers/radar/conti_radar/protocol/cluster_quality_info_702.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSER_QUALITY_INFO_702_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_CLUSER_QUALITY_INFO_702_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSER_QUALITY_INFO_702_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_CLUSER_QUALITY_INFO_702_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/const_vars.h b/modules/drivers/radar/conti_radar/protocol/const_vars.h similarity index 94% rename from modules/drivers/conti_radar/protocol/const_vars.h rename to modules/drivers/radar/conti_radar/protocol/const_vars.h index 752e1828f7..d8ddf9fabf 100644 --- a/modules/drivers/conti_radar/protocol/const_vars.h +++ b/modules/drivers/radar/conti_radar/protocol/const_vars.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_CONST_VARS_H_ -#define MODULES_DRIVERS_CONTI_RADAR_CONST_VARS_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_CONST_VARS_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_CONST_VARS_H_ namespace apollo { namespace drivers { @@ -84,4 +84,4 @@ const double OBJECT_LENGTH_RES = 0.2; } // namespace drivers } // namespace apollo -#endif // MODULES_DRIVERS_CONTI_RADAR_CONST_VARS_H_ +#endif // MODULES_DRIVERS_RADAR_CONTI_RADAR_CONST_VARS_H_ diff --git a/modules/drivers/conti_radar/protocol/object_extended_info_60d.cc b/modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.cc similarity index 96% rename from modules/drivers/conti_radar/protocol/object_extended_info_60d.cc rename to modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.cc index db3d4c34f9..7535535693 100644 --- a/modules/drivers/conti_radar/protocol/object_extended_info_60d.cc +++ b/modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.cc @@ -14,12 +14,12 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/object_extended_info_60d.h" +#include "modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.h" #include "glog/logging.h" #include "modules/drivers/canbus/common/byte.h" #include "modules/drivers/canbus/common/canbus_consts.h" -#include "modules/drivers/conti_radar/protocol/const_vars.h" +#include "modules/drivers/radar/conti_radar/protocol/const_vars.h" namespace apollo { namespace drivers { diff --git a/modules/drivers/conti_radar/protocol/object_extended_info_60d.h b/modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.h similarity index 92% rename from modules/drivers/conti_radar/protocol/object_extended_info_60d.h rename to modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.h index efc05e6133..9415783a4c 100644 --- a/modules/drivers/conti_radar/protocol/object_extended_info_60d.h +++ b/modules/drivers/radar/conti_radar/protocol/object_extended_info_60d.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_EXTENDED_INFO_60D_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_EXTENDED_INFO_60D_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_EXTENDED_INFO_60D_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_EXTENDED_INFO_60D_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/object_general_info_60b.cc b/modules/drivers/radar/conti_radar/protocol/object_general_info_60b.cc similarity index 96% rename from modules/drivers/conti_radar/protocol/object_general_info_60b.cc rename to modules/drivers/radar/conti_radar/protocol/object_general_info_60b.cc index 094e04e499..f878e08d47 100644 --- a/modules/drivers/conti_radar/protocol/object_general_info_60b.cc +++ b/modules/drivers/radar/conti_radar/protocol/object_general_info_60b.cc @@ -14,14 +14,14 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/object_general_info_60b.h" +#include "modules/drivers/radar/conti_radar/protocol/object_general_info_60b.h" #include "glog/logging.h" #include "modules/common/time/time.h" #include "modules/drivers/canbus/common/byte.h" #include "modules/drivers/canbus/common/canbus_consts.h" -#include "modules/drivers/conti_radar/protocol/const_vars.h" +#include "modules/drivers/radar/conti_radar/protocol/const_vars.h" namespace apollo { namespace drivers { diff --git a/modules/drivers/conti_radar/protocol/object_general_info_60b.h b/modules/drivers/radar/conti_radar/protocol/object_general_info_60b.h similarity index 92% rename from modules/drivers/conti_radar/protocol/object_general_info_60b.h rename to modules/drivers/radar/conti_radar/protocol/object_general_info_60b.h index 53b65e12e4..00046c80fa 100644 --- a/modules/drivers/conti_radar/protocol/object_general_info_60b.h +++ b/modules/drivers/radar/conti_radar/protocol/object_general_info_60b.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_GENERAL_INFO_60B_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_GENERAL_INFO_60B_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_GENERAL_INFO_60B_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_GENERAL_INFO_60B_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/object_list_status_60a.cc b/modules/drivers/radar/conti_radar/protocol/object_list_status_60a.cc similarity index 96% rename from modules/drivers/conti_radar/protocol/object_list_status_60a.cc rename to modules/drivers/radar/conti_radar/protocol/object_list_status_60a.cc index b9ce8a8f38..d850f9a023 100644 --- a/modules/drivers/conti_radar/protocol/object_list_status_60a.cc +++ b/modules/drivers/radar/conti_radar/protocol/object_list_status_60a.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/object_list_status_60a.h" +#include "modules/drivers/radar/conti_radar/protocol/object_list_status_60a.h" #include "glog/logging.h" diff --git a/modules/drivers/conti_radar/protocol/object_list_status_60a.h b/modules/drivers/radar/conti_radar/protocol/object_list_status_60a.h similarity index 91% rename from modules/drivers/conti_radar/protocol/object_list_status_60a.h rename to modules/drivers/radar/conti_radar/protocol/object_list_status_60a.h index 25c153b387..89452459d4 100644 --- a/modules/drivers/conti_radar/protocol/object_list_status_60a.h +++ b/modules/drivers/radar/conti_radar/protocol/object_list_status_60a.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_LIST_STATUS_60A_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_LIST_STATUS_60A_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_LIST_STATUS_60A_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_LIST_STATUS_60A_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/object_quality_info_60c.cc b/modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.cc similarity index 97% rename from modules/drivers/conti_radar/protocol/object_quality_info_60c.cc rename to modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.cc index ae509c8945..281930ae32 100644 --- a/modules/drivers/conti_radar/protocol/object_quality_info_60c.cc +++ b/modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.cc @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/object_quality_info_60c.h" -#include "modules/drivers/conti_radar/protocol/const_vars.h" +#include "modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.h" +#include "modules/drivers/radar/conti_radar/protocol/const_vars.h" #include "glog/logging.h" diff --git a/modules/drivers/conti_radar/protocol/object_quality_info_60c.h b/modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.h similarity index 93% rename from modules/drivers/conti_radar/protocol/object_quality_info_60c.h rename to modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.h index 5ad125f334..6a57765276 100644 --- a/modules/drivers/conti_radar/protocol/object_quality_info_60c.h +++ b/modules/drivers/radar/conti_radar/protocol/object_quality_info_60c.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_QUALITY_INFO_60C_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_OBJECT_QUALITY_INFO_60C_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_QUALITY_INFO_60C_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_OBJECT_QUALITY_INFO_60C_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/drivers/conti_radar/protocol/radar_config_200.cc b/modules/drivers/radar/conti_radar/protocol/radar_config_200.cc similarity index 99% rename from modules/drivers/conti_radar/protocol/radar_config_200.cc rename to modules/drivers/radar/conti_radar/protocol/radar_config_200.cc index 4330c32cfb..b7ad5d9116 100644 --- a/modules/drivers/conti_radar/protocol/radar_config_200.cc +++ b/modules/drivers/radar/conti_radar/protocol/radar_config_200.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/radar_config_200.h" +#include "modules/drivers/radar/conti_radar/protocol/radar_config_200.h" #include "modules/drivers/canbus/common/byte.h" diff --git a/modules/drivers/conti_radar/protocol/radar_config_200.h b/modules/drivers/radar/conti_radar/protocol/radar_config_200.h similarity index 94% rename from modules/drivers/conti_radar/protocol/radar_config_200.h rename to modules/drivers/radar/conti_radar/protocol/radar_config_200.h index fec002b728..449ea5d124 100644 --- a/modules/drivers/conti_radar/protocol/radar_config_200.h +++ b/modules/drivers/radar/conti_radar/protocol/radar_config_200.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" @@ -106,4 +106,4 @@ class RadarConfig200 } // namespace drivers } // namespace apollo -#endif // MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ +#endif // MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_RADAR_CONFIG_200_H_ diff --git a/modules/drivers/conti_radar/protocol/radar_state_201.cc b/modules/drivers/radar/conti_radar/protocol/radar_state_201.cc similarity index 97% rename from modules/drivers/conti_radar/protocol/radar_state_201.cc rename to modules/drivers/radar/conti_radar/protocol/radar_state_201.cc index 1f99161fcf..25c8014465 100644 --- a/modules/drivers/conti_radar/protocol/radar_state_201.cc +++ b/modules/drivers/radar/conti_radar/protocol/radar_state_201.cc @@ -14,7 +14,7 @@ * limitations under the License. *****************************************************************************/ -#include "modules/drivers/conti_radar/protocol/radar_state_201.h" +#include "modules/drivers/radar/conti_radar/protocol/radar_state_201.h" #include "glog/logging.h" diff --git a/modules/drivers/conti_radar/protocol/radar_state_201.h b/modules/drivers/radar/conti_radar/protocol/radar_state_201.h similarity index 93% rename from modules/drivers/conti_radar/protocol/radar_state_201.h rename to modules/drivers/radar/conti_radar/protocol/radar_state_201.h index 4bd609d91f..38cf009776 100644 --- a/modules/drivers/conti_radar/protocol/radar_state_201.h +++ b/modules/drivers/radar/conti_radar/protocol/radar_state_201.h @@ -14,8 +14,8 @@ * limitations under the License. *****************************************************************************/ -#ifndef MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_RADAR_STATE_201_H_ -#define MODULES_DRIVERS_CONTI_RADAR_PROTOCOL_RADAR_STATE_201_H_ +#ifndef MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_RADAR_STATE_201_H_ +#define MODULES_DRIVERS_RADAR_CONTI_RADAR_PROTOCOL_RADAR_STATE_201_H_ #include "modules/drivers/canbus/can_comm/protocol_data.h" #include "modules/drivers/proto/conti_radar.pb.h" diff --git a/modules/monitor/conf/monitor_conf.pb.txt b/modules/monitor/conf/monitor_conf.pb.txt index 16401449e0..3d43cd880c 100644 --- a/modules/monitor/conf/monitor_conf.pb.txt +++ b/modules/monitor/conf/monitor_conf.pb.txt @@ -19,7 +19,7 @@ modules { modules { name: "radar" process_conf { - process_cmd_keywords: "modules/drivers/conti_radar/conti_radar" + process_cmd_keywords: "modules/drivers/radar/conti_radar/conti_radar" } topic_conf { type: CONTI_RADAR diff --git a/modules/tools/supervisord/dev.conf b/modules/tools/supervisord/dev.conf index 090cd41902..f99f711a24 100644 --- a/modules/tools/supervisord/dev.conf +++ b/modules/tools/supervisord/dev.conf @@ -139,7 +139,7 @@ redirect_stderr=true stdout_logfile=/apollo/data/log/gnss_driver.out [program:conti_radar] -command=/apollo/bazel-bin/modules/drivers/conti_radar/conti_radar --flagfile=/apollo/modules/drivers/conti_radar/conf/conti_radar.conf --log_dir=/apollo/data/log +command=/apollo/bazel-bin/modules/drivers/radar/conti_radar/conti_radar --flagfile=/apollo/modules/drivers/radar/conti_radar/conf/conti_radar.conf --log_dir=/apollo/data/log autostart=false numprocs=1 exitcodes=0 diff --git a/modules/tools/supervisord/release.conf b/modules/tools/supervisord/release.conf index ef3f437081..859ddc5920 100644 --- a/modules/tools/supervisord/release.conf +++ b/modules/tools/supervisord/release.conf @@ -139,7 +139,7 @@ redirect_stderr=true stdout_logfile=/apollo/data/log/gnss_driver.out [program:conti_radar] -command=/apollo/modules/drivers/conti_radar/conti_radar --flagfile=/apollo/modules/drivers/conti_radar/conf/conti_radar.conf --log_dir=/apollo/data/log +command=/apollo/modules/drivers/radar/conti_radar/conti_radar --flagfile=/apollo/modules/drivers/radar/conti_radar/conf/conti_radar.conf --log_dir=/apollo/data/log autostart=false numprocs=1 exitcodes=0 diff --git a/scripts/conti_radar.sh b/scripts/conti_radar.sh index 97dfa08adb..8889c42f56 100755 --- a/scripts/conti_radar.sh +++ b/scripts/conti_radar.sh @@ -25,5 +25,5 @@ source "$DIR/apollo_base.sh" # run function from apollo_base.sh # run command_name module_name -run_customized_path drivers/conti_radar conti_radar "$@" +run_customized_path drivers/radar/conti_radar conti_radar "$@" -- GitLab