Merge branch 'fri-1.15' into fri-1.11

CMakeLists.txt

@@ -47,14 +47,14 @@ message("Found nanopb of version: " ${NANOPB_VERSION})
 
 # try to find FRIClient version
 file(READ ${CMAKE_CURRENT_BINARY_DIR}/${FRIClient_SDK_NAME}/include/friClientIf.h FRI_CLIENT_IF_HEADER)
-string(REGEX MATCH "\\version {([0-9]*).([0-9]*)}" _ ${FRI_CLIENT_IF_HEADER})
+string(REGEX MATCH "version \\{([0-9]+)\\.([0-9]+)" _ ${FRI_CLIENT_IF_HEADER})
 
 set(FRICLIENT_VERSION_MAJOR ${CMAKE_MATCH_1})
 set(FRICLIENT_VERSION_MINOR ${CMAKE_MATCH_2})
 set(FRICLIENT_VERSION ${FRICLIENT_VERSION_MAJOR}.${FRICLIENT_VERSION_MINOR})
 
 if (NOT FRICLIENT_VERSION STREQUAL "1.11")
-    message(FATAL_ERROR "Expected FRIClient ersion 1.11, found: " ${FRICLIENT_VERSION})
+    message(FATAL_ERROR "Expected FRIClient version 1.11, found: " ${FRICLIENT_VERSION})
 endif()
 
 message("Found FRIClient of version: " ${FRICLIENT_VERSION})

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.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
 To build, run

package.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="3">
+  <name>fri_client_sdk</name>
+  <version>2.0.0</version>
+  <description>CMake support for KUKA's FRI.</description>
+  <maintainer email="[email protected]">bowangFromMars</maintainer>
+  <maintainer email="[email protected]">fredRocs</maintainer>
+  <maintainer email="[email protected]">liver121888</maintainer>
+  <maintainer email="[email protected]">peterMitrano</maintainer>
+  <maintainer email="[email protected]">mhubii</maintainer>
+  <maintainer email="[email protected]">OmidRezayof</maintainer>
+
+  <license>Apache-2.0</license>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>