madrona-rad 0.3.7 → 0.3.8

data/lib/examples/debounce_methods.rb

@@ -1,60 +1,49 @@
 class DebounceMethods < ArduinoSketch
-  
-  # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
-  # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
-  output_pin 13, :as => :led
-
-  def loop
-    blink led, 100 
-    x = 4
-  end
-  
-  ##
-  
-  # output_pin 13, :as => :led 
-  # input_pin 6, :as => :button_one, :device => :button # can also :adjust => 300
-  # input_pin 7, :as => :button_two, :device => :button
-  # input_pin 8, :as => :button_three, :device => :button
-  # input_pin 9, :as => :button_four, :device => :button  
-  # input_pin 10, :as => :button_five, :device => :button  
+    
+  output_pin 13, :as => :led 
+  input_pin 6, :as => :button_one, :device => :button # can also :adjust => 300
+  input_pin 7, :as => :button_two, :device => :button
+  input_pin 8, :as => :button_three, :device => :button
+  input_pin 9, :as => :button_four, :device => :button  
+  input_pin 10, :as => :button_five, :device => :button  
   # 
   # # depressing and releasing button_one, button_two or button_four do the same thing
   # # with a slightly different syntax and number of blinks
   # # button_three simply toggles the led with the read_and_toggle method
   # # button_five does it with a twist
-  # 
-  #    def loop
-  #      blink_twice if read_input button_one
-  #      blink_three_times if read_input button_two
-  #      button_three.read_and_toggle led #  
-  #      blink_three_times_basic if read_input button_four
-  #      blink_with_a_twist if read_input button_five
-  #    end
-  #    
-  #    def blink_twice
-  #       2.times do |i|
-  #         led.blink 200 + i
-  #       end
-  #     end
-  #    
-  #    def blink_three_times
-  #      3.times { led.blink 200 }
-  #    end
-  # 
-  #    # no blink helper
-  #    def blink_three_times_basic
-  #      4.times do 
-  #        led.digitalWrite HIGH
-  #        delay 200
-  #        led.digitalWrite LOW
-  #        delay 200
-  #      end
-  #    end
-  #    
-  #    def blink_with_a_twist
-  #      20.times do |i|
-  #        led.blink i * 10
-  #      end
-  #    end     
+  
+     def loop
+       blink_twice if read_input button_one
+       blink_three_times if read_input button_two
+       button_three.read_and_toggle led #  
+       blink_three_times_basic if read_input button_four
+       blink_with_a_twist if read_input button_five
+     end
+     
+     def blink_twice
+        2.times do |i|
+          led.blink 200 + i
+        end
+      end
+     
+     def blink_three_times
+       3.times { led.blink 200 }
+     end
+  
+     # no blink helper
+     def blink_three_times_basic
+       4.times do 
+         led.on
+         delay 200
+         led.off
+         delay 200
+       end
+     end
+     
+     def blink_with_a_twist
+       20.times do |i|
+         led.blink i * 10
+       end
+     end     
      
 end

data/lib/examples/hello_eeprom.rb

@@ -1,62 +1,52 @@
 class HelloEeprom < ArduinoSketch
   
-  # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
-  # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
-  output_pin 13, :as => :led
-
+  output_pin 19, :as => :rtc, :device => :i2c_ds1307, :enable => :true
+  output_pin 19, :as => :mem0, :device => :i2c_eeprom
+  
+  output_pin 14, :as => :myLCD, :device => :pa_lcd, :rate => 19200
+    
   def loop
-    blink led, 100 
-    x = 4
-  end
+        myLCD.setxy 0,0         # set to 0,0
+        myLCD.print rtc.get(5, 1) # refresh registers (=1) get month
+      myLCD.print "/"
+        myLCD.print rtc.get(4, 0) # no need to refresh (=0) get day 
+      myLCD.print "/"
+        myLCD.print rtc.get(6, 0) # get year
+      myLCD.setxy(0,1)      # set in 1 byte line 1 (second line)
+      printlz 2         # print hours with lead zero
+      myLCD.print ":"
+        printlz 1         # print minutes with lead zero
+      myLCD.print ":"
+        printlz 0         # print seconds with lead zero
+        
+  
+      myLCD.setxy 10,0
+      myLCD.print "write test"
+      myLCD.setxy 0,2
+      32.upto(109) do       # write address of byte to that b yte
+        |x| mem0.write_byte  x, x
+        myLCD.print(".") if x%2
+        delay 10
+      end
   
-  ##
+      delay 2000
+      
+      myLCD.clearline 2   # clears bottom two lines           
+      myLCD.clearline 3
   
