Merge pull request #157 from MissouriMRDT/dev

Updated Competition Merge (release/testing)

.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

@@ -33,3 +33,9 @@ resources/tests/output/*
 
 # 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,14 +1,23 @@
 # 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.
 
+## Getting Set Up
+
+There are a couple of simple steps in order to get started writing software for the Autonomy system.
+
+1. Clone the repo in an appropriate place. Standard practice is to clone it inside a directory such as RoverSoftware.
+
+```
+git clone --recurse-submodules -j8 https://github.com/MissouriMRDT/Autonomy_Software_Python.git
+```
 
 2. Install Python 3.8, and then install pipenv using pip
 

algorithms/__init__.py

@@ -12,7 +12,9 @@
 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