Skip to content
Snippets Groups Projects

Improve armar7 platform movement

Merged Tobias Gröger requested to merge feature/improve-armar7-platform-movement into master
All threads resolved!

Merge request reports

Pipeline #19181 passed

Pipeline passed for 0231bec3 on feature/improve-armar7-platform-movement

Approval is optional
Test summary results are being parsed

Merged by Fabian ReisterFabian Reister 10 months ago (May 14, 2024 5:44pm UTC)

Merge details

  • Changes merged into master with 79b8b7f2.
  • Did not delete the source branch.

Pipeline #19182 passed

Pipeline passed for 79b8b7f2 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Fabian Reister
  • @utetg_groeger thanks for implementing this! To me, it seems to be already complete to test it on ARMAR-7. That was fast! Please also do so and let me know when you are testing it.

    Regarding merging this I have added several comments. We should allow both controllers be used in the PlatformSubUnit. As the ControlData struct is similar, we should be able to reuse parts of the existing data structures - eventually, we can also introduce a base class for both.

  • Tobias Gröger resolved all threads

    resolved all threads

  • added 1 commit

    • 35be75cc - Implement properties to choose controller

    Compare with previous version

  • added 1 commit

    • d4bc11c2 - Implement properties to choose controller

    Compare with previous version

  • added 1 commit

    • 4e612111 - Fix movement after emergency stop

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • added 1 commit

    • 256e8b12 - Implement separate 2dim CartesianVelocityRamp

    Compare with previous version

  • @utetg_groeger please let me know if I should review this PR.

  • added 1 commit

    • ad68bd49 - Fix set current velocity in controller pre activate

    Compare with previous version

  • Fabian Reister added 6 commits

    added 6 commits

    • ad68bd49...bad9c1a1 - 5 commits from branch master
    • 0231bec3 - Merge remote-tracking branch 'origin/master' into feature/improve-armar7-platform-movement

    Compare with previous version

  • mentioned in commit 79b8b7f2

  • Please register or sign in to reply
    Loading