Skip to content

Commit

Permalink
Rename hlvs api
Browse files Browse the repository at this point in the history
  • Loading branch information
Flova committed Oct 23, 2024
1 parent 38815c6 commit 6019777
Show file tree
Hide file tree
Showing 18 changed files with 75 additions and 39 deletions.
2 changes: 1 addition & 1 deletion bitbots_misc/bitbots_containers/hlvs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ RUN . /opt/ros/iron/setup.sh && colcon build --cmake-args -DBUILD_TESTING=OFF

# TODO execute tests

RUN cp src/bitbots_main/bitbots_robot/wolfgang_robocup_api/scripts/start.sh .local/bin/start
RUN cp src/bitbots_main/bitbots_robot/bitbots_robocup_api/scripts/start.sh .local/bin/start

# Volume for logs
VOLUME /robocup-logs
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics for the Wolfgang Robot.
This package bridges between the [official Humanoid League RoboCup Proto3 API](https://cdn.robocup.org/hl/wp/2021/05/v-hsc_simulator_api_v1.0.pdf) and our ROS topics.
62 changes: 62 additions & 0 deletions bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"name": "Bit-Bots",
"players": {
"1": {
"proto": "Wolfgang",
"dockerTag": "latest",
"dockerCmd": "roslaunch bitbots_robocup_api robocup_walk.launch",
"halfTimeStartingPose": {
"translation": [
-3.6,
-3.20,
0.43
],
"rotation": [
0.13,
-0.13,
-0.98,
-1.57
]
},
"reentryStartingPose": {
"translation": [
-3.6,
-3.20,
0.43
],
"rotation": [
0.0,
-0.0,
-1.0,
-1.57
]
},
"shootoutStartingPose": {
"translation": [
2.6,
0,
0.43
],
"rotation": [
0,
0.98,
0.13,
0.26
]
},
"goalKeeperStartingPose": {
"translation": [
-4.47,
0,
0.43
],
"rotation": [
-0.13,
0,
0.98,
3.14
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
<launch>
<node pkg="hlvs_player" exec="hlvs_player" output="screen">
<param name="devices_file" value="$(find-pkg-share wolfgang_robocup_api)/config/devices.json"/>
<param name="devices_file" value="$(find-pkg-share bitbots_robocup_api)/config/devices.json"/>
<remap from="camera/image_raw" to="camera/image_proc"/>
<remap from="imu/data" to="imu/data_raw"/>
</node>
<!-- The hlvs_player expects the joint command positions as a 'JointState' message.
We therfore need to convert the messages from our custom 'JointCommand' message to the
more common 'JointState' layout. -->
<node pkg="wolfgang_robocup_api" exec="command_proxy" output="screen">
<node pkg="bitbots_robocup_api" exec="command_proxy" output="screen">
<remap from="input" to="DynamixelController/command"/>
<remap from="output" to="joint_command"/>
</node>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</group>

<!-- load the robocup api -->
<include file="$(find-pkg-share wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
<include file="$(find-pkg-share bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />

<!-- launch the team player -->
<include file="$(find-pkg-share bitbots_bringup)/launch/teamplayer.launch">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<launch>
<include file="$(find wolfgang_robocup_api)/launch/wolfgang_robocup_api_bridge.launch" />
<include file="$(find bitbots_robocup_api)/launch/bitbots_robocup_api_bridge.launch" />

<include file="$(find bitbots_bringup)/launch/motion_standalone.launch">
<arg name="sim" value="true" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>wolfgang_robocup_api</name>
<name>bitbots_robocup_api</name>
<version>0.0.0</version>
<description>Bridge between the official Humanoid League RoboCup Proto3 API
and our ROS topics for the Wolfgang Robot
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,4 @@ sed -i "/^ target_ip:/s/^.*$/ target_ip: $ROBOCUP_MIRROR_SERVER_IP/" $TEAM
# Start ROS #
#############

exec ros2 launch wolfgang_robocup_api robocup_teamplayer.launch record:=$RECORD
exec ros2 launch bitbots_robocup_api robocup_teamplayer.launch record:=$RECORD
4 changes: 4 additions & 0 deletions bitbots_simulation/bitbots_robocup_api/setup.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[develop]
script_dir=$base/lib/bitbots_robocup_api
[install]
install_scripts=$base/lib/bitbots_robocup_api
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from setuptools import find_packages, setup

package_name = "wolfgang_robocup_api"
package_name = "bitbots_robocup_api"

setup(
name=package_name,
Expand Down
26 changes: 0 additions & 26 deletions bitbots_simulation/wolfgang_robocup_api/config/bitbots_walk.json

This file was deleted.

4 changes: 0 additions & 4 deletions bitbots_simulation/wolfgang_robocup_api/setup.cfg

This file was deleted.

0 comments on commit 6019777

Please sign in to comment.