madrona-rad 0.2.3 → 0.2.4

data/History.txt

@@ -1,3 +1,11 @@
+== 0.2.4 2008-07-12
+* 1ish large update:
+	- added incredibly primitive tests 
+	- added 11 sketch examples which are compiled or compiled/uploaded
+		- use rake test:compile or rake test:upload
+		- can also use the following to run an example (make:compile also works)
+		- make:upload sketch=examples/hello_servos
+
 == 0.2.3 2008-07-10
 * Manyish updates:
 	- updated servo library to support position parameter

data/Manifest.txt

@@ -4,6 +4,17 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/rad
+lib/examples/add_hysteresis.rb
+lib/examples/first_sound.rb
+lib/examples/frequency_generator.rb
+lib/examples/hello_servos.rb
+lib/examples/hello_world.rb
+lib/examples/orig_servo_throttle.rb
+lib/examples/servo_buttons.rb
+lib/examples/servo_throttle.rb
+lib/examples/sparkfun_lcd.rb
+lib/examples/times_method.rb
+lib/examples/toggle.rb
 lib/libraries/FrequencyTimer2/keywords.txt
 lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp
 lib/libraries/FrequencyTimer2/FrequencyTimer2.h
@@ -14,6 +25,7 @@ lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp
 lib/libraries/SWSerLCDpa/SWSerLCDpa.h
 lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp
 lib/libraries/SWSerLCDsf/SWSerLCDsf.h
+lib/plugins/blink_m.rb
 lib/plugins/debounce.rb
 lib/plugins/debug_output_to_lcd.rb
 lib/plugins/input_output_state.rb

data/bin/rad

@@ -120,6 +120,16 @@ FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/SWSerLCDsf/.", "#{ske
 puts "Installed SWSerLCDsf into #{sketch_name}/vendor/libraries"
 puts
 
+# Build examples -- used for basic testing
+
+FileUtils.mkdir_p "#{sketch_name}/vendor/libraries"
+puts "Successfully created your examples directory."
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/examples/.", "#{sketch_name}/examples"
+puts "Installed examples into #{sketch_name}/examples"
+puts
+
+
 # Build vendor/plugins:  
 
 FileUtils.mkdir_p "#{sketch_name}/vendor/plugins"
@@ -129,6 +139,11 @@ FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/plugins/.", "#{sketch_name}/ven
 puts "Installed Default plugins into #{sketch_name}/vendor/plugins"
 puts
 
+# Add an default sketch directory # needed to run test:compile
+
+FileUtils.mkdir_p "#{sketch_name}/#{sketch_name}"
+puts "Successfully created your default sketch directory."
+
 # Build sketch files, etc.:  
 
 FileUtils.touch "#{sketch_name}/#{sketch_name}.rb"

data/lib/examples/add_hysteresis.rb

@@ -0,0 +1,13 @@
+class AddHysteresis < ArduinoSketch
+  
+  input_pin 3, :as => :sensor
+  output_pin 13, :as => :led
+
+
+  def loop
+    reading = add_hysteresis sensor, 8
+    blink led, 100 if reading > 100
+    blink led, 1000 if reading <= 100
+  end
+  
+end

data/lib/examples/first_sound.rb

@@ -0,0 +1,23 @@
+class FirstSound < ArduinoSketch
+
+
+
+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

@@ -0,0 +1,30 @@
+class FrequencyGenerator < ArduinoSketch
+  
+  # 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
+      
+
+end

data/lib/examples/hello_servos.rb

