Permalink
Browse files

markdown

  • Loading branch information...
1 parent 0c4c8f0 commit 7f683a2eb11caa5069958dacf1314f99dc36cd54 @abloom committed Jan 10, 2012
Showing with 96 additions and 35 deletions.
  1. +1 −0 Gemfile
  2. +10 −3 Gemfile.lock
  3. +5 −1 config.ru
  4. BIN public/images/relay-schematic.png
  5. +28 −11 views/index.haml
  6. +11 −0 views/layout.haml
  7. +12 −12 notes.txt → views/notes.md
  8. +12 −0 views/notes.sass
  9. +17 −8 views/styles.sass
View
@@ -4,6 +4,7 @@ gem 'sinatra'
gem 'sass'
gem 'haml'
gem 'thin'
+gem 'rdiscount'
group :development do
gem 'foreman'
View
@@ -16,19 +16,25 @@ GEM
launchy (2.0.5)
addressable (~> 2.2.6)
mime-types (1.17.2)
- rack (1.3.5)
+ rack (1.4.0)
+ rack-protection (1.2.0)
+ rack
+ rdiscount (1.6.8)
rest-client (1.6.7)
mime-types (>= 1.16)
rubyzip (0.9.4)
sass (3.1.10)
- sinatra (1.0)
- rack (>= 1.0)
+ sinatra (1.3.2)
+ rack (~> 1.3, >= 1.3.6)
+ rack-protection (~> 1.2)
+ tilt (~> 1.3, >= 1.3.3)
term-ansicolor (1.0.6)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
+ tilt (1.3.3)
PLATFORMS
ruby
@@ -37,6 +43,7 @@ DEPENDENCIES
foreman
haml
heroku
+ rdiscount
sass
sinatra
thin
View
@@ -11,7 +11,11 @@ get '/assets/:name.css' do
end
get '/' do
- haml :index
+ haml :index, layout: false
+end
+
+get '/notes' do
+ markdown :notes, layout_engine: :haml
end
run Sinatra::Application
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -81,6 +81,15 @@
%p.subtitle Relays!
#eleventh.step.slide(data-x="0" data-y="-4000")
+ %h2 Relay Schematic
+ .outer
+ .inner
+ %img{src: '/images/relay-schematic.png'}
+
+ %p.subtitle
+ 2 resistors, a diode and a transistor
+
+ #twelfth.step.slide(data-x="1000" data-y="-4000")
%h2 Network Adapter
%p Tons of premade modules already exist
.outer
@@ -89,11 +98,11 @@
$45.95
%p.subtitle Yes, they stack!
- #twelfth.step.slide(data-x="1000" data-y="-4000")
+ #thirteenth.step.slide(data-x="2000" data-y="-4000")
%h2 The Sketch (code)
%script{src: 'https://gist.github.com/8f4f151667e4e7f9e864.js'}
- #thirteenth.step.slide(data-x="2000" data-y="-4000")
+ #fourteenth.step.slide(data-x="3000" data-y="-4000")
%h2 Serial code is boring.
%p Seriously, boring. Check it out on Github.
%p
@@ -102,10 +111,10 @@
%span (demo branch -- master only has ethernet, no serial due to memory constraints)
%p Demos are fun.
- #fourteenth.step(data-x="4000" data-y="-3000" data-rotate="90" data-scale="3")
+ #fifteenth.step(data-x="5000" data-y="-3000" data-rotate="90" data-scale="3")
%h1 Cool, but what can I do?
- #fifteenth.step.slide.bullets(data-x="4000" data-y="-6000" data-rotate="90")
+ #sixteenth.step.slide.bullets(data-x="4000" data-y="-6000" data-rotate="90")
%h2 A few other ways to trigger events
%ul
%li Processing
@@ -114,7 +123,7 @@
%li Sensors (pressure, temperature, light, audio)
%li MIDI (as a controller or an instrument)
- #sixteenth.step.slide(data-x="3000" data-y="-6000")
+ #seventeenth.step.slide(data-x="3000" data-y="-6000")
%h3 MIDI, could it be any easier?
.outer
.inner
@@ -124,21 +133,29 @@
3 wires, 1 resistor and a complete library for reading and writing!
%a{href: 'http://arduino.cc/playground/Main/MIDILibrary'} http://arduino.cc/playground/Main/MIDILibrary
- #seventeenth.step(data-x="1500" data-y="-6000" data-rotate="270")
+ #eighteenth.step(data-x="1500" data-y="-6000" data-rotate="270")
%p.one Are the gears turning yet?
%p.two What could you build?
- #eighteenth.step.slide(data-x="0" data-y="-6000")
+ #nineteenth.step.slide(data-x="0" data-y="-6000")
%p
%a{href: "http://vimeo.com/21874758"} MIDI Rainbow Demo
from
%a{href: "http://sululab.blogspot.com/2011/04/midi-rainbow.html"} SuLuLab
.outer
.inner
+ %iframe(src="http://player.vimeo.com/video/21874758?title=0&byline=0&portrait=0" width="400" height="300" frameborder="0")
%iframe(src="http://player.vimeo.com/video/21874568?title=0&byline=0&portrait=0" width="400" height="300" frameborder="0")
- #nineteenth.step.slide.bullets(data-x="0" data-y="-7000")
+ #twentieth.step(data-x="-1000" data-y="-6000")
+ %h2 One more thing...
+ .outer
+ .inner
+ %q
+ %a{href: 'http://fritzing.org/'} Fritzing!
+
+ #twentyfirst.step.slide.bullets(data-x="-1000" data-y="-7000")
%h3 Thanks for listening!
Useful links
@@ -158,9 +175,9 @@
or email me at
%a{href: 'mailto:andrew@andrewkbloom.com'} andrew@andrewkbloom.com
- #overview.step(data-x="0" data-y="-2000" data-scale='15')
+ -##overview.step(data-x="0" data-y="-2000" data-scale='15')
- .hint
- %p Use a spacebar or arrow keys to navigate
+ -#.hint
+ -#%p Use a spacebar or arrow keys to navigate
%script{src: "/js/impress.js", type: 'text/javascript'}
View
@@ -0,0 +1,11 @@
+!!! 5
+%html
+ %head
+ %title Notes
+ %link{href: 'http://twitter.github.com/bootstrap/1.4.0/bootstrap.min.css', rel: 'stylesheet'}
+ %link{href: '/assets/notes.css', rel: 'stylesheet'}
+
+ %body
+ .outer
+ .inner
+ = yield
@@ -1,5 +1,5 @@
-0. Good evening everyone. For those of you that don't know me, I'm
- Andrew Bloom.
+#### Good evening everyone.
+#### For those of you that don't know me, I'm Andrew Bloom.
1. Based on the last meetup it seems a lot of you already know how to
make digital audio and video. Today I'm going to talk about an electronics
@@ -37,42 +37,42 @@
do to control the lights is insert a switch into the line. Thats where
relays come in. They're just voltage controlled switches.
- When working with a relay a few resistors and a diode are needed to
- protect the microcontroller, nothing complicated. Google it or talk
- to me after.
+11. When working with a relay a few resistors a transistor and a diode are
+ needed to protect the microcontroller, nothing complicated. Google it or
+ talk to me after.
-11. All kinds of expansion boards already exist. Motor controls, LCDs,
+12. All kinds of expansion boards already exist. Motor controls, LCDs,
network adapters, even wireless mesh network systems.
-12. In the Arduino world they refer to programs as sketches. They use a
+13. In the Arduino world they refer to programs as sketches. They use a
simplified version of C++. Here's the bootstrapping code for the
traffic light. The bulk of the logic in the program is reading
messages off the serial port. The animations are all pretty static.
-13. No one wants to sit through a lecture on serial code. I'd be happy
+14. No one wants to sit through a lecture on serial code. I'd be happy
to go over it with any of you after if you're curious to see how I
attacked it.
Before we proceed, who wants to see a demo?
-14. If you're not used to hacking on electronics the Arduino may only
+15. If you're not used to hacking on electronics the Arduino may only
seem like a novelty, but if you think a little harder I bet you can
come up with some great ideas.
-15. Here are just a few ways you folks might want to interract with an
+16. Here are just a few ways you folks might want to interract with an
Arduino. Processing and Max/MSP both support serial communication
similar to what I just demonstrated. Wiring up buttons is straight
forward, and most sensors are pretty trivial to connect, requiring very
little extra hardware if any.
-16. I know a lot of you are musicians so you're probably familiar with MIDI and
+17. I know a lot of you are musicians so you're probably familiar with MIDI and
may even own some gear. Check out how simple it is to get an Arduino
to act as a Controller or Synthesizer!
The official MIDI library provides read and write functionality as
well as a pass thru mode. The possibilities are almost endless.
-17. I'd love to help anybody here get started. I've got a decent
+18. I'd love to help anybody here get started. I've got a decent
electronics education and can fake my way through enough of it to
hopefully not burn my house down. If you've got any ideas you want
to discuss let me know.
View
@@ -0,0 +1,12 @@
+ol
+ margin-top: 20px
+
+li
+ margin-bottom: 20px
+ &p
+ color: black
+ font-size: 120%
+
+.inner
+ margin: auto
+ width: 600px
View
@@ -128,42 +128,51 @@ h3
width: 226px
#eleventh
+ div.inner
+ width: 532px
+
+#twelfth
div.inner
width: 570px
img
width: 460px
-#twelfth
-
-#thirteenth
+#fourteenth
p
padding-top: 50px
span
display: block
font-size: 80%
color: gray
-#sixteenth
+#seventeenth
div.inner
width: 500px
img
width: 500px
-#seventeenth
+#eighteenth
p.two
padding-left: 250px
-#eighteenth
+#nineteenth
p
text-align: center
font-size: 110%
div.outer
- padding-top: 50px
+ margin-top: 0px
div.inner
width: 400px
-#nineteenth
+#twentieth
+ div.inner
+ margin: auto
+ width: 300px
+ q
+ font-size: 150%
+
+#twentyfirst
ul
padding-top: 20px

0 comments on commit 7f683a2

Please sign in to comment.