Skip to content

Commit 55cbdfd

Browse files
val-baval-ba
committed
Merge branch 'Gamecontroller-update-for-HSL' of github.com:bit-bots/bitbots_main into Gamecontroller-update-for-HSL
2 parents b5aa180 + 3d48999 commit 55cbdfd

9 files changed

Lines changed: 25 additions & 9 deletions

File tree

‎scripts/deploy/deploy_robots.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def _parse_arguments(self) -> argparse.Namespace:
118118
parser.add_argument(
119119
"-w",
120120
"--workspace",
121-
default=".",
122-
help="Path to the workspace directory to deploy to. Defaults to the current directory.",
121+
default="~/bitbots_main",
122+
help="Path to the workspace directory to deploy to. Defaults to 'bitbots_main' in $HOME dir.",
123123
)
124124
parser.add_argument("--skip-local-repo-check", action="store_true", help="Skip the local repository check.")
125125

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,22 @@ $DoOnce
109109
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
110110
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second
111111
THIRD --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition
112+
DIRECT_FREEKICK --> $RankToBallNoGoalie
113+
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
114+
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second
115+
THIRD --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition
116+
INDIRECT_FREEKICK --> $RankToBallNoGoalie
117+
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
118+
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second
119+
THIRD --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition
120+
GOAL_KICK --> $RankToBallNoGoalie
121+
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
122+
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second
123+
THIRD --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition
124+
PENALTYKICK --> $RankToBallNoGoalie
125+
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
126+
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second
127+
THIRD --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition
112128
ELSE --> $RankToBallNoGoalie
113129
FIRST --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_first
114130
SECOND --> @ChangeAction + action:positioning, @LookAtFieldFeatures, @AvoidBallActive, @GoToDefensePosition + mode:freekick_second

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/bitfoot_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_BITFOOT_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_BITFOOT_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/msg/foot_pressure.hpp>
77
#include <bitbots_ros_control/hardware_interface.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/button_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_BUTTON_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_BUTTON_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/msg/buttons.hpp>
77
#include <bitbots_ros_control/hardware_interface.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/core_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_CORE_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_CORE_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_ros_control/hardware_interface.hpp>
77
#include <bitbots_ros_control/utils.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/dynamixel_servo_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_DYNAMIXEL_SERVO_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_DYNAMIXEL_SERVO_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/msg/joint_command.hpp>
77
#include <bitbots_msgs/msg/joint_torque.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/imu_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_IMU_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_IMU_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/srv/accelerometer_calibration.hpp>
77
#include <bitbots_msgs/srv/complementary_filter_params.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/leds_hardware_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_LEDS_HARDWARE_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_LEDS_HARDWARE_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/srv/leds.hpp>
77
#include <bitbots_ros_control/hardware_interface.hpp>

‎src/bitbots_lowlevel/bitbots_ros_control/include/bitbots_ros_control/servo_bus_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_SERVO_BUS_INTERFACE_H_
22
#define BITBOTS_ROS_CONTROL_INCLUDE_BITBOTS_ROS_CONTROL_SERVO_BUS_INTERFACE_H_
33

4-
#include <dynamixel_driver.h>
4+
#include <dynamixel_workbench_toolbox/dynamixel_driver.h>
55

66
#include <bitbots_msgs/msg/audio.hpp>
77
#include <bitbots_msgs/msg/joint_torque.hpp>

0 commit comments

Comments
 (0)