@@ -0,0 +1,88 @@
+class HelloServos < ArduinoSketch
+  
+  output_pin 2, :as => :servo_1, :max => 2400, :min => 800
+  output_pin 3, :as => :servo_2, :max => 2400, :min => 800
+  output_pin 4, :as => :servo_3, :max => 2400, :min => 800
+
+
+     # time to go old school
+     def loop
+       song_sheet_two
+     end
+     
+     def song_sheet_two
+       e
+       d
+       e
+       d 
+       c
+       d
+       d
+       c
+       b
+       c
+       b
+       a
+       e
+       a
+       e
+       a
+       e
+       a
+       b
+       c
+       b
+       c
+       d
+       d
+       c
+       d
+       e
+       d
+       e
+     end
+     
+     def a
+       pulse_servo servo_1, 1450
+       delay 100
+       home servo_1
+       delay 20
+     end
+
+     def b
+       pulse_servo servo_1, 1350
+       delay 100
+       home servo_1
+       delay 20
+     end
+
+     def c
+       pulse_servo servo_2, 1450
+       delay 100
+       home servo_2
+       delay 20
+     end
+
+     def d
+       pulse_servo servo_2, 1350
+       delay 100
+       home servo_2
+       delay 20
+     end
+
+     def e
+       pulse_servo servo_3, 1500
+       delay 100
+       home servo_3
+       delay 20
+     end
+
+
+     # center servos
+
+     def home(s)
+       pulse_servo s, 1400
+       f = s + 0
+     end
+
+end

data/lib/examples/hello_world.rb

@@ -0,0 +1,11 @@
+class HelloWorld < ArduinoSketch
+  
+  output_pin 13, :as => :led
+
+     def loop
+         blink led, 100
+     end
+
+end
+
+

data/lib/examples/orig_servo_throttle.rb

@@ -0,0 +1,39 @@
+class OrigServoThrottle < ArduinoSketch
+  
+     # old school servo control
+     # uses pulsewidth for positioning
+     # potentiometer to control servo
+     # with a bit of hysteresis
+     # use analog pin for sensor
+     # need to format the output of sensor_position and sensor_amount
+     # probably going away soon
+
+     
+     external_vars :sensor_position => "int, 0", :servo_amount => "int, 0", :pw => "int, 0", :time_check => "unsigned long, 0"
+
+     output_pin 5, :as => :my_lcd, :device => :sf_lcd
+     input_pin 1, :as => :sensor
+     output_pin 2, :as => :my_servo, :min => 700, :max => 2200 #, :refresh => 60
+
+
+       def loop
+         #delay 9 # comment out if using servo status, since it will add enough delay
+         sensor_position = analogRead(sensor)
+         servo_amount = (add_hysteresis(sensor_position, 10)*2 + 500)
+         move_servo my_servo, servo_amount
+         servo_status
+         
+       end
+       
+       def servo_status
+         
+        my_lcd.home			# line 0, col 0
+     		my_lcd.print "Read  Send"
+     		my_lcd.setxy 0,1		# line 1, col 0
+     		my_lcd.print sensor_position # need method of blanking out previous reading
+     		my_lcd.setxy 6,1 
+     		my_lcd.print servo_amount
+       end
+
+  
+end

data/lib/examples/servo_buttons.rb

@@ -0,0 +1,23 @@
+class ServoButtons < ArduinoSketch
+  
+  # original syntax
+  input_pin 6, :as => :button_one, :latch => :off
+  # preferred syntax
+  input_pin 7, :as => :button_two, :device => :button
+  input_pin 8, :as => :button_three, :device => :button
+  output_pin 13, :as => :led 
+  output_pin 2, :as => :my_servo, :device => :servo 
+  
+
+  def loop
+   check_buttons
+   servo_refresh 
+  end
+
+  def check_buttons
+  	read_and_toggle button_one, led
+  	my_servo.position 180 if read_input button_two
+  	my_servo.position 60 if read_input button_three
+  end
+  
+end

data/lib/examples/servo_throttle.rb

