Conversation
This is currently driven by a rhythm
Move RUHM variable inside #if scope
This fix is part of the change from RUH Model
included #if for Tibial Scaling -otherwise error when using no legs.
melund
force-pushed
the
master
branch
3 times, most recently
from
fd40f11 to
aad6932
Compare
melund
force-pushed
the
master
branch
2 times, most recently
from
35d2fb7 to
99c9da1
Compare
There is still some drivers missing
* Update arm joint-moment measures * add changelog entry * Deprecate BM_MANNEQUIN_DRIVER_ANKLE_EVERSION * Add changelog entry * Remove use of deprecated _CONST_* swtiches * Backport the SternalBody Segment reference (#641) The sternum is split into two segments in the upcomming thoracic model. This backports that structure for the rigid thorax. * update micromamba ci package to 22 * Use internally hosted micromamba * Addapt to new micromamba interface * Update compare reference CI * Move trunk modelparameters to invidual folders * Fix references for lumbar ligaments * Ensure CType can be overriden in default mannequin drivers * Add changelog entry [Skip ci] * Update changelog and fix small bug * Simplify default driver template structure * Don't use variables named 'r' * add changelog entry * Update changelog * add OpenGraph html tags for link previews * Update Docs/environment.yaml * fix squat model loading error When disabling the shoulder rhythm there where a comma to much. * Fix typo in define statement * Bvh-box-model (#651) * add bvh box lift model example * update box description * fix .anyset missing file error * add test of model * fix ignoring of gitkeep files * Fix typos in comments * Substitute depth by length. Depth and height have similar meaning for description of box dimensions. Co-authored-by: dsc <dsc@anybodytech.com> * add missing documentation for boxlift example * fix typo * Fixed a lack of robustness with the `buckle support`. Muscle recruitment could previously fail with high lumbar flexion. A small support "artificial muscle" has beeen added to the buckle segment, preventing muscle reqruitment from failing. * Update AnyBody webpage links * More link updates * Exo concept example JR (#656) * Concept Exo Example from JR's webcast on 28 March 2022. First and last frames of BVH_BoxLift model Trial 5 have been updated. * Documentation of ExoExample JR: Work in Progress * Documentation of ExoExample JR * Update Documentation of Exo Concept example * Remove path statement for output folder (default statement is correct). Fix code for selecting trial folder. and update comments * Add test model for Exo Example. * update AMMR Changelog * Update Application/Examples/ExoskeletonConcept/ExoConcept_BoxLift.main.any * Update Tests/Applications/test_ExoConcept_BoxLift.any * Update comments to add instruction in the beginning for using the code in own model. * Make EXO_CONCEPT 4 the default so it matches the image * Update image generating test file Co-authored-by: dsc <dsc@anybodytech.com> * Add video creation script to AMMR examples (#581) * Add video creation script to AMMR example This update assumes ffmpeg will be in the AMS install directory * Add camera to bvh model * Update camera class template and AMMR examples Now many examples have a built in camera. * Add more CreateVideo files * Ensure the VideoInputFrameRate is always valid * Add changelog entry * Update gitignore for video file output * Add video operation for bench press * Update template to handle missing ffmpeg * Update MoCap video script to look like other examples * New DEBUG setup for video examples * Add overlay option * Remove video from standing lift. It was a static model anyway * Add video script to wheelchair model * Rename overlay option * Fix missing detailed hand drivers * Remove the use of default to keep backward compat * Release prep for AMMR 2.4 (#657) * Update changelog entry * Update versions * Update doc build environment * add ammr 2.4 relase note anchor in docs * Exo example peg (#658) * Trunk exoskeleton concept example from PEG * Add test model for trunk exo concept * Add documentation of trunk exo concept model. (Small fix: Hide drawing of one reference frame in the model) * Update AMMR Changelog * Split news into examples and features (#659) * Split news into examples and features * Fix links in new example models. Delete repetitive model entries from new section. Fix link to TLEM 2 in femoral torsion tool page. Co-authored-by: dsc <dsc@anybodytech.com> * Simplify selected output for arms. (#660) There is now only a single SelectOutput file for both the configuration with and without muscles. * Fix wrong sign for the wrist flexion variable given in mannequin files (#661) * Fix a wrong sign for wrist joint flexion * Update changelog * Swap sign on previous incorrect wrist flexion variables * Rename Any*Muscle to AnyMuscle* (#662) * Remove the use of deprecated muscle class names * Remove the use of deprecated Ligament class name * Add changelog entry * Run tests on new 7.4 * Remove debug drawing * Small release prep (#663) * Ensure the VideoTool Create Video is visible in operation dropdown * Add example of creating videos in half speed. * Simplify main libdef * Update itermediate MoCap files * Update release date * Fix load problem for knee simulator example (#665) * Fix load problem for knee simulator example * Use overlay from assist folder if it exists * Pin sphinx build packages * Fix paths * fix syntax in "contribute" docs * Update BodyModelConfiguration.any * Activate 7.5 beta tests, exclude linux for now (#667) * Exclude test failures in 7.5 beta (#669) * Minor cleanup (#670) * Hide local create-video opration in mocap models * Exclude failures on 7.5 beta * BVH Xsens TrialSpecificData.any missing ";" (#668) * Update TrialSpecificData.any Missing semicolon * Update CHANGELOG.md Co-authored-by: Morten Enemark Lund <melund@gmail.com> * Fix typo in MoCap model create video links * Still problems with create video refernce * Updated references * Update regensburg_ulm_hand_model.md * Fix issue with Sacrum interface morphing (#673) * Fix issue with sacrum interface morphing, when using the Trunk pelvis with the TLEM2 legs The Interface morphing for the sacrum had very closely spaced points, which caused problems with the RBF algorithm. * Add changelog entry * Also fix TLEM1 interface morphing * Latisimus calibration (#677) * Fix latissimus dorsi calibraiton This fixes the missing calibration for the new latissimus dorsi elements. It also ensure all latissimus dorsi elements are calibrated at the same posture. * Clean up armcal0 This ensure that the only real muscle are calibrated in armcal0. This is purely a cleanup, since calibration has no effect on 'AnyGeneralMuscle' * Add changelog entry * Update CHANGELOG.md * Adjust the range of motion for trunk evaluate joint strength (#679) * Release prep for 2.4.1 (#678) * Add old names for seat_contact nodes, to improve backwards compatibility. * Update versions and dates * fix minor typos Co-authored-by: dsc <dsc@anybodytech.com> * Optimize bv horigin (#671) * define target points on floor and square wave fun test. Switch off muscles in bodymodel. * Small working example that can optimize BVH origin for small translational offsets (<0.5m). Optimizing for angular offset needs more work. * Optimization improvement: Driving BVH stick figure points to the target points. This greatly improves the offset (linear and angular) that can be accepted in the optimization. * Attempt to Optimize origin using AnyKinMotion on a single node but including rotational measures as well * Class template for optimizing BVH origin. WIP * Working class template for LFoot and RFoot * Class template with hand targets * Create new BVH example for optimizing origin. Plus add foot/hand prints for target frame and warning for missing load parameters from variable * Switch optimization to use AnyKinMotion. This allows to locate hand/foot targets on AnySeg. * Class template code cleanup and plan example of class template * Comments in BVH Optimize origin demo. Revert Trial specific data file of BVH_Xsens model to original version. * Revert BVH Xsens model to master * Add comments in class template * Rename file and remove unnecessary file * Add documentation page in AMMR and update changelog. More comments in the model files. * Fix typos in documentation pages of BVH Xsens and BVH Xsens box lift. * Add Test model * Add #ifndef for TARGET_SEG in example to make sure AMMR test model works on different define statements * Define load parameters from as blank in the test model to prevent errors in RunApplication.LoadParameters * Add code for multiple implementation of class template (in the class template and demo in the example model). Add sequence of operations for running and saving the optimization study. Update subject anthropometry * Update test model to include two new cases of target seg * Refactor code to relocate class template in AnyMocap folder, box in model folder. * Update documentation * Delete test file and lines to include the test file * Delete entry about previous AMMR version from the documentation page * Switch ACTIVE_TIME definition as AnyVar Co-authored-by: dsc <dsc@anybodytech.com> * Simpler gh joint humero ulnar joint 2 (#680) The anyscript implemenatation of the acromio-clavicuala, sterno-clavicular, gleno-humeral, and elbow joints have been refactored. They now use explicit AnyScript joint classes (e.g. AnySphericalJoint)instead of implementing the joints directly with measures and constraints. This simplifies the implementation, but also changes the structure of the model tree. However, it has no influence the kinematics of the model, which remains identical. The new names of the explicit joint objects in ShoulderArm.Jnt are: SternoClavicularJoint (-3 DOF) AcromioClavicularJoint (-3 DOF) GlenoHumeralJoint (-3 DOF) HumeroUlnarJoint (-5 DOF) HumeroRadialJoint (-1 DOF) DistalRadioUlnarJoint (-2 DOF) ProximalRadioUlnarJoint (-2 DOF) * Update changelog entry * Update CHANGELOG.md * Don't export changelog * Update ammr-doc.yaml * Update environment.yaml * Patch optimize bvh origin (#683) * Fix BVH optimize origin class template when same segment is optimized twice in the same model. Update example model (and test model) with additional demo (Target Seg 7) Update AMMR changelog * Update vertical position of target foot print * Update changelog to include change in position of target foot drawing * Update description for box lift model (#682) * Minor fix scaling from bvh (#685) * Change calculation of pelvis width to use sRel of reference nodes on the same segment. Delete bvh file of Trial 07 from box lift example. * Update changelog entry (only for change in calculation of pelvis width). * add latissimus dorsi 6-11 and pec major thoracic 6-10 for moment arm evaluation (#688) * Fix signs for `ThoraxSkullRotation` and `ThoraxSkullLateralbending` variables (#689) * Change skull thorax measures signs consistant This makes the signs for lateral bending and rotation consistant with the rest of the spine. * Fixed potentially wrong skullflexion sign in examples No flexion angle was set in these examples, but this ensure the sign is correct if the users chooses to change the variable. * Add changelog entry * Update nighly-tests.yml * Fix calibration test ignores (#690) * Update versions (#691) * Update to test with 7.4.2 on linux * Fix calibration study warnings (#693) * Explicitly include muscles to prevent picking up muscle which can't be calibrated. * Exclude Sternocleidomastoid from calibration It is not a 3 element muscle because it was moved from the neck-spine model. * Ignore 7.5 beta warnings about calibration issues * Try to fix test stability A lower force in evaluate joint strength study may help. * MoCap model improvements (#694) * Remove unnecessary define * Redefine ROOT_TOKEN component config * Change UnallowCombination error implementation error define * Add helper class templates for common class operations This adds helper class templates for the "Update Values", "Load Values", and "Save Values" class operations * Add _BM_PELVIS_DISPLAY_ internal define to undef file * Add guards for define statements * Improves JointAngleOptimize file for easier reuse * Don't use class templates for TrialSpecificData folders * Remove the use of MarkerName argument in Marker class * Add changelog entry * Update test specification * Fix a problem with CreateVideo visibility in operation menu (#695) The CreateVideo operation was not visible in some the MoCap examples. This i has been fixed, but it requires that users update their applications with the new `CreateVideo.any` file from the examples. * Fix worng marker name (#696) The marker driver name is now used to lookup the marker. So the name must be correct. This fixes a test regression. No changelog entry is needed for this fix. * Update corrected marker name in anyset files (#697) * Update corrected marker name in anyset files (#698) * Don't run specific test for Beta versions * Build docs only from ammr-* tags * Fix wrapping problem in 2 parameter calibration for the posterior deltoid muscle (#703) * Use finer time descritization in 2 param calibration, This will solve a problem with muscle wrapping of the deltoid muscle. * Add changelog entry * Update load-time position of the box according to the hands. Automatic calculation of gravity direction. Add changelog entry (#701) * Move slowest test first in the test order (#705) * Move slowest test first in the test order * Update micromamba install scripts * add duration output from normal ci tests * Also trigger ci build for ammr-master-2.5 PRs * Fix regression in CI script * Ensure exo tests can run in parallel (#711) (#712) * Fix regression in CI script * Ensure output files from different models don't conflict No changelog entry is needed for this. * Ensure the MOCAP variables exists before they are used * Update compare test ams version (#713) * Build on linux with containers directly (#714) * Build on linux with container directly * Add strategy for linux build * Fix syntax for RLM license setup (#715) * Update linux test CI (#716) * Ensure stringmesh is an AnyInt (#720) No changelog needed for this * Improve the way CameraLookAtPoint is set in MoCap Examples (#721) This should make the code robust against changing the UP_DIRECTION of the camera class template * Remove unused guard in tests (#719) * Rename the MuscleModel folder in hand model (#723) This will prevent conflict with future member of the muscle class * Add option for viewing camera (defaults to off) and set default camera distance to 6. (#725) Looks good * Add ObjRefResolve in AMS 7.5 (#726) * Update README.md * Fix docutils deprecation warning (#727) * Fix deprecation warning * Backport xref fix from ammr 2.5 branch * Remvoe unused github actions --------- Co-authored-by: bke <bke@anybodytech.com> Co-authored-by: bkje14 <42773361+bkje14@users.noreply.github.com> Co-authored-by: dsc <dsc@anybodytech.com> Co-authored-by: Kristofferiversen <48679556+Kristofferiversen@users.noreply.github.com> Co-authored-by: divyaksh-chander <102362310+divyaksh-chander@users.noreply.github.com> Co-authored-by: menzejo <64215489+menzejo@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Add:
Fix: