Skip to content

Commit 73662b5

Browse files
Merge branch 'main' into feature/toe_joint
2 parents 67a6f74 + 9606916 commit 73662b5

File tree

402 files changed

+8711
-7751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

402 files changed

+8711
-7751
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: ros-tooling/[email protected]
2020

2121
- name: Check out repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
2323

2424
- name: Configure git to trust repository
2525
run: git config --global --add safe.directory /__w/bitbots_main/bitbots_main

.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,9 @@ doku/*
221221
/lib/
222222

223223
# Path to the protocol buffer definitions, which are a diffrerent repository and managed by vcstool
224-
/bitbots_team_communication/bitbots_team_communication/RobocupProtocol
224+
/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/RobocupProtocol
225225
# Protobuf generated file
226-
/bitbots_team_communication/bitbots_team_communication/robocup_extension_pb2.py
226+
/bitbots_team_communication/bitbots_team_communication/bitbots_team_communication/robocup_extension_pb2.py
227227

228+
# Workspace git status file from the deploy tool
229+
**/workspace_status.json

.vscode/settings.json

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"cSpell.words": [
66
"animatable",
77
"ansible",
8+
"antiwindup",
89
"autoconnect",
910
"basler",
1011
"bitbot",
@@ -14,8 +15,10 @@
1415
"chrt",
1516
"coef",
1617
"colcon",
18+
"conv",
1719
"cornerkick",
1820
"costmap",
21+
"costmaps",
1922
"cpus",
2023
"cuda",
2124
"cudnn",
@@ -27,6 +30,7 @@
2730
"dtype",
2831
"dynamixel",
2932
"dynup",
33+
"euler",
3034
"externproto",
3135
"fetchrobotics",
3236
"fieldboundary",
@@ -35,6 +39,7 @@
3539
"freekick",
3640
"gamecontroller",
3741
"gamestate",
42+
"gaussian",
3843
"goalkick",
3944
"hexsha",
4045
"hlvs",
@@ -49,9 +54,11 @@
4954
"joern",
5055
"jupyter",
5156
"kalman",
57+
"Leph",
5258
"linalg",
5359
"matplotlib",
5460
"mmse",
61+
"moveit",
5562
"msgify",
5663
"mutex",
5764
"nanosec",
@@ -63,16 +70,21 @@
6370
"odom",
6471
"odometry",
6572
"particlefilter",
73+
"pathfinding",
6674
"penaltykick",
6775
"penaltyshoot",
6876
"pointcloud",
6977
"pointclouds",
78+
"popen",
7079
"pretrained",
7180
"proto",
7281
"protos",
7382
"pyplot",
83+
"pywrapper",
84+
"Quaterniond",
7485
"rclcpp",
7586
"rclpy",
87+
"reapproach",
7688
"rhoban",
7789
"robocup",
7890
"rory",
@@ -83,14 +95,18 @@
8395
"rosgraph",
8496
"rosout",
8597
"roundrobin",
98+
"Rouxel",
8699
"rtype",
87100
"rviz",
88101
"scipy",
102+
"sdev",
89103
"seaborn",
90104
"segmentations",
105+
"srdf",
91106
"ssid",
92107
"std_srvs",
93108
"taskset",
109+
"teamcomm",
94110
"teamplayer",
95111
"teleop",
96112
"throwin",
@@ -103,8 +119,10 @@
103119
"walkready",
104120
"wandb",
105121
"webots",
122+
"Werror",
106123
"wifi",
107124
"wolfgang",
125+
"xacro",
108126
"yoeo",
109127
"yolo",
110128
"yolov"
@@ -193,7 +211,8 @@
193211
"valarray": "cpp",
194212
"variant": "cpp",
195213
"regex": "cpp",
196-
"future": "cpp"
214+
"future": "cpp",
215+
"*.ipp": "cpp"
197216
},
198217
// Tell the ROS extension where to find the setup.bash
199218
// This also utilizes the COLCON_WS environment variable, which needs to be set
@@ -209,4 +228,7 @@
209228
"editor.formatOnSave": true,
210229
"editor.defaultFormatter": "charliermarsh.ruff",
211230
"restructuredtext.pythonRecommendation.disabled": true,
231+
"[xml]": {
232+
"editor.defaultFormatter": "DotJoshJohnson.xml"
233+
},
212234
}

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ fresh-libs: remove-libs setup-libs
7070
remove-libs:
7171
# Removes the lib directory and all its contents
7272
rm -rf lib/*
73+
# Also remove the generated protobuf files, as they are not needed anymore
74+
rm bitbots_team_communication/bitbots_team_communication/robocup_extension_pb2.py 2> /dev/null || true
7375

7476
setup-libs:
7577
# Clone lib repositories in workspace.repos into the lib directory

bitbots_behavior/bitbots_blackboard/.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

bitbots_behavior/bitbots_blackboard/.idea/bitbots_blackboard.iml

Lines changed: 0 additions & 14 deletions
This file was deleted.

bitbots_behavior/bitbots_blackboard/.idea/inspectionProfiles/profiles_settings.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

bitbots_behavior/bitbots_blackboard/.idea/misc.xml

Lines changed: 0 additions & 4 deletions
This file was deleted.

bitbots_behavior/bitbots_blackboard/.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

bitbots_behavior/bitbots_blackboard/.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)