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.

Sign up for GitHub

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

Fix Doxygen Comment Blocks are based off of Eastern Time #119

Merged
merged 3 commits into from
Sep 6, 2023
Merged

Fix Doxygen Comment Blocks are based off of Eastern Time #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b402b1f
Change how timezone is set
Byrdman32 Sep 5, 2023
f5faac7
Merge branch 'development' into hotfix/timzone-issues
Byrdman32 Sep 5, 2023
af478e7
Change Sub Pages Names
Byrdman32 Sep 5, 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
12 changes: 7 additions & 5 deletions .devcontainer/Dockerfile_Focal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ ARG CMAKE_VERSION="3.24.3"
ARG OPENCV_VERSION="4.8.0"
ARG QUILL_VERSION="v3.3.1"
ARG GTEST_VERSION="v1.14.0"
ARG TZ="America/Chicago"

# Set Labels
LABEL authors="Missouri S&T Mars Rover Design Team"
LABEL maintainer="Mars Rover Design Team <[email protected]>"
LABEL org.opencontainers.image.source=https://github.com/missourimrdt/autonomy_software
LABEL org.opencontainers.image.licenses=GPL-3.0-onlyLABEL
LABEL org.opencontainers.image.licenses=GPL-3.0-only
LABEL org.opencontainers.image.version="v24.1.0"
LABEL org.opencontainers.image.description="Docker Image for Ubuntu ${UBUNTU_MAJOR}.${UBUNTU_MINOR} with CUDA ${CUDA_MAJOR}.${CUDA_MINOR}, ZED SDK ${ZED_MAJOR}.${ZED_MINOR}, OpenCV ${OPENCV_VERSION}, Quill ${QUILL_VERSION}, and Google Test ${GTEST_VERSION}."

Expand All @@ -34,9 +35,6 @@ ARG DEBIAN_FRONTEND=noninteractive
ENV NVIDIA_DRIVER_CAPABILITIES \
${NVIDIA_DRIVER_CAPABILITIES:+$NVIDIA_DRIVER_CAPABILITIES,}compute,video,utility,graphics

# Set Timezone
RUN echo "America/Chicago" > /etc/localtime

# Set CUDA Version
RUN echo "CUDA Version ${CUDA_MAJOR}.${CUDA_MINOR}.0" > /usr/local/cuda/version.txt

Expand All @@ -47,12 +45,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev tzdata curl \
yasm libatlas-base-dev gfortran libpq-dev libavutil-dev libpostproc-dev \
libxine2-dev libglew-dev libtiff5-dev zlib1g-dev cowsay locales \
libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev \
libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev tzdata \
libboost-all-dev valgrind doxygen graphviz htop nano fortune fortunes

# Install Required Python Packages
RUN python3 -m pip install numpy opencv-python pyopengl

# Set Timezone
RUN echo "${TZ}" > /etc/localtime && \
echo "${TZ}" > /etc/timezone

# Install gcc/g++
RUN apt-get install --no-install-recommends -y \
gcc-10 g++-10 && \
Expand Down
9 changes: 7 additions & 2 deletions .devcontainer/Dockerfile_Jammy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ ARG CMAKE_VERSION="3.24.3"
ARG OPENCV_VERSION="4.8.0"
ARG QUILL_VERSION="v3.3.1"
ARG GTEST_VERSION="v1.14.0"
ARG TZ="America/Chicago"

# Set Labels
LABEL authors="Missouri S&T Mars Rover Design Team"
LABEL maintainer="Mars Rover Design Team <[email protected]>"
LABEL org.opencontainers.image.source=https://github.com/missourimrdt/autonomy_software
LABEL org.opencontainers.image.licenses=GPL-3.0-onlyLABEL
LABEL org.opencontainers.image.licenses=GPL-3.0-only
LABEL org.opencontainers.image.version="v24.1.0"
LABEL org.opencontainers.image.description="Docker Image for Ubuntu ${UBUNTU_MAJOR}.${UBUNTU_MINOR} with CUDA ${CUDA_MAJOR}.${CUDA_MINOR}, ZED SDK ${ZED_MAJOR}.${ZED_MINOR}, OpenCV ${OPENCV_VERSION}, Quill ${QUILL_VERSION}, and Google Test ${GTEST_VERSION}."

