madrona-rad 0.3.5 → 0.3.6

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.6 2009-08-18
+   - added support for multiple boards
+
 == 0.3.5 2009-08-16
    - added support for ruby 1.9 with help of Zen Spider
 

data/README.rdoc

@@ -12,8 +12,7 @@ See also the Arduino Software reference: http://www.arduino.cc/en/Reference/Home
 
 ==Examples
 
-See the examples directory for lots of examples of RAD in action: 
-http://github.com/atduskgreg/rad/tree/master/lib/examples
+See the examples directory for lots of examples of RAD in action
 
 The atduskgreg/rad wiki also contains a growing library of examples and hardware tutorials:
 http://github.com/atduskgreg/rad/wikis
@@ -46,7 +45,7 @@ Write a sketch that will blink a single LED every 500ms:
   	end
   end
 
-Attach your Arduino and use rake to complile and upload your sketch:
+Attach your Arduino and use rake to compile and upload your sketch:
 
  $ rake make:upload
 
@@ -58,6 +57,8 @@ Installing RAD and the Arduino software on Linux can be a little more difficult
 
 And RAD will do its best to get the Arduino software installed on your system.
 
+   For OS X, Arduino should be installed in your applications directory -- install the intel or power pc drivers in /drivers
+
 ==Get Involved
 
 Cheers? Jeers? Wanna help out? Contact Greg Borenstein: greg [dot] borenstein [at] gmail [dot] com

data/bin/rad

@@ -28,7 +28,7 @@ class OptionParser #:nodoc:
                 "physical_reset"   => false
                 },
                 "software" => {
-                  "arduino_root"   => "/Applications/arduino-0012"
+                  "arduino_root"   => "/Applications/arduino-0015"
                  }
                }
     
@@ -261,9 +261,13 @@ else
     # example sketches can be uploaded to your arduino with
     # rake make:upload sketch=examples/hello_world
     # just replace hello_world with other examples
+    # 
+    # hello world (replace with your code):
     
+      output_pin 13, :as => :led
+
       def loop
-       # your code here
+        blink led, 100
       end
       
   end
@@ -282,6 +286,20 @@ else
   puts "Added #{sketch_name}/config"
   
   File.open("#{sketch_name}/config/hardware.yml", 'w') do |file|
+    file << "##############################################################
+# Today's MCU Choices (replace the mcu with your arduino board)
+# atmega8 => Arduino NG or older w/ ATmega8
+# atmega168 => Arduino NG or older w/ ATmega168
+# mini => Arduino Mini
+# bt  => Arduino BT
+# diecimila  => Arduino Diecimila or Duemilanove w/ ATmega168
+# nano  => Arduino Nano
+# lilypad  => LilyPad Arduino
+# pro => Arduino Pro or Pro Mini (8 MHz)
+# atmega328 => Arduino Duemilanove w/ ATmega328
+# mega => Arduino Mega
+
+"
     file << options["hardware"].to_yaml
   end
   puts "Added #{sketch_name}/config/hardware.yml"
@@ -296,7 +314,14 @@ else
   
   puts "***************************************************"
   puts "***     Please note: This version supports      ***"
-  puts "***            Arduino 12 only!                 ***"
+  puts "***            Arduino 15 only!                 ***"
+  puts "***                                             ***"
+  puts "***      default configuration: diecimila       ***"
+  puts "***       to change goto config/hardware        ***"
+  puts "***                                             ***"
+  puts "***                using usb?                   ***"
+  puts "***    don't forget to install the drivers      ***"
+  puts "***                                             ***"
   puts "***   run rad install arduino to upgrade        ***"
   puts "***************************************************"
 end

data/lib/examples/blink_m_address_assignment.rb

@@ -1,5 +1,13 @@
 class BlinkMAddressAssignment < 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
   # want to use more than one blink m?
   # since each blink m arrives with the same address, 
   # we can't address each one individually
