Skip to content

Commit

Permalink
Merge branch 'main' of github.com:lucashicks1/lambda-deco3801
Browse files Browse the repository at this point in the history
  • Loading branch information
lucashicks1 committed Oct 13, 2023
2 parents 8d2f12d + 2cd5802 commit 15f7451
Show file tree
Hide file tree
Showing 29 changed files with 1,143 additions and 433 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Lambda - Deco3801

# Hi Rosti 🪩 Please read!
We really wanted to have our READMEs finished for the snapshot so we could get your feedback on them but unfortunately we're all a bit slammed until the weekend and probably won't make it to them in time :(
We'll just do our best to finish it up & maybe ping you a lot until next studio instead. Hope that's okay! And sorry for the lack of good docs in most places at the moment.
*Promise* they'll be shipshape for the real submission.

## Getting started

To make it easy for you to get started with GitLab, here's a list of recommended next steps.
Expand Down
Binary file modified assets/image-test/test2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build-documentation/Lamba_Circuit_Layout.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion build/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Build code goes here when project underway
## Build Instructions in order of process
1. [Database](../build/db-handler/README.md)
2. [Camera](../build/README.md)
2. [Camera](../build/vision/README.md)
3. [Display](../build/ui-display/frontend-app/README.md)
4. [Microcontroller](../build/microcontroller/README.md)
5. [Microcontroller Communication](../build/figurines/README.md)
Expand Down
Empty file removed build/camera/__init__.py
Empty file.
30 changes: 0 additions & 30 deletions build/camera/app6.py

This file was deleted.

82 changes: 0 additions & 82 deletions build/camera/app7.py

This file was deleted.

85 changes: 0 additions & 85 deletions build/camera/environment.yaml

This file was deleted.

41 changes: 0 additions & 41 deletions build/camera/motion.py

This file was deleted.

18 changes: 18 additions & 0 deletions build/db-handler/testing.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import requests

headers = {
'Content-Type': 'application/json',
'Accept': 'application/json'
}

r = requests.post('http://127.0.0.1:8000/whiteboard/user_4', headers = headers, json={
"body": [
{
"day": "tuesday",
"time_slot": 12,
"data": "minecraft gaming"
}
]
})

print(r.json())
5 changes: 5 additions & 0 deletions build/figurines/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Microcontroller Communications
1. Connect the Seeduino Xiao to a serial port using provided USB-C to USB-A cable
2. Double click the .bat file located in this directory
3. The file will download all required python libraries, so please wait for it to finish
4. The program will run on completion of installations
Binary file added build/microcontroller/Circuit_Layout.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added build/microcontroller/Lamba_Circuit_Layout.pdf
Binary file not shown.
32 changes: 32 additions & 0 deletions build/microcontroller/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Microcontroller

## Microcontroller Circuitry
### Required Components
#### Physical Layout Components
- 1 x Atmega 328P Microcontroller flashed with Arduino Uno Bootloader
- 1 x 16MHz Crystal Oscillator
- 1 x Seeeduino Xiao
- 1 x Piezzo Buzzer
- 4 x 5010G 180 degree Servo motor
- 2 x 22pF ceramic capacitors, through hole
- 1 x 1000uF electrolytic capacitor
- 2 x Breadboards with dual power rails
- 1 x 4 AA Battery holder, plastic
- 1 x 2 Way PCB mount Screw terminals, 5mm Pitch

#### Programming Components
- 1 x Duinotech ISP Programmer for Arduino and AVR
- 1 x Duinotech Arduino Compatible AVR ISP 10pin to 6pin Adaptor

## Circuit Layout
![image](Circuit_Layout.jpg)

## Programming the microcontroller
The Atmega328P microcontroller will already come flashed with code to run this project. However if you are interested in flashing the controller, follow the below steps.
1. If you do not have the AVRDude or Zandig configuration files downloaded, follow the documentation instructions [here](https://www.jaycar.com.au/medias/sys_master/images/images/9963160993822/XC4627-manualMain.pdf) with any mentions to the software zip file being found [here](https://www.jaycar.com.au/duinotech-isp-programmer-for-arduino-and-avr/p/XC4627)
2. Connect the ISP programmer to computer and board per the layout circuit above
3. Open the atmega328p_lambda_mc.ino file in Arduino IDE
4. Verify the code file
5. Under the Sketch tab, click export compiled binary
6. In the AVRDude GUI, select the atmega328p_lambda_mc folder as the directory and select the binary export file to upload
7. Click the upload button and wait for the upload sequence to finish
Loading

0 comments on commit 15f7451

Please sign in to comment.