-
Notifications
You must be signed in to change notification settings - Fork 2
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 tam control #4
Conversation
e85c5fa
to
3f12844
Compare
.vscode/settings.json
Outdated
@@ -6,7 +6,83 @@ | |||
"*.srdf": "xml", | |||
"*.rviz": "yaml", | |||
"*.config": "xml", | |||
"*.sdf": "xml" | |||
"*.sdf": "xml", |
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.
Don't need these
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.
Outdated because of the rebase?
...ller/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
Outdated
Show resolved
Hide resolved
...ller/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
Outdated
Show resolved
Hide resolved
...ller/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
Outdated
Show resolved
Hide resolved
return controller_interface::CallbackReturn::SUCCESS; | ||
} | ||
|
||
void ThrusterAllocationMatrixController::reference_callback(std::shared_ptr<geometry_msgs::msg::Wrench> msg) |
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.
Don't need this. See the relevant comment in the lambda
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.
Not sure. Same comment as the other relevant comment.
|
||
} // namespace | ||
|
||
ThrusterAllocationMatrixController::CallbackReturn ThrusterAllocationMatrixController::on_init() |
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.
Why aren't you using update_parameters
here?
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.
Not sure what you mean.
thruster_allocation_matrix_controller/src/thruster_allocation_matrix_controller.cpp
Outdated
Show resolved
Hide resolved
command_interfaces_[i].set_value(thruster_forces[i]); | ||
} | ||
|
||
// TODO: we still aren't sure if this is the correct type/way of doing this. we may need to come back and do |
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.
Add this back in before you submit the PR
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.
Noted.
|
||
// otherwise, they are all the same length and we can pack them into an Eigen matrix | ||
Eigen::MatrixXd tam_(dof_, num_thrusters_); | ||
tam_ << tam_x, tam_y, tam_z, tam_rx, tam_ry, tam_rz; |
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.
Check this in your debugging. I think Eigen is column major so things might be inserted weird.
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.
Okay, will do.
Changes Made
Please provide a description of all changes made in this PR and why the changes
are needed.
Associated Issues
Please provide a list of all open issues that this PR will close or contribute
toward closing.
Testing
Please provide a clear and concise description of the testing performed.