Skip to content

Fix incorrect thruster mapping for jointThrAllocation#1416

Open
Will-Schwend wants to merge 8 commits into
developfrom
bug/jointThrAllocation-Fix
Open

Fix incorrect thruster mapping for jointThrAllocation#1416
Will-Schwend wants to merge 8 commits into
developfrom
bug/jointThrAllocation-Fix

Conversation

@Will-Schwend

@Will-Schwend Will-Schwend commented Jun 11, 2026

Copy link
Copy Markdown
Contributor
  • Review: By commit
  • Merge strategy: Merge (no squash)

Description

This PR updates jointThrAllocation so the spacecraft center of mass (CoM) used in the thruster wrench map is computed from articulated-arm geometry and body mass properties instead of relying on a separate static CoM state input.

The main changes are:

  • updated THRArmConfigMsgPayload to include the kinematic and mass-property data needed to represent articulated spacecraft bodies
  • removed CoMStatesInMsg from jointThrAllocation, since it is no longer used
  • updated jointThrAllocation to compute r_ComB_B dynamically during the optimization based on the current joint-angle solution

Verification

Changes were validated with updated unit-test coverage and an integrated MuJoCo scenario.

Validation included:

  • updated test_jointThrAllocation.py:
    • added tests for jointPoseFromTheta and computeComFromTheta across multiple spacecraft configurations
  • updated scenarioThrArmControl.py / MuJoCo FSW setup:
    • passed the new required arm/body mass-property message data
    • removed the unused CoM state message dependency
    • updated non-pytest default simulation parameters to improve direct-run performance
    • added an integration tolerance to improve runtime
    • updated pytest scenario parameters to improve runtime

Documentation

This PR updates documentation for the revised allocation behavior:

  • removed the unused input message from src/fswAlgorithms/effectorInterfaces/jointThrAllocation/jointThrAllocation.rst
  • updated docs/source/Support/bskKnownIssues.rst
  • added the release-note snippet docs/source/Support/bskReleaseNotesSnippets/1416-JointThrAllocation-Fix.rst

Future work

N/A

@Will-Schwend Will-Schwend self-assigned this Jun 11, 2026
@Will-Schwend Will-Schwend requested a review from a team as a code owner June 11, 2026 20:04
@Will-Schwend Will-Schwend added the bug Something isn't working label Jun 11, 2026
@Will-Schwend Will-Schwend moved this to 👀 In review in Basilisk Jun 11, 2026
Will-Schwend added a commit that referenced this pull request Jun 11, 2026
@Will-Schwend Will-Schwend force-pushed the bug/jointThrAllocation-Fix branch from c50a163 to cdc1460 Compare June 11, 2026 20:10
Will-Schwend added a commit that referenced this pull request Jun 11, 2026
Will-Schwend added a commit that referenced this pull request Jun 11, 2026
Will-Schwend added a commit that referenced this pull request Jun 11, 2026
Will-Schwend added a commit that referenced this pull request Jun 11, 2026
@Will-Schwend

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: cdc1460443

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread examples/mujoco/mujocoModels/BSK_MujocoFSW.py Outdated
Comment thread examples/mujoco/sat_w_thruster_arms.xml Outdated
Comment thread examples/mujoco/mujocoModels/BSK_MujocoFSW.py Outdated
Comment thread docs/source/Support/bskKnownIssues.rst Outdated
@Will-Schwend Will-Schwend force-pushed the bug/jointThrAllocation-Fix branch from cdc1460 to beb6856 Compare June 12, 2026 15:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working

Projects

Status: 👀 In review

Development

Successfully merging this pull request may close these issues.

2 participants