Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ergocub no ifeel teleop #374

Merged
merged 4 commits into from
Nov 9, 2023
Merged

Ergocub no ifeel teleop #374

merged 4 commits into from
Nov 9, 2023

Conversation

S-Dafarra
Copy link
Contributor

@S-Dafarra S-Dafarra commented Nov 7, 2023

Add teleoperation files to be used without iFeel.

I think these files got lost in some branch. These are what we used for the teleoperation in Tokyo for example

@S-Dafarra S-Dafarra marked this pull request as ready for review November 7, 2023 18:03
@S-Dafarra S-Dafarra requested a review from lrapetti as a code owner November 7, 2023 18:03
Copy link
Member

@lrapetti lrapetti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, can you just update the CHANGELOG?

@S-Dafarra
Copy link
Contributor Author

Looks good, can you just update the CHANGELOG?

Sure, done in a60fb0c

@lrapetti
Copy link
Member

lrapetti commented Nov 9, 2023

I have solved the confilicts and we can merge it

@lrapetti lrapetti merged commit 1e501e3 into master Nov 9, 2023
6 checks passed
@lrapetti lrapetti deleted the ergocub_no_ifeel_teleop branch November 9, 2023 09:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants