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

Control the fingers and the walking through the OpenXR joystick #130

Merged
merged 21 commits into from
Oct 16, 2023

Conversation

S-Dafarra
Copy link
Collaborator

This PR takes some code of https://github.com/robotology/walking-teleoperation/tree/refactoring_and_htc

The focus is only to control the walking and the fingers. There is some code duplication with the OculusModule, but the plan in the future will be to deprecate that module.

S-Dafarra and others added 19 commits August 11, 2023 12:16
Inherited from the branch refactoring_and_htc_rebased
…if the button associated to the motion is pressed
- The buttons mask does not require the mask in conf file to have the same dimension of the number of buttons.
- The module can start even if the connection to the fingers fails. Also, there will not be continuous errors printed.
- Removed the internal state machine
- Added possibility to print buttons and axes
- The number of buttons is retrieved only once
Added "swapped" maps to control the walking.
This is to make it easier to trigger commands that require combination of buttons
Removed the dependencies from the RobotStateProvider to allow starting even when not using iFeel
@S-Dafarra
Copy link
Collaborator Author

Updated the license after #132

The PR is ready for review @GiulioRomualdi

@S-Dafarra
Copy link
Collaborator Author

Friendly ping @GiulioRomualdi

@S-Dafarra
Copy link
Collaborator Author

Friendly ping @GiulioRomualdi

Another friendly ping. This would allow moving forward in #133

Copy link
Member

@GiulioRomualdi GiulioRomualdi left a comment

Choose a reason for hiding this comment

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

Some minors comment but you can merge it as it is

Comment on lines +181 to +189
yarp::os::Bottle remoteControlBoards;
remoteControlBoards.clear();
yarp::os::Bottle& remoteControlBoardsList = remoteControlBoards.addList();
for (auto& iCubPart : iCubParts)
remoteControlBoardsList.addString("/" + robot + "/" + iCubPart);

options.put("remoteControlBoards", remoteControlBoards.get(0));
options.put("localPortPrefix", "/" + name + "/remoteControlBoard");
yarp::os::Property& remoteControlBoardsOpts = options.addGroup("REMOTE_CONTROLBOARD_OPTIONS");
Copy link
Member

Choose a reason for hiding this comment

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

Not now but we may think of using blf in the future

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is indeed a good point. TBH I copied some old existing code and I did not invest too much time on it. I have opened #134 as a reminder

modules/OpenXRJoypad_module/src/OpenXRJoypadModule.cpp Outdated Show resolved Hide resolved
modules/OpenXRJoypad_module/src/OpenXRJoypadModule.cpp Outdated Show resolved Hide resolved
modules/OpenXRJoypad_module/src/OpenXRJoypadModule.cpp Outdated Show resolved Hide resolved
S-Dafarra and others added 2 commits October 16, 2023 09:57
Explicitly using parenthesis in for loops

Co-authored-by: Giulio Romualdi <[email protected]>
@S-Dafarra
Copy link
Collaborator Author

CI passed. Merging. Thanks @GiulioRomualdi

@S-Dafarra S-Dafarra merged commit 5d0865d into master Oct 16, 2023
6 checks passed
@S-Dafarra S-Dafarra deleted the JoypadFingersModule_rebased branch March 20, 2024 14:41
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