-  # output_pin 19, :as => :rtc, :device => :i2c_ds1307, :enable => :true
-  # output_pin 19, :as => :mem0, :device => :i2c_eeprom
-  # 
-  # output_pin 14, :as => :myLCD, :device => :pa_lcd, :rate => 19200
-  #   
-  # def loop
-  #       myLCD.setxy 0,0         # set to 0,0
-  #       myLCD.print rtc.get(5, 1) # refresh registers (=1) get month
-  #     myLCD.print "/"
-  #       myLCD.print rtc.get(4, 0) # no need to refresh (=0) get day 
-  #     myLCD.print "/"
-  #       myLCD.print rtc.get(6, 0) # get year
-  #     myLCD.setxy(0,1)      # set in 1 byte line 1 (second line)
-  #     printlz 2         # print hours with lead zero
-  #     myLCD.print ":"
-  #       printlz 1         # print minutes with lead zero
-  #     myLCD.print ":"
-  #       printlz 0         # print seconds with lead zero
-  #       
-  # 
-  #     myLCD.setxy 10,0
-  #     myLCD.print "write test"
-  #     myLCD.setxy 0,2
-  #     32.upto(109) do       # write address of byte to that b yte
-  #       |x| mem0.write_byte  x, x
-  #       myLCD.print(".") if x%2
-  #       delay 10
-  #     end
-  # 
-  #     delay 2000
-  #     
-  #     myLCD.clearline 2   # clears bottom two lines           
-  #     myLCD.clearline 3
-  # 
-  #     myLCD.setxy 10,0, "read test "
-  #     myLCD.setxy 0,2
-  #                   # read and print 39 addresses with printable numbers
-  #     75.upto(113) { |x| myLCD.print(mem0.read_byte(x)) }
-  #     delay 10000
-  #     myLCD.clearscr
-  # end
-  # 
-  # def printlz(w)
-  #       i = 0 + rtc.get(w,0)         # the '0 +' is YARH (Yet Another RubyToc Hack)
-  #       myLCD.print "0" if i < 10
-  #       myLCD.print i
-  # end
+      myLCD.setxy 10,0, "read test "
+      myLCD.setxy 0,2
+                    # read and print 39 addresses with printable numbers
+      75.upto(113) { |x| myLCD.print(mem0.read_byte(x)) }
+      delay 10000
+      myLCD.clearscr
+  end
+  
+  def printlz(w)
+    f = 1 + w # hack to coerce w to int
+    i = rtc.get(w,0)
+    myLCD.print "0" if i < 10
+    myLCD.print i
+  end
 
 end

data/lib/examples/i2c_with_clock_chip.rb

@@ -1,5 +1,7 @@
 class I2cWithClockChip < ArduinoSketch
   
+  # until is an unsupported node type
+  
   # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
   # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
   output_pin 13, :as => :led

data/lib/examples/midi_scales.rb

@@ -1,16 +1,5 @@
 class MidiScales < ArduinoSketch
   
-  # IMPORTANT -- This is one for four examples that fails with Ruby 1.9 support (latest ruby2c and parsetree)
-  # the failing example is commented out and replaced with this hello world until I have a chance to resolve the issue -- jd
-  output_pin 13, :as => :led
-
-  def loop
-    blink led, 100 
-    x = 4
-  end
-  
-  ##
-  
 # purpose
 # trigger midi output with buttons and
 # spectra soft pots
@@ -18,88 +7,90 @@ class MidiScales < ArduinoSketch
 #
 
 
