rad 0.2.2 → 0.2.9

data/lib/rad/README.rdoc

@@ -0,0 +1,5 @@
+=Welcome to RAD (Ruby Arduino Development) Quick Start Documentation
+
+ArduinoSketch is the main access point for working with RAD. Sub-classes of ArduinoSketch have access to a wide array of convenient class methods (documented below) for doing the most common kinds of setup needed when programming the Arduino such as configuring input and output pins and establishing serial connections. Here is the canonical 'hello world' example of blinking a single LED in RAD:
+
+test... to be continued if it works..

data/lib/rad/arduino_plugin.rb

@@ -0,0 +1,246 @@
+## RAD plugins -- the start
+
+## June 25, 2008
+## jd@jdbarnhart.com
+## 
+
+
+# Disclaimer: This is only a first run at the notion of plugins and started off as just a way to keep from adding everything to ArduinoSketch.  
+# ArduinoPlugin is the RAD class for adding "plugins" which add functionality such as servo control, special lcd screen methods, debounce methods, etc.. Sub-classes of ArduinoPlugin (the plugins) add  class methods for doing thing beyond the most common kinds of setup needed when programming the Arduino.  Here is an example of controlling a servo:
+#
+#   class MoveServo < ArduinoSketch
+#
+#     external_vars :sensor_position => "int, 0", :servo_amount => "int, 0"
+#
+#     output_pin 4, :as => :my_servo, :min => 700, :max => 2200
+#     input_pin 1, :as => :sensor
+#     def loop
+#       sensor_position = analogRead(sensor)
+#       servo_amount = (sensor_position*2 + 500)
+#       move_servo my_servo, servo_amount
+#     end
+#   end
+#
+# 
+# Here's one for latching an led
+
+#   output_pin 5, :as => :red_led
+#   input_pin 8, :as => :red_button, :latch => :off, # optional adjustment to amount of time for debounce (default 200) :adjust => 250
+#                                                    # latch sets the led as on or off initially and sets up a array of structs to keep timing and state
+#
+#     def loop
+#       debounce_toggle(red_button, red_led)
+#     end
+#   end
+#
+# Since this is a first pass, there is work to do here, such as 
+#   checking if plugin methods are needed and only loading those that are, 
+#   more compreshensive plugin organization (more railsish with tests, etc)
+#   a scheme to encourage plugin authors and provide an easy way to avoid method and variable namespace collisions
+#   a scheme to flag when a prerequisite plugin is required
+# on with the show:
+
+
+
+class ArduinoPlugin
+  
+def initialize #:nodoc:
+  
+  $plugin_directives = $plugin_directives || []
+  $plugin_external_variables = $plugin_external_variables || []
+  # moved to check_for_plugin_use $plugin_structs = $plugin_structs || {}
+  $plugin_signatures = $plugin_signatures || []
+  $plugin_methods = $plugin_methods || []
+ # $plugin_methods_hash = $plugin_methods_hash || {}  ### new
+ # $plugins_to_load = $plugins_to_load || []  ### new
+  $add_to_setup = $add_to_setup || []
+  $load_libraries = $load_libraries || []
+
+
+end
+  
+# c declarations are automatic
+# you won't need them in the plugins
+# so, the first thing we can do is gather all the plugin methods, and scan the 
+# sketch available plugins...
+# if the sketch has them, we include the plugins in the build...
+# otherwise not..
+
+  def include_wire
+    $load_libraries << "Wire" unless $load_libraries.include?("Wire")
+  end
+
+
+  def add_to_setup(*args)
+    if args
+       args.each do |arg|
+         $add_to_setup << arg
+       end
+     end
+  end
+
+
+  def plugin_directives(*args)
+    if args
+       args.each do |arg|
+         $plugin_directives << arg
+       end
+     end
+  end
+
+
+  def external_variables(*args)
+    if args
+       args.each do |arg|
+         puts self.class
+         puts "\tadding plugin external variables: #{arg}"
+         # colons aptional
+         colon  = arg[arg.length - 1, 1] == ";"  ? '' : ';' 
+         $plugin_external_variables << "#{arg}#{colon}"
+       end
+     end
+  end
+  
+  def add_blink_m_struct
+    $plugin_structs[:blink_m] = <<-STR
+    typedef struct _blinkm_script_line {
+        uint8_t dur;
+        uint8_t cmd[4];    // cmd,arg1,arg2,arg3
+    } blinkm_script_line;
+    STR
+  end
+  
+  def self.add_blink_m_struct
+    $plugin_structs[:blink_m] = <<-STR
+    typedef struct _blinkm_script_line {
+        uint8_t dur;
+        uint8_t cmd[4];    // cmd,arg1,arg2,arg3
+    } blinkm_script_line;
+    STR
+  end
+  
+  def add_debounce_struct
+    $plugin_structs[:debounce] = <<-STR
+    struct debounce {
+      int state;
+      int read;
+      int prev;
+      unsigned long time;
+      unsigned long adjust;
+    };
+    STR
+  end
+  
+  
+  def add_servo_struct 
+    $plugin_structs[:servo] = <<-STR
+    struct servo {
+      int pin;
+      long unsigned pulseWidth;
+      long unsigned lastPulse;
+      long unsigned startPulse;
+      long unsigned refreshTime;
+      int min;
+      int max;
+    };
+    STR
+  end
+  
+  def self.add_debounce_struct
+    $plugin_structs[:debounce] = <<-STR
+    struct debounce {
+      int state;
+      int read;
+      int prev;
+      unsigned long time;
+      unsigned long adjust;
+    };
+    STR
+  end
+  
+  
+  def self.add_servo_struct
+    $plugin_structs[:servo] = <<-STR
+    struct servo {
+      int pin;
+      long unsigned pulseWidth;
+      long unsigned lastPulse;
+      long unsigned startPulse;
+      long unsigned refreshTime;
+      int min;
+      int max;
+    };
+    STR
+  end
+  
+  def self.add_sensor_struct
+    $plugin_structs[:sensor] = <<-STR
+    struct hysteresis {
+      int pin;
+      int state;
+    };
+    STR
+  end
+  
+  def self.add_spectra_struct
+    $plugin_structs[:spectra] = <<-STR
+    struct spectra {
+      int pin;
+      int state;
+      int r1;
+      int r2;
+      int r3;
+    };
+    STR
+  end
+  
+
+  def self.check_for_plugin_use(sketch_string, plugin_string, file_name) # rename klass to filename
+    $plugin_structs = $plugin_structs || {}
+    $plugin_methods_hash = $plugin_methods_hash || {}  
+    $plugins_to_load = $plugins_to_load || []  
+    plugin_signatures = []
+    plugin_methods = []
+    ## 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*(((#{PLUGIN_C_VAR_TYPES})\s*)+\w*\(.*\))/)
+    # 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... 
+    $plugin_methods_hash[file_name] = plugin_methods
+    $plugin_methods_hash.each do |k,meths|
+      meths.each do |meth|
+        if sketch_string.include?(meth)
+           # load this plugin... 
+           $plugins_to_load << k unless $plugins_to_load.include?(k)
+         end
+      end
+    end
+
+  end
+
+
+  def self.process(plugin_string)
+    plugin_signatures = []
+    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*(((#{PLUGIN_C_VAR_TYPES}).*\)).*(\n.*)*^\s*\})/)
+    plugin_signatures << first_process.scan(/^\s((#{PLUGIN_C_VAR_TYPES}).*\(.*\))/)
+    $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*(#{PLUGIN_C_VAR_TYPES}).*(\n.*)*^\s*\}/, ""  )
+    
+  end
+  
+  private
+  
+  def add_struct(struct)
+    
+    
+  end
+    
+end

data/lib/rad/arduino_sketch.rb

@@ -1,7 +1,7 @@
 # ArduinoSketch is the main access point for working with RAD. Sub-classes of ArduinoSketch have access to a wide array of convenient class methods (documented below) for doing the most common kinds of setup needed when programming the Arduino such as configuring input and output pins and establishing serial connections. Here is the canonical 'hello world' example of blinking a single LED in RAD:
 #
 #   class HelloWorld < ArduinoSketch
-#     output_pin 13, :as => led
+#     output_pin 13, :as => :led
 #     
 #     def loop
 #       blink 13, 500
@@ -108,60 +108,156 @@
 #
 #   Documentation: http://www.arduino.cc/en/Serial/Flush
 #
+#   June 25, 2008
+#   Added a new external variable method which keeps track 
+#   external_vars :sensor_position => "int, 0", :feedback => "int", :pulseTime => "unsigned long, 0"
+# 
+#   added ability to write additional methods besides loop in the sketch 
+#   since there is quite a bit of work to do with the c translation, it is easy to write a method that
+#   won't compile or even translate into c, but for basics, it works.  
+#   Note: stay basic and mindful that c is picky about variables and must make a decision
+#   which will not always be what you want
+#   also: for now, don't leave empty methods (something like foo = 1 cures this)
+# 
+#   Example:
+#
+#   class HelloMethods < ArduinoSketch
+#     output_pin 13, :as => :led
+#     
+#     def loop
+#       blink_it
+#     end
+
+#     def blink_it
+#       blink 13, 500
+#     end
+#
+#   end
+#
+#   
+#   added pin methods for servos and latching which generate an array of structs to contain setup and status
+#   input_pin 12, :as => :back_off_button, :latch => :off
+#   input_pin 8, :as => :red_button, :latch => :off # adjust is optional with default set to 200
+#
+#   added add_to_setup method that takes a string of c code and adds it to setup
+#   colons are options and will be added if not present  
+#   no translation from ruby for now
+#
+#   example:
+#   
+#   add_to_setup "call_my_new_method();", "call_another();"  
+#
+#   added some checking to c translation that (hopefully) makes it a bit more predictable
+#   most notably, we keep track of all external variables and let the translator know they exist 
+#   
+#   
+
 class ArduinoSketch
   
+  include ExternalVariableProcessing
+  
+  # find another way to do this
+  @@twowire_inc	  = FALSE
+  @@hwserial_inc  = FALSE
+
+  
   def initialize #:nodoc:
+    @servo_settings = [] # need modular way to add this
+    @debounce_settings = [] # need modular way to add this
+    @hysteresis_settings = []
+    @spectra_settings = []
+    @servo_pins = [] 
+    @debounce_pins = []
+    @hysteresis_pins = []
+    @spectra_pins = []
+    $external_array_vars = [] 
+    $external_vars =[]
+    $external_var_identifiers = []
+    $sketch_methods = []
+    $load_libraries ||= []
+    $defines  ||= []
+    $define_types = {}
+    $array_types = {}
+    $array_index_helpers = ('a'..'zz').to_a
+
     @declarations = []
     @pin_modes = {:output => [], :input => []}
     @pullups = []
     @other_setup = [] # specifically, Serial.begin
     @assembler_declarations = []
     @accessors = []
-    @signatures = ["void blink();", "int main();"]
-
+    @signatures = ["int main();"]
+ 
     helper_methods = []
-    helper_methods << "void blink(int pin, int ms) {"
-    helper_methods << "\tdigitalWrite( pin, HIGH );"
-    helper_methods << "\tdelay( ms );"
-    helper_methods << "\tdigitalWrite( pin, LOW );"
-    helper_methods << "\tdelay( ms );"
-    helper_methods << "}"
     @helper_methods = helper_methods.join( "\n" )
+
   end
   
-  # Setup variables outside of the loop. Does some magic based on type of arguments. Subject to renaming. Use with caution.
-  def vars(opts={})
-    opts.each do |k,v|
-      if v.class == Symbol
-       @declarations << "#{v} _#{k};"
-       @accessors << <<-CODE
-        #{v} #{k}(){
-        \treturn _#{k};
-        }
-       CODE
-      else
-        type = case v
-        when Integer
-          "int"
-        when String
-          "char*"
-        when TrueClass
-          "bool"
-        when FalseClass
-          "bool"
+
+  
+  # array "char buffer[32]"
+  # result: char buffer[32];
+  # array "char buffer[32]"
+  # result: char buffer[32];
+  # todo 
+  # need to feed array external array identifiers to rtc if they are in plugins or libraries, (not so sure about this will do more testing)
+  def array(arg)
+    if arg
+        arg = arg.chomp.rstrip.lstrip
+        name = arg.scan(/\s*(\w*)\[\d*\]?/).first.first
+        # help rad_processor do a better job with array types
+        types = ["int", "long", "char*", "unsigned int", "unsigned long", "byte", "bool", "float" ]
+        types.each_with_index do |type, i|
+          @type = types[i] if /#{type}/ =~ arg
         end
+        raise ArgumentError, "type not currently supported.. got: #{arg}.  Currently supporting #{types.join(", ")}" unless @type
 
-        @declarations << "#{type} _#{k} = #{v};"
-        @accessors << <<-CODE
-          #{type} #{k}(){
-          \treturn _#{k};
-          }
-        CODE
-      end
+        arg = "#{arg};" unless arg[-1,1] == ";"
+        $array_types[name] = @type
+        @type = nil
+        $external_var_identifiers << name unless $external_var_identifiers.include?(name)
+        # add array_name declaration
+        $external_array_vars << arg unless $external_array_vars.include?(arg)
+    end
+  end
+  
+  # define "DS1307_SEC 0"
+  # result: #define DS1307_SEC 0
+  # note we send the constant identifiers and type to our rad_type_checker
+  # however, it only knows about long, float, str....
+  # so we don't send ints ...yet..
+  # need more testing
+  def define(arg)
+    if arg
+        arg = arg.chomp.rstrip.lstrip
+        name = arg.split(" ").first
+        value = arg.gsub!("#{name} ","")
+        # negative
+        if value =~ /^-(\d|x)*$/ 
+           type = "long"
+         # negative float
+         elsif value =~ /^-(\d|\.|x)*$/ 
+           type = "float" 
+         elsif value =~ /[a-zA-Z]/
+           type = "str"
+           value = "\"#{value}\""
+         elsif value !~ /(\.|x)/
+           type = "long"
+         elsif value =~ /(\d*\.\d*)/ # and no 
+           type = "float"
+         elsif value =~ /0x\d\d/
+           type = "byte"
+         else 
+           raise ArgumentError, "opps, could not determine the define type, got #{value}"
+         end
+        $define_types[name] = type
+        arg = "#define #{name} #{value}"
+        $defines << arg
+        dummy_for_testing = arg, type
     end
   end
   
-  # Confiugre a single pin for output and setup a method to refer to that pin, i.e.:
+  # Configure a single pin for output and setup a method to refer to that pin, i.e.:
   #
   #   output_pin 7, :as => :led
   #
@@ -176,6 +272,57 @@ class ArduinoSketch
     raise ArgumentError, "can only define pin from Fixnum, got #{num.class}" unless num.is_a?(Fixnum)
     @pin_modes[:output] << num
     if opts[:as]
+      if opts[:device]
+        case opts[:device]
+        when :servo
+          servo_setup(num, opts)
+          return # don't use declarations, accessor, signatures below
+        when :pa_lcd || :pa_LCD
+          pa_lcd_setup(num, opts)
+          return 
+        when :sf_lcd || :sf_LCD
+          sf_lcd_setup(num, opts)
+          return         
+        when :freq_out || :freq_gen || :frequency_generator
+          frequency_timer(num, opts)
+          return
+        when :i2c
+          two_wire(num, opts) unless @@twowire_inc
+          return #
+        when :i2c_eeprom
+          two_wire(num, opts) unless @@twowire_inc
+          i2c_eeprom(num, opts)
+          return #
+        when :i2c_ds1307
+          two_wire(num, opts) unless @@twowire_inc
+          ds1307(num, opts) 
+          return #
+        when :i2c_blinkm
+          two_wire(num, opts) unless @@twowire_inc
+          blinkm
+          return #
+        when :onewire
+          one_wire(num, opts)
+          return #
+        when :ethernet
+          ethernet(num, opts)
+          return #
+        else
+          raise ArgumentError, "today's device choices are: :servo, :pa_lcd, :sf_lcd, :freq_out,:i2c, :i2c_eeprom, :i2c_ds1307, and :i2c_blinkm  got #{opts[:device]}"
+        end
+      end
+      
+  # add state variables for outputs with :state => :on or :off -- useful for toggling a light with output_toggle -- need to make this more modular
+      if opts[:state] 
+        # add debounce settings to dbce struct array
+        ArduinoPlugin.add_debounce_struct
+        @debounce_pins << num
+        state = opts[:latch] == :on ? 1 : 0
+        prev = opts[:latch] == :on ? 0 : 1
+        adjust = opts[:adjust] ? opts[:adjust] : 200
+        @debounce_settings <<  "dbce[#{num}].state = #{state}, dbce[#{num}].read = 0, dbce[#{num}].prev = #{prev}, dbce[#{num}].time = 0, dbce[#{num}].adjust = #{adjust}"
+      end
+      
       @declarations << "int _#{opts[ :as ]} = #{num};"
       
       accessor = []
@@ -188,13 +335,8 @@ class ArduinoSketch
     end
   end
   
-  # Like ArduinoSketch#output_pin but configure more than one output pin simultaneously. Takes an array of pin numbers. 
-  def output_pins(nums)
-    ar = Array(nums)
-    ar.each {|n| output_pin(n)} 
-  end
   
-  # Confiugre a single pin for input and setup a method to refer to that pin, i.e.:
+  # Configure a single pin for input and setup a method to refer to that pin, i.e.:
   #
   #   input_pin 3, :as => :button
   #
@@ -209,6 +351,31 @@ class ArduinoSketch
     raise ArgumentError, "can only define pin from Fixnum, got #{num.class}" unless num.is_a?(Fixnum)
     @pin_modes[:input] << num
     if opts[:as]
+      # transitioning to :device => :button syntax
+      if opts[:latch] || opts[:device] == :button
+        if opts[:device] == :button
+          opts[:latch] ||= :off
+        end
+        # add debounce settings to dbce struct array
+        ArduinoPlugin.add_debounce_struct
+        @debounce_pins << num
+        state = opts[:latch] == :on ? 1 : 0
+        prev = opts[:latch] == :on ? 0 : 1
+        adjust = opts[:adjust] ? opts[:adjust] : 200
+        @debounce_settings <<  "dbce[#{num}].state = #{state}, dbce[#{num}].read = 0, dbce[#{num}].prev = #{prev}, dbce[#{num}].time = 0, dbce[#{num}].adjust = #{adjust}"
+      end
+      if opts[:device] == :sensor
+        ArduinoPlugin.add_sensor_struct
+        count = @hysteresis_pins.length
+        @hysteresis_pins << num
+        @hysteresis_settings << "hyst[#{count}].pin = #{num}, hyst[#{count}].state = 0"
+      end
+      if opts[:device] == :spectra
+        ArduinoPlugin.add_spectra_struct
+        count = @spectra_pins.length
+        @spectra_pins << num
+        @spectra_settings << "spec[#{count}].pin = #{num}, spec[#{count}].state = 10, spec[#{count}].r1 = 0, spec[#{count}].r2 = 0, spec[#{count}].r3 = 0"
+      end
       @declarations << "int _#{opts[ :as ]} = #{num};"
 
       accessor = []
@@ -241,207 +408,158 @@ class ArduinoSketch
   def serial_begin(opts={})
     rate = opts[:rate] ? opts[:rate] : 9600
     @other_setup << "Serial.begin(#{rate});"
+    @@hwserial_inc = TRUE
   end
   
-  # Treat a pair of digital I/O pins as a serial line. See: http://www.arduino.cc/en/Tutorial/SoftwareSerial
- 	def software_serial(rx, tx, opts={})
-    raise ArgumentError, "can only define rx from Fixnum, got #{rx.class}" unless rx.is_a?(Fixnum)
-    raise ArgumentError, "can only define tx from Fixnum, got #{tx.class}" unless tx.is_a?(Fixnum)
-    
-    output_pin(tx)
-    
-    rate = opts[:rate] ? opts[:rate] : 9600
- 		if opts[:as]
- 			@declarations << "SoftwareSerial _#{opts[ :as ]} = SoftwareSerial(#{rx}, #{tx});"
- 			accessor = []
- 			accessor << "SoftwareSerial& #{opts[ :as ]}() {"
- 			accessor << "\treturn _#{opts[ :as ]};"
- 			accessor << "}"
- 			accessor << "int read(SoftwareSerial& s) {"
- 			accessor << "\treturn s.read();"
- 			accessor << "}"
- 			accessor << "void println( SoftwareSerial& s, char* str ) {"
- 			accessor << "\treturn s.println( str );"
- 			accessor << "}"
- 			accessor << "void print( SoftwareSerial& s, char* str ) {"
- 			accessor << "\treturn s.print( str );"
- 			accessor << "}"
- 			accessor << "void println( SoftwareSerial& s, int i ) {"
- 			accessor << "\treturn s.println( i );"
- 			accessor << "}"
- 			accessor << "void print( SoftwareSerial& s, int i ) {"
- 			accessor << "\treturn s.print( i );"
- 			accessor << "}"
- 			@accessors << accessor.join( "\n" )
- 			
- 			@signatures << "SoftwareSerial& #{opts[ :as ]}();"
- 
- 			@other_setup << "_#{opts[ :as ]}.begin(#{rate});"
- 		end
- 	end 	
- 	
- 	def swser_LCDpa(tx, opts={})
-    raise ArgumentError, "can only define tx from Fixnum, got #{tx.class}" unless tx.is_a?(Fixnum)
-    output_pin(tx)
+
+  def formatted_print(opts={})
+
+    buffer_size = opts[:buffer_size] ? opts[:buffer_size] : 64
     
-    rate = opts[:rate] ? opts[:rate] : 9600
- 		if opts[:as]
- 			@declarations << "SWSerLCDpa _#{opts[ :as ]} = SWSerLCDpa(#{tx});"
- 			accessor = []
- 			accessor << "SWSerLCDpa& #{opts[ :as ]}() {"
- 			accessor << "\treturn _#{opts[ :as ]};"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, uint8_t b ) {"
- 			accessor << "\treturn s.print( b );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, const char *str ) {"
- 			accessor << "\treturn s.print( str );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, char c ) {"
- 			accessor << "\treturn s.print( c );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, int i ) {"
- 			accessor << "\treturn s.print( i );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, unsigned int i ) {"
- 			accessor << "\treturn s.print( i );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, long i ) {"
- 			accessor << "\treturn s.print( i );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, unsigned long i ) {"
- 			accessor << "\treturn s.print( i );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, long i, int b ) {"
- 			accessor << "\treturn s.print( i, b );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, char* str ) {"
- 			accessor << "\treturn s.println( str );"
- 			accessor << "}"
- 			accessor << "void print( SWSerLCDpa& s, char* str ) {"
- 			accessor << "\treturn s.print( str );"
- 			accessor << "}"
- 			accessor << "void println(SWSerLCDpa& s) {"
- 			accessor << "\treturn s.println();"
- 			accessor << "}"
- 			accessor << "void clearscr(SWSerLCDpa& s) {"
- 			accessor << "\treturn s.clearscr();"
- 			accessor << "}"
- 			accessor << "void home(SWSerLCDpa& s) {"
- 			accessor << "\treturn s.home();"
- 			accessor << "}"
- 			accessor << "void setgeo( SWSerLCDpa& s, int i ) {"
- 			accessor << "\treturn s.setgeo( i );"
- 			accessor << "}"
- 			accessor << "void setintensity( SWSerLCDpa& s, int i ) {"
- 			accessor << "\treturn s.setintensity( i );"
- 			accessor << "}"
- 			accessor << "void intoBignum(SWSerLCDpa& s) {"
- 			accessor << "\treturn s.intoBignum();"
- 			accessor << "}"
- 			accessor << "void outofBignum(SWSerLCDpa& s) {"
- 			accessor << "\treturn s.outofBignum();"
- 			accessor << "}"
- 			accessor << "void setxy( SWSerLCDpa& s, int x, int y) {"
- 			accessor << "\treturn s.setxy( x, y );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, char c ) {"
- 			accessor << "\treturn s.println( c );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, const char c[] ) {"
- 			accessor << "\treturn s.println( c );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, uint8_t b ) {"
- 			accessor << "\treturn s.println( b );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, int i ) {"
- 			accessor << "\treturn s.println( i );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, long i ) {"
- 			accessor << "\treturn s.println( i );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, unsigned long i ) {"
- 			accessor << "\treturn s.println( i );"
- 			accessor << "}"
- 			accessor << "void println( SWSerLCDpa& s, long i, int b ) {"
- 			accessor << "\treturn s.println( i, b );"
- 			accessor << "}"
- 			@accessors << accessor.join( "\n" )
- 			
- 			@signatures << "SWSerLCDpa& #{opts[ :as ]}();"
- 
- 			@other_setup << "_#{opts[ :as ]}.begin(#{rate});"
- 		end
- 	end 	
+    if opts[:as]
+      @@sprintf_inc ||= FALSE
+      if @@sprintf_inc == FALSE
+        @@sprintf_inc = TRUE
+        accessor = []
+        accessor << "\n#undef int\n#include <stdio.h>"
+        accessor << "#define write_line(...) sprintf(#{opts[:as]},__VA_ARGS__);"
+        @accessors << accessor.join( "\n" )
+        array("char #{opts[:as]}[#{buffer_size}]") 
+      end
+    end
+  end
+
   
+
+
   def compose_setup #:nodoc: also composes headers and signatures
+
+    declarations = []
+    plugin_directives = []
+    signatures = []
+    external_vars = []
+    setup = []
+    additional_setup =[]
+    helpers = []
+    main = []
     result = []
     
-    result << comment_box( "Auto-generated by RAD" )
+    declarations << comment_box( "Auto-generated by RAD" )
+    
+    declarations << "#include <WProgram.h>\n"
+    declarations << "#include <SoftwareSerial.h>\n"
+    $load_libraries.each { |lib| declarations << "#include <#{lib}.h>" } unless $load_libraries.nil?
+    $defines.each { |d| declarations << d }
+
+    plugin_directives << comment_box( 'plugin directives' )
+    $plugin_directives.each {|dir| plugin_directives << dir } unless $plugin_directives.nil? ||  $plugin_directives.empty?
+    
+    signatures << comment_box( 'method signatures' )
+    signatures << "void loop();"
+    signatures << "void setup();"
+    signatures << "// sketch signatures"
+    @signatures.each {|sig| signatures << sig}
+    signatures << "// plugin signatures"
+    $plugin_signatures.each {|sig| signatures << sig } unless $plugin_signatures.nil? || $plugin_signatures.empty?
+    external_vars << "\n" + comment_box( "plugin external variables" )
+    $plugin_external_variables.each { |meth| external_vars << meth } unless $plugin_external_variables.nil? || $plugin_external_variables.empty?
     
-    result << "#include <WProgram.h>\n"
-    result << "#include <SoftwareSerial.h>\n"
-    result << "#include <SWSerLCDpa.h>"
+    signatures << "\n" + comment_box( "plugin structs" )
+    $plugin_structs.each { |k,v| signatures << v } unless $plugin_structs.nil? || $plugin_structs.empty?
 
+    external_vars << "\n" + comment_box( "sketch external variables" )
     
-    result << comment_box( 'method signatures' )
-    result << "void loop();"
-    result << "void setup();"
-    @signatures.each {|sig| result << sig}
+    $external_vars.each {|v| external_vars << v }
+    external_vars << "" 
+    external_vars << "// servo_settings array"
 
-    result << "\n" + comment_box( "variable and accessors" )
-    @declarations.each {|dec| result << dec}
-    result << "" # blank line    
-    @accessors.each {|ac| result << ac}
+    array_size = @servo_settings.empty? ? 1 : @servo_pins.max + 1 # conserve space if no variables needed
+    external_vars << "struct servo serv[#{array_size}] = { #{@servo_settings.join(", ")} };" if $plugin_structs[:servo]
+    external_vars << "" 
 
-    result << "\n" + comment_box( "assembler declarations" )
+    external_vars << "// debounce array"
+    array_size = @debounce_settings.empty? ? 1 : @debounce_pins.max + 1 # conserve space if no variables needed
+    external_vars << "struct debounce dbce[#{array_size}] = { #{@debounce_settings.join(", ")} };" if $plugin_structs[:debounce]
+    external_vars << ""
+    
+    external_vars << "// hysteresis array"
+    h_array_size = @hysteresis_settings.empty? ? 1 : @hysteresis_pins.length + 1 # conserve space if no variables needed
+    external_vars << "struct hysteresis hyst[#{h_array_size}] = { #{@hysteresis_settings.join(", ")} };" if $plugin_structs[:sensor]
+    external_vars << ""
+    
+    external_vars << "// spectrasymbol soft pot array"
+    sp_array_size = @spectra_settings.empty? ? 1 : @spectra_pins.length + 1 # conserve space if no variables needed
+    external_vars << "struct spectra spec[#{sp_array_size}] = { #{@spectra_settings.join(", ")} };" if $plugin_structs[:spectra]
+    external_vars << ""
+    
+    $external_array_vars.each { |var| external_vars << var } if $external_array_vars
+
+    external_vars << "\n" + comment_box( "variable and accessors" )
+    @declarations.each {|dec| external_vars << dec}
+    external_vars << ""     
+    @accessors.each {|ac| external_vars << ac}
+
+    # fix naming
+    external_vars << "\n" + comment_box( "assembler declarations" )
     unless @assembler_declarations.empty?
-      result << <<-CODE
+      external_vars << <<-CODE
          extern "C" {
            #{@assembler_declarations.join("\n")}
          }
       CODE
     end
 
-    result << "\n" + comment_box( "setup" )
-    result << "void setup() {"
-    result << "\t// pin modes"
+    external_vars << "\n" + comment_box( "setup" )
+    setup << "void setup() {"
+    setup << "\t// pin modes"
     
     @pin_modes.each do |k,v|
       v.each do |value| 
-        result << "\tpinMode(#{value}, #{k.to_s.upcase});"
+        setup << "\tpinMode(#{value}, #{k.to_s.upcase});"
       end
     end
 
     @pullups.each do |pin|
-	    result << "\tdigitalWrite( #{pin}, HIGH ); // enable pull-up resistor for input"
+	    setup << "\tdigitalWrite( #{pin}, HIGH ); // enable pull-up resistor for input"
+    end
+    
+    unless $add_to_setup.nil? || $add_to_setup.empty?
+      setup << "\t// setup from plugins via add_to_setup method"
+      $add_to_setup.each {|item| setup << "\t#{item}"}
     end
     
     unless @other_setup.empty?
-      result << "\t// other setup"
-      result << @other_setup.join( "\n" )
+      setup << "\t// other setup"
+      setup << @other_setup.join( "\n" )
     end
     
-    result << "}\n"
+    additional_setup << "}\n"
+    
+    helpers << comment_box( "helper methods" )
+    helpers << "\n// RAD built-in helpers"
+    helpers << @helper_methods.lstrip
     
-    result << comment_box( "helper methods" )
-    result << "\n// RAD built-in helpers"
-    result << @helper_methods.lstrip
+    helpers << "\n" + comment_box( "plugin methods" )  
+    # need to add plugin name to this... 
+    $plugin_methods.each { |meth| helpers << "#{meth[0][0]}\n" } unless $plugin_methods.nil? || $plugin_methods.empty?
     
-    result << "\n// serial helpers"
-    result << serial_boilerplate.lstrip
+    if @@hwserial_inc == TRUE
+      helpers << "\n// serial helpers"
+      helpers << serial_boilerplate.lstrip
+    end
     
-    result << "\n" + comment_box( "main() function" )
-    result << "int main() {"
-    result << "\tinit();"
-    result << "\tsetup();"
-    result << "\tfor( ;; ) { loop(); }"
-    result << "\treturn 0;"
-    result << "}"
+    main << "\n" + comment_box( "main() function" )
+    main << "int main() {"
+    main << "\tinit();"
+    main << "\tsetup();"
+    main << "\tfor( ;; ) { loop(); }"
+    main << "\treturn 0;"
+    main << "}"
 
-    result << "\n" + comment_box( "loop!  Autogenerated by RubyToC, sorry it's ugly." )
+    main << "\n" + comment_box( "loop!  Autogenerated by RubyToC, sorry it's ugly." )
+
+  return [declarations, plugin_directives, signatures, external_vars, setup, additional_setup, helpers, main]
 
-    return result.join( "\n" )
   end
   
   
@@ -463,7 +581,13 @@ class ArduinoSketch
   end
   
   def self.pre_process(sketch_string) #:nodoc:
-    result = sketch_string
+    result = sketch_string 
+    # add external vars to each method (needed for better translation, will be removed in make:upload)
+    result.gsub!(/(^\s*def\s.\w*(\(.*\))?)/, '\1' + " \n #{$external_vars.join("  \n ")}"  )
+    # gather method names
+    sketch_methods = result.scan(/^\s*def\s.\w*/)
+    sketch_methods.each {|m| $sketch_methods << m.gsub(/\s*def\s*/, "") }
+    
     result.gsub!("HIGH", "1")
     result.gsub!("LOW", "0")
     result.gsub!("ON", "1")
@@ -471,57 +595,25 @@ class ArduinoSketch
     result
   end
   
-  private
-  
-  def serial_boilerplate #:nodoc:
-    out = []
-    out << "int serial_available() {"
-    out << "\treturn (Serial.available() > 0);"
-    out << "}"
-
-    out << "char serial_read() {"
-    out << "\treturn (char) Serial.read();"
-    out << "}"
-
-    out << "void serial_flush() {"
-    out << "\treturn Serial.flush();"
-    out << "}"
-
-    out << "void serial_print( char str ) {"
-    out << "\treturn Serial.print( str );"
-    out << "}"
-    
-    out << "void serial_print( char* str ) {"
-    out << "\treturn Serial.print( str );"
-    out << "}"
-    
-    out << "void serial_print( int i ) {"
-    out << "\treturn Serial.print( i );"
-    out << "}"
-    
-    out << "void serial_print( long i ) {"
-    out << "\treturn Serial.print( i );"
-    out << "}"
+  def self.add_to_setup(meth) 
+    meth = meth.gsub("setup", "additional_setup")
+    post_process_ruby_to_c_methods(meth)
+  end
   
- 		out << "void serial_println( char* str ) {"
-    out << "\treturn Serial.println( str );"
-    out << "}"
-    
-    out << "void serial_println( char str ) {"
-    out << "\treturn Serial.println( str );"
-    out << "}"
- 
-  	out << "void serial_println( int i ) {"
-    out << "\treturn Serial.println( i );"
-    out << "}"
-    
-    out << "void serial_println( long i ) {"
-    out << "\treturn Serial.println( i );"
-    out << "}"
-
-    return out.join( "\n" )
+  def self.post_process_ruby_to_c_methods(e)      
+    clean_c_methods = []
+      # need to take a look at the \(unsigned in the line below not sure if we are really trying to catch something like that
+      if e !~ /^\s*(#{C_VAR_TYPES})(\W{1,6}|\(unsigned\()(#{$external_var_identifiers.join("|")})/ || $external_var_identifiers.empty?
+        # use the list of identifers the external_vars method of the sketch and remove the parens the ruby2c sometime adds to variables
+        # keep an eye on the gsub!.. are we getting nil errors
+        # and more recently, the \b
+        e.gsub!(/\b((#{$external_var_identifiers.join("|")})\(\))/, '\2')  unless $external_var_identifiers.empty?
+        clean_c_methods << e
+      end
+      return clean_c_methods.join( "\n" )
   end
   
+
   def comment_box( content ) #:nodoc:
     out = []
     out << "/" * 74
@@ -530,4 +622,6 @@ class ArduinoSketch
     
     return out.join( "\n" )
   end  
+
+  
 end