-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:bit-bots/bitbots_main
- Loading branch information
Showing
485 changed files
with
179 additions
and
146 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,17 +10,19 @@ As such you can lookup some of the needed requirements there. | |
|
||
- have an LDAP mafiasi account for access to the CLs | ||
- have ros2 aliases setup (see linked docs) | ||
- have GitHub ssh access setup for bitbots_main (see linked docs) | ||
|
||
**1. Setup and download our software** | ||
|
||
- SSH into the ``cl0*`` with your mafiasi user | ||
- Add your SSH key to GitHub to access and sync our repositories | ||
- If you don't know what I am talking about or you don't yet have a SSH key, follow this guide: https://docs.github.com/en/authentication/connecting-to-github-with-ssh/checking-for-existing-ssh-keys | ||
- Go to your account settings and add your SSH key (the ``.pub`` file) to `GitHub <https://github.com/settings/keys>`_ | ||
- setup bitbots_main in your home directory | ||
|
||
.. code-block:: bash | ||
mkdir -p "~/colcon_ws/src" | ||
cd "~/colcon_ws/src" | ||
mkdir -p "$HOME/colcon_ws/src" | ||
cd "$HOME/colcon_ws/src" | ||
git clone [email protected]:bit-bots/bitbots_main.git && cd bitbots_main | ||
make install-no-root | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...gang/wolfgang_pybullet_sim/CMakeLists.txt → ...ation/bitbots_pybullet_sim/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
17 changes: 17 additions & 0 deletions
17
bitbots_simulation/bitbots_pybullet_sim/launch/simulation.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<launch> | ||
<arg name="gui" default="true"/> | ||
|
||
<group if="$(var gui)"> | ||
<node pkg="bitbots_pybullet_sim" exec="simulation_with_gui.py" name="pybullet_sim" output="screen"> | ||
<param from="$(find-pkg-share bitbots_pybullet_sim)/config/config.yaml"/> | ||
</node> | ||
</group> | ||
<group unless="$(var gui)"> | ||
<node pkg="bitbots_pybullet_sim" exec="simulation_headless.py" name="pybullet_sim" output="screen"> | ||
<param from="$(find-pkg-share bitbots_pybullet_sim)/config/config.yaml"/> | ||
</node> | ||
</group> | ||
<include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch"> | ||
<arg name="sim" value="true"/> | ||
</include> | ||
</launch> |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
<?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_pybullet_sim</name> | ||
<name>bitbots_pybullet_sim</name> | ||
<version>1.3.0</version> | ||
<description>Simulation environment using PyBullet for Wolfgang robot.</description> | ||
<description>Simulation environment using PyBullet.</description> | ||
|
||
<maintainer email="[email protected]">Marc Bestmann </maintainer> | ||
<maintainer email="[email protected]">Hamburg Bit-Bots</maintainer> | ||
|
@@ -21,15 +21,15 @@ | |
<depend>rosgraph_msgs</depend> | ||
<depend>std_msgs</depend> | ||
<depend>bitbots_docs</depend> | ||
<depend>wolfgang_webots_sim</depend> | ||
<depend>bitbots_webots_sim</depend> | ||
<depend>tf_transformations</depend> | ||
<depend>python3-transforms3d</depend> | ||
<depend>python3-numpy</depend> | ||
|
||
<export> | ||
<bitbots_documentation> | ||
<status>unknown</status> | ||
<language>python</language> | ||
</bitbots_documentation> | ||
<bitbots_documentation> | ||
<status>unknown</status> | ||
<language>python</language> | ||
</bitbots_documentation> | ||
</export> | ||
</package> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...s_wolfgang/wolfgang_robocup_api/README.md → ..._simulation/bitbots_robocup_api/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
62
bitbots_simulation/bitbots_robocup_api/config/bitbots_walk.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
] | ||
} | ||
} | ||
} | ||
} |
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions
6
...launch/wolfgang_robocup_api_bridge.launch → .../launch/bitbots_robocup_api_bridge.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,16 @@ | ||
<?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> | ||
<include file="$(find-pkg-share wolfgang_webots_sim)/launch/imu_filter_sim.launch" /> | ||
<include file="$(find-pkg-share bitbots_webots_sim)/launch/imu_filter_sim.launch" /> | ||
</launch> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ng_robocup_api/launch/robocup_walk.launch → ...ts_robocup_api/launch/robocup_walk.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...lfgang/wolfgang_webots_sim/CMakeLists.txt → ...ulation/bitbots_webots_sim/CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
...sim/webots_robot_supervisor_controller.py → ...sim/webots_robot_supervisor_controller.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.