Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b5fcbad
started porting bridge to base controller
evan-palmer Mar 28, 2023
8586481
continued base controller implementation
evan-palmer Mar 29, 2023
d6cff38
bedtime
evan-palmer Mar 29, 2023
b29613a
Added parameter to control publish rate
evan-palmer Mar 29, 2023
168cc3f
Continued controller implementation and fixed docker errors
evan-palmer Mar 30, 2023
1fafaac
save point
evan-palmer Mar 31, 2023
93ef5e6
reincluded bridge to separate concerns
evan-palmer Mar 31, 2023
fc51e3e
continued base controller implementation
evan-palmer Apr 1, 2023
3886d10
added linear velocity calculation
evan-palmer Apr 3, 2023
d35103d
cleaned up lambdas and continued base controller
evan-palmer Apr 4, 2023
3c8ffe4
Started implementing vehicle dynamics
evan-palmer Apr 22, 2023
9665b66
Continued vehicle dynamics implementation
evan-palmer Apr 22, 2023
024dff5
Finished initial untested version of vehicle dynamics
evan-palmer Apr 23, 2023
fbaa3d6
Resolve initial bugs
evan-palmer Apr 23, 2023
5ab75cc
Started working on unit testing the dynamics
evan-palmer Apr 23, 2023
9752844
i dont remember
evan-palmer Apr 23, 2023
8ab67d5
Started implementing test cases and squashed some bugs
evan-palmer Apr 25, 2023
dec9c6b
Finished vehicle dynamics test cases and added current effects
evan-palmer Apr 25, 2023
14fd359
Added TCM and started thruster dynamics
evan-palmer Apr 26, 2023
eeacad6
Removed unrelevant files
evan-palmer Apr 26, 2023
f534ddd
Fixed comments
evan-palmer Apr 27, 2023
cb4e649
started implementation of manager
evan-palmer May 3, 2023
f3854b3
Removed unused packages and cleaned up manager implementation
evan-palmer May 4, 2023
8028506
Removed dynamics package as not in pr scope
evan-palmer May 4, 2023
4f1230c
Implemented and tested parameter backup procedure, started on passthr…
evan-palmer May 5, 2023
9805961
Cleaned up implementation and started param backup service
evan-palmer May 5, 2023
4551beb
Time for some video games baby
evan-palmer May 6, 2023
17a5cf8
Removed unnecessary methods
evan-palmer May 6, 2023
4e5d8ad
Removed more unused methods
evan-palmer May 6, 2023
fee7d3a
Added interface to stop thrusters and improve success rate of mode ch…
evan-palmer May 8, 2023
6b6ab1c
Refactored to use multithreadedexecutor
evan-palmer May 8, 2023
37313a3
Save point for golf
evan-palmer May 8, 2023
adc56e5
Finalized initial version
evan-palmer May 9, 2023
3e7ff22
Resolved PR comments
evan-palmer May 9, 2023
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
3 changes: 1 addition & 2 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ Checks: >
-bugprone-narrowing-conversions,
-bugprone-easily-swappable-parameters,
-bugprone-implicit-widening-of-multiplication-result,
-modernize-avoid-bind,
-modernize-use-nodiscard
-modernize-avoid-bind
WarningsAsErrors: "*"
CheckOptions:
- key: readability-braces-around-statements.ShortStatementLines
Expand Down
13 changes: 10 additions & 3 deletions .devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
"files.insertFinalNewline": true,
"files.trimTrailingWhitespace": true,
"editor.formatOnSave": true,
"editor.tabSize": 2,
"xml.format.maxLineWidth": 100,
"json.format.enable": true,
"python.linting.enabled": true,
Expand All @@ -45,14 +46,20 @@
"python.linting.mypyEnabled": true,
"python.formatting.provider": "black",
"autoDocstring.startOnNewLine": false,
"autoDocstring.docstringFormat": "google",
"autoDocstring.docstringFormat": "google-notypes",
"isort.args": ["--profile", "black"],
"isort.check": true,
"python.autoComplete.extraPaths": [
"/opt/ros/humble/lib/python3.10/site-packages/"
"/opt/ros/humble/lib/python3.10/site-packages/",
"/opt/ros/humble/local/lib/python3.10/dist-packages/",
"/opt/ros/rolling/lib/python3.10/site-packages/",
"/opt/ros/rolling/local/lib/python3.10/dist-packages/"
],
"python.analysis.extraPaths": [
"/opt/ros/humble/lib/python3.10/site-packages/"
"/opt/ros/humble/lib/python3.10/site-packages/",
"/opt/ros/humble/local/lib/python3.10/dist-packages/",
"/opt/ros/rolling/lib/python3.10/site-packages/",
"/opt/ros/rolling/local/lib/python3.10/dist-packages/"
],
"C_Cpp.default.intelliSenseMode": "linux-gcc-x86",
"C_Cpp.clang_format_fallbackStyle": "Google",
Expand Down
34 changes: 21 additions & 13 deletions .docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@ FROM ros:$ROS_DISTRO-ros-base as ci
LABEL maintainer="Evan Palmer"
LABEL maintainer-email="evanp922@gmail.com"

