Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup meta scripts and add .vscode #198

Merged
merged 16 commits into from
Aug 31, 2023
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
*.pyc
.pyenv2/*
.pyenv3/*
.vscode/*

ansible_robots/*
doc_internal/*
Expand Down
96 changes: 96 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
{
"autoDocstring.docstringFormat": "sphinx",
"cSpell.language": "en,de-de,lorem",
"cSpell.words": [
"autoconnect",
"basler",
"bitbot",
"bitbots",
"bringup",
"cartesian",
"chrt",
"coef",
"colcon",
"CORNERKICK",
"CPUS",
"cuda",
"cudnn",
"Cyberbotics",
"darknet",
"DROPBALL",
"DROPIN",
"dsize",
"dtype",
"Dynamixel",
"Dynup",
"EXTERNPROTO",
"fieldboundary",
"fieldname",
"fovs",
"FREEKICK",
"gamecontroller",
"gamestate",
"GOALKICK",
"hlvs",
"hostnames",
"hsv",
"imgmsg",
"imread",
"imwrite",
"isolcpus",
"isort",
"jupyter",
"Kalman",
"linalg",
"matplotlib",
"mutex",
"nanosec",
"ndarray",
"nmcli",
"odom",
"odometry",
"PENALTYKICK",
"pointcloud",
"pointclouds",
"pretrained",
"proto",
"protos",
"pyplot",
"rclcpp",
"rclpy",
"robocup",
"RoboCup",
"rosbag",
"rosbags",
"rosdep",
"rosdeps",
"rosgraph",
"rosout",
"ROUNDROBIN",
"rtype",
"rviz",
"scipy",
"seaborn",
"segmentations",
"taskset",
"teamplayer",
"teleop",
"THROWIN",
"timespec",
"tqdm",
"unpenalized",
"urdf",
"URDF",
"walkready",
"wandb",
"Webots",
"wifi",
"wolfgang",
"yoeo",
"yolo",
"yolov"
],
"files.autoSave": "onFocusChange",
"files.insertFinalNewline": true,
"python.analysis.typeCheckingMode": "basic"
}
29 changes: 19 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
.PHONY : basler doc install update pull-all pull-init vision-files status
.PHONY : basler install pip pre-commit pull-all pull-init pull-files rosdep status update vs-code

basler:
test -d basler_drivers || git clone git@git.mafiasi.de:Bit-Bots/basler_drivers.git
cd basler_drivers && ./setup.sh

doc:
scripts/build-doc.py
scripts/make_basler.sh

install: pull-init
scripts/install.pl
scripts/make_basler.sh
scripts/make_update.sh

update: pull-all
rosdep install -irya
pip:
scripts/make_pip.sh

pre-commit:
scripts/make_pre-commit.sh

pull-all:
git pull
Expand All @@ -26,5 +26,14 @@ pull-init:
pull-files:
scripts/pull_files.bash

rosdep:
scripts/make_rosdep.sh

status:
scripts/git_status.bash
scripts/git_status.bash

update: pull-all
scripts/make_update.sh

vs-code:
scripts/make_vscode.sh
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
# bitbots_meta

This git repository contains all RoboCup-related code and documentation from the Hamburg Bit-Bots team as git submodules.
All code is written as ROS 2 packages for ROS 2 on Ubuntu.

[![Test if all packages build](https://github.com/bit-bots/bitbots_meta/actions/workflows/build.yml/badge.svg)](https://github.com/bit-bots/bitbots_meta/actions/workflows/build.yml)

## Installation

Full step-by-step instructions for installing the Bit-Bots software stack and ROS 2 can be found in our documentation [here](https://doku.bit-bots.de/meta/manual/tutorials/install_software_ros2.html).

To download the Bit-Bots software stack clone this repository.

```bash
Expand All @@ -28,7 +31,7 @@ If you want to update all submodules, this repo, and supplementing files, run
make pull-all
```

Make sure you are on the correct branch and have no uncommited changes in each submodule.
Make sure you are on the correct branch and have no uncommitted changes in each submodule.
To check this run

```bash
Expand All @@ -41,10 +44,10 @@ 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
* humanoid_league_ : packages which are useful for all teams in the RoboCup Humanoid League, e.g. visualization tools and gamecontroller
* 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
* bitbots_ : specific RoboCup code of our team which follows interface specification of humanoid_league_msgs
* 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

## Documentation

Expand Down
7 changes: 1 addition & 6 deletions requirements.txt → requirements/common.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
fabric
# This file includes common dependencies for all environments
filterpy
mycroft-mimic3-tts
pip
pydot
pyopencl
pytorchyolo
pyttsx3
rich
git+https://github.com/SammyRamone/stable-baselines3.git
git+https://github.com/bit-bots/deep_quintic.git
git+https://github.com/Flova/pyastar2d
Expand Down
7 changes: 7 additions & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file is used by pip to install dependencies for the development environment
-r robot.txt # Include robot.txt dependencies
black
fabric
pre-commit
rich
ruff
6 changes: 6 additions & 0 deletions requirements/robot.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# This file is used for installation of dependencies on the robot
-r common.txt # Includes all common dependencies
mycroft-mimic3-tts
pydot
pyopencl
pyttsx3
Loading