madrona-rad 0.4.3 → 0.5.0

data/Manifest.txt

@@ -106,6 +106,7 @@ lib/rad/arduino_sketch.rb
 lib/rad/darwin_installer.rb
 lib/rad/generators/makefile/makefile.erb
 lib/rad/generators/makefile/makefile.rb
+lib/rad/generators/makefile/better_makefile.erb
 lib/rad/hardware_library.rb
 lib/rad/init.rb
 lib/rad/linux_installer.rb

data/README.rdoc

@@ -22,15 +22,13 @@ http://github.com/atduskgreg/rad/wikis
 To install the edge gem:
 
  # Update to RubyGems 1.2.0 before proceeding!
- $ gem sources -a http://gems.github.com (you only have to do this once)
+ $ gem sources -a http://gemcutter.org (you only have to do this once)
  $ sudo gem install madrona-rad
 
 A very old and feature poor (though slightly more 'stable' RAD) is available from RubyGems:
 
  $ sudo gem install rad
 
-We plan to push tagged releases to RubyGems at key points. The 0.3 release should be coming up soon.
-
 Run the rad command to create a new project:
 
  $ rad my_project
@@ -61,4 +59,4 @@ And RAD will do its best to get the Arduino software installed on your system.
 
 ==Get Involved
 
-Cheers? Jeers? Wanna help out? Contact Greg Borenstein: greg [dot] borenstein [at] gmail [dot] com
+Cheers? Jeers? Wanna help out? Contact JD Barnhart: jd [at] jdbarnhart [dot] com

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/bin/rad

@@ -24,11 +24,13 @@ class OptionParser #:nodoc:
     
     options = {"hardware" => {
                 "serial_port"      => '/dev/tty.usbserial*', 
-                "mcu"              => "atmega168", 
+                "mcu"              => "diecimila", 
                 "physical_reset"   => false
                 },
                 "software" => {
-                  "arduino_root"   => "/Applications/arduino-0015"
+                  "arduino_root"   => "/Applications/arduino-0015",
+                  "experimental" => false,
+                  "arduino_version" => 22
                  }
                }
     
@@ -299,12 +301,29 @@ else
 # atmega328 => Arduino Duemilanove w/ ATmega328
 # mega => Arduino Mega
 
+# and if you are running in experimental mode:
+# uno => Arduino Uno
+
 "
     file << options["hardware"].to_yaml
   end
   puts "Added #{sketch_name}/config/hardware.yml"
   
   File.open("#{sketch_name}/config/software.yml", 'w') do |file|
+    file << "##############################################################
+# What's this experimental stuff?
+# baby steps working towards support for the latest boards 
+# like duo using arduino version 22
+#
+# Are there drawbacks?
+# Yes, we haven't ported over the
+# rad libraries, so only bare-bones sketches work and it
+# has only been tested on OS X
+#
+# How do I use it?
+# flip experimental to true and make sure you have the latest arduino installed (22)
+
+"
     file << options["software"].to_yaml
   end
   puts "Added #{sketch_name}/config/software.yml"

data/lib/rad/arduino_sketch.rb

@@ -435,6 +435,7 @@ class ArduinoSketch
 
   def compose_setup #:nodoc: also composes headers and signatures
 
+    software_params = Makefile::software_params
     declarations = []
     plugin_directives = []
     signatures = []
@@ -448,7 +449,7 @@ class ArduinoSketch
     declarations << comment_box( "Auto-generated by RAD" )
     
     declarations << "#include <WProgram.h>\n"
-    declarations << "#include <SoftwareSerial.h>\n"
+    declarations << "#include <SoftwareSerial.h>\n" unless software_params['experimental'] == true
     $load_libraries.each { |lib| declarations << "#include <#{lib}.h>" } unless $load_libraries.nil?
     $defines.each { |d| declarations << d }
 

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

