Skip to content

Commit

Permalink
Cleanup PR (#207)
Browse files Browse the repository at this point in the history
  • Loading branch information
Flova authored Nov 14, 2023
2 parents cdb03b6 + 2a7ee7d commit 105a9ee
Show file tree
Hide file tree
Showing 9 changed files with 142 additions and 10 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@
[submodule "humanoid_league_misc"]
path = humanoid_league_misc
url = ../../bit-bots/humanoid_league_misc.git
[submodule "humanoid_league_msgs"]
path = humanoid_league_msgs
url = ../../bit-bots/humanoid_league_msgs.git
[submodule "udp_bridge"]
path = udp_bridge
url = ../../bit-bots/udp_bridge.git
Expand Down
26 changes: 26 additions & 0 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"configurations": [
{
"browse": {
"databaseFilename": "${default}",
"limitSymbolsToIncludedHeaders": false
},
// Set include paths so the editor can find the c++ header files for the auto completion
// The Bit-Bots specific environment variable COLCON_WS is utilized here and needs to be set
"includePath": [
"${env:COLCON_WS}/install/*/include/**",
"${env:COLCON_WS}/build/**/include/**",
"${env:COLCON_WS}/build/**/rosidl_generator_cpp/**",
"${workspaceFolder}/**/include/**",
"/opt/ros/${env:ROS_DISTRO}/include/**",
"/usr/include/**"
],
"name": "ROS",
"intelliSenseMode": "gcc-x64",
"compilerPath": "/usr/bin/gcc",
"cStandard": "gnu11",
"cppStandard": "c++17"
}
],
"version": 4
}
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@
"trond-snekvik.simple-rst", // Syntax highlighting for rst files
"twxs.cmake", // CMake support
"zxh404.vscode-proto3", // Protobuf support
"Mastermori.dsd", // DSD support
]
}
10 changes: 10 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "ROS: Attach",
"type": "ros",
"request": "attach"
}
]
}
103 changes: 101 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"coef",
"colcon",
"CORNERKICK",
"costmap",
"Costmap",
"CPUS",
"cuda",
"cudnn",
Expand All @@ -33,6 +35,7 @@
"gamestate",
"GOALKICK",
"hlvs",
"holonomic",
"hostnames",
"hsv",
"imgmsg",
Expand All @@ -45,13 +48,19 @@
"Kalman",
"linalg",
"matplotlib",
"Mmse",
"msgify",
"mutex",
"nanosec",
"ndarray",
"Neff",
"nmcli",
"numpify",
"odom",
"odometry",
"PARTICLEFILTER",
"PENALTYKICK",
"PENALTYSHOOT",
"pointcloud",
"pointclouds",
"pretrained",
Expand All @@ -60,6 +69,7 @@
"pyplot",
"rclcpp",
"rclpy",
"Rhoban",
"robocup",
"RoboCup",
"rosbag",
Expand All @@ -82,6 +92,7 @@
"timespec",
"TLDR",
"tqdm",
"unpenalize",
"unpenalized",
"urdf",
"URDF",
Expand All @@ -94,8 +105,96 @@
"yolo",
"yolov"
],
"files.autoSave": "onFocusChange",
"files.autoSave": "afterDelay",
"files.autoSaveDelay": 500,
"files.insertFinalNewline": true,
"python.analysis.typeCheckingMode": "basic",
"python.analysis.typeCheckingMode": "off",
"esbonio.sphinx.confDir": "",
"files.associations": {
"cctype": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"any": "cpp",
"array": "cpp",
"atomic": "cpp",
"strstream": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"codecvt": "cpp",
"compare": "cpp",
"complex": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"cstdint": "cpp",
"deque": "cpp",
"forward_list": "cpp",
"list": "cpp",
"map": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"type_traits": "cpp",
"utility": "cpp",
"hash_map": "cpp",
"hash_set": "cpp",
"slist": "cpp",
"fstream": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iosfwd": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"semaphore": "cpp",
"shared_mutex": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"cfenv": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"valarray": "cpp",
"variant": "cpp"
},

// Tell the ROS extension where to find the setup.bash
// This also utilizes the COLCON_WS environment variable, which needs to be set
"ros.rosSetupScript": "${env:COLCON_WS}/install/setup.bash",

// DO NOT COMMIT THESE ABSOLUTE PYTHON PATHS:


}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Other scripts are available in the `scripts` folder, [documented here](scripts/R

The naming prefix of submodules indicates the scope of the packages.

* bitbots_ : specific RoboCup code of our team which follows interface specification of humanoid_league_msgs
* bitbots_ : specific RoboCup code of our team
* humanoid_league_ : packages which are useful for all teams in the RoboCup Humanoid League, e.g. visualization tools and game controller
* no prefix : packages which are useful in general and usable outside of RoboCup
* lib : folder for third party libraries that need to be build from source
Expand Down
1 change: 0 additions & 1 deletion humanoid_league_msgs
Submodule humanoid_league_msgs deleted from 350f46
2 changes: 2 additions & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ fabric # Manages SSH sessions for the deploy tool
pre-commit # Installs and runs pre-commit hooks for git
rich # Rich terminal output
ruff # Python linting
syrupy # Python snapshot testing
pytest-mock # Mocking for pytest
4 changes: 1 addition & 3 deletions sync_includes_wolfgang_nuc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@ include:
- bitbots_behavior:
- bitbots_blackboard
- bitbots_body_behavior
- bitbots_head_mover
- bitbots_lowlevel:
- bitbots_buttons
- bitbots_ros_control
- bitbots_misc:
- bitbots_basler_camera
- bitbots_bringup
- bitbots_convenience_frames
- bitbots_extrinsic_calibration
- bitbots_ipm
- bitbots_teleop
Expand All @@ -21,6 +19,7 @@ include:
- bitbots_dynamic_kick
- bitbots_dynup
- bitbots_hcm
- bitbots_head_mover
- bitbots_moveit_bindings
- bitbots_odometry
- bitbots_quintic_walk
Expand All @@ -44,7 +43,6 @@ include:
- humanoid_league_map_generator
- humanoid_league_speaker
- humanoid_league_team_communication
- humanoid_league_msgs
- lib:
- audio_common
- bio_ik
Expand Down

0 comments on commit 105a9ee

Please sign in to comment.