From 528b13d217b16ed74d3b403216676e9fa6bb0c66 Mon Sep 17 00:00:00 2001 From: matija9 Date: Mon, 3 Feb 2025 11:51:37 +0100 Subject: [PATCH 1/3] Fixed CMake to accept appropriate version of FRI SDK. Version in SDK is marked as 2.5 even thou it is downloaded from robot running on version 2.6 so CMake is also configured to request version 2.5 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d9216cb..3474127 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,8 +59,8 @@ set(FRI_CLIENT_VERSION_MAJOR ${CMAKE_MATCH_1}) set(FRI_CLIENT_VERSION_MINOR ${CMAKE_MATCH_2}) set(FRI_CLIENT_VERSION ${FRI_CLIENT_VERSION_MAJOR}.${FRI_CLIENT_VERSION_MINOR}) -if (NOT FRI_CLIENT_VERSION STREQUAL "1.15") - message(FATAL_ERROR "Expected FRIClient version 1.15, found: " ${FRI_CLIENT_VERSION}) +if (NOT FRI_CLIENT_VERSION STREQUAL "2.5") + message(FATAL_ERROR "Expected FRIClient version 2.5, found: " ${FRI_CLIENT_VERSION}) endif() message("Found FRIClient of version: " ${FRI_CLIENT_VERSION}) From 1755ff112977284ad5add8b4bbdf91f58c1bb084 Mon Sep 17 00:00:00 2001 From: matija9 Date: Tue, 4 Feb 2025 09:24:35 +0100 Subject: [PATCH 2/3] Added 2.6 to the version table --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a57b395..cd0275c 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ This folder adds CMake support to KUKA's Fast Robot Interface (FRI). | `1.15` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.15)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) | | `1.16` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-1.16)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) | | `2.5` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.5)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) | +| `2.6` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.6)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) | | `2.7` | [![Build status](https://github.com/lbr-stack/fri/actions/workflows/build.yaml/badge.svg?branch=fri-2.7)](https://github.com/lbr-stack/fri/actions/workflows/build.yaml) | ## Build From ad3f952ef6df82c623f3673db24fdde7cd6009e0 Mon Sep 17 00:00:00 2001 From: Matija Markulin <30287515+matija9@users.noreply.github.com> Date: Tue, 4 Feb 2025 09:29:48 +0100 Subject: [PATCH 3/3] Update build.yaml for correct branch --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 067a11d..0310d5a 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -5,7 +5,7 @@ on: push: pull_request: branches: - - fri-1.15 + - fri-2.6 schedule: - cron: "0 0 1 * *" # monthly