@@ -0,0 +1,37 @@
+class ServoThrottle < ArduinoSketch
+  
+     # potentiometer to control servo
+     # with a bit of hysteresis
+     # use analog pin for sensor
+     # need to format the output of sensor_position and sensor_amount
+
+     
+     external_vars :sensor_position => "int, 0", :servo_amount => "int, 0"
+
+     output_pin 5, :as => :my_lcd, :device => :sf_lcd
+     input_pin 1, :as => :sensor
+     output_pin 2, :as => :my_servo, :device => :servo
+
+
+       def loop
+         servo_refresh
+         #delay 9 # comment out if using servo status, since it will add enough delay
+         sensor_position = analogRead(sensor)
+         servo_amount = (add_hysteresis(sensor_position, 10)*0.36)
+         my_servo.position servo_amount
+         servo_status
+         
+       end
+       
+       def servo_status
+         
+        my_lcd.home			# line 0, col 0
+     		my_lcd.print "Read  Send"
+     		my_lcd.setxy 0,1		# line 1, col 0
+     		my_lcd.print sensor_position # need method of blanking out previous reading
+     		my_lcd.setxy 6,1 
+     		my_lcd.print servo_amount
+       end
+
+  
+end

data/lib/examples/sparkfun_lcd.rb

@@ -0,0 +1,48 @@
+class SparkfunLcd < ArduinoSketch
+
+
+  input_pin 6, :as => :button_one, :latch => :off
+  input_pin 7, :as => :button_two, :latch => :off
+  input_pin 8, :as => :button_three, :latch => :off
+  output_pin 13, :as => :led
+  
+  swser_LCDsf 5, :as => :my_lcd
+  
+
+
+
+#serial_begin # not necessary when using :device => :sf_lcd or :pa_lcd
+
+  def loop
+   check_buttons
+  end
+  
+
+# need a bit
+
+  def say_hello
+    my_lcd.home			# line 0, col 0
+		my_lcd.print "All your base   "
+		my_lcd.setxy 0,1		# line 1, col 0
+		my_lcd.print "are belong to us"
+  
+  end 
+  
+  def	say_ruby
+		my_lcd.home			# line 0, col 0
+		my_lcd.print " Ruby + Arduino "
+		my_lcd.setxy 0,1		# line 1, col 0
+		my_lcd.print " RAD 0.2.4+     "
+		# un comment to change display startup
+		#myLCD.setcmd 0x7C, 10
+	end
+
+  def check_buttons
+  	read_and_toggle button_one, led
+  	say_hello if read_input button_two
+  	say_ruby if read_input button_three
+  	
+  	
+  end
+  
+end

data/lib/examples/times_method.rb

@@ -0,0 +1,8 @@
+class TimesMethod < ArduinoSketch
+
+  def loop
+    5.times { delay 200 }
+  end
+
+  
+end

data/lib/examples/toggle.rb

@@ -0,0 +1,10 @@
+class Toggle < ArduinoSketch
+
+    output_pin 13, :as => :led
+
+       def loop
+         led.toggle
+         delay 300
+       end
+
+  end

data/lib/plugins/blink_m.rb

@@ -0,0 +1,25 @@
+class BlinkM < ArduinoPlugin
+
+# scaffolding for blink_m
+
+
+
+
+
+
+void simply_blink(void)
+{
+   
+}   
+
+
+static void clear_blinkm( void )
+{
+  Wire.beginTransmission(0x09);
+  Wire.send('c');
+  Wire.endTransmission();
+}
+
+
+
+end

data/lib/plugins/spark_fun_serial_lcd.rb

@@ -79,7 +79,7 @@ void set_splash(){
   selectLineOne();
   Serial.print(" Ruby + Auduino");
   selectLineTwo();
-  Serial.print(" RAD 0.2.3+     ");
+  Serial.print(" RAD 0.2.4+     ");
   Serial.print(0x7C, BYTE);   // decimal 124, command flag for backlight stuff
   Serial.print(10, BYTE);
 }

data/lib/rad/arduino_plugin.rb