@@ -0,0 +1,304 @@
+#
+# Copyright 2011 Alan Burlison, alan@bleaklow.com.  All rights reserved.
+# Subsequently modified by Matthieu Weber, matthieu.weber@jyu.fi.
+# Use is subject to license terms.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#  1. Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#
+#  2. Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY ALAN BURLISON "AS IS" AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL ALAN BURLISON OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+# OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+# EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Minor adjustments for Mac OS X and for educational purposes by Maik Schmidt,
+# contact@maik-schmidt.de.
+#
+# Makefile for building Arduino projects outside of the Arduino environment
+#
+# This makefile should be included into a per-project Makefile of the following
+# form:
+#
+# ----------
+# BOARD = mega
+# PORT = /dev/term/0
+# INC_DIRS = ../common
+# LIB_DIRS = ../libraries/Task ../../libraries/VirtualWire
+# include ../../Makefile.master
+# ----------
+#
+# Where:
+#   BOARD    : Arduino board type, from $(ARD_HOME)/hardware/boards.txt
+#   PORT     : USB port
+#   INC_DIRS : List pf directories containing header files
+#   LIB_DIRS : List of directories containing library source
+#
+# Before using this Makefile you can adjust the following macros to suit
+# your environment, either by editing this file directly or by defining them in
+# the Makefile that includes this one, in which case they will override the
+# definitions below:
+#   ARD_REV      : arduino software revision, e.g. 0017, 0018
+#   ARD_HOME     : installation directory of the Arduino software.
+#   ARD_BIN      : location of compiler binaries
+#   AVRDUDE      : location of avrdude executable
+#   AVRDUDE_CONF : location of avrdude configuration file
+#   PROGRAMMER   : avrdude programmer type
+#   MON_CMD      : serial monitor command
+#   MON_SPEED    : serial monitor speed
+#
+
+
+# from makefile
+
+# SKETCH = <%= params['target'] %>
+ARD_REV = 0022
+ARD_HOME = /Applications/Arduino.app/Contents/Resources/Java
+AVR_HOME = $(ARD_HOME)/hardware/tools/avr
+ARD_BIN = $(AVR_HOME)/bin
+AVRDUDE = $(ARD_BIN)/avrdude
+AVRDUDE_CONF = $(AVR_HOME)/etc/avrdude.conf
+
+# Your favorite serial monitor.
+MON_CMD = screen
+MON_SPEED = 9600
+
+# Board settings.
+BOARD = <%= params['build.board_designation'] %>
+PORT = <%= params['serial_port'] %>
+PROGRAMMER = <%= params['upload.protocol'] %>
+
+# Where to find header files and libraries.
+INC_DIRS = ./inc
+LIB_DIRS = $(addprefix $(ARD_HOME)/libraries/, $(LIBS))
+LIBS =
+
+# Global configuration.
+ARD_REV ?= 0022
+ARD_HOME ?= /Applications/Arduino.app/Contents/Resources/Java
+ARD_BIN ?= /usr/local/CrossPack-AVR/bin
+AVRDUDE ?= $(ARD_HOME)/hardware/tools/avr/bin/avrdude
+AVRDUDE_CONF ?= $(ARD_HOME)/hardware/tools/avr/etc/avrdude.conf
+PROGRAMMER ?= stk500v1
+MON_SPEED ?= 57600
+MON_CMD ?= picocom
+PORT ?= /dev/tty.usbserial-A60061a3
+BOARD ?= atmega328
+
+### Nothing below here should require editing. ###
+
+# Check for the required definitions.
+
+ifndef BOARD
+    $(error $$(BOARD) not defined)
+endif
+ifndef PORT
+    $(error $$(PORT) not defined)
+endif
+
+# Version-specific settings
+ARD_BOARDS = $(ARD_HOME)/hardware/arduino/boards.txt
+ARD_SRC_DIR = $(ARD_HOME)/hardware/arduino/cores/arduino
+ARD_MAIN = $(ARD_SRC_DIR)/main.cpp
+
+# Standard macros.
+# grab the pde, because it's not a directory
+SKETCH = $(notdir $(CURDIR))
+BUILD_DIR = buildz
+VPATH = $(LIB_DIRS)
+
+# Macros derived from boards.txt
+MCU := $(shell sed -n 's/$(BOARD)\.build\.mcu=\(.*\)/\1/p' < $(ARD_BOARDS))
+F_CPU := $(shell sed -n 's/$(BOARD)\.build\.f_cpu=\(.*\)/\1/p' < $(ARD_BOARDS))
+UPLOAD_SPEED := \
+    $(shell sed -n 's/$(BOARD)\.upload\.speed=\(.*\)/\1/p' < $(ARD_BOARDS))
+
+# Build tools.
+CC = $(ARD_BIN)/avr-gcc
+CXX = $(ARD_BIN)/avr-g++
+CXXFILT = $(ARD_BIN)/avr-c++filt
+OBJCOPY = $(ARD_BIN)/avr-objcopy
+OBJDUMP = $(ARD_BIN)/avr-objdump
+AR = $(ARD_BIN)/avr-ar
+SIZE = $(ARD_BIN)/avr-size
+NM = $(ARD_BIN)/avr-nm
+MKDIR = mkdir -p
+RM = rm -rf
+MV = mv -f
+LN = ln -f
+
+# Compiler flags.
+INC_FLAGS = \
+    $(addprefix -I,$(INC_DIRS)) $(addprefix -I,$(LIB_DIRS)) -I$(ARD_SRC_DIR)
+ARD_FLAGS = -mmcu=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARD_REV)
+C_CXX_FLAGS = \
+    -Wall -Wextra -Wundef -Wno-unused-parameter \
+    -fdiagnostics-show-option -g -Wa,-adhlns=$(BUILD_DIR)/$*.lst 
+C_FLAGS = \
+    $(C_CXX_FLAGS) -std=gnu99 -Wstrict-prototypes -Wno-old-style-declaration
+CXX_FLAGS = $(C_CXX_FLAGS)
+
+# Optimiser flags.
+#     optimise for size, unsigned by default, pack data.
+#     separate sections, drop unused ones, shorten branches, jumps.
+#     don't inline, vectorise loops. no exceptions.
+#     no os preamble, use function calls in prologues.
+# http://gcc.gnu.org/onlinedocs/gcc-4.3.5/gcc/
+# http://www.tty1.net/blog/2008-04-29-avr-gcc-optimisations_en.html
+OPT_FLAGS = \
+     -Os -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums \
+    -ffunction-sections -fdata-sections -Wl,--gc-sections,--relax \
+    -fno-inline-small-functions -fno-tree-scev-cprop -fno-exceptions \
+    -ffreestanding -mcall-prologues
+
+# Build parameters.
+IMAGE = $(BUILD_DIR)/$(SKETCH)
+ARD_C_SRC = $(wildcard $(ARD_SRC_DIR)/*.c)
+ARD_CXX_SRC = $(wildcard $(ARD_SRC_DIR)/*.cpp)
+ARD_C_OBJ = $(patsubst %.c,%.o,$(notdir $(ARD_C_SRC)))
+ARD_CXX_OBJ = $(patsubst %.cpp,%.o,$(notdir $(ARD_CXX_SRC)))
+ARD_LIB = arduino
+ARD_AR = $(BUILD_DIR)/lib$(ARD_LIB).a
+ARD_AR_OBJ = $(ARD_AR)($(ARD_C_OBJ) $(ARD_CXX_OBJ))
+ARD_LD_FLAG = -l$(ARD_LIB)
+
+# Workaround for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=34734
+$(ARD_AR)(Tone.o) : CXX_FLAGS += -w
+
+# Copy source and libraries to BUILD_DIR
+# Sketch libraries.
+LIB_C_SRC = $(foreach ld,$(LIB_DIRS),$(wildcard $(ld)/*.c))
+LIB_CXX_SRC = $(foreach ld,$(LIB_DIRS),$(wildcard $(ld)/*.cpp))
+LIB_SRC = $(LIB_C_SRC) $(LIB_CXX_SRC)
+ifneq "$(strip $(LIB_C_SRC) $(LIB_CXX_SRC))" "" 
+	LIB_C_OBJ = $(patsubst %.c,%.o,$(notdir $(LIB_C_SRC)))
+	LIB_CXX_OBJ = $(patsubst %.cpp,%.o,$(notdir $(LIB_CXX_SRC)))
+	LIB_LIB = library
+	LIB_AR = $(BUILD_DIR)/lib$(LIB_LIB).a
+	LIB_AR_OBJ = $(LIB_AR)($(LIB_C_OBJ) $(LIB_CXX_OBJ))
+	LIB_LD_FLAG = -l$(LIB_LIB)
+endif
+
+# Sketch PDE source.
+SKT_PDE_SRC = $(wildcard *.pde)
+# SKT_PDE_SRC_BIS = $(wildcard *.pde)
+ifneq "$(strip $(SKT_PDE_SRC))" ""
+  SKT_PDE_OBJ = $(BUILD_DIR)/$(SKETCH)_pde.o
+endif
+
+# C and C++ source.
+SKT_C_SRC = $(wildcard *.c)
+SKT_CXX_SRC = $(wildcard *.cpp)
+ifneq "$(strip $(SKT_C_SRC) $(SKT_CXX_SRC))" ""
+  SKT_C_OBJ = $(patsubst %.c,%.o,$(SKT_C_SRC))
+  SKT_CXX_OBJ = $(patsubst %.cpp,%.o,$(SKT_CXX_SRC))
+  SKT_LIB = sketch
+  SKT_AR = $(BUILD_DIR)/lib$(SKT_LIB).a
+  SKT_AR_OBJ = $(SKT_AR)/($(SKT_C_OBJ) $(SKT_CXX_OBJ))
+  SKT_LD_FLAG = -l$(SKT_LIB)
+endif
+
+# Definitions.
+define run-cc
+	@ $(CC) $(ARD_FLAGS) $(INC_FLAGS) -M -MT '$@($%)' -MF $@_$*.dep $<
+	$(CC) -c $(C_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) $(INC_FLAGS) \
+	    $< -o $(BUILD_DIR)/$%
+	@ $(AR) rc $@ $(BUILD_DIR)/$%
+	@ $(RM) $(BUILD_DIR)/$%
+	@ $(CXXFILT) < $(BUILD_DIR)/$*.lst > $(BUILD_DIR)/$*.lst.tmp
+	@ $(MV) $(BUILD_DIR)/$*.lst.tmp $(BUILD_DIR)/$*.lst
+endef
+
+define run-cxx
+  @ $(CXX) $(ARD_FLAGS) $(INC_FLAGS) -M -MT '$@($%)' -MF $@_$*.dep $<
+  $(CXX) -c $(CXX_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) $(INC_FLAGS) \
+      $< -o $(BUILD_DIR)/$%
+  @ $(AR) rc $@ $(BUILD_DIR)/$%
+  @ $(RM) $(BUILD_DIR)/$%
+  @ $(CXXFILT) < $(BUILD_DIR)/$*.lst > $(BUILD_DIR)/$*.lst.tmp
+  @ $(MV) $(BUILD_DIR)/$*.lst.tmp $(BUILD_DIR)/$*.lst
+endef
+
+# Rules.
+.PHONY : all clean upload monitor upload_monitor
+
+all : $(BUILD_DIR) $(IMAGE).hex
+
+clean :
+	$(RM) $(BUILD_DIR)
+
+$(BUILD_DIR) :
+	$(MKDIR) $@
+
+$(SKT_PDE_OBJ) : $(SKT_PDE_SRC)
+	echo '#include <WProgram.h>' > $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '#include "$(SKT_PDE_SRC)"' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '// hack notes' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '// SKT_PDE_SRC "$(SKT_PDE_SRC)"' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '// SKT_PDE_OBJ "$(SKT_PDE_OBJ)"' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '// CXX "$(CXX)"' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	echo '// SKETCH "$(SKETCH)"' >> $(BUILD_DIR)/$(SKETCH)_pde.cpp
+	$(LN) $(SKT_PDE_SRC) $(BUILD_DIR)/$(SKT_PDE_SRC)
+	cd $(BUILD_DIR) && $(CXX) -c $(subst build/,,$(CXX_FLAGS)) \
+	    $(OPT_FLAGS) $(ARD_FLAGS) -I.. \
+	    $(patsubst -I..%,-I../..%,$(INC_FLAGS)) \
+	    $(SKETCH)_pde.cpp -o $(@F)
+
+(%.o) : $(ARD_SRC_DIR)/%.c
+	$(run-cc)
+
+(%.o) : $(ARD_SRC_DIR)/%.cpp
+	$(run-cxx)
+
+(%.o) : %.c
+	$(run-cc)
+
+(%.o) : %.cpp
+	$(run-cxx)
+
+$(BUILD_DIR)/%.d : %.c
+	$(run-cc-d)
+
+$(BUILD_DIR)/%.d : %.cpp
+	$(run-cxx-d)
+
+$(IMAGE).hex : $(ARD_AR_OBJ) $(LIB_AR_OBJ) $(SKT_AR_OBJ) $(SKT_PDE_OBJ)
+	$(CC) $(CXX_FLAGS) $(OPT_FLAGS) $(ARD_FLAGS) -L$(BUILD_DIR) \
+	    $(SKT_PDE_OBJ) $(SKT_LD_FLAG) $(LIB_LD_FLAG) $(ARD_LD_FLAG) -lm \
+	    -o $(IMAGE).elf
+	$(OBJCOPY) -O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load \
+	    --no-change-warnings --change-section-lma .eeprom=0 $(IMAGE).elf \
+	    $(IMAGE).eep
+	$(OBJCOPY) -O ihex -R .eeprom $(IMAGE).elf $(IMAGE).hex
+	$(OBJDUMP) -h -S $(IMAGE).elf | $(CXXFILT) -t > $(IMAGE).lst
+	$(SIZE) $(IMAGE).hex
+
+# START:makemods
+upload : all
+	- pkill -f '$(MON_CMD).*$(PORT)'
+	- sleep 1
+	- stty -f $(PORT) hupcl
+	- $(AVRDUDE) -V -C$(AVRDUDE_CONF) -p$(MCU) -c$(PROGRAMMER) \
+	  -P$(PORT) -b$(UPLOAD_SPEED) -D -Uflash:w:$(IMAGE).hex:i
+
+monitor :
+	$(MON_CMD) $(PORT) $(MON_SPEED)
+# END:makemods
+
+upload_monitor : upload monitor
+
+-include $(wildcard $(BUILD_DIR)/*.dep))
+
+# vim:ft=make

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

@@ -7,7 +7,17 @@ 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['serial_port'] = serial_port if params['serial_port'] == "/dev/tty.usbserial*"
+      if @software_params['experimental'] == true
+        @experimental_mode = true
+        puts "#################################### running in experimental mode"
+        if @software_params['arduino_root'] == "/Applications/arduino-0015"
+          @software_params['arduino_root'] = "/Applications/Arduino.app/Contents/Resources/Java"
+        end
+        board_config = board_configuration(@software_params['arduino_root'], @hardware_params['mcu'], "/arduino")
+      else
+        board_config = board_configuration(@software_params['arduino_root'], @hardware_params['mcu'], "")
+      end
       params = params.merge board_config
       params['target'] = build_dir.split("/").last
            
@@ -19,7 +29,7 @@ class Makefile
       
       params['asm_files'] = Dir.entries( File.expand_path(RAD_ROOT) + "/" + PROJECT_DIR_NAME ).select{|e| e =~ /\.S/}            
             
-      e = ERB.new File.read("#{File.dirname(__FILE__)}/makefile.erb")
+      e = ERB.new File.read("#{File.dirname(__FILE__)}/#{"better_" if @experimental_mode == true}makefile.erb")
       
       File.open("#{build_dir}/Makefile", "w") do |f|
         f << e.result(binding)
@@ -36,15 +46,35 @@ class Makefile
       return @software_params = YAML.load_file( "#{RAD_ROOT}/config/software.yml" )
     end
     
+    def serial_port     
+      usb = Dir.glob("/dev/tty.usbserial*")
+      if usb.empty?
+        usb = Dir.glob("/dev/tty.usbmodem*") #uno shows up as usbmodem on OS X...
+      end
+      puts "#################################### serial port: #{usb}"
+      usb
+    end
+    
     ## match the mcu with the proper board configuration from the arduino board.txt file
-    def board_configuration(arduino_root, board_name)
+    def board_configuration(arduino_root, board_name, path_mod)
       board_configuration = {}
-      File.open("#{arduino_root}/hardware/boards.txt", "r") do |infile|
+      board_type = {}
+      puts "#################################### checking boards.txt at: #{arduino_root}/hardware#{path_mod}/boards.txt for: #{board_name}"
+      File.open("#{arduino_root}/hardware#{path_mod}/boards.txt", "r") do |infile|
       	infile.each_line do |line|
-      	  next unless line.chomp =~ /^#{board_name}\.([^=]*)=(.*)$/
-      	  board_configuration[$1] = $2
+          next unless line.chomp =~ /^#{board_name}\.([^=]*)=(.*)$/
+          # next unless line.chomp =~ /^(#{board_name})\.name/
+          board_configuration[$1] = $2
+          # board_configuration = $1
       	end
       end
+      board_type['build.board_designation'] = board_name
+      if board_configuration.empty?
+        raise "#################################### no board configuration found for : #{board_name} check your hardware configuration -- type rake arduino:boards"
+      else
+        puts "#################################### board_configuration (per boards.txt): #{board_configuration.inspect}"
+      end
+      board_configuration = board_configuration.merge board_type
       board_configuration
     end
       

data/lib/rad/tasks/build_and_make.rake

@@ -37,6 +37,18 @@ namespace :test do
 
 end
 
+namespace :arduino do
+  
+  desc "list all supported boards in the current arduino version (currently hardwired for OS X to get this up and running)"
+  task :boards do 
+    File.open("/Applications/Arduino.app/Contents/Resources/Java/hardware/arduino/boards.txt", "r") do |f1|
+      while line = f1.gets  
+        puts line  
+      end  
+    end
+  end
+
+end
 
 namespace :make do
   
@@ -73,7 +85,7 @@ namespace :make do
   
   task :clean_sketch_dir => ["build:file_list", "build:sketch_dir"] do
     FileList.new(Dir.entries("#{@sketch.build_dir}")).exclude("#{@sketch.name}.cpp").exclude(/^\./).each do |f|
-      sh %{rm #{@sketch.build_dir}/#{f}}
+      sh %{rm -rf #{@sketch.build_dir}/#{f}}
     end
   end
   

data/madrona-rad.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{madrona-rad}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JD Barnhart", "Greg Borenstein"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2011-07-04}
   s.default_executable = %q{rad}
   s.description = %q{Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby}
   s.email = %q{jd@jdbarnhart.com}
@@ -18,173 +18,159 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "History.txt",
-     "License.txt",
-     "Manifest.txt",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/rad",
-     "lib/examples/add_hysteresis.rb",
-     "lib/examples/basic_blink.rb",
-     "lib/examples/blink_m_address_assignment.rb",
-     "lib/examples/blink_m_hello.rb",
-     "lib/examples/blink_m_multi.rb",
-     "lib/examples/blink_with_serial.rb",
-     "lib/examples/configure_pa_lcd_boot.rb",
-     "lib/examples/debounce_methods.rb",
-     "lib/examples/external_variable_fu.rb",
-     "lib/examples/external_variables.rb",
-     "lib/examples/first_sound.rb",
-     "lib/examples/frequency_generator.rb",
-     "lib/examples/hello_array.rb",
-     "lib/examples/hello_array2.rb",
-     "lib/examples/hello_array_eeprom.rb",
-     "lib/examples/hello_clock.rb",
-     "lib/examples/hello_eeprom.rb",
-     "lib/examples/hello_eeprom_lcdpa.rb",
-     "lib/examples/hello_format_print.rb",
-     "lib/examples/hello_lcd_charset.rb",
-     "lib/examples/hello_maxbotix.rb",
-     "lib/examples/hello_pa_lcd.rb",
-     "lib/examples/hello_servos.rb",
-     "lib/examples/hello_spectra_sound.rb",
-     "lib/examples/hello_world.rb",
-     "lib/examples/hello_xbee.rb",
-     "lib/examples/hysteresis_duel.rb",
-     "lib/examples/i2c_with_clock_chip.rb",
-     "lib/examples/midi_beat_box.rb",
-     "lib/examples/midi_scales.rb",
-     "lib/examples/motor_knob.rb",
-     "lib/examples/servo_buttons.rb",
-     "lib/examples/servo_calibrate_continuous.rb",
-     "lib/examples/servo_throttle.rb",
-     "lib/examples/software_serial.rb",
-     "lib/examples/sparkfun_lcd.rb",
-     "lib/examples/spectra_soft_pot.rb",
-     "lib/examples/times_method.rb",
-     "lib/examples/toggle.rb",
-     "lib/examples/twitter.rb",
-     "lib/examples/two_wire.rb",
-     "lib/libraries/AFSoftSerial/AFSoftSerial.cpp",
-     "lib/libraries/AFSoftSerial/AFSoftSerial.h",
-     "lib/libraries/AFSoftSerial/keywords.txt",
-     "lib/libraries/AF_XPort/AF_XPort.cpp",
-     "lib/libraries/AF_XPort/AF_XPort.h",
-     "lib/libraries/DS1307/DS1307.cpp",
-     "lib/libraries/DS1307/DS1307.h",
-     "lib/libraries/DS1307/keywords.txt",
-     "lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp",
-     "lib/libraries/FrequencyTimer2/FrequencyTimer2.h",
-     "lib/libraries/FrequencyTimer2/keywords.txt",
-     "lib/libraries/I2CEEPROM/I2CEEPROM.cpp",
-     "lib/libraries/I2CEEPROM/I2CEEPROM.h",
-     "lib/libraries/I2CEEPROM/keywords.txt",
-     "lib/libraries/LoopTimer/LoopTimer.cpp",
-     "lib/libraries/LoopTimer/LoopTimer.h",
-     "lib/libraries/LoopTimer/keywords.txt",
-     "lib/libraries/OneWire/OneWire.cpp",
-     "lib/libraries/OneWire/OneWire.h",
-     "lib/libraries/OneWire/keywords.txt",
-     "lib/libraries/OneWire/readme.txt",
-     "lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp",
-     "lib/libraries/SWSerLCDpa/SWSerLCDpa.h",
-     "lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp",
-     "lib/libraries/SWSerLCDsf/SWSerLCDsf.h",
-     "lib/libraries/Servo/Servo.cpp",
-     "lib/libraries/Servo/Servo.h",
-     "lib/libraries/Stepper/Stepper.cpp",
-     "lib/libraries/Stepper/Stepper.h",
-     "lib/libraries/Stepper/keywords.txt",
-     "lib/libraries/Wire/Wire.cpp",
-     "lib/libraries/Wire/Wire.h",
-     "lib/libraries/Wire/keywords.txt",
-     "lib/libraries/Wire/twi.h",
-     "lib/libraries/Wire/utility/twi.c",
-     "lib/libraries/Wire/utility/twi.h",
-     "lib/plugins/basics.rb",
-     "lib/plugins/bitwise_ops.rb",
-     "lib/plugins/blink.rb",
-     "lib/plugins/blink_m.rb",
-     "lib/plugins/debounce.rb",
-     "lib/plugins/debug_output_to_lcd.rb",
-     "lib/plugins/hysteresis.rb",
-     "lib/plugins/input_output_state.rb",
-     "lib/plugins/lcd_padding.rb",
-     "lib/plugins/mem_test.rb",
-     "lib/plugins/midi.rb",
-     "lib/plugins/parallax_ping.rb",
-     "lib/plugins/servo_pulse.rb",
-     "lib/plugins/servo_setup.rb",
-     "lib/plugins/smoother.rb",
-     "lib/plugins/spark_fun_serial_lcd.rb",
-     "lib/plugins/spectra_symbol.rb",
-     "lib/plugins/twitter_connect.rb",
-     "lib/rad.rb",
-     "lib/rad/README.rdoc",
-     "lib/rad/antiquated_todo.txt",
-     "lib/rad/arduino_plugin.rb",
-     "lib/rad/arduino_sketch.rb",
-     "lib/rad/darwin_installer.rb",
-     "lib/rad/generators/makefile/makefile.erb",
-     "lib/rad/generators/makefile/makefile.rb",
-     "lib/rad/hardware_library.rb",
-     "lib/rad/init.rb",
-     "lib/rad/linux_installer.rb",
-     "lib/rad/progressbar.rb",
-     "lib/rad/rad_processor.rb",
-     "lib/rad/rad_rewriter.rb",
-     "lib/rad/rad_type_checker.rb",
-     "lib/rad/sim/arduino_sketch.rb",
-     "lib/rad/sketch_compiler.rb",
-     "lib/rad/tasks/build_and_make.rake",
-     "lib/rad/tasks/rad.rb",
-     "lib/rad/todo.txt",
-     "lib/rad/variable_processing.rb",
-     "lib/rad/version.rb",
-     "madrona-rad.gemspec",
-     "project_dev.rake",
-     "setup.rb",
-     "spec/examples/hello_world.rb",
-     "spec/examples/serial_motor.rb",
-     "spec/models/arduino_sketch_spec.rb",
-     "spec/models/sketch_compiler_spec.rb",
-     "spec/models/spec_helper.rb",
-     "spec/sim/hello_world_spec.rb",
-     "spec/spec.opts",
-     "test/fixture.rb",
-     "test/hello_world_test/Makefile",
-     "test/hello_world_test/hello_world.cpp",
-     "test/test_array_processing.rb",
-     "test/test_plugin_loading.rb",
-     "test/test_translation_post_processing.rb",
-     "test/test_variable_processing.rb"
+    "History.txt",
+    "License.txt",
+    "Manifest.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/rad",
+    "lib/examples/add_hysteresis.rb",
+    "lib/examples/basic_blink.rb",
+    "lib/examples/blink_m_address_assignment.rb",
+    "lib/examples/blink_m_hello.rb",
+    "lib/examples/blink_m_multi.rb",
+    "lib/examples/blink_with_serial.rb",
+    "lib/examples/configure_pa_lcd_boot.rb",
+    "lib/examples/debounce_methods.rb",
+    "lib/examples/external_variable_fu.rb",
+    "lib/examples/external_variables.rb",
+    "lib/examples/first_sound.rb",
+    "lib/examples/frequency_generator.rb",
+    "lib/examples/hello_array.rb",
+    "lib/examples/hello_array2.rb",
+    "lib/examples/hello_array_eeprom.rb",
+    "lib/examples/hello_clock.rb",
+    "lib/examples/hello_eeprom.rb",
+    "lib/examples/hello_eeprom_lcdpa.rb",
+    "lib/examples/hello_format_print.rb",
+    "lib/examples/hello_lcd_charset.rb",
+    "lib/examples/hello_maxbotix.rb",
+    "lib/examples/hello_pa_lcd.rb",
+    "lib/examples/hello_servos.rb",
+    "lib/examples/hello_spectra_sound.rb",
+    "lib/examples/hello_world.rb",
+    "lib/examples/hello_xbee.rb",
+    "lib/examples/hysteresis_duel.rb",
+    "lib/examples/i2c_with_clock_chip.rb",
+    "lib/examples/midi_beat_box.rb",
+    "lib/examples/midi_scales.rb",
+    "lib/examples/motor_knob.rb",
+    "lib/examples/servo_buttons.rb",
+    "lib/examples/servo_calibrate_continuous.rb",
+    "lib/examples/servo_throttle.rb",
+    "lib/examples/software_serial.rb",
+    "lib/examples/sparkfun_lcd.rb",
+    "lib/examples/spectra_soft_pot.rb",
+    "lib/examples/times_method.rb",
+    "lib/examples/toggle.rb",
+    "lib/examples/twitter.rb",
+    "lib/examples/two_wire.rb",
+    "lib/libraries/AFSoftSerial/AFSoftSerial.cpp",
+    "lib/libraries/AFSoftSerial/AFSoftSerial.h",
+    "lib/libraries/AFSoftSerial/keywords.txt",
+    "lib/libraries/AF_XPort/AF_XPort.cpp",
+    "lib/libraries/AF_XPort/AF_XPort.h",
+    "lib/libraries/DS1307/DS1307.cpp",
+    "lib/libraries/DS1307/DS1307.h",
+    "lib/libraries/DS1307/keywords.txt",
+    "lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp",
+    "lib/libraries/FrequencyTimer2/FrequencyTimer2.h",
+    "lib/libraries/FrequencyTimer2/keywords.txt",
+    "lib/libraries/I2CEEPROM/I2CEEPROM.cpp",
+    "lib/libraries/I2CEEPROM/I2CEEPROM.h",
+    "lib/libraries/I2CEEPROM/keywords.txt",
+    "lib/libraries/LoopTimer/LoopTimer.cpp",
+    "lib/libraries/LoopTimer/LoopTimer.h",
+    "lib/libraries/LoopTimer/keywords.txt",
+    "lib/libraries/OneWire/OneWire.cpp",
+    "lib/libraries/OneWire/OneWire.h",
+    "lib/libraries/OneWire/keywords.txt",
+    "lib/libraries/OneWire/readme.txt",
+    "lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp",
+    "lib/libraries/SWSerLCDpa/SWSerLCDpa.h",
+    "lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp",
+    "lib/libraries/SWSerLCDsf/SWSerLCDsf.h",
+    "lib/libraries/Servo/Servo.cpp",
+    "lib/libraries/Servo/Servo.h",
+    "lib/libraries/Stepper/Stepper.cpp",
+    "lib/libraries/Stepper/Stepper.h",
+    "lib/libraries/Stepper/keywords.txt",
+    "lib/libraries/Wire/Wire.cpp",
+    "lib/libraries/Wire/Wire.h",
+    "lib/libraries/Wire/keywords.txt",
+    "lib/libraries/Wire/twi.h",
+    "lib/libraries/Wire/utility/twi.c",
+    "lib/libraries/Wire/utility/twi.h",
+    "lib/plugins/basics.rb",
+    "lib/plugins/bitwise_ops.rb",
+    "lib/plugins/blink.rb",
+    "lib/plugins/blink_m.rb",
+    "lib/plugins/debounce.rb",
+    "lib/plugins/debug_output_to_lcd.rb",
+    "lib/plugins/hysteresis.rb",
+    "lib/plugins/input_output_state.rb",
+    "lib/plugins/lcd_padding.rb",
+    "lib/plugins/mem_test.rb",
+    "lib/plugins/midi.rb",
+    "lib/plugins/parallax_ping.rb",
+    "lib/plugins/servo_pulse.rb",
+    "lib/plugins/servo_setup.rb",
+    "lib/plugins/smoother.rb",
+    "lib/plugins/spark_fun_serial_lcd.rb",
+    "lib/plugins/spectra_symbol.rb",
+    "lib/plugins/twitter_connect.rb",
+    "lib/rad.rb",
+    "lib/rad/README.rdoc",
+    "lib/rad/antiquated_todo.txt",
+    "lib/rad/arduino_plugin.rb",
+    "lib/rad/arduino_sketch.rb",
+    "lib/rad/darwin_installer.rb",
+    "lib/rad/generators/makefile/better_makefile.erb",
+    "lib/rad/generators/makefile/makefile.erb",
+    "lib/rad/generators/makefile/makefile.rb",
+    "lib/rad/hardware_library.rb",
+    "lib/rad/init.rb",
+    "lib/rad/linux_installer.rb",
+    "lib/rad/progressbar.rb",
+    "lib/rad/rad_processor.rb",
+    "lib/rad/rad_rewriter.rb",
+    "lib/rad/rad_type_checker.rb",
+    "lib/rad/sim/arduino_sketch.rb",
+    "lib/rad/sketch_compiler.rb",
+    "lib/rad/tasks/build_and_make.rake",
+    "lib/rad/tasks/rad.rb",
+    "lib/rad/todo.txt",
+    "lib/rad/variable_processing.rb",
+    "lib/rad/version.rb",
+    "madrona-rad.gemspec",
+    "project_dev.rake",
+    "setup.rb",
+    "spec/examples/hello_world.rb",
+    "spec/examples/serial_motor.rb",
+    "spec/models/arduino_sketch_spec.rb",
+    "spec/models/sketch_compiler_spec.rb",
+    "spec/models/spec_helper.rb",
+    "spec/sim/hello_world_spec.rb",
+    "spec/spec.opts",
+    "test/fixture.rb",
+    "test/hello_world_test/Makefile",
+    "test/hello_world_test/hello_world.cpp",
+    "test/test_array_processing.rb",
+    "test/test_plugin_loading.rb",
+    "test/test_translation_post_processing.rb",
+    "test/test_variable_processing.rb"
   ]
   s.homepage = %q{http://github.com/madrona/madrona-rad}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RAD: Ruby Arduino Development - 0.4.1 -- 1.9 Ready!}
-  s.test_files = [
-    "spec/examples/hello_world.rb",
-     "spec/examples/serial_motor.rb",
-     "spec/models/arduino_sketch_spec.rb",
-     "spec/models/sketch_compiler_spec.rb",
-     "spec/models/spec_helper.rb",
-     "spec/sim/hello_world_spec.rb",
-     "test/fixture.rb",
-     "test/test_array_processing.rb",
-     "test/test_plugin_loading.rb",
-     "test/test_translation_post_processing.rb",
-     "test/test_variable_processing.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ruby2c>, [">= 1.0.0.7"])
       s.add_runtime_dependency(%q<sexp_processor>, [">= 3.0.2"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  hash: 11
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - JD Barnhart
@@ -10,39 +16,56 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2011-07-04 00:00:00 -07:00
 default_executable: rad
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby2c
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 81
+        segments: 
+        - 1
+        - 0
+        - 0
+        - 7
         version: 1.0.0.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sexp_processor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 0
+        - 2
         version: 3.0.2
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: "Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby"
 email: jd@jdbarnhart.com
 executables: 
@@ -52,7 +75,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - License.txt
 - Manifest.txt
@@ -161,6 +183,7 @@ files:
 - lib/rad/arduino_plugin.rb
 - lib/rad/arduino_sketch.rb
 - lib/rad/darwin_installer.rb
+- lib/rad/generators/makefile/better_makefile.erb
 - lib/rad/generators/makefile/makefile.erb
 - lib/rad/generators/makefile/makefile.rb
 - lib/rad/hardware_library.rb
@@ -199,38 +222,34 @@ homepage: http://github.com/madrona/madrona-rad
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "RAD: Ruby Arduino Development - 0.4.1 -- 1.9 Ready!"
-test_files: 
-- spec/examples/hello_world.rb
-- spec/examples/serial_motor.rb
-- spec/models/arduino_sketch_spec.rb
-- spec/models/sketch_compiler_spec.rb
-- spec/models/spec_helper.rb
-- spec/sim/hello_world_spec.rb
-- test/fixture.rb
-- test/test_array_processing.rb
-- test/test_plugin_loading.rb
-- test/test_translation_post_processing.rb
-- test/test_variable_processing.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-bin/.DS_Store
-lib/.DS_Store
-lib/libraries/.DS_Store
-lib/rad/.DS_Store