@@ -16,89 +24,89 @@ class BlinkMAddressAssignment < ArduinoSketch
   # if you need to, program an led to help with the timing
    
 
-  @blink_m_start_address = 10
-  @flag = false
-  @addr1 = "10, byte"
-  @addr2 = "11, byte"
-  @addr3 = "12, byte"
-  
-  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
-  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 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
-  
-  def setup
-    delay 1000
-    my_lcd.setxy 0,0, "bienvenue"
-        delay 5000
-  end
-  
-  def loop  
- 
-    if @flag == false
-      staging
-    else
-      test_address 
-    end
-    delay 100
-  end
-  
-  def staging
-    my_lcd.setxy 0,0, "press button one to"
-    my_lcd.setxy 0,1, "set address to "
-    my_lcd.print @blink_m_start_address
-    my_lcd.setxy 0,2, "or two for status"
-    delay 60
-    my_lcd.setxy 0,3, "                "
-    my_lcd.setxy 0,3
-    800.times do |i|
-      return 0 if @flag == true
-      my_lcd.print "." if i % 50 == 0 
-      delay 5
-      if button_one.read_input
-        assign_address 
-      elsif button_two.read_input
-        test_address
-      end 
-    end
-    @blink_m_start_address += 1 
-  end
-  
-  def assign_address
-    @flag = true
-    my_lcd.clearscr "setting to "
-    my_lcd.print @blink_m_start_address
-    delay 100
-    BlinkM_setAddress @blink_m_start_address
-    my_lcd.clearscr "done"
-    control_it
-  end
-  
-  def control_it
-    delay 500
-    my_lcd.clearscr "stopping script"
-    BlinkM_stopScript @blink_m_start_address
-    my_lcd.clearscr "stopping script.."
-    delay 500
-    my_lcd.clearscr "fade to purple.."
-    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
-    my_lcd.clearscr "fade to purple"
-    delay 500
-    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
-  end
-  
-  
-  def test_address
-    my_lcd.clearscr
-    my_lcd.setxy 0,0, "testing address"
-    my_lcd.setxy 0,1
-    my_lcd.print blink_m_check_address_message @blink_m_start_address
-    delay 5000
-  end
-
-  
+  # @blink_m_start_address = 10
+  #   @flag = false
+  #   @addr1 = "10, byte"
+  #   @addr2 = "11, byte"
+  #   @addr3 = "12, byte"
+  #   
+  #   output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+  #   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 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  #   
+  #   def setup
+  #     delay 1000
+  #     my_lcd.setxy 0,0, "bienvenue"
+  #         delay 5000
+  #   end
+  #   
+  #   def loop  
+  #  
+  #     if @flag == false
+  #       staging
+  #     else
+  #       test_address 
+  #     end
+  #     delay 100
+  #   end
+  #   
+  #   def staging
+  #     my_lcd.setxy 0,0, "press button one to"
+  #     my_lcd.setxy 0,1, "set address to "
+  #     my_lcd.print @blink_m_start_address
+  #     my_lcd.setxy 0,2, "or two for status"
+  #     delay 60
+  #     my_lcd.setxy 0,3, "                "
+  #     my_lcd.setxy 0,3
+  #     800.times do |i|
+  #       return 0 if @flag == true
+  #       my_lcd.print "." if i % 50 == 0 
+  #       delay 5
+  #       if button_one.read_input
+  #         assign_address 
+  #       elsif button_two.read_input
+  #         test_address
+  #       end 
+  #     end
+  #     @blink_m_start_address += 1 
+  #   end
+  #   
+  #   def assign_address
+  #     @flag = true
+  #     my_lcd.clearscr "setting to "
+  #     my_lcd.print @blink_m_start_address
+  #     delay 100
+  #     BlinkM_setAddress @blink_m_start_address
+  #     my_lcd.clearscr "done"
+  #     control_it
+  #   end
+  #   
+  #   def control_it
+  #     delay 500
+  #     my_lcd.clearscr "stopping script"
+  #     BlinkM_stopScript @blink_m_start_address
+  #     my_lcd.clearscr "stopping script.."
+  #     delay 500
+  #     my_lcd.clearscr "fade to purple.."
+  #     BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+  #     my_lcd.clearscr "fade to purple"
+  #     delay 500
+  #     BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+  #   end
+  #   
+  #   
+  #   def test_address
+  #     my_lcd.clearscr
+  #     my_lcd.setxy 0,0, "testing address"
+  #     my_lcd.setxy 0,1
+  #     my_lcd.print blink_m_check_address_message @blink_m_start_address
+  #     delay 5000
+  #   end
+  # 
+  #   
     
 
 end

