Skip to content

Commit

Permalink
Merge remote-tracking branch 'ammr/master' into ammr4-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
melund committed Sep 24, 2024
2 parents 24df787 + 7a08167 commit 721c825
Show file tree
Hide file tree
Showing 6 changed files with 322 additions and 319 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/nightly-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
name: test-durations-${{ matrix.test_group }}
path: |
Tests\.test_durations
include-hidden-files: true
retention-days: 1


Expand Down Expand Up @@ -124,7 +125,7 @@ jobs:
shell: python

- name: Create updated durations PR
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
push-to-fork: anybody-bot/ammr
token: ${{ secrets.DURATIONS_TOKEN }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
.JntPos.PelvisPosX,
.JntPos.PelvisPosY,
.JntPos.PelvisPosZ,
pi/180*.JntPos.PelvisRotZ,
pi/180*.JntPos.PelvisRotX,
pi/180*.JntPos.PelvisRotY,
pi/180*.JntPos.PelvisRotX
pi/180*.JntPos.PelvisRotZ
};
DriverVel={
.JntVel.PelvisPosX,
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ The default pelvis model used in all models have changed. The pelvis morphology
### 🩹 Fixed:
* Fixed an issue that prevented switching off drawing of marker arrows in CreateMarkerDriverClass in MoCap models. Updated the search string
used in `Main.ModelSetup.Views.All_MarkerArrows.Objects` to correctly pick up the arrow drawing objects.
* Fixed an issue in the PelvisGround rotation drivers in the {ref}`Free Posture Static example<example_freeposture>`. The X and Z rotation drivers
were mixed up.

### 🔧 Changed:
* Changed the Human-Ground residual implmentation in the MoCap models to use
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gallery_image: "/Applications/images/FreePostureFullBodyShoulderRhythmStatic.web
---

(sphx-glr-auto-examples-adls-and-ergonomics-plot-freeposture-py)=

(example_freeposture)=
# Free posture Models


Expand Down
Loading

0 comments on commit 721c825

Please sign in to comment.