port cob_msgs

Author: fmessmer

cob_msgs/CMakeLists.txt

@@ -1,17 +1,40 @@
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.5)
 project(cob_msgs)
-find_package(catkin REQUIRED COMPONENTS diagnostic_msgs message_generation std_msgs)
 
-add_message_files(FILES
-  AccessPoint.msg
-  DashboardState.msg
-  EmergencyStopState.msg
-  Network.msg
-  PowerState.msg
-  SafetyControllerState.msg
-  SiteSurvey.msg
-)
+# Default to C99
+if(NOT CMAKE_C_STANDARD)
+  set(CMAKE_C_STANDARD 99)
+endif()
+
+# Default to C++14
+if(NOT CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 14)
+endif()
+
+if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  add_compile_options(-Wall -Wextra -Wpedantic)
+endif()
 
-generate_messages(DEPENDENCIES diagnostic_msgs std_msgs)
+find_package(ament_cmake REQUIRED)
+find_package(builtin_interfaces REQUIRED)
+find_package(rosidl_default_generators REQUIRED)
+find_package(diagnostic_msgs REQUIRED)
+find_package(std_msgs REQUIRED)
+
+set(msg_files
+  "msg/AccessPoint.msg"
+  "msg/DashboardState.msg"
+  "msg/EmergencyStopState.msg"
+  "msg/Network.msg"
+  "msg/PowerState.msg"
+  "msg/SafetyControllerState.msg"
+  "msg/SiteSurvey.msg"
+)
+rosidl_generate_interfaces(${PROJECT_NAME}
+  ${msg_files}
+  DEPENDENCIES std_msgs diagnostic_msgs
+  ADD_LINTER_TESTS
+)
 
-catkin_package(CATKIN_DEPENDS diagnostic_msgs message_runtime std_msgs)
+ament_export_dependencies(rosidl_default_runtime)
+ament_package()

cob_msgs/COLCON_IGNORE

@@ -1,5 +1,5 @@
 # This message communicates the state of the PR2's wifi access point.
-Header header
+std_msgs/Header header
 string essid
 string macaddr
 int32 signal

cob_msgs/msg/AccessPoint.msg

@@ -1,5 +1,5 @@
 # This message communicates the state of the power system.
-Header header
+std_msgs/Header header
 float64 voltage                     # [V]
 float64 current                     # [A]
 float64 power_consumption           # [W] can only be calculated if not charging

cob_msgs/msg/PowerState.msg

@@ -1,4 +1,4 @@
-Header header
+std_msgs/Header header
 bool has_wireless_emstop
 bool has_fall_sensors
 bool has_magnetic_safety_switch

cob_msgs/msg/SafetyControllerState.msg

@@ -1,2 +1,2 @@
-Header header
+std_msgs/Header header
 Network[] networks

cob_msgs/msg/SiteSurvey.msg

@@ -1,4 +1,6 @@
-<package format="2">
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
   <name>cob_msgs</name>
   <version>0.7.8</version>
   <description>
@@ -11,12 +13,18 @@
 
   <license>Apache 2.0</license>
 
-  <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>rosidl_default_generators</buildtool_depend>
 
-  <build_depend>message_generation</build_depend>
-  <exec_depend>message_runtime</exec_depend>
+  <exec_depend>rosidl_default_runtime</exec_depend>
 
+  <test_depend>ament_lint_common</test_depend>
+
+  <member_of_group>rosidl_interface_packages</member_of_group>
   <depend>diagnostic_msgs</depend>
   <depend>std_msgs</depend>
 
+  <export>
+    <build_type>ament_cmake</build_type>
+  </export>
 </package>