-  # @current_note = int
-  # @last_note_one = 0
-  # @last_note_two = 0
-  # @last_note_three = 0
-  # @note = int
-  # 
-  # input_pin 1, :as => :sensor_one, :device => :spectra
-  # input_pin 2, :as => :sensor_two, :device => :spectra
-  # input_pin 3, :as => :sensor_three, :device => :spectra
-  # input_pin 7, :as => :button_one, :device => :button
-  # input_pin 8, :as => :button_two, :device => :button
-  # input_pin 9, :as => :button_three, :device => :button
-  # output_pin 13, :as => :led
-  # 
-  # serial_begin :rate => 31250
-  # 
-  # def setup
-  #   delay 3000
-  # end
-  # 
-  # def loop
-  #   change_tone if button_one.read_input
-  #   change_pressure if button_two.read_input
-  #   change_channels if button_three.read_input
-  #   read_sensor_one
-  #   read_sensor_two
-  #   read_sensor_three
-  # end
-  #    
-  # def change_tone 
-  #   110.upto(127) do |note|
-  #     play 0, note, 127
-  #   end
-  # end
-  # 
-  # def change_pressure
-  #   110.upto(127) do |pressure| 
-  #      play 0, 45, pressure
-  #   end
-  # end
-  #    
-  # def change_channels 
-  #   0.upto(6) do |channel| 
-  #     play channel, 50, 100
-  #   end
-  # end
-  # 
-  # def read_sensor_one
-  #   @current_note = sensor_one.soft_lock
-  #   pre_play(@current_note, @last_note_one, 13)
-  #   @last_note_one = @current_note
-  # end
-  # 
-  # def read_sensor_two
-  #   @current_note = sensor_two.soft_lock
-  #   pre_play(@current_note, @last_note_two, 14)
-  #   @last_note_two = @current_note
-  # end
-  # 
-  # def read_sensor_three
-  #   @current_note = sensor_three.soft_lock
-  #   pre_play(@current_note, @last_note_three, 15)
-  #   @last_note_three = @current_note
-  # end
-  # 
-  # def pre_play(current_note, last_note, channel) # warning, don't use last as a parameter...
-  #   n = 1 + channel
-  #   unless current_note == last_note
-  #     @note = ((current_note /16) + 40)
-  #     play_with_no_delay( channel, @note, 100 )
-  #   end
-  # end
-  #   
-  # def play(chan, note, pressure)
-  #   note_on(chan, note, pressure)
-  #   delay 100 # adjust to need
-  #   note_off(chan, note, 0)
-  # end
-  # 
-  # def play_with_no_delay(chan, note, pressure) # note is not turned off
-  #   note_on(chan, note, pressure)
-  # end
+  @current_note = int
+  @last_note_one = 0
+  @last_note_two = 0
+  @last_note_three = 0
+  @note = int
+  
+  input_pin 1, :as => :sensor_one, :device => :spectra
+  input_pin 2, :as => :sensor_two, :device => :spectra
+  input_pin 3, :as => :sensor_three, :device => :spectra
+  input_pin 7, :as => :button_one, :device => :button
+  input_pin 8, :as => :button_two, :device => :button
+  input_pin 9, :as => :button_three, :device => :button
+  output_pin 13, :as => :led
+  
+  serial_begin :rate => 31250
+  
+  def setup
+    delay 3000
+  end
+  
+  def loop
+    change_tone if button_one.read_input
+    change_pressure if button_two.read_input
+    change_channels if button_three.read_input
+    read_sensor_one
+    read_sensor_two
+    read_sensor_three
+  end
+     
+  def change_tone 
+    110.upto(127) do |note|
+      play 0, note, 127
+    end
+  end
+  
+  def change_pressure
+    110.upto(127) do |pressure| 
+       play 0, 45, pressure
+    end
+  end
+     
+  def change_channels 
+    0.upto(6) do |channel| 
+      play channel, 50, 100
+    end
+  end
+  
+  def read_sensor_one
+    @current_note = sensor_one.soft_lock
+    pre_play(@current_note, @last_note_one, 13)
+    @last_note_one = @current_note
+  end
+  
+  def read_sensor_two
+    @current_note = sensor_two.soft_lock
+    pre_play(@current_note, @last_note_two, 14)
+    @last_note_two = @current_note
+  end
+  
+  def read_sensor_three
+    @current_note = sensor_three.soft_lock
+    pre_play(@current_note, @last_note_three, 15)
+    @last_note_three = @current_note
+  end
+  
+  def pre_play(current_note, last_note, channel) # warning, don't use last as a parameter...
+    n = 1 + channel
+    unless current_note == last_note
+      @note = ((current_note /16) + 40)
+      play_with_no_delay( channel, @note, 100 )
+    end
+  end
+    
+  def play(chan, note, pressure)
+    f = 1 + chan + note + pressure # hack to coerce args to int
+    note_on(chan, note, pressure)
+    delay 100 # adjust to need
+    note_off(chan, note, 0)
+  end
+  
+  def play_with_no_delay(chan, note, pressure) # note is not turned off
+    f = 1 + chan + note + pressure # hack to coerce args to int
+    note_on(chan, note, pressure)
+  end
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Greg Borenstein
@@ -204,7 +204,6 @@ files:
 - website/examples/serial_motor.rb.html
 has_rdoc: true
 homepage: http://github.com/atduskreg/rad
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --main
@@ -226,9 +225,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rad
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: "RAD: Ruby Arduino Development - 0.3.7 -- 1.9 Ready"
+summary: "RAD: Ruby Arduino Development - 0.3.8 -- 1.9 Ready"
 test_files: []