Merge remote-tracking branch 'origin/main' into main (362ec68c) · Commits · Shahrul Kamil bin Hassan / November 2021 Blimp Competition · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

N

November 2021 Blimp Competition
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

362ec68c

Commit 362ec68c authored 3 years ago by

Zhiying Li

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into main

parents f83cc079 2ead93d0

Branches

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

Code/Control/Laptop_Code/ESP32_AT/imageTread_AT.py 171 additions, 82 deletions

Code/Control/Laptop_Code/ESP32_AT/imageTread_AT.py
Code/Control/Laptop_Code/ESP32_slave/ESP32_slave.ino 76 additions, 27 deletions

Code/Control/Laptop_Code/ESP32_slave/ESP32_slave.ino
Code/Control/Laptop_Code/ball_detection/ball_detection.py 5 additions, 5 deletions

Code/Control/Laptop_Code/ball_detection/ball_detection.py
Code/Control/Laptop_Code/ball_detection/ball_detection_full.py 0 additions, 255 deletions

...Control/Laptop_Code/ball_detection/ball_detection_full.py
Code/Control/Laptop_Code/basic_comm_test/ESP32_master/ESP32_master.ino 6 additions, 4 deletions

...Laptop_Code/basic_comm_test/ESP32_master/ESP32_master.ino
Code/Control/Laptop_Code/constants.py 11 additions, 6 deletions

Code/Control/Laptop_Code/constants.py
Code/Control/Laptop_Code/imageThread_AT_gb_1_6.py 38 additions, 0 deletions

Code/Control/Laptop_Code/imageThread_AT_gb_1_6.py
Code/Control/Laptop_Code/imageThread_AT_gb_2_4.py 4 additions, 4 deletions

Code/Control/Laptop_Code/imageThread_AT_gb_2_4.py
Code/Control/Laptop_Code/main_keyboard.py 129 additions, 41 deletions

Code/Control/Laptop_Code/main_keyboard.py
Code/ESP32_Cam/WifiCam/WifiCam.ino 8 additions, 2 deletions

Code/ESP32_Cam/WifiCam/WifiCam.ino

with 448 additions and 426 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment