diff --git a/sparks/img/U2/lab03/Tektronix_Oscilloscope_475A.png b/sparks/img/U2/lab03/Tektronix_Oscilloscope_475A.png new file mode 100644 index 0000000000..71d4b0cae6 Binary files /dev/null and b/sparks/img/U2/lab03/Tektronix_Oscilloscope_475A.png differ diff --git a/sparks/student-pages/U2/L3/01-visualizing-sound-data.html b/sparks/student-pages/U2/L3/01-visualizing-sound-data.html index 435eb3ade8..f495a1b84e 100644 --- a/sparks/student-pages/U2/L3/01-visualizing-sound-data.html +++ b/sparks/student-pages/U2/L3/01-visualizing-sound-data.html @@ -43,8 +43,8 @@

Visualizing Sound Data

clarify that here, our intensity is volume/loudness
diff --git a/sparks/student-pages/U2/L3/02-oscilloscope.html b/sparks/student-pages/U2/L3/02-oscilloscope.html index 29266b5967..c8189f5d07 100644 --- a/sparks/student-pages/U2/L3/02-oscilloscope.html +++ b/sparks/student-pages/U2/L3/02-oscilloscope.html @@ -38,7 +38,7 @@

Oscilloscope

-
    +
    1. You learned about global variables in Unit 2 Lab 1 Activity 6: Storing Songs.

      @@ -114,7 +114,7 @@

      Oscilloscope

      -
        +
        1. Build this in Snap!
        2. Talk, sing, and make noise! If your computer's microphone is detecting sound and your Snap! code is working, you should see the frequencies displayed on the Snap! stage.
        3. Troubleshoot any problems with your code.
        4. diff --git a/sparks/student-pages/U2/L3/03-spectrum-analyzer.html b/sparks/student-pages/U2/L3/03-spectrum-analyzer.html index 203081ef48..1737f2a4d8 100644 --- a/sparks/student-pages/U2/L3/03-spectrum-analyzer.html +++ b/sparks/student-pages/U2/L3/03-spectrum-analyzer.html @@ -52,7 +52,7 @@

          Creating the Spectrum Analyzer

        5. If your project isn't open already, log in to Snap!, and open your "Sparks-Sound-Visualizer" project.
        6. Since you will reuse your oscilloscope code, preserve it by creating two copies of everything inside the forever block. Put one copy inside a show volume samples command block and one copy inside a show frequencies command block.
          - show volume samples:
+					<img class=There are helpful Snap! tricks for a few of these things:
          • To rename a variable and alle the places is appears at the same time, right-click the variable and choose "rename all..."
          • -
          • To change from one block (like × (times)) to a similar block (like - (minus) ), right-click the block, choose "relabel..." and choose the new block you want in its place.
          • +
          • To change from one block (like × (times)) to a similar block (like - (minus) ), right-click the block, choose "relabel..." and choose the new block you want in its place.
      The show frequencies will have a few critial differences: diff --git a/topic/sparks/2-sequencing-iteration.topic b/topic/sparks/2-sequencing-iteration.topic index 3b927d29ea..98e09d0d35 100755 --- a/topic/sparks/2-sequencing-iteration.topic +++ b/topic/sparks/2-sequencing-iteration.topic @@ -42,11 +42,12 @@ heading: Lab 2: Graphics and Animation //raw-html: heading: Lab 3: Make Some Noise - resource: Visualizing Sound Data [/bjc-r/sparks/student-pages/U2/L3/01-visualizing-sound-data.html] - resource: Oscilloscope [/bjc-r/sparks/student-pages/U2/L3/02-oscilloscope.html] - resource: Spectrum Analyzer [/bjc-r/sparks/student-pages/U2/L3/03-spectrum-analyzer.html] - resource: Switching Back and Forth [/bjc-r/sparks/student-pages/U2/L3/04-switching.html] - resource: Creating Sound Waves [/bjc-r/sparks/student-pages/U2/L3/05-sound-generator.html] + raw-html:
      + //resource: Visualizing Sound Data [/bjc-r/sparks/student-pages/U2/L3/01-visualizing-sound-data.html] + //resource: Oscilloscope [/bjc-r/sparks/student-pages/U2/L3/02-oscilloscope.html] + //resource: Spectrum Analyzer [/bjc-r/sparks/student-pages/U2/L3/03-spectrum-analyzer.html] + //resource: Switching Back and Forth [/bjc-r/sparks/student-pages/U2/L3/04-switching.html] + //resource: Creating Sound Waves [/bjc-r/sparks/student-pages/U2/L3/05-sound-generator.html] heading: Lab 4: Transmitting Data // resource: Finding the Best Routing Strategy //[]