data/lib/examples/blink_m_multi.rb

@@ -1,61 +1,70 @@
 class BlinkMMulti < 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
 
   # demonstrate control of individual blinkms
   # this assumes the leds have been assigned addresses 10, 11, 12
   # which can be done with blink m address assignment
 
   # two ways to address the blinkms, array and individual variables
-  @blink_addresses = [10,11,12]
-  @addr_all = "0, byte" 
-  @addr1 = "10, byte"
-  @addr2 = "11, byte"
-  @addr3 = "12, byte"
-  
-  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
-  input_pin 7,  :as => :button_one, :device => :button
-  input_pin 8,  :as => :button_two, :device => :button
-  input_pin 9,  :as => :button_three, :device => :button
-  input_pin 10,  :as => :button_four, :device => :button
-  
-  # display the action on a 4x20 pa_lcd, yours may be 9200 instead of 19,200
-
-  output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
-  
-  
-  def loop  
-    stop_and_fade(@addr1) if button_one.read_input
-    stop_and_fade(@addr2) if button_two.read_input 
-    stop_and_fade(@addr3) if button_three.read_input 
-    dance if button_four.read_input 
-  end
-  
-  def stop_and_fade(addr)
-    f = 1 + addr # hack to coerce addr to int
-    my_lcd.clearscr
-    my_lcd.setxy 0,0, "blinkm # "
-    my_lcd.print addr
-    delay 700
-    BlinkM_stopScript addr
-    my_lcd.setxy 0,1, "stopping script.."
-    delay 700
-    my_lcd.setxy 0,2, "fade to purple.."
-    BlinkM_fadeToRGB(addr, 0xff,0x00,0xff)
-  end
-  
-  def dance
-    BlinkM_setFadeSpeed(@addr_all, 20) # 1-255, with 1 producing the slowest fade
-    my_lcd.clearscr
-    my_lcd.setxy 0,0, "Do the shimmy.."
-    my_lcd.setxy 0,1
-    @blink_addresses.each do |a|
-      BlinkM_fadeToRGB(a, 1,166,138)
-      delay 100
-    end
-    @blink_addresses.each do |a|
-      BlinkM_fadeToRGB(a, 35,0,112)
-      delay 100
-    end
-  end
+  # @blink_addresses = [10,11,12]
+  #   @addr_all = "0, byte" 
+  #   @addr1 = "10, byte"
+  #   @addr2 = "11, byte"
+  #   @addr3 = "12, byte"
+  #   
+  #   output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+  #   input_pin 7,  :as => :button_one, :device => :button
+  #   input_pin 8,  :as => :button_two, :device => :button
+  #   input_pin 9,  :as => :button_three, :device => :button
+  #   input_pin 10,  :as => :button_four, :device => :button
+  #   
+  #   # display the action on a 4x20 pa_lcd, yours may be 9200 instead of 19,200
+  # 
+  #   output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  #   
+  #   
+  #   def loop  
+  #     stop_and_fade(@addr1) if button_one.read_input
+  #     stop_and_fade(@addr2) if button_two.read_input 
+  #     stop_and_fade(@addr3) if button_three.read_input 
+  #     dance if button_four.read_input 
+  #   end
+  #   
+  #   def stop_and_fade(addr)
+  #     f = 1 + addr # hack to coerce addr to int
+  #     my_lcd.clearscr
+  #     my_lcd.setxy 0,0, "blinkm # "
+  #     my_lcd.print addr
+  #     delay 700
+  #     BlinkM_stopScript addr
+  #     my_lcd.setxy 0,1, "stopping script.."
+  #     delay 700
+  #     my_lcd.setxy 0,2, "fade to purple.."
+  #     BlinkM_fadeToRGB(addr, 0xff,0x00,0xff)
+  #   end
+  #   
+  #   def dance
+  #     BlinkM_setFadeSpeed(@addr_all, 20) # 1-255, with 1 producing the slowest fade
+  #     my_lcd.clearscr
+  #     my_lcd.setxy 0,0, "Do the shimmy.."
+  #     my_lcd.setxy 0,1
+  #     @blink_addresses.each do |a|
+  #       BlinkM_fadeToRGB(a, 1,166,138)
+  #       delay 100
+  #     end
+  #     @blink_addresses.each do |a|
+  #       BlinkM_fadeToRGB(a, 35,0,112)
+  #       delay 100
+  #     end
+  #   end
     
 
 end