ENV DEBIAN_FRONTEND=noninteractive
WORKDIR /root/ws_blue

COPY . src/blue

# Install the core apt packages
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
# Install apt packages
RUN apt-get -q update \
&& apt-get -q -y upgrade \
&& apt-get -q install --no-install-recommends -y \
git \
wget \
curl \
Expand All @@ -30,10 +33,10 @@ RUN [ "/bin/bash" , "-c" , "\
&& sudo ./install_geographiclib_datasets.sh" ]

# Install all ROS dependencies
RUN apt-get update && apt-get upgrade -y \
RUN apt-get -q update \
&& apt-get -q -y upgrade \
&& rosdep update \
&& DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& rm -rf src \
&& apt-get autoremove -y \
&& apt-get clean -y \
Expand All @@ -42,14 +45,15 @@ RUN apt-get update && apt-get upgrade -y \
FROM ci as source

ENV ROS_UNDERLAY /root/ws_blue/install
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR $ROS_UNDERLAY/..

COPY . src/blue

RUN apt-get update && apt-get upgrade -y \
RUN apt-get -q update \
&& apt-get -q -y upgrade \
&& rosdep update \
&& DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -65,21 +69,24 @@ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \
FROM ci as develop

ENV ROS_UNDERLAY /root/ws_blue/install
ENV DEBIAN_FRONTEND=noninteractive
WORKDIR $ROS_UNDERLAY/..

COPY . src/blue

RUN apt-get update && apt-get upgrade -y \
RUN apt-get -q update \
&& apt-get -q -y upgrade \
&& rosdep update \
&& DEBIAN_FRONTEND=noninteractive \
rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --as-root=apt:false \
&& rm -rf src \
&& apt-get autoremove -y \
&& apt-get clean -y \
&& rm -rf /var/lib/apt/lists/*

# Install development tools
RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \
RUN apt-get -q update \
&& apt-get -q -y upgrade \
&& apt-get -q install --no-install-recommends -y \
python3-dev \
python3-pip \
iputils-ping \
Expand All @@ -95,7 +102,8 @@ RUN pip3 install \
mypy \
isort \
flake8 \
black
black \
setuptools==58.2.0

# Configure a new non-root user
ARG USERNAME=dev
Expand Down
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
*

# Except the following
!blue_bridge
!blue_manager
54 changes: 0 additions & 54 deletions blue_bridge/CMakeLists.txt

This file was deleted.

51 changes: 0 additions & 51 deletions blue_bridge/include/blue_bridge/bridge.hpp

This file was deleted.

90 changes: 0 additions & 90 deletions blue_bridge/src/bridge.cpp

This file was deleted.

File renamed without changes.
Empty file.
Loading