Skip to content
This repository has been archived by the owner on May 4, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
chrehall68 committed Mar 24, 2024
2 parents 5e615a0 + 8a65f21 commit 6382749
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 17 deletions.
18 changes: 14 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
*.pyc
env
*env
__pycache__/
*.py[cod]
*$py.class

.python-version

.env
.venv
env/
venv/
ENV/
env.bak/
venv.bak/

**.freq
**.vscode
frequency_analysis.json
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
# urc-intelligent_systems-2022
# urc-intelligent_systems-2023

Contains the intelligent systems module and sensor logic for the SJSU Robotics' 3-Wheeled Mars Rover

## Setup

[ ] Clone this repo
[ ] Use an appropriate environment file from [env_files](env_files) to create your environment
To get started, you will need to install the following dependencies, you can do this by using a virtual environment and the requirements.txt file in the root directory of the project.

```bash
pip install -r env_files/all_requirements.txt
```sh
python -m venv venv
source venv/bin/activate
pip install -r requirements.txt
```

or on the rover side

```bash
pip install -r env_files/rover_requirements.txt
```
![classes](https://github.com/SJSURoboticsTeam/urc-intelligent-systems-2023/assets/50222631/3d47c3d4-b21a-463e-9739-bc99b61f450f)
3 changes: 0 additions & 3 deletions Vision/requirements.txt

This file was deleted.

12 changes: 12 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Adafruit_Blinka==8.6.*
blobconverter==1.2.*
board==1.0
depthai==2.22.*
opencv-python==4.5.*; platform_machine != "aarch64"
pyserial==3.5.*
requests==2.31.*
rplidar==0.9.*
rplidar_roboticia==0.9.*
scikit_learn==1.3.*
simple_pid==2.0.*
smbus==1.1.post2; sys_platform == 'linux'

0 comments on commit 6382749

Please sign in to comment.