diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 42ac24e6..fe788e56 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -52,7 +52,7 @@ RUN apt-get update && \ RUN mkdir ~/source_code RUN cd ~/source_code && git clone https://github.com/frankaemika/libfranka.git \ && cd libfranka \ - && git switch 0.13.2 \ + && git checkout 0.13.3 \ && git submodule init \ && git submodule update \ && mkdir build && cd build \ diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 7e05bde7..d29e9951 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -9,7 +9,7 @@ services: tty: true stdin_open: true volumes: - - ../:/workspaces/src + - ../:/workspaces - /tmp/.X11-unix:/tmp/.X11-unix - $XAUTHORITY:$XAUTHORITY - ./limits.conf:/etc/security/limits.conf diff --git a/CHANGELOG.md b/CHANGELOG.md index 5115b792..c1d75998 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## 0.1.13 - 2024-01-18 + +Requires libfranka >= 0.13.2, requires ROS 2 Humble + +* update libfranka dependency on devcontainer to 0.13.3(requires system image 5.5.0) +* fix .devcontainer typo + ## 0.1.12 - 2024-01-12 Requires libfranka >= 0.13.2, requires ROS 2 Humble diff --git a/Dockerfile b/Dockerfile index dfcd803d..30ff5906 100644 --- a/Dockerfile +++ b/Dockerfile @@ -60,7 +60,7 @@ RUN python3 -m pip install -U \ RUN mkdir ~/source_code RUN cd ~/source_code && git clone https://github.com/frankaemika/libfranka.git \ && cd libfranka \ - && git checkout 0.13.2 \ + && git checkout 0.13.3 \ && git submodule init \ && git submodule update \ && mkdir build && cd build \ diff --git a/franka_bringup/package.xml b/franka_bringup/package.xml index 5e6a0188..18c563de 100644 --- a/franka_bringup/package.xml +++ b/franka_bringup/package.xml @@ -2,7 +2,7 @@ franka_bringup - 0.1.12 + 0.1.13 Package with launch files and run-time configurations for using Franka Robotics research robots with ros2_control Franka Robotics GmbH Apache 2.0 diff --git a/franka_description/package.xml b/franka_description/package.xml index 461da641..98eb869e 100644 --- a/franka_description/package.xml +++ b/franka_description/package.xml @@ -2,7 +2,7 @@ franka_description - 0.1.12 + 0.1.13 franka_description contains URDF files and meshes ofFranka Robotics robots Franka Robotics GmbH Apache 2.0 diff --git a/franka_example_controllers/package.xml b/franka_example_controllers/package.xml index b97f850f..940067a6 100644 --- a/franka_example_controllers/package.xml +++ b/franka_example_controllers/package.xml @@ -2,7 +2,7 @@ franka_example_controllers - 0.1.12 + 0.1.13 franka_example_controllers provides example code for controllingFranka Robotics research robots with ros2_control Franka Robotics GmbH Apache 2.0 diff --git a/franka_gripper/CMakeLists.txt b/franka_gripper/CMakeLists.txt index 3d4b74e0..3bc220df 100644 --- a/franka_gripper/CMakeLists.txt +++ b/franka_gripper/CMakeLists.txt @@ -19,7 +19,7 @@ find_package(std_srvs REQUIRED) find_package(sensor_msgs REQUIRED) find_package(control_msgs REQUIRED) -find_package(Franka 0.13.0 REQUIRED) +find_package(Franka 0.13.2 REQUIRED) add_library(gripper_server SHARED src/gripper_action_server.cpp) diff --git a/franka_gripper/package.xml b/franka_gripper/package.xml index 8321ab24..4447d0e5 100644 --- a/franka_gripper/package.xml +++ b/franka_gripper/package.xml @@ -2,7 +2,7 @@ franka_gripper - 0.1.12 + 0.1.13 This package implements the franka gripper of type Franka Hand for the use in ROS2 Franka Robotics GmbH Apache 2.0 diff --git a/franka_hardware/CMakeLists.txt b/franka_hardware/CMakeLists.txt index 49c9b01a..aeecab6b 100644 --- a/franka_hardware/CMakeLists.txt +++ b/franka_hardware/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(rclcpp REQUIRED) find_package(franka_msgs REQUIRED) find_package(hardware_interface REQUIRED) find_package(pluginlib REQUIRED) -find_package(Franka 0.13.0 REQUIRED) +find_package(Franka 0.13.2 REQUIRED) find_package(rclcpp_components REQUIRED) add_library(franka_hardware diff --git a/franka_hardware/package.xml b/franka_hardware/package.xml index 1cbac928..f8664550 100644 --- a/franka_hardware/package.xml +++ b/franka_hardware/package.xml @@ -2,7 +2,7 @@ franka_hardware - 0.1.12 + 0.1.13 franka_hardware provides hardware interfaces for using Franka Robotics research robots with ros2_control Franka Robotics GmbH Apache 2.0 diff --git a/franka_moveit_config/package.xml b/franka_moveit_config/package.xml index d54dbb24..f0c27fdb 100644 --- a/franka_moveit_config/package.xml +++ b/franka_moveit_config/package.xml @@ -2,7 +2,7 @@ franka_moveit_config - 0.1.12 + 0.1.13 Contains Moveit2 configuration files for Franka Robotics research robots Franka Robotics GmbH Apache 2.0 diff --git a/franka_msgs/package.xml b/franka_msgs/package.xml index 338daade..b75d8511 100644 --- a/franka_msgs/package.xml +++ b/franka_msgs/package.xml @@ -2,7 +2,7 @@ franka_msgs - 0.1.12 + 0.1.13 franka_msgs provides messages and actions specific to Franka Robotics research robots Franka Robotics GmbH Apache 2.0 diff --git a/franka_robot_state_broadcaster/package.xml b/franka_robot_state_broadcaster/package.xml index 00266027..bf1ee7e8 100644 --- a/franka_robot_state_broadcaster/package.xml +++ b/franka_robot_state_broadcaster/package.xml @@ -1,7 +1,7 @@ franka_robot_state_broadcaster - 0.1.12 + 0.1.13 Broadcaster to publish robot states Franka Robotics GmbH Apache 2.0 diff --git a/integration_launch_testing/package.xml b/integration_launch_testing/package.xml index 3d8a75f4..8559e06a 100644 --- a/integration_launch_testing/package.xml +++ b/integration_launch_testing/package.xml @@ -2,7 +2,7 @@ integration_launch_testing - 0.1.12 + 0.1.13 Functional integration tests for franka controllers Franka Robotics GmbH Apache 2.0