Merge pull request #121 from flynneva/devel

update main before removing legacy branches
flynneva · May 6, 2023 · 9304e48 · 9304e48
2 parents 23aaf5e + 623af3e
commit 9304e48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/ros_ci.yml b/.github/workflows/ros_ci.yml
@@ -14,14 +14,19 @@ jobs:
       matrix:
         ros_distribution:
           - foxy
+          - humble
           - rolling
         include:
           # Foxy Fitzroy (June 2020 - May 2023)
           - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-foxy-ros-base-latest
             ros_distribution: foxy
             ros_version: 2
+          # Humble Hawksbill  (May 2022 - 2027
+          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-humble-ros-base-latest
+            ros_distribution: humble
+            ros_version: 2    
           # Rolling Ridley  (June 2020 - Present)
-          - docker_image: rostooling/setup-ros-docker:ubuntu-focal-ros-rolling-ros-base-latest
+          - docker_image: rostooling/setup-ros-docker:ubuntu-jammy-ros-rolling-ros-base-latest
             ros_distribution: rolling
             ros_version: 2
     container:

diff --git a/grbl_ros/_command.py b/grbl_ros/_command.py
@@ -167,7 +167,7 @@ def parse_status(self, status):
                 'Received status from machine does not have required fields')
             self.node.get_logger().warn(
                 'Status should always include machine state and current position')
-            self.node.get_logger().warn('Received: %s'.format(status))
+            self.node.get_logger().warn('Received: %s'.format(str(status)))
 
     def handle_current_pose(self, pose):
         transforms = []

diff --git a/package.xml b/package.xml
@@ -15,7 +15,6 @@
 
   <test_depend>ament_copyright</test_depend>
   <test_depend>ament_flake8</test_depend>
-  <test_depend>ament_pep257</test_depend>
   <test_depend>python3-pytest</test_depend>
 
   <export>