-
Notifications
You must be signed in to change notification settings - Fork 3k
Extend ContactSensorData by force_matrix_w_history attribute
#1746
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
Conversation
|
FYI: Neither the documentation nor the unit tests mention the history of Please let me know if this is a hard requirement for this PR. |
| if self.cfg.history_length > 0: | ||
| self._data.net_forces_w_history[env_ids] = 0.0 |
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 these lines as they are redundant with the line above.
|
Thank you for this MR! Could you please update it to the latest main? There are a few merge conflicts |
) # Description This is a follow-up to #1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes #1720 ## Type of change - New feature (non-breaking change which adds functionality) ## Checklist - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
|
Closing this MR in favor of #2916 |
…aac-sim#2916) # Description This is a follow-up to isaac-sim#1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes isaac-sim#1720 ## Type of change - New feature (non-breaking change which adds functionality) ## Checklist - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
) This is a follow-up to #1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes #1720 - New feature (non-breaking change which adds functionality) - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
…aac-sim#2916) # Description This is a follow-up to isaac-sim#1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes isaac-sim#1720 ## Type of change - New feature (non-breaking change which adds functionality) ## Checklist - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
…aac-sim#2916) This is a follow-up to isaac-sim#1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes isaac-sim#1720 - New feature (non-breaking change which adds functionality) - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
…aac-sim#2916) This is a follow-up to isaac-sim#1746 by @lukasfro — thanks for the great work there! I’ve been using this feature and found it really helpful. Since the only remaining request was to resolve merge conflicts and the PR has been quiet for a bit, I went ahead and rebased it on the latest `main` to help move things forward. I branched directly off @lukasfro’s [original branch](https://github.com/lukasfro/IsaacLab/tree/feature/force_matrix_w_history) to preserve their authorship, and only applied the changes needed to resolve the conflicts. Of course, if @lukasfro prefers to continue the original PR, I’m more than happy to close this. Just hoping to be helpful and support getting this great addition merged. All credit for the original work goes to @lukasfro. Fixes isaac-sim#1720 - New feature (non-breaking change which adds functionality) - [x] I have run the [`pre-commit` checks](https://pre-commit.com/) with `./isaaclab.sh --format` - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] I have updated the changelog and the corresponding version in the extension's `config/extension.toml` file - [x] I have added my name to the `CONTRIBUTORS.md` or my name already exists there --------- Signed-off-by: Kelly Guo <kellyg@nvidia.com> Co-authored-by: lukasfro <lukas.froehlich@swiss-mile.com> Co-authored-by: Kelly Guo <kellyg@nvidia.com>
Description
As proposed in #1720, this PR extends the
ContactSensorDataclass with aforce_matrix_w_historyattribute that tracks the history of filtered contact forces.Fixes #1720
Type of change
Checklist
pre-commitchecks with./isaaclab.sh --formatconfig/extension.tomlfileCONTRIBUTORS.mdor my name already exists there