-
Notifications
You must be signed in to change notification settings - Fork 92
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
Feature/impedance control #533
base: develop
Are you sure you want to change the base?
Conversation
@@ -380,22 +380,15 @@ public void executeDesiredArmCommand(RobotSide robotSide) | |||
RDXBaseUI.pushNotification("Commanding arm jointspace trajectory..."); | |||
communicationHelper.publishToController(armTrajectoryMessage); | |||
} | |||
case TASKSPACE -> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed taskspace without joints, as this is not the right way to control the arm and it's never worked.
As an external user, I want to either control the arm in jointspace or taskspace, with or without impedance control. The fact that the taskspace control is using a hybrid message shouldn't concern the user
@@ -31,6 +44,41 @@ public HandHybridJointspaceTaskspaceTrajectoryCommand(RobotSide robotSide, boole | |||
this.taskspaceTrajectoryCommand.set(taskspaceTrajectoryCommand); | |||
} | |||
|
|||
public HandHybridJointspaceTaskspaceTrajectoryCommand(RobotSide robotSide, boolean forceExecution, SE3TrajectoryControllerCommand taskspaceTrajectoryCommand, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
these messages are not used for now, but will when replaying back or using a planner that can provide the gain trajectories and feedforward trajectories
command.getSpatialAccelerationCommand().getSelectionMatrix(selectionMatrix); | ||
selectionMatrix.getAngularPart().setAxisSelection(false, false, true); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be removed
Set the selectionMatrix.getAngularPar().setAxisSelection(false,false, true) makes error.
544db5c
to
4815806
Compare
# Conflicts: # ihmc-interfaces/src/main/generated-java/controller_msgs/msg/dds/HandHybridJointspaceTaskspaceTrajectoryMessagePubSubType.java
…feature/impedance-control # Conflicts: # ihmc-interfaces/src/main/generated-java/controller_msgs/msg/dds/HandHybridJointspaceTaskspaceTrajectoryMessagePubSubType.java
Reference to impedance controller in TU/e paper:
Quadratic Programming-Based Reference Spreading
Control for Dual-Arm Robotic Manipulation With
Planned Simultaneous Impacts