data/lib/examples/first_sound.rb

@@ -1,23 +1,30 @@
 class FirstSound < 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 11, :as => :myTone, :device => :freq_out, :frequency => 100 # frequency required
-
-    def loop
-        myTone.disable
-        1.upto(400) { |x| tone_out x }   # run up the scale to 4000 Hz in 10 Hz steps
-        399.downto(1) { |x| tone_out x } # come back down in 10 Hz steps
-        delay 2000
-    end
-
-    def tone_out(n)
-        myTone.set_frequency 10*n
-        myTone.enable
-        delay 80
-        myTone.disable
-        delay 10
-    end
+# output_pin 11, :as => :myTone, :device => :freq_out, :frequency => 100 # frequency required
+# 
+#     def loop
+#         myTone.disable
+#         1.upto(400) { |x| tone_out x }   # run up the scale to 4000 Hz in 10 Hz steps
+#         399.downto(1) { |x| tone_out x } # come back down in 10 Hz steps
+#         delay 2000
+#     end
+# 
+#     def tone_out(n)
+#         myTone.set_frequency 10*n
+#         myTone.enable
+#         delay 80
+#         myTone.disable
+#         delay 10
+#     end
     
 
 end

data/lib/examples/frequency_generator.rb

@@ -1,30 +1,37 @@
 class FrequencyGenerator < 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
   # need explaination
   
-  output_pin 11, :as => :myTone, :device => :freq_out, :frequency => 100
-
-     def loop
-         uh_oh 4   
-     end
-
-     def uh_oh(n)
-       
-
-         n.times do
-             myTone.enable
-             myTone.set_frequency 1800
-             delay 500
-             myTone.disable
-             delay 100
-             myTone.enable
-             myTone.set_frequency 1800
-             delay 800
-             myTone.enable
-         end
-         # hack to help translator guess that n is an int
-         f = n + 0
-      end
+  # output_pin 11, :as => :myTone, :device => :freq_out, :frequency => 100
+  # 
+  #     def loop
+  #         uh_oh 4   
+  #     end
+  # 
+  #     def uh_oh(n)
+  #       
+  # 
+  #         n.times do
+  #             myTone.enable
+  #             myTone.set_frequency 1800
+  #             delay 500
+  #             myTone.disable
+  #             delay 100
+  #             myTone.enable
+  #             myTone.set_frequency 1800
+  #             delay 800
+  #             myTone.enable
+  #         end
+  #         # hack to help translator guess that n is an int
+  #         f = n + 0
+  #      end
       
 
 end

data/lib/examples/hello_spectra_sound.rb

