diff --git a/content/assignments/ControlWithPython/_index.md b/content/assignments/ControlWithPython/_index.md deleted file mode 100644 index 914db18..0000000 --- a/content/assignments/ControlWithPython/_index.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -title: ControlWIthPython -type: docs -prev: assignments/SpinningAndBlinking/ -next: assignments/ControlWithPython/tutorial -weight: 5 ---- - -In this assignment you will extend your knowledge by learning to create a **G**raphical **U**ser **I**nterface (GUI) to interact with a microcontroller. diff --git a/content/assignments/_index.md b/content/assignments/_index.md index af0dd19..28dd79d 100644 --- a/content/assignments/_index.md +++ b/content/assignments/_index.md @@ -1,15 +1,15 @@ --- title: Assignments -next: assignments/LightShield/ +next: assignments/light-shield/ toc: false --- All of the ECE 196 assignment instructions can be found here. {{< cards >}} - {{< card link="lightshield" title="LightShield" icon="light-bulb" >}} - {{< card link="devboard" title="DevBoard" icon="chip" >}} - {{< card link="vumeter" title="VUMeter" icon="chart-square-bar" >}} - {{< card link="spinningandblinking" title="SpinningAndBlinking" icon="cog" >}} - {{< card link="controlwithpython" title="ControlWithPython" icon="code" >}} + {{< card link="light-shield" title="Light Shield" icon="light-bulb" >}} + {{< card link="dev-board" title="DevBoard" icon="chip" >}} + {{< card link="vu-meter" title="VU Meter" icon="chart-square-bar" >}} + {{< card link="spinning-and-blinking" title="Spinning and Blinking" icon="code" >}} + {{< card link="full-stack" title="Full Stack" icon="wifi" >}} {{< /cards >}} diff --git a/content/assignments/DevBoard/_index.md b/content/assignments/dev-board/_index.md similarity index 87% rename from content/assignments/DevBoard/_index.md rename to content/assignments/dev-board/_index.md index e3487bb..3cd7bef 100644 --- a/content/assignments/DevBoard/_index.md +++ b/content/assignments/dev-board/_index.md @@ -1,8 +1,8 @@ --- title: DevBoard type: docs -prev: assignments/LightShield/ -next: assignments/DevBoard/assembly +prev: assignments/light-shield/ +next: assignments/dev-board/assembly weight: 2 --- diff --git a/content/assignments/DevBoard/assembly.md b/content/assignments/dev-board/assembly.md similarity index 99% rename from content/assignments/DevBoard/assembly.md rename to content/assignments/dev-board/assembly.md index cdfd776..b316329 100644 --- a/content/assignments/DevBoard/assembly.md +++ b/content/assignments/dev-board/assembly.md @@ -1,7 +1,7 @@ --- title: Assembly type: docs -prev: assignments/DevBoard/ +prev: assignments/dev-board/ weight: 1 --- diff --git a/content/assignments/DevBoard/images/USB_no_bridging.png b/content/assignments/dev-board/images/USB_no_bridging.png similarity index 100% rename from content/assignments/DevBoard/images/USB_no_bridging.png rename to content/assignments/dev-board/images/USB_no_bridging.png diff --git a/content/assignments/DevBoard/images/diodes.png b/content/assignments/dev-board/images/diodes.png similarity index 100% rename from content/assignments/DevBoard/images/diodes.png rename to content/assignments/dev-board/images/diodes.png diff --git a/content/assignments/DevBoard/images/equipment.png b/content/assignments/dev-board/images/equipment.png similarity index 100% rename from content/assignments/DevBoard/images/equipment.png rename to content/assignments/dev-board/images/equipment.png diff --git a/content/assignments/DevBoard/images/solder_spreader.png b/content/assignments/dev-board/images/solder_spreader.png similarity index 100% rename from content/assignments/DevBoard/images/solder_spreader.png rename to content/assignments/dev-board/images/solder_spreader.png diff --git a/content/assignments/DevBoard/images/stencil_setup.png b/content/assignments/dev-board/images/stencil_setup.png similarity index 100% rename from content/assignments/DevBoard/images/stencil_setup.png rename to content/assignments/dev-board/images/stencil_setup.png diff --git a/content/assignments/DevBoard/images/switch.png b/content/assignments/dev-board/images/switch.png similarity index 100% rename from content/assignments/DevBoard/images/switch.png rename to content/assignments/dev-board/images/switch.png diff --git a/content/assignments/DevBoard/images/video_thumbnail.png b/content/assignments/dev-board/images/video_thumbnail.png similarity index 100% rename from content/assignments/DevBoard/images/video_thumbnail.png rename to content/assignments/dev-board/images/video_thumbnail.png diff --git a/content/assignments/DevBoard/submission.md b/content/assignments/dev-board/submission.md similarity index 84% rename from content/assignments/DevBoard/submission.md rename to content/assignments/dev-board/submission.md index 3d360c5..7f98feb 100644 --- a/content/assignments/DevBoard/submission.md +++ b/content/assignments/dev-board/submission.md @@ -1,7 +1,7 @@ --- title: Submission type: docs -next: assignments/VUMeter/ +next: assignments/vu-meter/ weight: 2 --- diff --git a/content/assignments/full-stack/_index.md b/content/assignments/full-stack/_index.md new file mode 100644 index 0000000..ebc8861 --- /dev/null +++ b/content/assignments/full-stack/_index.md @@ -0,0 +1,46 @@ +--- +title: Full Stack +type: docs +prev: assignments/spinning-and-blinking/ +next: assignments/full-stack/tutorial +weight: 5 +--- + +## Preamble + +You may have heard the term "full stack" before. Web developers have coined it as meaning all the systems from the database (backend) to the user interface (frontend). + +But web developers don't get all the fun. As Electrical Engineers, we have our *own* definition of "full stack". + +For us, the full stack is: + +1. Hardware +1. Firmware +1. Communication +1. User Interface + +You're half way there! In one fell swoop, we're going to finish off the last two. + +## Assignment + +In this assignment you will become a full stack engineer by learning to create a **G**raphical **U**ser **I**nterface (GUI) and a communication +system to interact with a microcontroller. + +You will create a **client** (the GUI running on your computer/phone) which communicates with a **peripheral** (your microcontroller) over some medium. + +**You are once again faced with an important decision** + +You now have **four** pathways to choose from: + +{{< cards >}} + {{< card link="python" title="USB: Python & Arduino" >}} + {{< card link="python" title="USB: Python & Rust" >}} + {{< card link="python" title="BLE: Swift & Arduino" >}} + {{< card link="python" title="BLE: Swift & Rust" >}} +{{< /cards >}} + +{{< callout type="warning" >}} + You **must** have a Mac and an iPhone to develop Swift apps. +{{< /callout >}} + +Similarly to the previous assignment, some of these paths are easier than others, but less interesting. diff --git a/content/assignments/ControlWithPython/quiz.md b/content/assignments/full-stack/quiz.md similarity index 89% rename from content/assignments/ControlWithPython/quiz.md rename to content/assignments/full-stack/quiz.md index ae187d5..6a333b8 100644 --- a/content/assignments/ControlWithPython/quiz.md +++ b/content/assignments/full-stack/quiz.md @@ -1,7 +1,7 @@ --- title: Quiz type: docs -prev: assignments/ControlWithPython/tutorial +prev: assignments/full-stack/tutorial weight: 2 --- diff --git a/content/assignments/ControlWithPython/submission.md b/content/assignments/full-stack/submission.md similarity index 100% rename from content/assignments/ControlWithPython/submission.md rename to content/assignments/full-stack/submission.md diff --git a/content/assignments/ControlWithPython/tutorial.md b/content/assignments/full-stack/tutorial.md similarity index 99% rename from content/assignments/ControlWithPython/tutorial.md rename to content/assignments/full-stack/tutorial.md index 625414e..b697d17 100644 --- a/content/assignments/ControlWithPython/tutorial.md +++ b/content/assignments/full-stack/tutorial.md @@ -1,7 +1,7 @@ --- title: Tutorial type: docs -prev: assignments/ControlWithPython/ +prev: assignments/full-stack/ weight: 1 --- diff --git a/content/assignments/LightShield/_index.md b/content/assignments/light-shield/_index.md similarity index 88% rename from content/assignments/LightShield/_index.md rename to content/assignments/light-shield/_index.md index 60b92bf..8f5b459 100644 --- a/content/assignments/LightShield/_index.md +++ b/content/assignments/light-shield/_index.md @@ -1,8 +1,8 @@ --- -title: LightShield +title: Light Shield type: docs prev: assignments/ -next: assignments/LightShield/assembly +next: assignments/light-shield/assembly weight: 1 --- diff --git a/content/assignments/LightShield/assembly.md b/content/assignments/light-shield/assembly.md similarity index 95% rename from content/assignments/LightShield/assembly.md rename to content/assignments/light-shield/assembly.md index b579b1c..25f3348 100644 --- a/content/assignments/LightShield/assembly.md +++ b/content/assignments/light-shield/assembly.md @@ -1,7 +1,7 @@ --- title: Assembly type: docs -prev: assignments/LightShield/ +prev: assignments/light-shield/ weight: 1 --- diff --git a/content/assignments/LightShield/images/in-action.png b/content/assignments/light-shield/images/in-action.png similarity index 100% rename from content/assignments/LightShield/images/in-action.png rename to content/assignments/light-shield/images/in-action.png diff --git a/content/assignments/LightShield/submission.md b/content/assignments/light-shield/submission.md similarity index 82% rename from content/assignments/LightShield/submission.md rename to content/assignments/light-shield/submission.md index b31b152..2553f95 100644 --- a/content/assignments/LightShield/submission.md +++ b/content/assignments/light-shield/submission.md @@ -1,7 +1,7 @@ --- title: Submission type: docs -next: assignments/DevBoard/ +next: assignments/dev-board/ weight: 2 --- diff --git a/content/assignments/SpinningAndBlinking/_index.md b/content/assignments/spinning-and-blinking/_index.md similarity index 92% rename from content/assignments/SpinningAndBlinking/_index.md rename to content/assignments/spinning-and-blinking/_index.md index f575922..69e89ec 100644 --- a/content/assignments/SpinningAndBlinking/_index.md +++ b/content/assignments/spinning-and-blinking/_index.md @@ -1,8 +1,8 @@ --- -title: SpinningAndBlinking +title: Spinning and Blinking type: docs -prev: assignments/VUMeter/ -next: assignments/SpinningAndBlinking/getting-started +prev: assignments/vu-meter/ +next: assignments/spinning-and-blinking/getting-started weight: 4 --- diff --git a/content/assignments/SpinningAndBlinking/Arduino/_index.md b/content/assignments/spinning-and-blinking/arduino/_index.md similarity index 81% rename from content/assignments/SpinningAndBlinking/Arduino/_index.md rename to content/assignments/spinning-and-blinking/arduino/_index.md index b83ceb4..d17116d 100644 --- a/content/assignments/SpinningAndBlinking/Arduino/_index.md +++ b/content/assignments/spinning-and-blinking/arduino/_index.md @@ -1,8 +1,8 @@ --- title: Arduino type: docs -prev: assignments/SpinningAndBlinking/ -next: assignments/SpinningAndBlinking/Arduino/Blinking +prev: assignments/spinning-and-blinking/ +next: assignments/spinning-and-blinking/arduino/blinking weight: 1 --- diff --git a/content/assignments/SpinningAndBlinking/Arduino/blinking.md b/content/assignments/spinning-and-blinking/arduino/blinking.md similarity index 91% rename from content/assignments/SpinningAndBlinking/Arduino/blinking.md rename to content/assignments/spinning-and-blinking/arduino/blinking.md index 060ef85..34c272d 100644 --- a/content/assignments/SpinningAndBlinking/Arduino/blinking.md +++ b/content/assignments/spinning-and-blinking/arduino/blinking.md @@ -1,7 +1,7 @@ --- title: Blinking type: docs -prev: assignments/SpinningAndBlinking/Arduino +prev: assignments/spinning-and-blinking/arduino weight: 1 --- diff --git a/content/assignments/SpinningAndBlinking/images/arduino.png b/content/assignments/spinning-and-blinking/images/arduino.png similarity index 100% rename from content/assignments/SpinningAndBlinking/images/arduino.png rename to content/assignments/spinning-and-blinking/images/arduino.png diff --git a/content/assignments/SpinningAndBlinking/images/ferris.png b/content/assignments/spinning-and-blinking/images/ferris.png similarity index 100% rename from content/assignments/SpinningAndBlinking/images/ferris.png rename to content/assignments/spinning-and-blinking/images/ferris.png diff --git a/content/assignments/SpinningAndBlinking/Rust/_index.md b/content/assignments/spinning-and-blinking/rust/_index.md similarity index 97% rename from content/assignments/SpinningAndBlinking/Rust/_index.md rename to content/assignments/spinning-and-blinking/rust/_index.md index ed2d4ad..d9e43a6 100644 --- a/content/assignments/SpinningAndBlinking/Rust/_index.md +++ b/content/assignments/spinning-and-blinking/rust/_index.md @@ -1,8 +1,8 @@ --- title: Rust type: docs -prev: assignments/SpinningAndBlinking/ -next: assignments/SpinningAndBlinking/Rust/setup +prev: assignments/spinning-and-blinking/ +next: assignments/spinning-and-blinking/rust/setup weight: 2 --- diff --git a/content/assignments/SpinningAndBlinking/Rust/blinking.md b/content/assignments/spinning-and-blinking/rust/blinking.md similarity index 99% rename from content/assignments/SpinningAndBlinking/Rust/blinking.md rename to content/assignments/spinning-and-blinking/rust/blinking.md index a144cd2..798fd96 100644 --- a/content/assignments/SpinningAndBlinking/Rust/blinking.md +++ b/content/assignments/spinning-and-blinking/rust/blinking.md @@ -1,7 +1,7 @@ --- title: Blinking type: docs -prev: assignments/SpinningAndBlinking/Rust/Setup +prev: assignments/spinning-and-blinking/rust/setup weight: 2 --- diff --git a/content/assignments/SpinningAndBlinking/Rust/setup.md b/content/assignments/spinning-and-blinking/rust/setup.md similarity index 89% rename from content/assignments/SpinningAndBlinking/Rust/setup.md rename to content/assignments/spinning-and-blinking/rust/setup.md index 8440948..85e7293 100644 --- a/content/assignments/SpinningAndBlinking/Rust/setup.md +++ b/content/assignments/spinning-and-blinking/rust/setup.md @@ -1,10 +1,17 @@ --- title: Setup type: docs -prev: assignments/SpinningAndBlinking/Rust +prev: assignments/spinning-and-blinking/rust weight: 1 --- +{{< callout type="info" >}} + Ideally these steps would be omitted and a Docker image would be provided. + Unfortunately the environment we are setting up relies on USB access + which is currently unsupported on Apple Silicon. Learn more [here](https://github.com/docker/for-mac/issues/5263). +{{< /callout >}} + + ## Install Rust To install rust, follow the instructions [here](https://www.rust-lang.org/tools/install). diff --git a/content/assignments/SpinningAndBlinking/Rust/spinning.md b/content/assignments/spinning-and-blinking/rust/spinning.md similarity index 84% rename from content/assignments/SpinningAndBlinking/Rust/spinning.md rename to content/assignments/spinning-and-blinking/rust/spinning.md index 42b1b3e..5953615 100644 --- a/content/assignments/SpinningAndBlinking/Rust/spinning.md +++ b/content/assignments/spinning-and-blinking/rust/spinning.md @@ -1,7 +1,7 @@ --- title: Spinning type: docs -prev: assignments/SpinningAndBlinking/Blinking +prev: assignments/spinning-and-blinking/blinking weight: 3 --- diff --git a/content/assignments/VUMeter/_index.md b/content/assignments/vu-meter/_index.md similarity index 77% rename from content/assignments/VUMeter/_index.md rename to content/assignments/vu-meter/_index.md index cfad3b4..ffdd71f 100644 --- a/content/assignments/VUMeter/_index.md +++ b/content/assignments/vu-meter/_index.md @@ -1,8 +1,8 @@ --- -title: VUMeter +title: VU Meter type: docs -prev: assignments/DevBoard/ -next: assignments/VUMeter/firmware +prev: assignments/dev-board/ +next: assignments/vu-meter/firmware weight: 3 --- diff --git a/content/assignments/VUMeter/enclosure.md b/content/assignments/vu-meter/enclosure.md similarity index 100% rename from content/assignments/VUMeter/enclosure.md rename to content/assignments/vu-meter/enclosure.md diff --git a/content/assignments/VUMeter/firmware.md b/content/assignments/vu-meter/firmware.md similarity index 99% rename from content/assignments/VUMeter/firmware.md rename to content/assignments/vu-meter/firmware.md index 83ceb17..2fb7382 100644 --- a/content/assignments/VUMeter/firmware.md +++ b/content/assignments/vu-meter/firmware.md @@ -1,7 +1,7 @@ --- title: Firmware type: docs -prev: assignments/VUMeter/ +prev: assignments/vu-meter/ weight: 1 --- diff --git a/content/assignments/VUMeter/images/boot-contents.png b/content/assignments/vu-meter/images/boot-contents.png similarity index 100% rename from content/assignments/VUMeter/images/boot-contents.png rename to content/assignments/vu-meter/images/boot-contents.png diff --git a/content/assignments/VUMeter/images/circuitpy.png b/content/assignments/vu-meter/images/circuitpy.png similarity index 100% rename from content/assignments/VUMeter/images/circuitpy.png rename to content/assignments/vu-meter/images/circuitpy.png diff --git a/content/assignments/VUMeter/images/connect-button.png b/content/assignments/vu-meter/images/connect-button.png similarity index 100% rename from content/assignments/VUMeter/images/connect-button.png rename to content/assignments/vu-meter/images/connect-button.png diff --git a/content/assignments/VUMeter/images/connect-dialog.png b/content/assignments/vu-meter/images/connect-dialog.png similarity index 100% rename from content/assignments/VUMeter/images/connect-dialog.png rename to content/assignments/vu-meter/images/connect-dialog.png diff --git a/content/assignments/VUMeter/images/devkit.png b/content/assignments/vu-meter/images/devkit.png similarity index 100% rename from content/assignments/VUMeter/images/devkit.png rename to content/assignments/vu-meter/images/devkit.png diff --git a/content/assignments/VUMeter/images/flashing.png b/content/assignments/vu-meter/images/flashing.png similarity index 100% rename from content/assignments/VUMeter/images/flashing.png rename to content/assignments/vu-meter/images/flashing.png diff --git a/content/assignments/VUMeter/images/installer-select.png b/content/assignments/vu-meter/images/installer-select.png similarity index 100% rename from content/assignments/VUMeter/images/installer-select.png rename to content/assignments/vu-meter/images/installer-select.png diff --git a/content/assignments/VUMeter/images/open-installer.png b/content/assignments/vu-meter/images/open-installer.png similarity index 100% rename from content/assignments/VUMeter/images/open-installer.png rename to content/assignments/vu-meter/images/open-installer.png diff --git a/content/assignments/VUMeter/images/s3dkc1boot.png b/content/assignments/vu-meter/images/s3dkc1boot.png similarity index 100% rename from content/assignments/VUMeter/images/s3dkc1boot.png rename to content/assignments/vu-meter/images/s3dkc1boot.png diff --git a/content/assignments/VUMeter/images/serial-monitor.png b/content/assignments/vu-meter/images/serial-monitor.png similarity index 100% rename from content/assignments/VUMeter/images/serial-monitor.png rename to content/assignments/vu-meter/images/serial-monitor.png diff --git a/content/assignments/VUMeter/images/vscode-main.png b/content/assignments/vu-meter/images/vscode-main.png similarity index 100% rename from content/assignments/VUMeter/images/vscode-main.png rename to content/assignments/vu-meter/images/vscode-main.png diff --git a/content/assignments/VUMeter/images/vscode-open.png b/content/assignments/vu-meter/images/vscode-open.png similarity index 100% rename from content/assignments/VUMeter/images/vscode-open.png rename to content/assignments/vu-meter/images/vscode-open.png diff --git a/content/assignments/VUMeter/images/vsscode-ext-install.png b/content/assignments/vu-meter/images/vsscode-ext-install.png similarity index 100% rename from content/assignments/VUMeter/images/vsscode-ext-install.png rename to content/assignments/vu-meter/images/vsscode-ext-install.png diff --git a/content/assignments/VUMeter/images/vu-off.jpg b/content/assignments/vu-meter/images/vu-off.jpg similarity index 100% rename from content/assignments/VUMeter/images/vu-off.jpg rename to content/assignments/vu-meter/images/vu-off.jpg diff --git a/content/assignments/VUMeter/images/vu-on.jpg b/content/assignments/vu-meter/images/vu-on.jpg similarity index 100% rename from content/assignments/VUMeter/images/vu-on.jpg rename to content/assignments/vu-meter/images/vu-on.jpg diff --git a/content/assignments/VUMeter/submission.md b/content/assignments/vu-meter/submission.md similarity index 89% rename from content/assignments/VUMeter/submission.md rename to content/assignments/vu-meter/submission.md index 5381695..1a245f2 100644 --- a/content/assignments/VUMeter/submission.md +++ b/content/assignments/vu-meter/submission.md @@ -1,7 +1,7 @@ --- title: Submission type: docs -next: assignments/SpinningAndBlinking/ +next: assignments/spinning-and-blinking/ weight: 3 --- diff --git a/hugo.yaml b/hugo.yaml index 16aede7..22e33f2 100644 --- a/hugo.yaml +++ b/hugo.yaml @@ -60,3 +60,7 @@ params: page: width: full + + theme: + default: "dark" + displayToggle: false diff --git a/static/android-chrome-192x192.png b/static/android-chrome-192x192.png new file mode 100644 index 0000000..95d2f27 Binary files /dev/null and b/static/android-chrome-192x192.png differ diff --git a/static/android-chrome-512x512.png b/static/android-chrome-512x512.png new file mode 100644 index 0000000..c3cd901 Binary files /dev/null and b/static/android-chrome-512x512.png differ diff --git a/static/apple-touch-icon.png b/static/apple-touch-icon.png new file mode 100644 index 0000000..6bb6214 Binary files /dev/null and b/static/apple-touch-icon.png differ diff --git a/static/favicon-16x16.png b/static/favicon-16x16.png new file mode 100644 index 0000000..f377107 Binary files /dev/null and b/static/favicon-16x16.png differ diff --git a/static/favicon-32x32.png b/static/favicon-32x32.png new file mode 100644 index 0000000..578304d Binary files /dev/null and b/static/favicon-32x32.png differ diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..e8e9f68 Binary files /dev/null and b/static/favicon.ico differ diff --git a/static/site.webmanifest b/static/site.webmanifest new file mode 100644 index 0000000..45dc8a2 --- /dev/null +++ b/static/site.webmanifest @@ -0,0 +1 @@ +{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"} \ No newline at end of file