From 3eb3d5e90e756a41d61473d175ef3488ccd7b98a Mon Sep 17 00:00:00 2001 From: Suhail Khan <26044674+suhailskhan@users.noreply.github.com> Date: Sat, 23 Mar 2024 15:52:43 -0700 Subject: [PATCH] Restore lost changes after cleanup Some changes previously pushed to `main` were lost after the branch was replaced earlier today. This includes changes to `.gitignore`, `README.md`, and `requirements.txt`. --- .gitignore | 18 ++++++++++++++---- README.md | 24 ++++++++++++++---------- Vision/requirements.txt | 3 --- requirements.txt | 19 ++++++++++++------- 4 files changed, 40 insertions(+), 24 deletions(-) delete mode 100644 Vision/requirements.txt diff --git a/.gitignore b/.gitignore index a490539..1cdd6a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,16 @@ -*.pyc -env -*env -**.freq +__pycache__/ +*.py[cod] +*$py.class + +.python-version +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +**.freq frequency_analysis.json diff --git a/README.md b/README.md index 5b5abb1..317c1c3 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ -# urc-intelligent_systems-2022 - -Contains the intelligent systems module and sensor logic for the SJSU Robotics' 3-Wheeled Mars Rover - -## Setup -To get started, you will need to install the following dependencies, you can do this by using the requirements.txt file in the root directory of the project. - -```bash -pip install -r requirements.txt -``` \ No newline at end of file +# urc-intelligent_systems-2023 + +Contains the intelligent systems module and sensor logic for the SJSU Robotics' 3-Wheeled Mars Rover + +## Setup +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. + +```sh +python -m venv venv +source venv/bin/activate +pip install -r requirements.txt +``` + +![classes](https://github.com/SJSURoboticsTeam/urc-intelligent-systems-2023/assets/50222631/3d47c3d4-b21a-463e-9739-bc99b61f450f) diff --git a/Vision/requirements.txt b/Vision/requirements.txt deleted file mode 100644 index 61a4fcf..0000000 --- a/Vision/requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -opencv-python==4.5.1.48; platform_machine != "aarch64" -depthai==2.11.1.1 -blobconverter==1.2.6 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 5f9fd01..8516879 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,12 @@ -Adafruit_Blinka==8.6.1 -board==1.0 -pyserial==3.5 -requests==2.28.1 -rplidar==0.9.2 -rplidar_roboticia==0.9.5 -smbus==1.1.post2 +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'