From 6e7c78dd858dca6b55c5a7ceacb68f385f7af2c0 Mon Sep 17 00:00:00 2001
From: daniel watson <ozzloy@gmail.com>
Date: Wed, 1 Jun 2016 17:03:14 -0700
Subject: [PATCH] show more detail on 6-32 screw

---
 curriculum/arduino-to-deck/6-32-screw.svg | 370 ++++++++++++++++++++++
 curriculum/challenge-bot.scm              |   5 +-
 curriculum/makefile                       |   1 +
 3 files changed, 375 insertions(+), 1 deletion(-)
 create mode 100644 curriculum/arduino-to-deck/6-32-screw.svg

diff --git a/curriculum/arduino-to-deck/6-32-screw.svg b/curriculum/arduino-to-deck/6-32-screw.svg
new file mode 100644
index 0000000..993016f
--- /dev/null
+++ b/curriculum/arduino-to-deck/6-32-screw.svg
@@ -0,0 +1,370 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="640"
+   height="480"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="screw.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lstart"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lstart"
+       style="overflow:visible">
+      <path
+         id="path3927"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt"
+         transform="scale(0.8) translate(12.5,0)" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path3930"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.7"
+     inkscape:cx="410.66164"
+     inkscape:cy="204.42938"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1366"
+     inkscape:window-height="729"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-572.36218)">
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 257.50764,717.95095 127.44174,22.32483"
+       id="path2989-5-3-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 258.5178,897.73274 127.44174,22.32483"
+       id="path2989-5-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 258.51779,852.27587 385.95953,874.6007"
+       id="path2989-5-15"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 256.49749,807.82916 127.44174,22.32483"
+       id="path2989-5-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 257.50764,761.38751 127.44174,22.32483"
+       id="path2989-5"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:0.86554625;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect2985"
+       width="110.10663"
+       height="230.31479"
+       x="266.6803"
+       y="700.8291" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 257.5889,762.4484 384.86812,739.21489"
+       id="path2989"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 256.57875,808.89005 383.85797,785.65654"
+       id="path2989-9"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 258.59905,853.33676 385.87827,830.10325"
+       id="path2989-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:11.39999962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 258.59906,898.79363 385.87828,875.56012"
+       id="path2989-2"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.52700016;fill:none;stroke:#0a00ff;stroke-width:5.30000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2987"
+       sodipodi:cx="296.98486"
+       sodipodi:cy="120.3857"
+       sodipodi:rx="119.198"
+       sodipodi:ry="16.162441"
+       d="m 416.18286,120.3857 a 119.198,16.162441 0 1 1 -238.39599,0 119.198,16.162441 0 1 1 238.39599,0 z"
+       transform="translate(26.263966,567.31142)" />
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="295.9747"
+       y="689.71741"
+       id="text3870"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3872"
+         x="295.9747"
+         y="689.71741">head</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="317.61465"
+       y="1002.3596"
+       id="text3874"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3876"
+         x="317.61465"
+         y="1002.3596">body</tspan><tspan
+         sodipodi:role="line"
+         x="317.61465"
+         y="1027.3596"
+         id="tspan5489">&quot;#6&quot; = 6 gauge = 0.138 inches diameter</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="488.91385"
+       y="734.16412"
+       id="text3878"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3880"
+         x="488.91385"
+         y="734.16412">thread</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 481.84276,153.72073 -87.88327,9.09137"
+       id="path3921"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="109.09647"
+       y="638.19965"
+       id="text4367"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4369"
+         x="109.09647"
+         y="638.19965"
+         style="font-size:64px">#6-32 screw</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 317.5,418.92857 317.5,395"
+       id="path5111"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-end:url(#Arrow1Lend)"
+       d="M 365,365.35714 317.5,395.71429 275,363.92857"
+       id="path5117"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="448.50772"
+       y="209.27911"
+       id="text5491"
+       sodipodi:linespacing="125%"
+       transform="translate(0,572.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan5493"
+         x="448.50772"
+         y="209.27911">&quot;32&quot;</tspan><tspan
+         sodipodi:role="line"
+         x="448.50772"
+         y="234.27911"
+         id="tspan5503">thread</tspan><tspan
+         sodipodi:role="line"
+         x="448.50772"
+         y="259.27911"
+         id="tspan5501">wraps</tspan><tspan
+         sodipodi:role="line"
+         x="448.50772"
+         y="284.27911"
+         id="tspan5495">per inch</tspan><tspan
+         sodipodi:role="line"
+         x="448.50772"
+         y="309.27911"
+         id="tspan5497">along</tspan><tspan
+         sodipodi:role="line"
+         x="448.50772"
+         y="334.27911"
+         id="tspan5499">the body</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="237.38585"
+       y="724.06262"
+       id="text5509"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5511"
+         x="237.38585"
+         y="724.06262">0</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="235.36554"
+       y="768.50934"
+       id="text5513"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5515"
+         x="235.36554"
+         y="768.50934">1</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="236.3757"
+       y="813.96619"
+       id="text5517"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5519"
+         x="236.3757"
+         y="813.96619">2</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="239.40614"
+       y="857.40271"
+       id="text5521"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan5523"
+         x="239.40614"
+         y="857.40271">3</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="238.396"
+       y="327.46698"
+       id="text5525"
+       sodipodi:linespacing="125%"
+       transform="translate(0,572.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan5527"></tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="237.38585"
+       y="333.52789"
+       id="text5529"
+       sodipodi:linespacing="125%"
+       transform="translate(0,572.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan5531"
+         x="237.38585"
+         y="333.52789">4</tspan></text>
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 149.50258,147.65981 68.69037,1.01016"
+       id="path5533"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="m 157.5838,331.50758 62.62945,0"
+       id="path5719"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 151.01781,147.15474 6.06091,183.84776"
+       id="path5905"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 153.03811,236.55324 -41.92133,0.50507"
+       id="path5907"
+       inkscape:connector-curvature="0"
+       transform="translate(0,572.36218)" />
+    <text
+       xml:space="preserve"
+       style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Linux Libertine Mono O;-inkscape-font-specification:Linux Libertine Mono O"
+       x="42.426407"
+       y="203.72328"
+       id="text5909"
+       sodipodi:linespacing="125%"
+       transform="translate(0,572.36218)"><tspan
+         sodipodi:role="line"
+         id="tspan5911"
+         x="42.426407"
+         y="203.72328">4 thread</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="228.72328"
+         id="tspan5917">wraps</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="253.72328"
+         id="tspan5923">=</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="278.72327"
+         id="tspan5925">4/32 of</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="303.72327"
+         id="tspan5927">an inch,</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="328.72327"
+         id="tspan5929">=</tspan><tspan
+         sodipodi:role="line"
+         x="42.426407"
+         y="353.72327"
+         id="tspan5931">1/8&quot;</tspan></text>
+  </g>
+</svg>
diff --git a/curriculum/challenge-bot.scm b/curriculum/challenge-bot.scm
index c076dd9..cfba910 100644
--- a/curriculum/challenge-bot.scm
+++ b/curriculum/challenge-bot.scm
@@ -87,7 +87,10 @@
      (p [the "#6" part of "#6-32x3/8\"" is how big around the bolt is.
              it is related to wire gauge.
              bigger numbers mean larger screw.
-             smaller numbers means smaller screws.])
+             smaller numbers means smaller screws.]
+        (figure :legend "arduino to deck / #6-32 screw"
+                (image :file
+                       "arduino-to-deck/6-32-screw.png")))
      (p [check
          ,(itemize
            (item
diff --git a/curriculum/makefile b/curriculum/makefile
index 8f54f0d..ebc4ee0 100644
--- a/curriculum/makefile
+++ b/curriculum/makefile
@@ -74,6 +74,7 @@ translate.html: translate.scm \
 
 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 \
 		makefile
 	@skribilo challenge-bot.scm > challenge-bot.html
-- 
2.30.2