Merge branch 'revert-7132f423' into 'master'

Revert "Initial commit"

See merge request !1

CMakeLists.txt

 cmake_minimum_required(VERSION 3.0.2)
-project(iri_lane_Detection_msgs)
+project(iri_adc_msgs)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
 # add_compile_options(-std=c++11)
@@ -8,6 +8,9 @@ project(iri_lane_Detection_msgs)
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
+  nav_msgs
+  actionlib_msgs
+  geometry_msgs
   message_generation
   std_msgs
 )
@@ -48,27 +51,31 @@ find_package(catkin REQUIRED COMPONENTS
 ## Generate messages in the 'msg' folder
 add_message_files(
   FILES
-  lane.msg
-  lanes.msg
+  adc_goal.msg
+  adc_goal_array.msg
+  feature.msg
+  feature_array.msg
 )
 
 ## Generate services in the 'srv' folder
-# add_service_files(
-#   FILES
+add_service_files(
+  FILES
+  get_opendrive_map.srv
 #   Service1.srv
 #   Service2.srv
-#)
+)
 
 ## Generate actions in the 'action' folder
-# add_action_files(
-#   FILES
+add_action_files(
+  FILES
+  adc_jury.action
 #   Action2.action
-#)
+)
 
 ## Generate added messages and services with any dependencies listed here
 generate_messages(
   DEPENDENCIES
-  std_msgs
+  nav_msgs actionlib_msgs geometry_msgs std_msgs
 )
 
 ################################################
@@ -102,7 +109,7 @@ generate_messages(
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
 #  INCLUDE_DIRS include
-#  LIBRARIES iri_lane_Detection_msgs
+#  LIBRARIES iri_adc_msgs
 #  CATKIN_DEPENDS actionlib_msgs geometry_msgs message_generation std_msgs
 #  DEPENDS system_lib
 )
@@ -120,7 +127,7 @@ include_directories(
 
 ## Declare a C++ library
 # add_library(${PROJECT_NAME}
-#   src/${PROJECT_NAME}/iri_lane_Detection_msgs.cpp
+#   src/${PROJECT_NAME}/iri_adc_msgs.cpp
 # )
 
 ## Add cmake target dependencies of the library
@@ -131,7 +138,7 @@ include_directories(
 ## Declare a C++ executable
 ## With catkin_make all packages are built within a single CMake context
 ## The recommended prefix ensures that target names across packages don't collide
-# add_executable(${PROJECT_NAME}_node src/iri_lane_Detection_msgs_node.cpp)
+# add_executable(${PROJECT_NAME}_node src/iri_adc_msgs_node.cpp)
 
 ## Rename C++ executable without prefix
 ## The above recommended prefix causes long target names, the following renames the
@@ -195,7 +202,7 @@ include_directories(
 #############
 
 ## Add gtest based cpp test target and link libraries
-# catkin_add_gtest(${PROJECT_NAME}-test test/test_iri_lane_Detection_msgs.cpp)
+# catkin_add_gtest(${PROJECT_NAME}-test test/test_iri_adc_msgs.cpp)
 # if(TARGET ${PROJECT_NAME}-test)
 #   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
 # endif()

action/adc_jury.action

+###action
+#goals
+adc_goal_array goals
+---
+#result
+---
+#feedback
+string status
+geometry_msgs/PoseStamped base_position

msg/adc_goal.msg

+#type definitions
+uint8 PASSTHROUGH_GOAL=0
+uint8 STOP_GOAL=1
+uint8 PARKING_GOAL=2
+
+string id       # goal identifier
+float32 x       # x coordinates in meters [m]
+float32 y       # y coordinate in meters [m]
+float32 yaw     # yaw orientation in radians [rad]
+int32 type      # see type definitions above

msg/lanes.msg → msg/adc_goal_array.msg

 Header     header
-lane[]     lanes
+adc_goal[] goals

msg/feature.msg

+geometry_msgs/Pose pose
+float32 probability
+int32 type

msg/feature_array.msg

+Header     header
+feature[] features

msg/lane.msg

-float32[] lane_x
-float32[] lane_y

package.xml

 <?xml version="1.0"?>
 <package format="2">
-  <name>iri_lane_Detection_msgs</name>
+  <name>iri_adc_msgs</name>
   <version>1.0.0</version>
-  <description>The iri_lane_Detection_msgs package</description>
+  <description>The iri_adc_msgs package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
   <!-- Example:  -->
@@ -19,7 +19,7 @@
   <!-- Url tags are optional, but multiple are allowed, one per tag -->
   <!-- Optional attribute type can be: website, bugtracker, or repository -->
   <!-- Example: -->
-  <!-- <url type="website">http://wiki.ros.org/iri_lane_Detection_msgs</url> -->
+  <!-- <url type="website">http://wiki.ros.org/iri_adc_msgs</url> -->
 
 
   <!-- Author tags are optional, multiple are allowed, one per tag -->
@@ -49,10 +49,19 @@
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>actionlib_msgs</build_depend>
+  <build_depend>geometry_msgs</build_depend>
   <build_depend>message_generation</build_depend>
   <build_depend>std_msgs</build_depend>
+  <build_export_depend>actionlib_msgs</build_export_depend>
+  <build_export_depend>geometry_msgs</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
+  <build_export_depend>nav_msgs</build_export_depend>
+  <exec_depend>actionlib_msgs</exec_depend>
+  <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>std_msgs</exec_depend>
+  <exec_depend>nav_msgs</exec_depend>
+
 
   <!-- The export tag contains other, unspecified, tags -->
   <export>

srv/get_opendrive_map.srv

+---
+nav_msgs/OccupancyGrid opendrive_map