@@ -1,5 +1,14 @@
 class HelloSpectraSound < 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
+  
   # demonstrate capability to use soft pot as traditional pot
   # the last pot reading remains "locked" to the last touch point
   # similar same behavior as ipod
@@ -7,32 +16,32 @@ class HelloSpectraSound < ArduinoSketch
   # this sketch assumes a pa_lcd operating at 19200 and one 
   # spectra symbol softpot connected to analog pin 3
   # 
-  @reading  = int
-  output_pin 14, :as => :my_lcd, :device => :pa_lcd, :rate => 9600, :clear_screen => :true
-  output_pin 11, :as => :sound, :device => :freq_out, :frequency => 100, :enable => :true
-  input_pin 3, :as => :sensor_one, :device => :spectra
-
-
-   def setup
-     delay 1000
-     my_lcd.setxy 0,0, "spectra symbol"
-     my_lcd.setxy 0,1, "soft pot sound"
-     delay 3000
-     my_lcd.clearscr
-   end
-
-   def loop
-     my_lcd.setxy 0,1
-     # since lcd's have issues clearing tens and hundreds digits when reading ones, 
-     # we use pad_int_to_str, which is a hack to display these cleanly
-     # pad_int_to_str takes two arguments: an integer and the final string length
-     # 
-#     my_lcd.print pad_int_to_str analogRead(sensor_one), 5
-     @reading = sensor_one.soft_lock
-     sound.set_frequency @reading * 10
-     my_lcd.print pad_int_to_str @reading, 3
-     delay 30
-   end
+#   @reading  = int
+#   output_pin 14, :as => :my_lcd, :device => :pa_lcd, :rate => 9600, :clear_screen => :true
+#   output_pin 11, :as => :sound, :device => :freq_out, :frequency => 100, :enable => :true
+#   input_pin 3, :as => :sensor_one, :device => :spectra
+# 
+# 
+#    def setup
+#      delay 1000
+#      my_lcd.setxy 0,0, "spectra symbol"
+#      my_lcd.setxy 0,1, "soft pot sound"
+#      delay 3000
+#      my_lcd.clearscr
+#    end
+# 
+#    def loop
+#      my_lcd.setxy 0,1
+#      # since lcd's have issues clearing tens and hundreds digits when reading ones, 
+#      # we use pad_int_to_str, which is a hack to display these cleanly
+#      # pad_int_to_str takes two arguments: an integer and the final string length
+#      # 
+# #     my_lcd.print pad_int_to_str analogRead(sensor_one), 5
+#      @reading = sensor_one.soft_lock
+#      sound.set_frequency @reading * 10
+#      my_lcd.print pad_int_to_str @reading, 3
+#      delay 30
+#    end
     
 
 end

data/lib/rad/darwin_installer.rb

@@ -1,9 +1,9 @@
 class DarwinInstaller
   def self.install!
-    puts "Downloading arduino-0012 for Mac from Arduino.cc"
-    File.open("/Applications/arduino-0012.zip", "w") do |file|
+    puts "Downloading arduino-0015 for Mac from Arduino.cc"
+    File.open("/Applications/arduino-0015.zip", "w") do |file|
       pbar = nil