@@ -160,7 +160,7 @@ end
     ## need a test for this
     ## fails on string interpolation, but since ruby_to_c also currently fails ...
     sketch_string = sketch_string.gsub(/#(?!\{.*\}).*/, "")
-    plugin_signatures << plugin_string.scan(/^\s((int|void|unsigned|long|short).*\(.*\))/)
+    plugin_signatures << plugin_string.scan(/^\s((int|void|unsigned|long|short|uint8_t|static).*\(.*\))/)
     # gather just the method name and then add to #plugin_methods_hash
     plugin_signatures[0].map {|sig| "#{sig[0]}"}.each {|m| plugin_methods << m.gsub!(/^.*\s(\w*)\(.*\)/, '\1')}
     # we don't know the methods yet, so... 
@@ -182,13 +182,13 @@ end
     first_process = plugin_string 
     # todo: need to add plugin names to the methods, so we can add them as comments in the c code
     # gather the c methods
-    $plugin_methods << first_process.scan(/^\s*(((int|void|unsigned|long|short).*\)).*(\n.*)*^\s*\})/)
-    plugin_signatures << first_process.scan(/^\s((int|void|unsigned|long|short).*\(.*\))/)
+    $plugin_methods << first_process.scan(/^\s*(((int|void|unsigned|long|short|uint8_t|static).*\)).*(\n.*)*^\s*\})/)
+    plugin_signatures << first_process.scan(/^\s((int|void|unsigned|long|short|uint8_t|static).*\(.*\))/)
     $plugin_signatures << plugin_signatures[0].map {|sig| "#{sig[0]};"}
     ## strip out the methods and pass it back 
     result = plugin_string
     # strip out the c methods so we have only ruby before eval
-    result.gsub(/^\s*(int|void|unsigned|long|short).*(\n.*)*^\s*\}/, ""  )
+    result.gsub(/^\s*(int|void|unsigned|long|short|uint8_t|static).*(\n.*)*^\s*\}/, ""  )
     
   end
   

data/lib/rad/arduino_sketch.rb

@@ -169,6 +169,7 @@ class ArduinoSketch
     $external_var_identifiers = []
     $sketch_methods = []
     $load_libraries = []
+    $include_wire = false
 
     @declarations = []
     @pin_modes = {:output => [], :input => []}
@@ -306,7 +307,6 @@ class ArduinoSketch
       if opts[:device]
         case opts[:device]
         when :servo
-          puts "line 309"
           new_servo_setup(num, opts)
           return # don't use declarations, accessor, signatures below
         when :orig_servo
@@ -764,7 +764,9 @@ class ArduinoSketch
  		  
     raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum)
     raise ArgumentError, "only pin 11 may be used for freq_out, got #{pin}" unless pin == 11
-    raise ArgumentError, "the frequency or period option must be included.  Example: :frequecy => 700" unless opts[:frequency] || opts[:period]
+    if opts[:enable]
+      raise ArgumentError, "enable option must include the frequency or period option" unless opts[:frequency] || opts[:period]
+    end
     if opts[:frequency]
       raise ArgumentError, "the frequency option must be an integer, got #{opts[:frequency].class}" unless opts[:frequency].is_a?(Fixnum)
     end
@@ -802,6 +804,7 @@ class ArduinoSketch
 
    			@signatures << "FrequencyTimer2& #{opts[ :as ]}();"
 	
+		    @other_setup << "\tFrequencyTimer2::setPeriod(0L);" unless opts[:frequency] || opts[:period]
  			  @other_setup << "\tFrequencyTimer2::setPeriod(1000000L/#{opts[:frequency]});" if opts[:frequency]
  			  @other_setup << "\tFrequencyTimer2::setPeriod(#{opts[:period]});" if opts[:period]
  			  @other_setup << "\tFrequencyTimer2::enable();" if opts[:enable] == :true
@@ -818,6 +821,7 @@ class ArduinoSketch
     
     result << "#include <WProgram.h>\n"
     result << "#include <SoftwareSerial.h>\n"
+    result << "#include <Wire.h>\n" if $include_wire == true  ## 
     $load_libraries.each { |lib| result << "#include <#{lib}.h>" } unless $load_libraries.nil?
 
     result << comment_box( 'plugin directives' )

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

