Skip to content

Commit f44c21f

Browse files
committed
reset code to normal state
1 parent 4a937ac commit f44c21f

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

src/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/behavior_dsd/actions/kick_ball.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ def perform(self, reevaluate=False):
131131

132132

133133
class RLKick(AbstractKickAction):
134+
# TODO: Currently no connection between this class and rl kick policy
134135
def __init__(self, blackboard, dsd, parameters):
135136
super().__init__(blackboard, dsd, parameters)
136137

@@ -141,7 +142,7 @@ def __init__(self, blackboard, dsd, parameters):
141142
self.penalty_kick_angle = self.blackboard.config["penalty_kick_angle"]
142143

143144
def perform(self, reevaluate=False):
144-
#TODO: Check whether relevant
145+
# TODO: Check whether relevant
145146
ball_pose = PoseStamped()
146147
ball_pose.header.stamp = self.blackboard.node.get_clock().now().to_msg()
147148
ball_pose.header.frame_id = self.blackboard.world_model.base_footprint_frame

src/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/behavior_dsd/demo.dsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
@ChangeAction + action:searching, @LookAtFieldFeatures, @WalkInPlace + duration:3, @Turn
33

44
#PerformKickLeft
5-
@ChangeAction + action:kicking, @LookAtFront, @RLKick + foot:left + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
5+
@ChangeAction + action:kicking, @LookAtFront, @WalkKick + foot:left + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
66

77
#PerformKickRight
8-
@ChangeAction + action:kicking, @LookAtFront, @RLKick + foot:right + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
8+
@ChangeAction + action:kicking, @LookAtFront, @WalkKick + foot:right + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
99

1010
#KickWithAvoidance
1111
$AvoidBall

src/bitbots_behavior/bitbots_body_behavior/bitbots_body_behavior/behavior_dsd/main.dsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ $DoOnce
2121
@ChangeAction + action:waiting + r:false, @PlayAnimationInitInSim + r:false, @LookAtFieldFeatures + r:false, @GetWalkready + r:false, @WalkInPlace
2222

2323
#PerformKickLeft
24-
@ChangeAction + action:kicking, @LookAtFront, @RLKick + foot:left + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
24+
@ChangeAction + action:kicking, @LookAtFront, @WalkKick + foot:left + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
2525

2626
#PerformKickRight
27-
@ChangeAction + action:kicking, @LookAtFront, @RLKick + foot:right + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
27+
@ChangeAction + action:kicking, @LookAtFront, @WalkKick + foot:right + r:false, @WalkInPlace + duration:1 + r:false, @ForgetBall + r:false, @WalkInPlace + duration:1 + r:false, @LookAtFieldFeatures + r:false
2828

2929
#Dribble
3030
@ChangeAction + action:going_to_ball, @CancelPathplanning, @LookAtFront, @DribbleForward

src/bitbots_misc/bitbots_bringup/launch/motion.launch

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,13 @@
6060
-->
6161

6262

63-
<!--launch rl policies-->
63+
<!--launch rl policies (currently diabled)
6464
<group if="$(var rl_policies)">
6565
<node pkg="bitbots_rl_motion" exec="run_policies" output="screen">
6666
<param name="use_sim_time" value="$(var sim)"/>
6767
</node>
6868
</group>
69+
-->
6970

7071
<!-- launch dynup -->
7172
<include file="$(find-pkg-share bitbots_dynup)/launch/dynup.launch">

0 commit comments

Comments
 (0)