Merge branch 'main' into fix/deploy

bit-bots · Jan 26, 2024 · d8264f2 · d8264f2
2 parents f493327 + 57b5723
commit d8264f2
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 28 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,28 +12,28 @@
         "chrt",
         "coef",
         "colcon",
-        "CORNERKICK",
+        "cornerkick",
         "costmap",
-        "Costmap",
-        "CPUS",
+        "cpus",
         "cuda",
         "cudnn",
-        "Cyberbotics",
+        "cyberbotics",
         "darknet",
-        "DROPBALL",
-        "DROPIN",
+        "dropball",
+        "dropin",
         "dsize",
         "dtype",
-        "Dynamixel",
-        "Dynup",
-        "EXTERNPROTO",
+        "dynamixel",
+        "dynup",
+        "externproto",
+        "fetchrobotics",
         "fieldboundary",
         "fieldname",
         "fovs",
-        "FREEKICK",
+        "freekick",
         "gamecontroller",
         "gamestate",
-        "GOALKICK",
+        "goalkick",
         "hlvs",
         "holonomic",
         "hostnames",
@@ -43,24 +43,25 @@
         "imwrite",
         "isolcpus",
         "isort",
-        "Joern",
+        "joern",
         "jupyter",
-        "Kalman",
+        "kalman",
         "linalg",
         "matplotlib",
-        "Mmse",
+        "mmse",
         "msgify",
         "mutex",
         "nanosec",
         "ndarray",
-        "Neff",
+        "neff",
         "nmcli",
         "numpify",
+        "numpy",
         "odom",
         "odometry",
-        "PARTICLEFILTER",
-        "PENALTYKICK",
-        "PENALTYSHOOT",
+        "particlefilter",
+        "penaltykick",
+        "penaltyshoot",
         "pointcloud",
         "pointclouds",
         "pretrained",
@@ -69,17 +70,16 @@
         "pyplot",
         "rclcpp",
         "rclpy",
-        "Rhoban",
+        "rhoban",
         "robocup",
-        "RoboCup",
         "rory",
         "rosbag",
         "rosbags",
         "rosdep",
         "rosdeps",
         "rosgraph",
         "rosout",
-        "ROUNDROBIN",
+        "roundrobin",
         "rtype",
         "rviz",
         "scipy",
@@ -89,17 +89,16 @@
         "taskset",
         "teamplayer",
         "teleop",
-        "THROWIN",
+        "throwin",
         "timespec",
-        "TLDR",
+        "tldr",
         "tqdm",
         "unpenalize",
         "unpenalized",
         "urdf",
-        "URDF",
         "walkready",
         "wandb",
-        "Webots",
+        "webots",
         "wifi",
         "wolfgang",
         "yoeo",

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Bit-Bots Software Stack
 
 [![Test if all packages build](https://github.com/bit-bots/bitbots_main/actions/workflows/build.yml/badge.svg)](https://github.com/bit-bots/bitbots_main/actions/workflows/build.yml)
+[![ROS Version Iron](https://img.shields.io/badge/ROS%20Version-Iron-ab8c71)](https://docs.ros.org/en/iron/index.html)
 
 This git repository contains all RoboCup-related code and documentation from the Hamburg Bit-Bots team.
 All code is written as individual ROS 2 packages targeting Ubuntu.

diff --git a/bitbots_misc/bitbots_docs/docs/manual/tutorials/install_software_ros2.rst b/bitbots_misc/bitbots_docs/docs/manual/tutorials/install_software_ros2.rst
@@ -41,7 +41,7 @@ If you are not already using Ubuntu 22.04, consider installing it on your system
   Those services host our Git software repositories.
 - 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) for `GitHub <https://github.com/settings/keys>`_ AND `Gitea <https://git.mafiasi.de/user/settings/keys>`_
+    - Go to your account settings and add your SSH key (the ``.pub`` file) to `GitHub <https://github.com/settings/keys>`_
 - Now, you can clone (download) our main code repository (repo) called `bitbots_main <https://github.com/bit-bots/bitbots_main>`_:
     - Open a terminal and go to the directory where you want to download our code (typically ``~/git/bitbots/``)
         - Create the directory with: ``mkdir -p ~/git/bitbots``

diff --git a/sync_includes_wolfgang_nuc.yaml b/sync_includes_wolfgang_nuc.yaml
@@ -31,8 +31,7 @@ include:
         - bitbots_localization
         - bitbots_localization_handler
         - bitbots_path_planning
-    - bitbots_vision:
-        - bitbots_vision
+    - bitbots_vision
     - bitbots_wolfgang:
         - wolfgang_animations
         - wolfgang_description