Merge remote-tracking branch 'origin/main' into main (f2268a70) · 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

f2268a70

Commit f2268a70 authored 3 years ago by

Zhiying Li

Downloads
- Plain Diff

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

parents c31be3d8 2ead93d0

Branches

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Code/Control/Laptop_Code/ESP32_AT/imageTread_AT.py 166 additions, 83 deletions

Code/Control/Laptop_Code/ESP32_AT/imageTread_AT.py
Code/Control/Laptop_Code/ESP32_slave/ESP32_slave.ino 74 additions, 25 deletions

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

Code/Control/Laptop_Code/ball_detection/ball_detection.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 1 addition, 2 deletions

Code/Control/Laptop_Code/constants.py
Code/Control/Laptop_Code/imageThread_AT_gb_1_6.py 2 additions, 2 deletions

Code/Control/Laptop_Code/imageThread_AT_gb_1_6.py
Code/Control/Laptop_Code/main_keyboard.py 53 additions, 19 deletions

Code/Control/Laptop_Code/main_keyboard.py

with 304 additions and 137 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