Expand All @@ -47,12 +48,16 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev tzdata curl \
yasm libatlas-base-dev gfortran libpq-dev libavutil-dev libpostproc-dev \
libxine2-dev libglew-dev libtiff5-dev zlib1g-dev cowsay locales \
libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev \
libeigen3-dev python3-dev python3-pip python3-numpy libx11-dev tzdata \
libboost-all-dev valgrind doxygen graphviz htop nano fortune fortunes

# Install Required Python Packages
RUN python3 -m pip install numpy opencv-python pyopengl

# Set Timezone
RUN echo "${TZ}" > /etc/localtime && \
echo "${TZ}" > /etc/timezone

# Install gcc/g++
RUN apt-get install --no-install-recommends -y \
gcc-10 g++-10 && \
Expand Down
12 changes: 7 additions & 5 deletions .devcontainer/Dockerfile_JetPack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ARG CMAKE_VERSION="3.24.3"
ARG OPENCV_VERSION="4.8.0"
ARG QUILL_VERSION="v3.3.1"
ARG GTEST_VERSION="v1.14.0"
ARG TZ="America/Chicago"

# Set Labels
LABEL authors="Missouri S&T Mars Rover Design Team"
Expand All @@ -33,9 +34,6 @@ ARG DEBIAN_FRONTEND=noninteractive
# Set Jetson Streaming Evironment Variables
ENV LOGNAME root

# Set Timezone
RUN echo "America/Chicago" > /etc/localtime

# Set L4T Version
RUN echo "# R${L4T_MAJOR} (release), REVISION: ${L4T_MINOR}.${L4T_PATCH}" > /etc/nv_tegra_release

Expand All @@ -44,15 +42,19 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
build-essential gfortran cmake git gdb file tar libatlas-base-dev apt-transport-https \
libavcodec-dev libavformat-dev libavresample-dev libcanberra-gtk3-module zstd wget less \
libdc1394-22-dev libeigen3-dev libglew-dev libgstreamer-plugins-base1.0-dev udev curl \
libgstreamer-plugins-good1.0-dev libgstreamer1.0-dev libgtk-3-dev libjpeg-dev sudo \
libgstreamer-plugins-good1.0-dev libgstreamer1.0-dev libgtk-3-dev libjpeg-dev sudo tzdata \
libjpeg8-dev libjpeg-turbo8-dev liblapack-dev liblapacke-dev libopenblas-dev libpng-dev \
libpostproc-dev libswscale-dev libtbb-dev libtbb2 libtesseract-dev libtiff-dev libv4l-dev \
libxine2-dev libxvidcore-dev libx264-dev libgtkglext1 libgtkglext1-dev pkg-config qv4l2 \
v4l-utils zlib1g-dev python3-dev python-numpy libboost-all-dev valgrind doxygen graphviz nano

#This symbolic link is needed to use the streaming features on Jetson inside a container
# This symbolic link is needed to use the streaming features on Jetson inside a container
RUN ln -sf /usr/lib/aarch64-linux-gnu/tegra/libv4l2.so.0 /usr/lib/aarch64-linux-gnu/libv4l2.so

# Set Timezone
RUN echo "${TZ}" > /etc/localtime && \
echo "${TZ}" > /etc/timezone

# Install gcc/g++
RUN apt-get install --no-install-recommends -y \
gcc-10 g++-10 && \
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\page CONTRIBUTING_8md Contributing Guide
\page md_CONTRIBUTING Contributing Guide

# Contributing to Autonomy Software
## Contributing
Expand Down
2 changes: 1 addition & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\page INSTALL_8md Installation Guide
\page md_INSTALL Installation Guide

# Installing Autonomy Software

Expand Down
4 changes: 2 additions & 2 deletions docs/Doxygen/resources/DoxygenLayout.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<!-- Navigation index tabs for HTML output -->
<navindex>
<tab type="mainpage" visible="yes" title=""/>
<tab type="user" url="@ref CONTRIBUTING_8md" title="Contributing Guide"/>
<tab type="user" url="@ref INSTALL_8md" title="Installation Guide"/>
<tab type="user" url="@ref md_CONTRIBUTING" title="Contributing Guide"/>
<tab type="user" url="@ref md_INSTALL" title="Installation Guide"/>
<tab type="pages" visible="no" title="" intro=""/>
<tab type="modules" visible="no" title="" intro=""/>
<tab type="namespaces" visible="yes" title="">
Expand Down