@@ -68,7 +68,7 @@ LIBRARY_ROOT = <%= params['libraries_root'] %>
 SRC = $(ARDUINO)/pins_arduino.c $(ARDUINO)/wiring.c \
 $(ARDUINO)/wiring_analog.c $(ARDUINO)/wiring_digital.c \
 $(ARDUINO)/wiring_pulse.c $(ARDUINO)/wiring_serial.c \
-$(ARDUINO)/wiring_shift.c $(ARDUINO)/WInterrupts.c
+$(ARDUINO)/wiring_shift.c $(ARDUINO)/WInterrupts.c <%= params['twi_c'] %>
 CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(SOFTWARE_SERIAL)/SoftwareSerial.cpp<%= params['libraries'].collect{|l| " $(LIBRARY_ROOT)/#{ l }/#{l }.cpp"}.join('') %>
 MCU = <%= params['mcu'] %>
 <% if params['asm_files'] %>ASRC = <%= params['asm_files'].join(' ') %><% end %>
@@ -92,8 +92,8 @@ CDEFS = -DF_CPU=$(F_CPU)
 CXXDEFS = -DF_CPU=$(F_CPU)
 
 # Place -I options here
-CINCS = -I$(ARDUINO) -I$(SOFTWARE_SERIAL)<% params['libraries'].each do |l| %> -I$(LIBRARY_ROOT)/<%= l %><% end %>
-+CXXINCS = -I$(ARDUINO) -I$(SOFTWARE_SERIAL)<% params['libraries'].each do |l| %> -I$(LIBRARY_ROOT)/<%= l %><% end %>
+CINCS = -I$(ARDUINO) -I$(SOFTWARE_SERIAL)<% params['libraries'].each do |l| %> -I$(LIBRARY_ROOT)/<%= l %><% end %> <%= params['wire_h'] %>
++CXXINCS = -I$(ARDUINO) -I$(SOFTWARE_SERIAL)<% params['libraries'].each do |l| %> -I$(LIBRARY_ROOT)/<%= l %><% end %> <%= params['wire_h'] %>
 
 # Compiler flag to set the C Standard level.
 # c89   - "ANSI" C

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

@@ -7,7 +7,10 @@ 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(sketch_name)
       params = hardware_params.merge software_params
-      params['target'] = sketch_name
+      params['target'] = sketch_name.split("/").last
+      
+      params['wire_h'] = $include_wire == true ? "-I#{params['arduino_root']}/hardware/libraries/Wire/" : ""
+      params['twi_c'] = $include_wire == true ? "#{params['arduino_root']}/hardware/libraries/Wire/utility/twi.c" : ""
       
       params['libraries_root'] = "#{File.expand_path(RAD_ROOT)}/vendor/libraries"
       params['libraries'] = $load_libraries # load only libraries used 

data/lib/rad/tasks/build_and_make.rake

@@ -1,7 +1,40 @@
 require File.expand_path(File.dirname(__FILE__) + "/../init.rb")
 require 'ruby_to_ansi_c'
 
