Skip to content

Commit

Permalink
Merge pull request #123 from RoboTeamTwente/cleanup-codebase
Browse files Browse the repository at this point in the history
Cleanup codebase
  • Loading branch information
JornJorn authored Mar 26, 2024
2 parents 6533e5f + b47cef8 commit f5bfd0f
Show file tree
Hide file tree
Showing 428 changed files with 254 additions and 3,711 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/doxy-action.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
#
# Created by Max Thielen on Oct. 15, 2021
# Updated by Jibbe Andringa on Mar. 7, 2023
#

name: Doxygen Documentation

on:
Expand Down
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,10 @@ endif()

find_package(Qt5Network REQUIRED)



# internal projects
add_subdirectory(roboteam_networking)
add_subdirectory(roboteam_utils)
add_subdirectory(roboteam_logging)
add_subdirectory(roboteam_ai)
add_subdirectory(roboteam_robothub)
add_subdirectory(roboteam_world)
add_subdirectory(roboteam_observer)
2 changes: 1 addition & 1 deletion cmake_modules/CodeCoverage.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
# make my_coverage_target
#

set(COVERAGE_LCOV_EXCLUDES '*/googletest/*' '*/boost/*' '*/cmake-build-debug/*' '/usr/*' '/opt/*' '*/roboteam_msgs/*' '*/roboteam_utils/*' '*/json.h')
set(COVERAGE_LCOV_EXCLUDES '*/googletest/*' '*/cmake-build-debug/*' '/usr/*' '/opt/*' '*/roboteam_msgs/*' '*/roboteam_utils/*' '*/json.h')
set(COVERAGE_GCOVR_EXCLUDES ${COVERAGE_LCOV_EXCLUDES})

include(CMakeParseArguments)
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN apk add --no-cache bash build-base cmake make musl-dev libtool \
clang ninja-build autoconf automake pkgconfig \
python3 py3-pip git ccache sudo \
libzmq zeromq-dev libzmq-static eigen-dev gtest-dev \
libtbb-dev boost-dev curl unzip wget zlib-dev zip nodejs npm \
libtbb-dev curl unzip wget zlib-dev zip nodejs npm \
openssl-dev sdl2-dev libudev-zero libudev-zero-dev libusb libusb-dev \
qt5-qtbase-dev qt5-qtcharts-dev qt5-qtdeclarative-dev qt5-qtsvg-dev
RUN npm install -g yarn
Expand Down Expand Up @@ -64,7 +64,7 @@ ENV USER=$USERNAME
RUN apk add --no-cache \
libtool libzmq libzmq-static libudev-zero libusb \
zeromq-dev eigen-dev gtest-dev \
libtbb-dev boost-dev zlib-dev \
libtbb-dev zlib-dev \
openssl-dev sdl2-dev \
qt5-qtbase-dev qt5-qtcharts-dev qt5-qtdeclarative-dev qt5-qtsvg-dev \
sudo nodejs npm
Expand Down
3 changes: 2 additions & 1 deletion docs/World.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

## General ##
[World](https://github.com/RoboTeamTwente/roboteam_ai/blob/development/include/roboteam_ai/world_new/World.hpp#L36) by itself is a very interesting conversation, because we don't just have a single world.
We have two worlds, one called [roboteam_world](http://github.com/roboteamtwente/roboteam_world), and one that we refer
We have used to have two worlds, one called [roboteam_world](http://github.com/roboteamtwente/roboteam_world), and one that we refer
to as [ai world](https://github.com/RoboTeamTwente/roboteam_ai/blob/development/include/roboteam_ai/world_new/World.hpp)
Now, the world in AI is called world, while the other one is called roboteam_observer.

The world structure simply represents the current world and the history.
It keeps track of past worlds, and creates new worlds from [protobuf messages](https://developers.google.com/protocol-buffers).
Expand Down
2 changes: 1 addition & 1 deletion docs/WorldData.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# WorldData #

## General ##
[WorldData]() itself is just a representation of the current world. It receives data from [roboteam_world](http://://github.com/roboteamtwente/roboteam_world) and transforms it into a WorldData structure.
[WorldData]() itself is just a representation of the current world. It receives data from [roboteam_observer](http://://github.com/roboteamtwente/roboteam_world) and transforms it into a WorldData structure.

WorldData itself is not that complicated, it serves to be a simple data-only structure with some getters and setters.

Expand Down
5 changes: 0 additions & 5 deletions roboteam_ai/.clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<ext/.*\.h>'
Expand Down Expand Up @@ -158,9 +156,6 @@ SpacesInParentheses: false
SpacesInSquareBrackets: false
SpaceBeforeSquareBrackets: false
Standard: Auto
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseCRLF: false
UseTab: Never
Expand Down
4 changes: 0 additions & 4 deletions roboteam_ai/.github/workflows/doxy-action.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
#
# Created by Max Thielen on Oct. 15, 2021
#

name: Doxygen Documentation

on:
Expand Down
Loading

0 comments on commit f5bfd0f

Please sign in to comment.