Skip to content

Commit

Permalink
good behavior
Browse files Browse the repository at this point in the history
  • Loading branch information
budzianowski committed Jan 13, 2025
1 parent 02cd099 commit 5601b34
Show file tree
Hide file tree
Showing 17 changed files with 418 additions and 872 deletions.
50 changes: 25 additions & 25 deletions sim/envs/humanoids/zbot2_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ class asset(LeggedRobotCfg.asset):
file = str(robot_urdf_path(name))

foot_name = ["FOOT", "FOOT_2"]
knee_name = ["WJ-DP00-0002-FK-AP-020_7_5", "WJ-DP00-0002-FK-AP-020_7_6"]
knee_name = ["3215_BothFlange_6", "3215_BothFlange_5"]

termination_height = 0.1
default_feet_height = 0.01
Expand All @@ -140,9 +140,9 @@ class asset(LeggedRobotCfg.asset):
replace_cylinder_with_capsule = False
fix_base_link = False

# pfb30
friction = 0.013343597773929877
armature = 0.008793405204572328
# # pfb30
# friction = 0.013343597773929877
# armature = 0.008793405204572328

class terrain(LeggedRobotCfg.terrain):
mesh_type = "plane"
Expand All @@ -158,7 +158,7 @@ class terrain(LeggedRobotCfg.terrain):
num_cols = 10 # number of terrain cols (types)
max_init_terrain_level = 10 # starting curriculum state
# plane; obstacles; uniform; slope_up; slope_down, stair_up, stair_down
terrain_proportions = [0.2, 0.2, 0.4, 0.1, 0.1, 0, 0]
terrain_proportions = [0.8, 0.1, 0.1, 0.1, 0.1, 0, 0]
restitution = 0.0

class noise:
Expand Down Expand Up @@ -242,12 +242,12 @@ class ranges:
class rewards:
base_height_target = Robot.height
min_dist = 0.07
max_dist = 0.25
max_dist = 0.4

# put some settings here for LLM parameter tuning
# pfb30
target_joint_pos_scale = 0.24 # rad
target_feet_height = 0.03 # m
target_feet_height = 0.025 # m
cycle_time = 0.4 # sec
# if true negative total rewards are clipped at zero (avoids early termination problems)
only_positive_rewards = True
Expand All @@ -256,34 +256,34 @@ class rewards:
max_contact_force = 400 # forces above this value are penalized

class scales:
# reference motion tracking
joint_pos = 1.6
feet_clearance = 1.5
feet_contact_number = 1.5
feet_air_time = 1.4
joint_pos = 2.2
feet_clearance = 1.6
feet_contact_number = 1.4
# gait
feet_air_time = 1.5
foot_slip = -0.1
feet_distance = 0.2
knee_distance = 0.2
# contact
feet_contact_forces = -0.01
# contact
feet_contact_forces = -0.02
# vel tracking
tracking_lin_vel = 1.6
tracking_ang_vel = 1.6
tracking_lin_vel = 1.4
tracking_ang_vel = 1.1
vel_mismatch_exp = 0.5 # lin_z; ang x,y
low_speed = 0.4
low_speed = 0.2
track_vel_hard = 0.5

# stand_still = 5
# base pos
default_joint_pos = 0.5
orientation = 1
default_joint_pos = 0.8
orientation = 1.
base_height = 0.2
base_acc = 0.2
# energy
action_smoothness = -0.002
torques = -1e-5
dof_vel = -5e-4
dof_acc = -1e-7
collision = -1.0
action_smoothness = -0.003
torques = -1e-10
dof_vel = -1e-5
dof_acc = -5e-9
collision = -1.

class normalization:
class obs_scales:
Expand Down
128 changes: 0 additions & 128 deletions sim/resources/zbot2/imu_data.csv

This file was deleted.

44 changes: 23 additions & 21 deletions sim/resources/zbot2/joints.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,16 +153,16 @@ def default_limits(cls) -> Dict[str, Dict[str, float]]:
"""
return {
# Left side
cls.legs.left.hip_roll: {"lower": -0.9, "upper": 0.9},
cls.legs.left.hip_yaw: {"lower": -0.9, "upper": 0.9},
cls.legs.left.hip_pitch: {"lower": -0.9, "upper": 0.9},
cls.legs.left.knee_pitch: {"lower": -0.9, "upper": 0.9},
cls.legs.left.hip_roll: {"lower": -0.7, "upper": 0.7},
cls.legs.left.hip_yaw: {"lower": -1.54, "upper": 0.157},
cls.legs.left.hip_pitch: {"lower": -1.54, "upper": 1.0},
cls.legs.left.knee_pitch: {"lower": 0, "upper": 1.57},
cls.legs.left.ankle_pitch: {"lower": -0.9, "upper": 0.9},
# Right side
cls.legs.right.hip_roll: {"lower": -0.9, "upper": 0.9},
cls.legs.right.hip_yaw: {"lower": -0.9, "upper": 0.9},
cls.legs.right.hip_pitch: {"lower": -0.9, "upper": 0.9},
cls.legs.right.knee_pitch: {"lower": -0.9, "upper": 0.9},
cls.legs.right.hip_roll: {"lower": -0.7, "upper": 0.7},
cls.legs.right.hip_yaw: {"lower": -1.54, "upper": 0.157},
cls.legs.right.hip_pitch: {"lower": -1.0, "upper": 1.54},
cls.legs.right.knee_pitch: {"lower": -1.57, "upper": 0},
cls.legs.right.ankle_pitch: {"lower": -0.9, "upper": 0.9},
}

Expand Down Expand Up @@ -191,32 +191,34 @@ def damping(cls) -> Dict[str, float]:
@classmethod
def effort(cls) -> Dict[str, float]:
return {
"Hip_Pitch": 3.0,
"Hip_Yaw": 3.0,
"Hip_Roll": 3.0,
"Knee_Pitch": 3.0,
"Ankle_Pitch": 3.0,
"Hip_Pitch": 1.91,
"Hip_Yaw": 1.91,
"Hip_Roll": 1.91,
"Knee_Pitch": 1.91,
"Ankle_Pitch": 1.91,
}

# vel_limits
@classmethod
def velocity(cls) -> Dict[str, float]:
return {
"Hip_Pitch": 10,
"Hip_Yaw": 10,
"Hip_Roll": 10,
"Knee_Pitch": 10,
"Ankle_Pitch": 10,
"Hip_Pitch": 15,
"Hip_Yaw": 15,
"Hip_Roll": 15,
"Knee_Pitch": 15,
"Ankle_Pitch": 15,
}

@classmethod
def friction(cls) -> Dict[str, float]:
"""Example friction dictionary for certain joints."""
# Usually you'd have more specific friction values or a model.
return {
cls.legs.left.ankle_pitch: 0.1,
cls.legs.right.ankle_pitch: 0.1,
# etc...
"Hip_Pitch": 0.0,
"Hip_Yaw": 0.0,
"Hip_Roll": 0.0,
"Knee_Pitch": 0.0,
"Ankle_Pitch": 0.01,
}

@classmethod
Expand Down
Binary file removed sim/resources/zbot2/meshes/FK-AP-019-25T_11.stl
Binary file not shown.
Binary file removed sim/resources/zbot2/meshes/FK-AP-019-25T_11_2.stl
Binary file not shown.
Binary file removed sim/resources/zbot2/meshes/L-ARM_1.stl
Binary file not shown.
Binary file removed sim/resources/zbot2/meshes/R-ARM-1.stl
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 5601b34

Please sign in to comment.