From 0ac3258745c2e672c4b69e62faaf71c198bf5aab Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Thu, 20 Mar 2025 10:21:19 +0100 Subject: [PATCH 1/3] Add PolyScope X integration test configuration --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1d54a1d1..f2610b8ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,6 +26,9 @@ jobs: - ROBOT_MODEL: 'ur20' URSIM_VERSION: 'latest' PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/e-series' + - ROBOT_MODEL: 'ur5e' + URSIM_VERSION: '10.7.0' + PROGRAM_FOLDER: 'tests/resources/dockerursim/programs/polyscopex' steps: - uses: actions/checkout@v4 From 98dbc1044aabdeaa52c7f4f6c3469ec8ec24d1d1 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Thu, 20 Mar 2025 10:54:43 +0100 Subject: [PATCH 2/3] Do not run dashboard example on PolyScopeX --- examples/dashboard_example.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/examples/dashboard_example.cpp b/examples/dashboard_example.cpp index 1e7232cf9..b4264ed87 100644 --- a/examples/dashboard_example.cpp +++ b/examples/dashboard_example.cpp @@ -33,8 +33,12 @@ #include #include +#include #include +#include #include +#include "ur_client_library/comm/pipeline.h" +#include "ur_client_library/primary/primary_client.h" using namespace urcl; @@ -55,6 +59,18 @@ int main(int argc, char* argv[]) robot_ip = std::string(argv[1]); } + urcl::comm::INotifier notifier; + urcl::primary_interface::PrimaryClient primary_client(robot_ip, notifier); + primary_client.start(); + auto version_information = primary_client.getRobotVersion(); + if (version_information->major >= 10) + { + std::stringstream ss; + ss << "Robot has version " << *version_information << ". This example is not compatible with PolyScope X"; + URCL_LOG_ERROR(ss.str().c_str()); + return 0; + } + // Connect to the robot Dashboard Server auto my_dashboard = std::make_unique(robot_ip); if (!my_dashboard->connect()) From 98d9444e081c194e6c1f21c85eff367be06406c4 Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Thu, 20 Mar 2025 11:22:54 +0100 Subject: [PATCH 3/3] Do not generate and upload flight report for 10.7 --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f2610b8ce..c18138110 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -71,7 +71,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} flags: ${{ matrix.env.ROBOT_MODEL }}-${{ matrix.env.URSIM_VERSION }} - name: Generate URSim log files - if: always() + if: always() && matrix.env.URSIM_VERSION != '10.7.0' run: | nc -q 1 192.168.56.101 29999 <