Skip to content

Commit

Permalink
Merge branch 'fri-1.15' into fri-2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mhubii committed Feb 5, 2024
2 parents 7cef6da + f968ba9 commit dbeef0f
Show file tree
Hide file tree
Showing 4 changed files with 50 additions and 2 deletions.
24 changes: 24 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
cff-version: 1.2.0
message: "If you enjoyed using this repository for your work, we would really appreciate ❤️ if you could cite it, as it helps us to continue offering support."
authors:
- family-names: Huber
given-names: Martin
orcid: https://orcid.org/0000-0003-4603-6773
- family-names: Mower
given-names: Christopher E.
orcid: https://orcid.org/0000-0002-3929-9391
- family-names: Ourselin
given-names: Sebastien
orcid: https://orcid.org/0000-0002-5694-5340
- family-names: Vercauteren
given-names: Tom
orcid: https://orcid.org/0000-0003-1794-0456
- family-names: Bergeles
given-names: Christos
orcid: https://orcid.org/0000-0002-9152-3194


title: "LBR-Stack: ROS 2 and Python Integration of KUKA FRI for Med and IIWA Robots"
version: 1.4.2
doi: 10.48550/arXiv.2311.12709
date-released: 2023-12-29
Empty file modified FRI-Client-SDK_Cpp.zip
100644 → 100755
Empty file.
12 changes: 12 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
=====================================
Third party software
=====================================
Software under FRI-Client-SDK_Cpp.zip
is third party software. It is provideded
by KUKA. It contains:

- fri: Their custom license notice is included, as per condition. It can be re-distributed provided the license notice
is included.
- nanopb: A library that KUKA uses for the fri.
nanopb is distributed under zlib license Copyright (c) 2011 Petteri Aimonen <jpa at nanopb.mail.kapsi.fi>
=====================================
16 changes: 14 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# fri
![GitHub](https://img.shields.io/github/license/KCL-BMEIS/fri)

This folder adds CMake support to KUKA's Fast Robot Interface (FRI).

## Build
Expand Down Expand Up @@ -40,6 +38,20 @@ Do you use a different FRI version?
## License
Please note that we distribute the CMake support under MIT license. Please note that third party libraries under `FRI-Client-SDK_Cpp.zip` are distributed under their respective license.

## Citation
If you enjoyed using this repository for your work, we would really appreciate ❤️ if you could cite it, as it helps us to continue offering support.

```
@misc{huber2023lbrstack,
title={LBR-Stack: ROS 2 and Python Integration of KUKA FRI for Med and IIWA Robots},
author={Martin Huber and Christopher E. Mower and Sebastien Ourselin and Tom Vercauteren and Christos Bergeles},
year={2023},
eprint={2311.12709},
archivePrefix={arXiv},
primaryClass={cs.RO}
}
```

## Acknowledgements
<img src="https://medicalengineering.org.uk/wp-content/themes/aalto-child/_assets/images/medicalengineering-logo.svg" alt="wellcome" height="45" width="65" align="left">

Expand Down

0 comments on commit dbeef0f

Please sign in to comment.