From eef3ff811a491944642e3d9615337001b0ed8999 Mon Sep 17 00:00:00 2001 From: daniel watson Date: Mon, 13 Jun 2016 19:12:53 -0700 Subject: [PATCH] curriculum -> guide, prepend 0- to arduino-to-deck --- .../0-required-materials.png | Bin .../0-arduino-to-deck}/1-insert-bit.png | Bin .../2-twist-tighten-drill-teeth.png | Bin .../3-place-arduino-closeup.svg | 0 .../0-arduino-to-deck}/6-32-screw.svg | 0 .../keep-holes-far-apart.svg | 0 .../screw-cross-section.svg | 0 {curriculum => guide}/autobuild.bash | 0 {curriculum => guide}/challenge-bot.scm | 24 ++++++++++-------- {curriculum => guide}/makefile | 8 +++--- {curriculum => guide}/notes.org | 0 {curriculum => guide}/square.scad | 0 {curriculum => guide}/square.scm | 0 {curriculum => guide}/square1.scad | 0 {curriculum => guide}/square2.scad | 0 {curriculum => guide}/square3.scad | 0 {curriculum => guide}/translate.scad | 0 {curriculum => guide}/translate.scm | 0 {curriculum => guide}/translate01.scad | 0 {curriculum => guide}/translate10.scad | 0 20 files changed, 18 insertions(+), 14 deletions(-) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/0-required-materials.png (100%) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/1-insert-bit.png (100%) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/2-twist-tighten-drill-teeth.png (100%) rename curriculum/arduino-to-deck/4-place-arduino-closeup.svg => guide/0-arduino-to-deck/3-place-arduino-closeup.svg (100%) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/6-32-screw.svg (100%) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/keep-holes-far-apart.svg (100%) rename {curriculum/arduino-to-deck => guide/0-arduino-to-deck}/screw-cross-section.svg (100%) rename {curriculum => guide}/autobuild.bash (100%) rename {curriculum => guide}/challenge-bot.scm (95%) rename {curriculum => guide}/makefile (91%) rename {curriculum => guide}/notes.org (100%) rename {curriculum => guide}/square.scad (100%) rename {curriculum => guide}/square.scm (100%) rename {curriculum => guide}/square1.scad (100%) rename {curriculum => guide}/square2.scad (100%) rename {curriculum => guide}/square3.scad (100%) rename {curriculum => guide}/translate.scad (100%) rename {curriculum => guide}/translate.scm (100%) rename {curriculum => guide}/translate01.scad (100%) rename {curriculum => guide}/translate10.scad (100%) diff --git a/curriculum/arduino-to-deck/0-required-materials.png b/guide/0-arduino-to-deck/0-required-materials.png similarity index 100% rename from curriculum/arduino-to-deck/0-required-materials.png rename to guide/0-arduino-to-deck/0-required-materials.png diff --git a/curriculum/arduino-to-deck/1-insert-bit.png b/guide/0-arduino-to-deck/1-insert-bit.png similarity index 100% rename from curriculum/arduino-to-deck/1-insert-bit.png rename to guide/0-arduino-to-deck/1-insert-bit.png diff --git a/curriculum/arduino-to-deck/2-twist-tighten-drill-teeth.png b/guide/0-arduino-to-deck/2-twist-tighten-drill-teeth.png similarity index 100% rename from curriculum/arduino-to-deck/2-twist-tighten-drill-teeth.png rename to guide/0-arduino-to-deck/2-twist-tighten-drill-teeth.png diff --git a/curriculum/arduino-to-deck/4-place-arduino-closeup.svg b/guide/0-arduino-to-deck/3-place-arduino-closeup.svg similarity index 100% rename from curriculum/arduino-to-deck/4-place-arduino-closeup.svg rename to guide/0-arduino-to-deck/3-place-arduino-closeup.svg diff --git a/curriculum/arduino-to-deck/6-32-screw.svg b/guide/0-arduino-to-deck/6-32-screw.svg similarity index 100% rename from curriculum/arduino-to-deck/6-32-screw.svg rename to guide/0-arduino-to-deck/6-32-screw.svg diff --git a/curriculum/arduino-to-deck/keep-holes-far-apart.svg b/guide/0-arduino-to-deck/keep-holes-far-apart.svg similarity index 100% rename from curriculum/arduino-to-deck/keep-holes-far-apart.svg rename to guide/0-arduino-to-deck/keep-holes-far-apart.svg diff --git a/curriculum/arduino-to-deck/screw-cross-section.svg b/guide/0-arduino-to-deck/screw-cross-section.svg similarity index 100% rename from curriculum/arduino-to-deck/screw-cross-section.svg rename to guide/0-arduino-to-deck/screw-cross-section.svg diff --git a/curriculum/autobuild.bash b/guide/autobuild.bash similarity index 100% rename from curriculum/autobuild.bash rename to guide/autobuild.bash diff --git a/curriculum/challenge-bot.scm b/guide/challenge-bot.scm similarity index 95% rename from curriculum/challenge-bot.scm rename to guide/challenge-bot.scm index 710051d..1d662c2 100644 --- a/curriculum/challenge-bot.scm +++ b/guide/challenge-bot.scm @@ -12,8 +12,10 @@ (subsection :title [required materials] (p [you will need the things in this picture. - ,(figure :legend "arduino to deck / required materials" - (image :file "arduino-to-deck/0-required-materials.png")) + ,(figure + :legend "arduino to deck / required materials" + (image :file + "0-arduino-to-deck/0-required-materials.png")) ,(itemize (item [medical kit with bandages]) (item [safety goggles]) @@ -48,7 +50,7 @@ (p [here's a cross section of a screw in the deck] (figure :legend "screw cross section" (image :file - "arduino-to-deck/screw-cross-section.png"))) + "0-arduino-to-deck/screw-cross-section.png"))) (p [check ,(itemize (item @@ -60,13 +62,13 @@ (subsubsection :title [inserting drill bit] (p (figure :legend "arduino to deck / insert bit" - (image :file "arduino-to-deck/1-insert-bit.png")) + (image :file "0-arduino-to-deck/1-insert-bit.png")) [insert the drill bit into the teeth of the drill. insert it far enough that the teeth will clamp on the smooth part of the bit when they are tightened.]) (p (figure :legend "arduino to deck / twist tighten drill teeth" - (image :file "arduino-to-deck/2-twist-tighten-drill-teeth.png")) + (image :file "0-arduino-to-deck/2-twist-tighten-drill-teeth.png")) [while holding the drill bit, twist end of the drill to tighten the teeth. make sure that the teeth end up gripping the flat part of @@ -87,11 +89,11 @@ :title [arduino placement] (p [the arduino should be placed as shown in this picture.] (figure :legend "arduino to deck / place arduino" - (image :file "arduino-to-deck/3-place-arduino.png"))) + (image :file "0-arduino-to-deck/3-place-arduino.png"))) (p [here's a closeup] (figure :legend "arduino to deck / place arduino closeup" (image :file - "arduino-to-deck/4-place-arduino-closeup.png")) + "0-arduino-to-deck/4-place-arduino-closeup.png")) [the picture above shows where to place the arduino on the deck. the arduino should line up with the holes on the deck. this alignment line is highlighted in pink. @@ -181,7 +183,7 @@ smaller numbers means smaller screws.] (figure :legend "arduino to deck / #6-32 screw" (image :file - "arduino-to-deck/6-32-screw.png"))) + "0-arduino-to-deck/6-32-screw.png"))) (p [check ,(itemize (item @@ -262,8 +264,10 @@ the picture below shows that the second hole should be as far as possible from the first hole, since that minimizes rotation.] - (figure :legend "arduino to deck / keep holes far apart" - (image :file "arduino-to-deck/keep-holes-far-apart.png")))) + (figure + :legend "arduino to deck / keep holes far apart" + (image + :file "0-arduino-to-deck/keep-holes-far-apart.png")))) (subsubsection :title [drilling and attaching second screw] (p [to drill the second hole, follow the same steps as drilling the diff --git a/curriculum/makefile b/guide/makefile similarity index 91% rename from curriculum/makefile rename to guide/makefile index 08764ae..a510be8 100644 --- a/curriculum/makefile +++ b/guide/makefile @@ -77,10 +77,10 @@ translate.html: translate.scm \ > /dev/null challenge-bot.html: challenge-bot.scm \ - arduino-to-deck/screw-cross-section.png \ - arduino-to-deck/6-32-screw.png \ - arduino-to-deck/4-place-arduino-closeup.png \ - arduino-to-deck/keep-holes-far-apart.png \ + 0-arduino-to-deck/screw-cross-section.png \ + 0-arduino-to-deck/6-32-screw.png \ + 0-arduino-to-deck/4-place-arduino-closeup.png \ + 0-arduino-to-deck/keep-holes-far-apart.png \ makefile @skribilo $< > $@ diff --git a/curriculum/notes.org b/guide/notes.org similarity index 100% rename from curriculum/notes.org rename to guide/notes.org diff --git a/curriculum/square.scad b/guide/square.scad similarity index 100% rename from curriculum/square.scad rename to guide/square.scad diff --git a/curriculum/square.scm b/guide/square.scm similarity index 100% rename from curriculum/square.scm rename to guide/square.scm diff --git a/curriculum/square1.scad b/guide/square1.scad similarity index 100% rename from curriculum/square1.scad rename to guide/square1.scad diff --git a/curriculum/square2.scad b/guide/square2.scad similarity index 100% rename from curriculum/square2.scad rename to guide/square2.scad diff --git a/curriculum/square3.scad b/guide/square3.scad similarity index 100% rename from curriculum/square3.scad rename to guide/square3.scad diff --git a/curriculum/translate.scad b/guide/translate.scad similarity index 100% rename from curriculum/translate.scad rename to guide/translate.scad diff --git a/curriculum/translate.scm b/guide/translate.scm similarity index 100% rename from curriculum/translate.scm rename to guide/translate.scm diff --git a/curriculum/translate01.scad b/guide/translate01.scad similarity index 100% rename from curriculum/translate01.scad rename to guide/translate01.scad diff --git a/curriculum/translate10.scad b/guide/translate10.scad similarity index 100% rename from curriculum/translate10.scad rename to guide/translate10.scad -- 2.30.2