Humble対応 (#48)

* Adds namespace

* Adds Humble to industrial ci

* Changes the order of the libraries

* Removes the Foxy distribution from the CI

* Updates link

* Removes the icon and link. Will replace after the packages gets released

* Update GitHub Actions settings (#47)

* Updates build farm information and requirements

Co-authored-by: Daisuke Sato <daisuke.sato@rt-net.jp>

.github/workflows/add-tag.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Add tag
         if: startsWith(github.event.pull_request.title, 'Release') && github.event.pull_request.merged == true
         env:

.github/workflows/industrial_ci.yml

@@ -17,9 +17,9 @@ jobs:
     strategy:
       matrix:
         env:
-          - { ROS_DISTRO: foxy, ROS_REPO: ros }
+          - { ROS_DISTRO: humble, ROS_REPO: ros }
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: "ros-industrial/industrial_ci@master"
         env: ${{ matrix.env }}

README.md

@@ -11,11 +11,11 @@ ROS 2 node for the Raspberry Pi Mouse.
 [![industrial_ci](https://github.com/rt-net/raspimouse2/workflows/industrial_ci/badge.svg?branch=master)](https://github.com/rt-net/raspimouse2/actions?query=workflow%3Aindustrial_ci+branch%3Amaster)
 
 ### Source Build Status on ROS2 Buildfarm
-#### Foxy + Focal ([`foxy-devel`](https://github.com/rt-net/raspimouse2/tree/foxy-devel))
 
-| raspimouse | raspimouse_msgs |
-|:---:|:---:|
-| [![Build Status](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse__ubuntu_focal__source/badge/icon)](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse__ubuntu_focal__source/) | [![Build Status](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse_msgs__ubuntu_focal__source/badge/icon)](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse_msgs__ubuntu_focal__source/) |
+| ROS 2 + Ubuntu | raspimouse | raspimouse_msgs |
+|:---:|:---:|:---:|
+| Foxy + Focal ([`foxy-devel`](https://github.com/rt-net/raspimouse2/tree/foxy-devel)) | [![Build Status](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse__ubuntu_focal__source/badge/icon)](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse__ubuntu_focal__source/) | [![Build Status](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse_msgs__ubuntu_focal__source/badge/icon)](https://build.ros2.org/view/Fsrc_uF/job/Fsrc_uF__raspimouse_msgs__ubuntu_focal__source/) |
+| Humble + Jammy ([`humble-devel`](https://github.com/rt-net/raspimouse2/tree/humble-devel)) | **TODO** | **TODO** |
 
 ## Requirements
 
@@ -29,6 +29,7 @@ ROS 2 node for the Raspberry Pi Mouse.
   - [rt-net/RaspberryPiMouse](https://github.com/rt-net/RaspberryPiMouse)
 - ROS
   - [Foxy Fitzroy](https://index.ros.org/doc/ros2/Installation/Foxy/Linux-Install-Debians/)
+  - [Humble Hawksbill](https://docs.ros.org/en/humble/Installation/Ubuntu-Install-Debians.html)
 
 ## Installation
 

raspimouse/include/raspimouse/raspimouse_component.hpp

@@ -53,21 +53,23 @@ extern "C" {
 }  // extern "C"
 #endif
 
+#include <tf2_ros/transform_broadcaster.h>
+#include <tf2/LinearMath/Quaternion.h>
+
+#include <memory>
+
 #include <rclcpp/rclcpp.hpp>
 #include <rclcpp_lifecycle/lifecycle_node.hpp>
 #include <rclcpp_lifecycle/lifecycle_publisher.hpp>
 #include <rclcpp/time.hpp>
 #include <std_msgs/msg/int16.hpp>
 #include <std_srvs/srv/set_bool.hpp>
 #include <nav_msgs/msg/odometry.hpp>
-#include <tf2_ros/transform_broadcaster.h>
-#include <tf2/LinearMath/Quaternion.h>
 
 #include <raspimouse_msgs/msg/leds.hpp>
 #include <raspimouse_msgs/msg/switches.hpp>
 #include <raspimouse_msgs/msg/light_sensors.hpp>
 
-#include <memory>
 
 namespace raspimouse
 {

raspimouse/launch/raspimouse.launch.py

@@ -28,6 +28,7 @@
 
 def generate_launch_description():
     mouse_node = LifecycleNode(
+        namespace='',
         name='raspimouse',
         package='raspimouse', executable='raspimouse', output='screen',
         parameters=[os.path.join(get_package_share_directory(

raspimouse/src/raspimouse.cpp

@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <rclcpp/rclcpp.hpp>
-#include <memory>
-
 #include "raspimouse/raspimouse_component.hpp"
 
+#include <memory>
+#include <rclcpp/rclcpp.hpp>
+
 int main(int argc, char * argv[])
 {
   rclcpp::init(argc, argv);

raspimouse/src/raspimouse_component.cpp

@@ -14,18 +14,20 @@
 
 #include "raspimouse/raspimouse_component.hpp"
 
-#define _USE_MATH_DEFINES
 #include <cmath>
 #include <chrono>
 #include <fstream>
 #include <functional>
 #include <limits>
 #include <memory>
 #include <string>
+
 #include "rclcpp/rclcpp.hpp"
 #include "rosidl_runtime_cpp/message_initialization.hpp"
 #include "lifecycle_msgs/msg/transition.hpp"
 
+#define _USE_MATH_DEFINES
+
 using namespace std::chrono_literals;
 using CallbackReturn = rclcpp_lifecycle::node_interfaces::LifecycleNodeInterface::CallbackReturn;