From 2ae78fe6b886414f078f2cbc19b5875e3f13cd4f Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Mon, 3 Oct 2016 14:59:58 -0700 Subject: [PATCH] Updated guitar lessons (#268) * initial notes * updated code samples * splitting the page and preparing layout * missing gamepad api * added basic guitar activty md files added initial draft of guitar lesson - in progress * word smithing and adding detail for concepts listed * word smithing and adding detail for concepts listed * typo in file name * missing macro * replaced guitar.png with image from Julia Carlson * adding a few pictures * adding cards macros * few tweaks * image for accellerometer lesson xyz axis * fixed the numbering buttons page -fixed the numbering to restart for each section and asdded spaces after so they don't wrap * adding a few video links * pin-press - added circuit info * more vids * fixing latest commit * edits to light sensor and pin-press * updated descriptions, linking lesson * pin-press and display-buttons updates -added dode samples to pin press * updated making video * light-sensor updated numbering * Clean up Clean up of headings to template style, other fixes * putting display in template use h2 with "Step 1:" and image before text * removed numbered lists for display & light these topics are code complete * more consistent formating Acceleromenter, buttons, light sensosr * Acceleration Lesson, added art Lesson steps for Acceleration, art for degree F to C for Map anology+clean up of light sensor topic * Pin Press code complete some other basic fomats and edits * Removed dashes in lesson names renamed and fixed references to files with "-" in names * rest of fles w/ dash in name changes * fixed links to guitar activities * updated acceleraomter section * transparency 4 art, image text added transarency and renamed art, added descriptive text for video and still images * renamed art * fixing the merge * fixing hint * moved step 2 outside ~hint block * fixing snippets * remove guitar from project list * Duration/Materials consistent format moved out of ~avatar block --- docs/projects/guitar/accelerometer.md | 3 ++- docs/projects/guitar/lightsensor.md | 9 ++++----- docs/projects/guitar/pinpress.md | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/docs/projects/guitar/accelerometer.md b/docs/projects/guitar/accelerometer.md index 22cad8ea..25e74c9d 100644 --- a/docs/projects/guitar/accelerometer.md +++ b/docs/projects/guitar/accelerometer.md @@ -5,7 +5,6 @@ ### ~avatar avatar Use the Accelerometer to control guitar tempo -* Duration: 30 - 45 minutes * Concepts: * Gravity * Acceleration @@ -18,6 +17,8 @@ Use the Accelerometer to control guitar tempo ### ~ +## Duration: 30 - 45 minutes + *accelerometer controlled tempo* https://youtu.be/h_gPkBaVkoo TODO: add sound to video diff --git a/docs/projects/guitar/lightsensor.md b/docs/projects/guitar/lightsensor.md index d08dbe65..bfd7af7d 100644 --- a/docs/projects/guitar/lightsensor.md +++ b/docs/projects/guitar/lightsensor.md @@ -4,8 +4,8 @@ ### ~avatar avatar -Use the Light Sensor to control guitar Tone -* **Duration:** 30 - 45 minutes +Use the Light Sensor to the control tone for this [Theremin](https://en.wikipedia.org/wiki/Theremin) inspired guitar + * **Concepts:** * Inputs * Light Intensity @@ -13,11 +13,10 @@ Use the Light Sensor to control guitar Tone * Ratio Mapping * Forever Loop * Math (multiplication) with code properties -* **Resources:** - * This guitar is inspired by the [Theremin](https://en.wikipedia.org/wiki/Theremin) - ### ~ +## Duration: 30 - 45 minutes + *playing tones with light sensor* https://youtu.be/2cKg9pokVC4 diff --git a/docs/projects/guitar/pinpress.md b/docs/projects/guitar/pinpress.md index 6e5fb6b2..e7b377d4 100644 --- a/docs/projects/guitar/pinpress.md +++ b/docs/projects/guitar/pinpress.md @@ -4,16 +4,19 @@ ### ~avatar avatar Use pin press to switch guitar play on/off -* **Duration:** approximately 45 minutes -* **Materials:** - * 2-3 Crocodile clips + * Concepts: * Circuit * Conductor * Variable/Global-Variable * Conditional: **`if`**, **`else`** * Boolean: **`True`/`False`** -### ~ +### ~ + +## Duration: approximately 45 minutes + +## Materials: +2-3 Crocodile clips ## Blocks