-      file << open("http://www.arduino.cc/files/arduino-0012-mac.zip",
+      file << open("http://arduino.googlecode.com/files/arduino-0015-mac.zip",
       :content_length_proc => lambda {|t|
         if t && 0 < t
           pbar = ProgressBar.new(" Progress", t)
@@ -16,8 +16,8 @@ class DarwinInstaller
       pbar.finish
     end
     puts "Unzipping..."
-    `cd /Applications; unzip arduino-0012.zip`
-    `rm /Applications/arduino-0012.zip`
-    puts "installed Arduino here: /Applications/arduino-0012"
+    `cd /Applications; unzip arduino-0015.zip`
+    `rm /Applications/arduino-0015.zip`
+    puts "installed Arduino here: /Applications/arduino-0015"
   end
 end

data/lib/rad/generators/makefile/makefile.erb

@@ -59,6 +59,9 @@
 #     upload your program to the Arduino board.
 #
 # $Id$
+#
+#
+# 
 
 PORT = <%= params['serial_port'] %>
 TARGET = <%= params['target'] %>
@@ -70,11 +73,11 @@ $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
 $(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \
 $(ARDUINO)/wiring_shift.c $(ARDUINO)/WInterrupts.c <%= params['twi_c'] %>
 CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(SOFTWARE_SERIAL)/SoftwareSerial.cpp $(ARDUINO)/Print.cpp<%= params['libraries'].collect{|l| " $(LIBRARY_ROOT)/#{ l }/#{l }.cpp"}.join('') %>
-MCU = <%= params['mcu'] %>
+MCU = <%= params['build.mcu'] %>
 <% if params['asm_files'] %>ASRC = <%= params['asm_files'].join(' ') %><% end %>
-F_CPU = 16000000
+F_CPU = <%= params['build.f_cpu'].chomp("L") %>
 FORMAT = ihex
-UPLOAD_RATE = 19200
+UPLOAD_RATE = <%= params['upload.speed']%>
 BIN_DIR = <%= params['arduino_root'] %>/hardware/tools/avr/bin
 
 # Name of this Makefile (used for "make depend").
@@ -113,7 +116,7 @@ LDFLAGS = -lm
 
 
 # Programming support using avrdude. Settings and variables.
-AVRDUDE_PROGRAMMER = stk500
+AVRDUDE_PROGRAMMER = <%= params['upload.protocol'] %>
 AVRDUDE_PORT = $(PORT)
 AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
 AVRDUDE_FLAGS = -F -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \

data/lib/rad/generators/makefile/makefile.rb

@@ -7,6 +7,8 @@ class Makefile
     # build the sketch Makefile for the given template based on the values in its software and hardware config files
     def compose_for_sketch(build_dir)
       params = hardware_params.merge software_params
+      board_config = board_configuration(@software_params['arduino_root'], @hardware_params['mcu'])
+      params = params.merge board_config
       params['target'] = build_dir.split("/").last
            
       params['libraries_root'] = "#{File.expand_path(RAD_ROOT)}/vendor/libraries"
@@ -33,6 +35,18 @@ class Makefile
       return @software_params if @software_params
       return @software_params = YAML.load_file( "#{RAD_ROOT}/config/software.yml" )
     end
+    
+    ## match the mcu with the proper board configuration from the arduino board.txt file
+    def board_configuration(arduino_root, board_name)
+      board_configuration = {}
+      File.open("#{arduino_root}/hardware/boards.txt", "r") do |infile|
+      	infile.each_line do |line|
+      	  next unless line.chomp =~ /^#{board_name}\.([^=]*)=(.*)$/
+      	  board_configuration[$1] = $2
+      	end
+      end
+      board_configuration
+    end
       
   end
 end

data/lib/rad/linux_installer.rb

@@ -91,34 +91,34 @@ class LinuxInstaller
   end
   
   def self.check_or_install_arduino 
-  	if File.exist?("/usr/local/arduino-0012")
-  		puts "arduino software previously installed at /usr/local/arduino-0012 !"
+  	if File.exist?("/usr/local/arduino-0015")
+  		puts "arduino software previously installed at /usr/local/arduino-0015 !"
   	else
   		puts "installing arduino software..."
-  		%x{cd /usr/local/; wget http://arduino.cc/files/arduino-0012-linux.tgz}
-  		%x{tar -C /usr/local -xzf /usr/local/arduino-0012-linux.tgz}
+  		%x{cd /usr/local/; wget http://arduino.googlecode.com/files/arduino-0015-linux.tgz}
+  		%x{tar -C /usr/local -xzf /usr/local/arduino-0015-linux.tgz}
   
-  		%x{ln -s /usr/local/arduino-0012/arduino ~/Desktop/arduino}
+  		%x{ln -s /usr/local/arduino-0015/arduino ~/Desktop/arduino}
   
   		# gotta patch it so it can run from command line or anywhere
-  		arduino_file = File.open("/usr/local/arduino-0012/arduino") {|f| f.read}
+  		arduino_file = File.open("/usr/local/arduino-0015/arduino") {|f| f.read}
   		new_doc = arduino_file.split("\n")
-  		new_doc[1] = "cd /usr/local/arduino-0012"
-  		File.open("/usr/local/arduino-0012/arduino", "w") {|f| f.puts new_doc }
+  		new_doc[1] = "cd /usr/local/arduino-0015"
+  		File.open("/usr/local/arduino-0015/arduino", "w") {|f| f.puts new_doc }
   
-  		%x{mkdir -p /usr/local/arduino-0012/hardware/tools/avr/bin}
+  		%x{mkdir -p /usr/local/arduino-0015/hardware/tools/avr/bin}
   		# there is a difference from what the makefile expects to where it is
-  		%x{ln -s /usr/bin/avr-gcc /usr/local/arduino-0012/hardware/tools/avr/bin/avr-gcc}		
-  		%x{ln -s /usr/bin/avr-g++ /usr/local/arduino-0012/hardware/tools/avr/bin/avr-g++}
-  		%x{ln -s /usr/bin/avr-ar /usr/local/arduino-0012/hardware/tools/avr/bin/avr-ar}
-  		%x{ln -s /usr/bin/avr-objcopy /usr/local/arduino-0012/hardware/tools/avr/bin/avr-objcopy}
-  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude /usr/local/arduino-0012/hardware/tools/avr/bin/avrdude}
-  		%x{ln -s /usr/local/arduino-0012/hardware/tools/avrdude.conf /usr/local/arduino-0012/hardware/tools/avr/etc/avrdude.conf}
+  		%x{ln -s /usr/bin/avr-gcc /usr/local/arduino-0015/hardware/tools/avr/bin/avr-gcc}		
+  		%x{ln -s /usr/bin/avr-g++ /usr/local/arduino-0015/hardware/tools/avr/bin/avr-g++}
+  		%x{ln -s /usr/bin/avr-ar /usr/local/arduino-0015/hardware/tools/avr/bin/avr-ar}
+  		%x{ln -s /usr/bin/avr-objcopy /usr/local/arduino-0015/hardware/tools/avr/bin/avr-objcopy}
+  		%x{ln -s /usr/local/arduino-0015/hardware/tools/avrdude /usr/local/arduino-0015/hardware/tools/avr/bin/avrdude}
+  		%x{ln -s /usr/local/arduino-0015/hardware/tools/avrdude.conf /usr/local/arduino-0015/hardware/tools/avr/etc/avrdude.conf}
   
   
   		puts
   		puts "************************************************************************"
-  		puts "**  please add /usr/local/arduino-0012 to your path!                  **"
+  		puts "**  please add /usr/local/arduino-0015 to your path!                  **"
   		puts "**  you will also need to run sudo update-alternatives --config java  **"
   		puts "**  to choose java-1.50-sun as the default java                       **"
   		puts "************************************************************************"

data/lib/rad/version.rb

@@ -2,7 +2,7 @@ module Rad #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 1
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Greg Borenstein
-- "plugins+: JD Barnhart"
+- JD Barnhart
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -46,6 +46,19 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ParseTree
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.0.4
+    version: 
 description: "Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby"
 email: jd@jdbarnhart.com
 executables: 
@@ -228,6 +241,6 @@ rubyforge_project: rad
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
-summary: "RAD: Ruby Arduino Development - 0.3.5 -- 1.9 Ready"
+summary: "RAD: Ruby Arduino Development - 0.3.6 -- 1.9 Ready"
 test_files: []