Skip to content

Commit 3ec6ca0

Browse files
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # atlas/src/main/resources/us/ihmc/atlas/parameters/AtlasFootstepPlannerParameters.json
2 parents 7f238a8 + 31e34c8 commit 3ec6ca0

File tree

1,152 files changed

+13743
-86140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,152 files changed

+13743
-86140
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
*.glb filter=lfs diff=lfs merge=lfs -text
1414
*.bin filter=lfs diff=lfs merge=lfs -text
1515
*.raw filter=lfs diff=lfs merge=lfs -text
16+
*.webm filter=lfs diff=lfs merge=lfs -text

.github/workflows/gradle-test-fast.yml

Lines changed: 57 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,62 @@ jobs:
1717
with:
1818
subproject: 'atlas'
1919
test-category: 'fast'
20+
atlas-video:
21+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
22+
with:
23+
subproject: 'atlas'
24+
test-category: 'video'
25+
atlas-controller-api:
26+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
27+
with:
28+
subproject: 'atlas'
29+
test-category: 'controller-api'
30+
atlas-controller-api-2:
31+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
32+
with:
33+
subproject: 'atlas'
34+
test-category: 'controller-api-2'
35+
atlas-humanoid-behaviors:
36+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
37+
with:
38+
subproject: 'atlas'
39+
test-category: 'humanoid-behaviors'
40+
atlas-humanoid-flat-ground:
41+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
42+
with:
43+
subproject: 'atlas'
44+
test-category: 'humanoid-flat-ground'
45+
atlas-humanoid-flat-ground-bullet:
46+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
47+
with:
48+
subproject: 'atlas'
49+
test-category: 'humanoid-flat-ground-bullet'
50+
atlas-humanoid-obstacle:
51+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
52+
with:
53+
subproject: 'atlas'
54+
test-category: 'humanoid-obstacle'
55+
atlas-humanoid-obstacle-2:
56+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
57+
with:
58+
subproject: 'atlas'
59+
test-category: 'humanoid-obstacle-2'
60+
requires-self-hosted: true
61+
atlas-humanoid-push-recovery:
62+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
63+
with:
64+
subproject: 'atlas'
65+
test-category: 'humanoid-push-recovery'
66+
atlas-humanoid-rough-terrain:
67+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
68+
with:
69+
subproject: 'atlas'
70+
test-category: 'humanoid-rough-terrain'
71+
atlas-humanoid-toolbox:
72+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
73+
with:
74+
subproject: 'atlas'
75+
test-category: 'humanoid-toolbox'
2076
example-simulations:
2177
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
2278
with:
@@ -42,6 +98,7 @@ jobs:
4298
with:
4399
subproject: 'ihmc-footstep-planning'
44100
test-category: 'fast'
101+
requires-self-hosted: true
45102
ihmc-graphics:
46103
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
47104
with:
@@ -87,11 +144,6 @@ jobs:
87144
with:
88145
subproject: 'ihmc-parameter-optimization'
89146
test-category: 'fast'
90-
ihmc-parameter-tuner:
91-
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
92-
with:
93-
subproject: 'ihmc-parameter-tuner'
94-
test-category: 'fast'
95147
ihmc-path-planning:
96148
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
97149
with:
@@ -143,21 +195,11 @@ jobs:
143195
with:
144196
subproject: 'ihmc-system-identification'
145197
test-category: 'fast'
146-
ihmc-trajectory-optimization:
147-
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
148-
with:
149-
subproject: 'ihmc-trajectory-optimization'
150-
test-category: 'fast'
151198
ihmc-whole-body-controller:
152199
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
153200
with:
154201
subproject: 'ihmc-whole-body-controller'
155202
test-category: 'fast'
156-
promp:
157-
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
158-
with:
159-
subproject: 'promp'
160-
test-category: 'fast'
161203
robot-environment-awareness:
162204
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
163205
with:
Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
name: Gradle test (slow)
2+
3+
on:
4+
schedule:
5+
- cron: '0 */8 * * *'
6+
workflow_dispatch:
7+
8+
permissions:
9+
checks: write
10+
contents: read
11+
12+
jobs:
13+
atlas-allocation-slow:
14+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
15+
with:
16+
subproject: 'atlas'
17+
test-category: 'allocation-slow'
18+
atlas-allocation-slow-2:
19+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
20+
with:
21+
subproject: 'atlas'
22+
test-category: 'allocation-slow-2'
23+
atlas-controller-api-slow:
24+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
25+
with:
26+
subproject: 'atlas'
27+
test-category: 'controller-api-slow'
28+
atlas-controller-api-slow-3:
29+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
30+
with:
31+
subproject: 'atlas'
32+
test-category: 'controller-api-slow-3'
33+
atlas-controller-api-slow-4:
34+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
35+
with:
36+
subproject: 'atlas'
37+
test-category: 'controller-api-slow-4'
38+
atlas-humanoid-behaviors-slow:
39+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
40+
with:
41+
subproject: 'atlas'
42+
test-category: 'humanoid-behaviors-slow'
43+
atlas-humanoid-flat-ground-slow-2:
44+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
45+
with:
46+
subproject: 'atlas'
47+
test-category: 'humanoid-flat-ground-slow-2'
48+
atlas-humanoid-flat-ground-slow-3:
49+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
50+
with:
51+
subproject: 'atlas'
52+
test-category: 'humanoid-flat-ground-slow-3'
53+
atlas-humanoid-flat-ground-slow-4:
54+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
55+
with:
56+
subproject: 'atlas'
57+
test-category: 'humanoid-flat-ground-slow-4'
58+
atlas-humanoid-obstacle-slow:
59+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
60+
with:
61+
subproject: 'atlas'
62+
test-category: 'humanoid-obstacle-slow'
63+
atlas-humanoid-obstacle-slow-2:
64+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
65+
with:
66+
subproject: 'atlas'
67+
test-category: 'humanoid-obstacle-slow-2'
68+
atlas-humanoid-obstacle-slow-3:
69+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
70+
with:
71+
subproject: 'atlas'
72+
test-category: 'humanoid-obstacle-slow-3'
73+
atlas-humanoid-push-recovery-slow:
74+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
75+
with:
76+
subproject: 'atlas'
77+
test-category: 'humanoid-push-recovery-slow'
78+
atlas-humanoid-rough-terrain-slow:
79+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
80+
with:
81+
subproject: 'atlas'
82+
test-category: 'humanoid-rough-terrain-slow'
83+
atlas-humanoid-stairs-slow:
84+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
85+
with:
86+
subproject: 'atlas'
87+
test-category: 'humanoid-stairs-slow'
88+
ihmc-footstep-planning-slow:
89+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
90+
with:
91+
subproject: 'ihmc-footstep-planning'
92+
test-category: 'footstep-planning-slow'
93+
requires-self-hosted: true
94+
ihmc-footstep-planning-slow-2:
95+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
96+
with:
97+
subproject: 'ihmc-footstep-planning'
98+
test-category: 'path-planning-slow'
99+
requires-self-hosted: true
100+
ihmc-java-toolkit-gui-slow:
101+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
102+
with:
103+
subproject: 'ihmc-java-toolkit'
104+
test-category: 'gui-slow'
105+
requires-self-hosted: true
106+
ihmc-path-planning-slow:
107+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
108+
with:
109+
subproject: 'ihmc-path-planning'
110+
test-category: 'path-planning-slow'
111+
requires-self-hosted: true
112+
simulation-construction-set-tools-slow:
113+
uses: ihmcrobotics/ihmc-actions/.github/workflows/gradle-test.yml@main
114+
with:
115+
subproject: 'simulation-construction-set-tools'
116+
test-category: 'gui-slow'
117+
requires-self-hosted: true

