Skip to content

chore: update main with latest common pipeline#409

Draft
Meow404 wants to merge 983 commits into
mainfrom
push_anything_dev
Draft

chore: update main with latest common pipeline#409
Meow404 wants to merge 983 commits into
mainfrom
push_anything_dev

Conversation

@Meow404

@Meow404 Meow404 commented Jun 10, 2026

Copy link
Copy Markdown

Merge push_anything_dev into main

Keeps main in sync with the latest code actively being used in the lab. Any branches derived from push_anything_dev will be rebased off main following this merge.

Notes for reviewers: This is primarily a sanity check — some examples may be broken, but keeping main current with active lab development is the priority.

⚠️ Please merge using "Create a merge commit" — do not squash or rebase. Squashing will collapse the commit history; rebasing will rewrite it. Either will cause issues for branches derived from push_anything_dev.

Todo :

  • Fix merge conflicts
  • Clang format all cpp files

This change is Reviewable

yangwill added 30 commits March 30, 2024 17:31
cuie23 and others added 22 commits September 6, 2025 13:55
…ing away even if letters come back out of tolerance)
* feat: use external c3 repo for sampling example

* build: Pin c3 version
* chore: update Drake to v1.51.1

* fix: include header "drake/common/text_logging.h" for using "drake::log()->info"

* fix: MobyLCPSolver to MobyLcpSolver as in the latest Drake's version

* fix: using <> instead of "", which caused missing header error since Bazel treats "" as internal packages

* fix: replace old OSQP options

* fix: upgrade osqp version to 1.0.0. This osqp dependency is for our fast osqp, and it does not affect osqp that comes with Drake v1.51.1

* fix: error that the function isnan is undefined when compiling on linux

* build: update image being used

* fix: google library dependency

---------

Co-authored-by: Hien Bui <xuanhien070594@gmail.com>
…rlib (#403)

* cleanup: remove c3 from dairlib

* plate-balancing: remove plate-balancing example due to dependence on c3

* fix: optional parameters

* build: update c3 commit and fix options for depricated handlers

* cleanup: remove redundant code
* Switch to version of C3 repo that has cost computation helpers (not currently utilized)

* Fix LCS resolution change bug

* Fix timestep bug affecting published C3 trajectory timestamps

* Fix bug in calculating cost contribution of the last timestep

* Fix indexing bugs related to different LCS discretizations for cost calculation

* Introduce new cost calculation relying on C3 repo functionality; all cost types match closely; includes test printouts; to be cleaned for final use

* Use x_N implied by the C3 plan's last x, u, and lambda along with the LCS matrices

* Add and test cost breakdown in new cost calculation; test with printouts to be removed

* Finish migrating sample cost calculations to C3-repo-based implementations

* Use updated C3 commit

* Update MODULE.bazel to point to C3 main branch after C3 merge
…comes in collision with an object -- Squashed commit of the following:

commit de9610b
Author: Bibit Bianchini <ebianchini.mit@gmail.com>
Date:   Fri May 22 13:55:19 2026 -0400

    Fix collision checking for sample rejection

commit d5f63d8
Author: Bibit Bianchini <ebianchini.mit@gmail.com>
Date:   Fri May 22 13:18:29 2026 -0400

    Properly handle repositioning target switching case when previous target is rejected due to collision

commit 29353d0
Author: Bibit Bianchini <ebianchini.mit@gmail.com>
Date:   Thu May 21 18:07:14 2026 -0400

    Part 2 of buffer bug fix:  include new samples while staying within buffer size

commit 0badc88
Author: Bibit Bianchini <ebianchini.mit@gmail.com>
Date:   Thu May 21 17:54:21 2026 -0400

    Fix sample buffer overwriting bug
* chore: remove obsolete sdf, urdf, and obj files

* feat: add containerized environment for Push Anything simulation using Docker Compose

* docs: add Push Anything simulation README

* fix: add missing dependencies for multiyaml_rewrite in the dockerfile

* fix: set visualize_drake_sim flag in sim_params.yaml to false to disable launching additional meshcat server
…406)

* Resolve merge conflicts with main (#386)

* Resolve merge conflicts with main

* Remove obsolete codes

* Remove accidentally commited files

* Add external force tracking result to lcm

* Add back the deleted files in Cassie example

* Add back deleted files in pydairlib/cassie

* Revert code formatting

* Revert code formatting

* Revert code formatting

* Include workspace and input limits as constraints in C3 QP step

* Add parameters for different contact pair configurations

* Fix intended checks for resolving contact pairs and maintaining sample buffer

* fix: removed depricated functions

---------

Co-authored-by: Hien Bui <xuanhien070594@gmail.com>
Co-authored-by: Bibit Bianchini <ebianchini.mit@gmail.com>
@Meow404 Meow404 marked this pull request as draft June 10, 2026 15:48
@Meow404 Meow404 force-pushed the push_anything_dev branch from 8cef68d to 718cf25 Compare June 10, 2026 17:45
@Meow404 Meow404 marked this pull request as ready for review June 10, 2026 17:55
@Meow404 Meow404 force-pushed the push_anything_dev branch from 7fd66f9 to 257e3ed Compare June 11, 2026 17:19
@Meow404 Meow404 marked this pull request as draft June 11, 2026 17:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants