From 35a547680d52f8453b094375771c8a5f2dffc615 Mon Sep 17 00:00:00 2001 From: urrsk <41109954+urrsk@users.noreply.github.com> Date: Fri, 30 Jun 2023 19:39:37 +0200 Subject: [PATCH] Changed Polyscope version support to 3.14.3 and 5.9.4 Change the version to support urscript scalar operations --- .github/workflows/ci.yml | 4 ++-- .github/workflows/industrial-ci.yml | 10 +++++----- README.md | 4 ++-- doc/polyscope_compatibility.md | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f67cdb5..ca6ed4d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,13 +12,13 @@ jobs: BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' CTEST_OUTPUT_ON_FAILURE: 1 ROBOT_MODEL: 'ur5' - URSIM_VERSION: '3.12.1' + URSIM_VERSION: '3.14.3' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/cb3' - DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' CTEST_OUTPUT_ON_FAILURE: 1 ROBOT_MODEL: 'ur5e' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' steps: diff --git a/.github/workflows/industrial-ci.yml b/.github/workflows/industrial-ci.yml index ef105d32..6d3860f6 100644 --- a/.github/workflows/industrial-ci.yml +++ b/.github/workflows/industrial-ci.yml @@ -25,7 +25,7 @@ jobs: DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS_Driver#master https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS_Driver/master/.melodic.rosinstall" DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' ROBOT_MODEL: 'ur5e' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' - ROS_DISTRO: noetic @@ -35,7 +35,7 @@ jobs: BUILDER: catkin_tools DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' ROBOT_MODEL: 'ur5e' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' - ROS_DISTRO: galactic @@ -44,7 +44,7 @@ jobs: DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#galactic" DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' ROBOT_MODEL: 'ur5e' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' NOT_TEST_DOWNSTREAM: true @@ -54,7 +54,7 @@ jobs: DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#humble https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS2_Driver/humble/Universal_Robots_ROS2_Driver-not-released.humble.repos" DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' ROBOT_MODEL: 'ur5e' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' NOT_TEST_DOWNSTREAM: true @@ -64,7 +64,7 @@ jobs: DOWNSTREAM_WORKSPACE: "github:UniversalRobots/Universal_Robots_ROS2_Driver#main https://raw.githubusercontent.com/UniversalRobots/Universal_Robots_ROS2_Driver/main/Universal_Robots_ROS2_Driver-not-released.rolling.repos" DOCKER_RUN_OPTS: --network ursim_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' - URSIM_VERSION: '5.5.1' + URSIM_VERSION: '5.9.4' ROBOT_MODEL: 'ur5e' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' NOT_TEST_DOWNSTREAM: true diff --git a/README.md b/README.md index f7fd515e..c49b75a8 100644 --- a/README.md +++ b/README.md @@ -32,8 +32,8 @@ implemented in order to create external applications leveraging the versatility robotic manipulators. ## Requirements - * **Polyscope** (The software running on the robot controller) version **3.12.0** (for CB3-Series), - or **5.5.1** (for e-Series) or higher. If you use an older Polyscope version it is suggested to + * **Polyscope** (The software running on the robot controller) version **3.14.3** (for CB3-Series), + or **5.9.4** (for e-Series) or higher. If you use an older Polyscope version it is suggested to update your robot. If for some reason (please tell us in the issues why) you cannot upgrade your robot, please see the [version compatibility table](doc/polyscope_compatibility.md) for a compatible tag. diff --git a/doc/polyscope_compatibility.md b/doc/polyscope_compatibility.md index 9aad4b1f..b4e023b2 100644 --- a/doc/polyscope_compatibility.md +++ b/doc/polyscope_compatibility.md @@ -14,4 +14,4 @@ your robot. |Polyscope version | Maximum tag | Breaking changes | |------------------|-------------|------------------| -| < 3.12.0 / 5.5.1 | [polyscope_compat_break_1](https://github.com/UniversalRobots/Universal_Robots_Client_Library/tree/polyscope_compat_break_1) | [tcp_offset in RTDE interface](https://github.com/UniversalRobots/Universal_Robots_Client_Library/pull/110)| +| < 3.14.3 / 5.9.4 | [polyscope_compat_break_1](https://github.com/UniversalRobots/Universal_Robots_Client_Library/tree/polyscope_compat_break_1) | [tcp_offset in RTDE interface](https://github.com/UniversalRobots/Universal_Robots_Client_Library/pull/110)|