Skip to content

Commit

Permalink
Changed Polyscope version support to 3.14.3 and 5.9.4
Browse files Browse the repository at this point in the history
Change the version to support urscript scalar operations
  • Loading branch information
urrsk committed Jul 1, 2023
1 parent 5c7ee37 commit 35a5476
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/industrial-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion doc/polyscope_compatibility.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)|

0 comments on commit 35a5476

Please sign in to comment.