-C_VAR_TYPES = "unsigned|int|long|double|str|char"
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte"
+
+# incredibly primitive tests 
+# rake test:compile or rake test:upload
+# runs through all sketches in the example directory
+
+def run_tests(sketch, type)
+  sh %{rake make:#{type} sketch=examples/#{sketch}}
+end
+
+namespace :test do
+  
+  desc "iterate through all the sketches in the example directory"
+  task :upload => :gather do 
+    @examples.each {|e| run_tests(e, "upload")}
+  end
+  
+  task :compile => :gather do 
+    @examples.each {|e| run_tests(e, "compile")}
+    end
+  end
+  
+  desc "gather all tests"
+  task :gather do # => "make:upload" do
+    @examples = []
+    @test_results = []
+    Dir.entries( File.expand_path("#{RAD_ROOT}/examples/") ).each do |f|
+      if (f =~ /\.rb$/)
+        @examples << f.split('.').first
+      end
+  end
+
+end
+
 
 namespace :make do
   
@@ -11,36 +44,37 @@ namespace :make do
       puts "Reset the Arduino and hit enter.\n==If your board doesn't need it, you can turn off this prompt in config/software.yml=="
       STDIN.gets.chomp
     end
-    sh %{cd #{RAD_ROOT}/#{@sketch_name}; make upload}
+    sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make upload}
   end
-  
+    
   desc "generate a makefile and use it to compile the .cpp"
   task :compile => [:clean_sketch_dir, "build:sketch"] do # should also depend on "build:sketch"
-    Makefile.compose_for_sketch( @sketch_name )
+    Makefile.compose_for_sketch( @test_dir + @sketch_name )
     # not allowed? sh %{export PATH=#{Makefile.software_params[:arduino_root]}/tools/avr/bin:$PATH}
-    sh %{cd #{RAD_ROOT}/#{@sketch_name}; make depend; make}
+    sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make depend; make}
   end
   
   desc "generate a makefile and use it to compile the .cpp using the current .cpp file"
   task :compile_cpp => ["build:sketch_dir", :clean_sketch_dir] do # should also depend on "build:sketch"
-    Makefile.compose_for_sketch( @sketch_name )
+    Makefile.compose_for_sketch( @test_dir + @sketch_name )
     # not allowed? sh %{export PATH=#{Makefile.software_params[:arduino_root]}/tools/avr/bin:$PATH}
-    sh %{cd #{RAD_ROOT}/#{@sketch_name}; make depend; make}
+    sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make depend; make}
   end
   
   desc "generate a makefile and use it to compile the .cpp and upload it using current .cpp file"
   task :upload_cpp => ["build:sketch_dir", :clean_sketch_dir] do # should also depend on "build:sketch"
-    Makefile.compose_for_sketch( @sketch_name )
+    Makefile.compose_for_sketch( @test_dir + @sketch_name )
     # not allowed? sh %{export PATH=#{Makefile.software_params[:arduino_root]}/tools/avr/bin:$PATH}
-    sh %{cd #{RAD_ROOT}/#{@sketch_name}; make depend; make upload}
+    sh %{cd #{RAD_ROOT}/#{@test_dir + @sketch_name}; make depend; make upload}
   end
   
   task :clean_sketch_dir => ["build:file_list", "build:sketch_dir"] do
     @sketch_name = @sketch_class.split(".").first
-    FileList.new(Dir.entries("#{RAD_ROOT}/#{@sketch_name}")).exclude("#{@sketch_name}.cpp").exclude(/^\./).each do |f|
-      sh %{rm #{RAD_ROOT}/#{@sketch_name}/#{f}}
+    FileList.new(Dir.entries("#{RAD_ROOT}/#{@test_dir + @sketch_name}")).exclude("#{@test_dir + @sketch_name}.cpp").exclude(/^\./).each do |f|
+      sh %{rm #{RAD_ROOT}/#{@test_dir + @sketch_name}/#{f}}
     end
   end
+  
 end
 
 namespace :build do
@@ -48,10 +82,16 @@ namespace :build do
   desc "actually build the sketch"
   task :sketch => [:file_list, :sketch_dir, :gather_required_plugins, :plugin_setup, :setup] do
     klass = @sketch_class.split(".").first.split("_").collect{|c| c.capitalize}.join("")    
-    eval ArduinoSketch.pre_process(File.read(@sketch_class))
+    eval ArduinoSketch.pre_process(File.read(@test_dir + @sketch_class))
     c_methods = []
     sketch_signatures = []
-    $sketch_methods.each {|m| c_methods << RADProcessor.translate(constantize(klass), m) }
+    # until we better understand RubyToC let's see what's happening on errors
+    $sketch_methods.each do |meth| 
+      raw_rtc_meth = RADProcessor.translate(constantize(klass), meth) 
+      puts "Translator Error: #{raw_rtc_meth.inspect}" if raw_rtc_meth[0..8] == "// ERROR:"
+      c_methods << raw_rtc_meth
+    end
+    #$sketch_methods.each {|m| c_methods << RADProcessor.translate(constantize(klass), m) }
     c_methods.each {|meth| sketch_signatures << "#{meth.scan(/^\w*\s?\*?\n.*\)/)[0].gsub("\n", " ")};" }
     clean_c_methods = []
     c_methods.join("\n").each_with_index do |e,i|
@@ -66,7 +106,7 @@ namespace :build do
     @setup.gsub!("// sketch signatures", "// sketch signatures\n#{ sketch_signatures.join("\n")}") unless sketch_signatures.empty?
     result = "#{@setup}\n#{c_methods_with_timer}\n"
     name = @sketch_class.split(".").first
-    File.open("#{name}/#{name}.cpp", "w"){|f| f << result}
+    File.open("#{@test_dir}#{name}/#{name}.cpp", "w"){|f| f << result}
   end
 
   # needs to write the library include and the method signatures
@@ -87,7 +127,7 @@ namespace :build do
        end
        CODE
     end
-    eval File.read(@sketch_class)
+    eval File.read(@test_dir + @sketch_class)
     @setup = @@as.compose_setup
   end
   
@@ -118,14 +158,14 @@ namespace :build do
   desc "determine which plugins to load based on use of methods in sketch"
   task :gather_required_plugins do
     @plugin_names.each do |name|
-       ArduinoPlugin.check_for_plugin_use(File.read(@sketch_class), File.read("vendor/plugins/#{name}"), name )
+       ArduinoPlugin.check_for_plugin_use(File.read(@test_dir + @sketch_class), File.read("vendor/plugins/#{name}"), name )
     end
     puts "#{$plugins_to_load.length} of #{$plugin_methods_hash.length} plugins are being loaded:  #{$plugins_to_load.join(", ")}"
   end
   
   desc "setup target directory named after your sketch class"
   task :sketch_dir => [:file_list] do
-    mkdir_p "#{@sketch_class.split(".").first}"
+    mkdir_p "#{@test_dir + @sketch_class.split(".").first}"
   end
 
   task :file_list do
@@ -133,6 +173,12 @@ namespace :build do
     # perhaps we generate a constant when the project is generated an pop it here or in the init file
     @sketch_directory = File.expand_path("#{File.dirname(__FILE__)}/../../../").split("/").last
     # multiple sketches are possible with rake make:upload sketch=new_sketch
+    @test_dir = ""
+    if ENV['sketch'] =~ /^examples\//
+      # strip the example and set a directory variable
+      ENV['sketch'] = ENV['sketch'].gsub(/^examples\//, "")
+      @test_dir = "examples/"
+    end
     @sketch_class = ENV['sketch'] ? "#{ENV['sketch']}.rb" : "#{@sketch_directory}.rb"
     @file_names = []
     @plugin_names = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Greg Borenstein
@@ -48,11 +48,23 @@ files:
 - README.rdoc
 - Rakefile
 - bin/rad
+- lib/examples/add_hysteresis.rb
+- lib/examples/first_sound.rb
+- lib/examples/frequency_generator.rb
+- lib/examples/hello_servos.rb
+- lib/examples/hello_world.rb
+- lib/examples/orig_servo_throttle.rb
+- lib/examples/servo_buttons.rb
+- lib/examples/servo_throttle.rb
+- lib/examples/sparkfun_lcd.rb
+- lib/examples/times_method.rb
+- lib/examples/toggle.rb
 - lib/libraries/FrequencyTimer2/keywords.txt
 - lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp
 - lib/libraries/FrequencyTimer2/FrequencyTimer2.h
 - lib/libraries/Servo/keywords.txt
 - lib/libraries/Servo/Servo.cpp
+- lib/plugins/blink_m.rb
 - lib/libraries/Servo/Servo.h
 - lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp
 - lib/libraries/SWSerLCDpa/SWSerLCDpa.h
@@ -118,6 +130,6 @@ rubyforge_project: rad
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Fork of the Ruby Arduino Development - 0.2.4.5.3
+summary: Fork of the Ruby Arduino Development - 0.2.4.5.9
 test_files: []