Skip to content

Commit 09aad72

Browse files
committed
Adapt for animation execution
Signed-off-by: Florian Vahl <florian@flova.de>
1 parent ad696a8 commit 09aad72

4 files changed

Lines changed: 25 additions & 27 deletions

File tree

src/bitbots_motion/bitbots_animation_server/bitbots_animation_server/animation_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def __init__(self):
4646
self.goals_to_abort: set[UUID] = set()
4747

4848
# Get robot type and create resource manager
49-
self.declare_parameter("robot_type", "wolfgang")
49+
self.declare_parameter("robot_type", "piplus")
5050
self.resource_manager = ResourceManager(self.get_parameter("robot_type").value)
5151

5252
# Load all animations into memory

src/bitbots_motion/bitbots_hcm/bitbots_hcm/hcm_dsd/hcm.dsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->HCM
88
$StartHCM
99
START_UP --> $Simulation
10-
YES --> @RobotStateStartup, @PlayAnimationStartup, @PlayAnimationWalkReady
10+
YES --> @RobotStateStartup, @PlayAnimationInit, @PlayAnimationWalkReady
1111
NO --> #INIT_PATTERN
1212
RUNNING --> $CheckMotors
1313
MOTORS_NOT_STARTED --> @RobotStateStartup, @Wait

src/bitbots_motion/bitbots_hcm/launch/hcm.launch

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@
1616
</node>
1717
</group>
1818

19-
<group unless="$(var sim)">
20-
<node pkg="bitbots_hcm" exec="led.py" />
21-
</group>
22-
2319
</launch>

src/bitbots_robot/piplus_animations/animations/misc/init.json

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,31 @@
33
"name": "init",
44
"keyframes": [
55
{
6-
"duration": 1.0,
6+
"duration": 2.0,
77
"pause": 0.0,
88
"goals": {
9-
"LShoulderPitch": 0.0,
10-
"LShoulderRoll": 0.0,
11-
"RShoulderRoll": 0.0,
12-
"HeadTilt": 0.0,
13-
"LKnee": 0.0,
14-
"RHipYaw": 0.0,
15-
"LAnklePitch": 0.0,
16-
"RKnee": 0.0,
17-
"RAnkleRoll": 0.0,
18-
"RAnklePitch": 0.0,
19-
"LHipPitch": 0.0,
20-
"LHipYaw": 0.0,
21-
"LHipRoll": 0.0,
22-
"RHipRoll": 0.0,
23-
"LAnkleRoll": 0.0,
24-
"LElbow": 0.0,
25-
"RElbow": 0.0,
26-
"RHipPitch": 0.0,
27-
"HeadPan": 0.0,
28-
"RShoulderPitch": 0.0
9+
"l_shoulder_pitch_joint": 0.0,
10+
"l_shoulder_roll_joint": 0.0,
11+
"l_upper_arm_joint": 0.0,
12+
"l_elbow_joint": 0.0,
13+
"r_shoulder_pitch_joint": 0.0,
14+
"r_shoulder_roll_joint": 0.0,
15+
"r_upper_arm_joint": 0.0,
16+
"r_elbow_joint": 0.0,
17+
"l_hip_pitch_joint": 0.0,
18+
"l_hip_roll_joint": 0.0,
19+
"l_thigh_joint": 0.0,
20+
"l_calf_joint": 0.0,
21+
"l_ankle_pitch_joint": 0.0,
22+
"l_ankle_roll_joint": 0.0,
23+
"r_hip_pitch_joint": 0.0,
24+
"r_hip_roll_joint": 0.0,
25+
"r_thigh_joint": 0.0,
26+
"r_calf_joint": 0.0,
27+
"r_ankle_pitch_joint": 0.0,
28+
"r_ankle_roll_joint": 0.0,
29+
"head_yaw_joint": 0.0,
30+
"head_pitch_joint": 0.0
2931
}
3032
}
3133
]

0 commit comments

Comments
 (0)