README.md

Lines changed: 120 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
# IHMC Open Robotics Software
22

3+
## Current Continuous Integration Status
4+
5+
![develop, fast](https://github.com/ihmcrobotics/ihmc-open-robotics-software/actions/workflows/gradle-test-fast.yml/badge.svg?branch=develop) Current develop status
6+
7+
![develop, fast](https://github.com/ihmcrobotics/ihmc-open-robotics-software/actions/workflows/gradle-test-fast.yml/badge.svg?branch=0.14.0-240126) Current release status
8+
39
## Robots
410

5-
- [Nadia](https://boardwalkrobotics.com/)
11+
This software has been used to power a wide variety of humanoid robots. This includes
12+
- [Nadia](https://www.ihmc.us/nadia-humanoid/)
13+
- [Valkyrie](https://www.nasa.gov/wp-content/uploads/2023/06/r5-fact-sheet.pdf)
614
- [Alex](https://boardwalkrobotics.com/)
715

816
## Licensing
@@ -27,22 +35,124 @@ https://ihmcrobotics.atlassian.net/wiki/spaces/PUBLIC/overview
2735

2836
## Other IHMC Libraries
2937
IHMC Open Robotics Software both depends on and is depended on by many other IHMC Robotics Libraries.
30-
A small sampling of our other software includes:
38+
A sampling of our other software depended on by this repository includes
39+
40+
Simulation Construction Set 2, our own simulation environment with
41+
built-in analysis tools: https://github.com/ihmcrobotics/simulation-construction-set-2
42+
43+
![scs2](https://maven-badges.herokuapp.com/maven-central/us.ihmc/scs2-definition/badge.svg?style=plastic)
44+
![buildstatus](https://github.com/ihmcrobotics/simulation-construction-set-2/actions/workflows/main-gradleCI-build.yml/badge.svg)
45+
46+
Simulation Construction Set, a deprecated simulation engine that's still used for base visualization
3147

32-
- Simulation Construction Set 2, our own simulation environment with
33-
built-in analysis tools: https://github.com/ihmcrobotics/simulation-construction-set-2
34-
- Euclid, an alternative vector/geometry library for Java with support for additional structures
48+
![scs2](https://maven-badges.herokuapp.com/maven-central/us.ihmc/simlation-construction-set/badge.svg?style=plastic)
49+
![buildstatus](https://github.com/ihmcrobotics/simulation-construction-set/actions/workflows/main-gradleCI-build.yml/badge.svg)
50+
51+
52+
Euclid, an alternative vector/geometry library for Java with support for additional structures
3553
common in 3D geometry without needing vecmath or Java3D: https://github.com/ihmcrobotics/euclid
36-
- Mecano, a rigid-body dynamics library built on top of Euclid and EJML: https://github.com/ihmcrobotics/mecano
37-
- IHMC YoVariables, our core data structures tools that enable the time-series tracing
54+
55+
![euclid](https://maven-badges.herokuapp.com/maven-central/us.ihmc/euclid/badge.svg?style=plastic)
56+
![buildstatus](https://github.com/ihmcrobotics/euclid/actions/workflows/gradle-test.yml/badge.svg)
57+
58+
Mecano, a rigid-body dynamics library built on top of Euclid and EJML: https://github.com/ihmcrobotics/mecano
59+
60+
![mecano](https://maven-badges.herokuapp.com/maven-central/us.ihmc/mecano/badge.svg?style=plastic)
61+
![buildstatus](https://github.com/ihmcrobotics/mecano/actions/workflows/gradle-test.yml/badge.svg)
62+
63+
IHMC YoVariables, our core data structures tools that enable the time-series tracing
3864
and analysis of Simulation Construction Set: https://github.com/ihmcrobotics/ihmc-yovariables
39-
- JOctoMap, a Java implementation of OctoMap: https://github.com/ihmcrobotics/joctomap
40-
- IHMC Realtime, a library for enabling soft real-time threading for Java on Linux using the
65+
66+
[ ![ihmc-yovariables](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-yovariables/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-yovariables)
67+
![buildstatus](https://github.com/ihmcrobotics/ihmc-yovariables/actions/workflows/gradle-test.yml/badge.svg)
68+
69+
JOctoMap, a Java implementation of OctoMap: https://github.com/ihmcrobotics/joctomap
70+
71+
![joctomap](https://maven-badges.herokuapp.com/maven-central/us.ihmc/joctomap/badge.svg?style=plastic)
72+
![buildstatus](https://github.com/ihmcrobotics/joctomap/actions/workflows/gradle-test.yml/badge.svg)
73+
74+
IHMC Realtime, a library for enabling soft real-time threading for Java on Linux using the
4175
RT_PREEMPT patches: https://github.com/ihmcrobotics/ihmc-realtime
42-
- IHMC EtherCAT Master, a Java library using IHMC Realtime and Simple Open EtherCAT Master (SOEM)
76+
77+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-realtime/badge.svg?style=plastic)
78+
![buildstatus](https://github.com/ihmcrobotics/ihmc-realtime/actions/workflows/gradle-test.yml/badge.svg)
79+
80+
IHMC EtherCAT Master, a Java library using IHMC Realtime and Simple Open EtherCAT Master (SOEM)
4381
that makes it simple to start a software EtherCAT Master and pure Java data structures that map to
4482
EtherCAT Slave defintions: https://github.com/ihmcrobotics/ihmc-ethercat-master
4583

84+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-ethercat-master/badge.svg?style=plastic)
85+
![buildstatus](https://github.com/ihmcrobotics/ihmc-ethercat-master/actions/workflows/gradle-test.yml/badge.svg)
86+
87+
IHMC Robot Data Logger, an application for logging yo variables.
88+
89+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-robot-data-logger/badge.svg?style=plastic)
90+
![buildstatus](https://github.com/ihmcrobotics/ihmc-robot-data-logger/actions/workflows/gradle-test.yml/badge.svg)
91+
92+
IHMC Matrix Library
93+
94+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-matrix-library/badge.svg?style=plastic)
95+
![buildstatus](https://github.com/ihmcrobotics/ihmc-matrix-library/actions/workflows/gradle-test.yml/badge.svg)
96+
97+
IHMC Convex Optimization, an implementation of a number of algorithms for solving convex optimization problems.
98+
99+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-convex-optimization/badge.svg?style=plastic)
100+
![buildstatus](https://github.com/ihmcrobotics/ihmc-convex-optimization/actions/workflows/gradle-test.yml/badge.svg)
101+
102+
IHMC EKF
103+
104+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ekf/badge.svg?style=plastic)
105+
![buildstatus](https://github.com/ihmcrobotics/ekf/actions/workflows/gradle-test.yml/badge.svg)
106+
107+
108+
IHMC ROS2 Library, a lightweight implementation of the ROS2 communication protocol.
109+
110+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-ros2-library/badge.svg?style=plastic)
111+
![buildstatus](https://github.com/ihmcrobotics/ihmc-java-ros2-communication/actions/workflows/gradle.yml/badge.svg)
112+
113+
IHMC PubSub
114+
115+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-pub-sub/badge.svg?style=plastic)
116+
![buildstatus](https://github.com/ihmcrobotics/ihmc-pub-sub-group/actions/workflows/build-natives.yml/badge.svg)
117+
![buildstatus](https://github.com/ihmcrobotics/ihmc-pub-sub-group/actions/workflows/run-gradle-test-all-platforms.yml/badge.svg)
118+
![buildstatus](https://github.com/ihmcrobotics/ihmc-pub-sub-group/actions/workflows/run-gradle-test-linux-self-hosted.yml/badge.svg)
119+
120+
IHMC Messager Kryo
121+
122+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-messager-kryo/badge.svg?style=plastic)
123+
![buildstatus](https://github.com/ihmcrobotics/ihmc-messager-kryo/actions/workflows/gradle-test.yml/badge.svg)
124+
125+
IHMC Video Codecs
126+
127+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-video-codecs/badge.svg?style=plastic)
128+
![buildstatus](https://github.com/ihmcrobotics/ihmc-video-codecs/actions/workflows/gradle-test.yml/badge.svg)
129+
130+
IHMC JavaFX Toolkit
131+
132+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-javafx-toolkit/badge.svg?style=plastic)
133+
![buildstatus](https://github.com/ihmcrobotics/ihmc-javafx-toolkit/actions/workflows/gradle-test.yml/badge.svg)
134+
135+
IHMC Graphics Description
136+
137+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-graphics-description/badge.svg?style=plastic)
138+
![buildstatus](https://github.com/ihmcrobotics/ihmc-graphics-description/actions/workflows/gradle-test.yml/badge.svg)
139+
140+
IHMC Commons
141+
142+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-commons/badge.svg?style=plastic)
143+
![buildstatus](https://github.com/ihmcrobotics/ihmc-commons/actions/workflows/gradle-test.yml/badge.svg)
144+
145+
IHMC Native Library Loader
146+
147+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/ihmc-native-library-loader/badge.svg?style=plastic)
148+
![buildstatus](https://github.com/ihmcrobotics/ihmc-native-library-loader/actions/workflows/gradle-test.yml/badge.svg)
149+
150+
IHMC Log Tools
151+
152+
![realtime](https://maven-badges.herokuapp.com/maven-central/us.ihmc/log-tools/badge.svg?style=plastic)
153+
![buildstatus](https://github.com/ihmcrobotics/log-tools/actions/workflows/gradle-test.yml/badge.svg)
154+
155+
46156
You can find all of our other repositories as well as the ones above at https://github.com/ihmcrobotics
47157

48158
## ROS APIs

atlas/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mainDependencies {
2020
api("us.ihmc:robotiq-hand-drivers:source")
2121
api("us.ihmc:ihmc-model-file-loader:source")
2222
api("us.ihmc:ihmc-manipulation-planning:source")
23-
api("us.ihmc:ihmc-parameter-tuner:source")
23+
api("us.ihmc:ihmc-parameter-tuner:0.14.1")
2424
api("us.ihmc:ihmc-footstep-planning-visualizers:source")
2525
api("us.ihmc:ihmc-high-level-behaviors:source")
2626
}

0 commit comments

Comments
 (0)