Merge pull request #158 from MissouriMRDT/release/testing

Updated Competition Merge (release/competition)

.gitattributes

@@ -0,0 +1,3 @@
+*.iso filter=lfs diff=lfs merge=lfs -text
+*.pt filter=lfs diff=lfs merge=lfs -text
+*.onnx filter=lfs diff=lfs merge=lfs -text

.github/workflows/Autonomy_Unit_Tests.yml

@@ -23,14 +23,14 @@ jobs:
       with:
         submodules: "recursive"
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4.5.0
       with:
         python-version: 3.8
     - name: Install dependencies with pipenv
       run: |
         python -m pip install --upgrade pip
         pip install pipenv
-        pipenv install -d 
+        pipenv install --dev --verbose
     - name: Unit and coverage test with pytest (excludes tests not in the tests/ folder)
       run: |
         pipenv run pytest -v --cov=../Autonomy_Software tests/

.gitignore

@@ -1,31 +1,41 @@
+#
+# Mars Rover Design Team
+# .gitignore
+#
+# Created on Feb 06, 2017
+# Updated on Aug 21, 2022
+#
+
 # PyCharm files
 .idea/
 
-#Pytest files
+# Pytest files
 .pytest_cache/
 
-#pipenv lock file
-.lock
-Pipfile.lock
-
 # Mac Temp Files
 .DS_Store
 
 # Python temp files
 *.pyc
 
-#Our Log Files
+# Autonomy Log Files
 */logs/
 logs/
 *.log
 *.avi
 
-#Output files from unit tests
+# Output files from unit tests
 resources/tests/output/* 
 !resources/tests/output/.keep 
 
-#Coverage files
+# Coverage Files
 *.coverage
 
-# Map test output
-map.html
+# Web Output Files
+*.html
+
+# Pip wheels
+*.whl
+
+# pip lock
+*.lock

Pipfile

@@ -3,8 +3,8 @@ python_version = "3.8"
 
 [[source]]
 name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
+url = "https://pypi.org/simple"   
+verify_ssl = false
 
 [packages]
 simplejson = "*"
@@ -20,6 +20,12 @@ rich = "*"
 gmplot = "*"
 opencv-python = "*"
 opencv-contrib-python = "*"
+pandas = "*"
+tdqm = "*"
+seaborn = "*"
+utm = "*"
+torch = "*"
+torchvision = "*"
 
 [dev-packages]
 pytest = "*"

README.md

@@ -1,10 +1,10 @@
 # Autonomy Software
 
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/MissouriMRDT/Autonomy_Software?style=flat)
-![GitHub pull requests](https://img.shields.io/github/issues-pr/MissouriMRDT/Autonomy_Software?style=flat)
-![GitHub issues](https://img.shields.io/github/issues/MissouriMRDT/Autonomy_Software)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/MissouriMRDT/Autonomy_Software/Autonomy%20Flake8%20Linter/dev?label=flake8%20linter&style=flat)
-![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/MissouriMRDT/Autonomy_Software/Autonomy%20Unit%20Tests/dev?label=unit%20tests&style=flat)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/MissouriMRDT/Autonomy_Software_Python?style=flat)
+![GitHub pull requests](https://img.shields.io/github/issues-pr/MissouriMRDT/Autonomy_Software_Python?style=flat)
+![GitHub issues](https://img.shields.io/github/issues/MissouriMRDT/Autonomy_Software_Python)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/MissouriMRDT/Autonomy_Software_Python/Autonomy%20Flake8%20Linter/dev?label=flake8%20linter&style=flat)
+![GitHub Workflow Status (branch)](https://img.shields.io/github/workflow/status/MissouriMRDT/Autonomy_Software_Python/Autonomy%20Unit%20Tests/dev?label=unit%20tests&style=flat)
 
 This repo contains the Autonomy software stack for the current iteration of the Mars Rover Design Team's Rover designed
 to compete at the University Rover Challenge. The software is developed to run on a Jetson Xavier NX development board.
@@ -16,7 +16,7 @@ There are a couple of simple steps in order to get started writing software for
 1. Clone the repo in an appropriate place. Standard practice is to clone it inside a directory such as RoverSoftware.
 
 ```
-git clone --recurse-submodules https://github.com/MissouriMRDT/Autonomy_Software.git
+git clone --recurse-submodules -j8 https://github.com/MissouriMRDT/Autonomy_Software_Python.git
 ```
 
 2. Install Python 3.8, and then install pipenv using pip
@@ -114,6 +114,7 @@ The architecture is broken up into four categories:
 ![State Machine Diagram](docs/state_machine.png)
 
 ## Contributing
+To learn more about contributing to Autonomy view [contributing.md](./docs/readme_resources/contributing.md).
 
 Dev serves as the development branch throughout the school year. So if you want to start developing a feature or
 improvement create a branch based off of dev:
@@ -149,7 +150,6 @@ sudo apt-get install python3.8-dev  # for python3.8 installs
 ```
 
 To properly install python-pcl:
-1. sudo apt install python3-pcl
 
 2. copy over pcl/and egg files from usr/lib/python3/dist-packages to .local/share/virtualenvs/Autonomy_Software/lib/python3.8/site-packages/
 

algorithms/__init__.py

@@ -1,9 +1,20 @@
-import algorithms.geomath as geomath
-import algorithms.follow_marker as follow_marker
-import algorithms.gps_navigate as gps_navigate
-import algorithms.heading_hold as heading_hold
-import algorithms.marker_search as marker_search
-import algorithms.PID_controller as PID_controller
-import algorithms.obstacle_detector as obstacle_detector
-import algorithms.obstacle_avoider as obstacle_avoider
-import algorithms.AR_tag as AR_tag
+#
+# Mars Rover Design Team
+# __init__.py
+#
+# Created on Feb 06, 2017
+# Updated on Aug 21, 2022
+#
+
+from algorithms import geomath as geomath
+from algorithms import follow_marker as follow_marker
+from algorithms import gps_navigate as gps_navigate
+from algorithms import heading_hold as heading_hold
+from algorithms import marker_search as marker_search
+from algorithms import pid_controller as PID_controller
+from algorithms import small_movements as small_movements
+from algorithms import obstacle_detector as obstacle_detector
+from algorithms import obstacle_avoider as obstacle_avoider
+from algorithms import stanley_controller as stanley_controller
+from algorithms import ar_tag as ar_tag
+from algorithms import helper_funcs as helper_funcs