madrona-rad 0.2.4 → 0.2.5

data/lib/plugins/i2c_eeprom.rb

@@ -0,0 +1,70 @@
+class I2cEeprom < ArduinoPlugin
+  
+  # RAD plugins are c methods, directives, external variables and assignments and calls 
+  # that may be added to the main setup method
+  # function prototypes not needed since we generate them automatically
+  
+  # directives, external variables and setup assignments and calls can be added rails style (not c style)
+
+
+  # add to directives
+  plugin_directives "#define BUF_SIZE 32"
+
+
+  # add to external variables
+  external_variables  "byte i2cbuf[BUF_SIZE];"
+
+  # add the following to the setup method
+  # add_to_setup 
+
+void i2c_eeprom_write_byte( int deviceaddress, unsigned int eeaddress, byte data ) {
+  int rdata = data;
+  Wire.beginTransmission(deviceaddress);
+  Wire.send((int)(eeaddress >> 8));    // Address High Byte
+  Wire.send((int)(eeaddress & 0xFF));  // Address Low Byte
+  Wire.send(rdata);
+  Wire.endTransmission();
+}
+
+// Address is a page address, 6-bit (63). More and end will wrap around
+// But data can be maximum of 28 bytes, because the Wire library has a buffer of 32 bytes
+
+void i2c_eeprom_write_page( int deviceaddress, unsigned int eeaddresspage, byte* data, byte length ) {
+  Wire.beginTransmission(deviceaddress);
+  Wire.send((int)(eeaddresspage >> 8)); // Address High Byte
+  Wire.send((int)(eeaddresspage & 0xFF)); // Address Low Byte
+  byte c;
+  for ( c = 0; c < length; c++)
+    Wire.send(data[c]);
+  Wire.endTransmission();
+  delay(10);                           // need some delay
+}
+
+byte i2c_eeprom_read_byte( int deviceaddress, unsigned int eeaddress ) {
+  byte rdata = 0xFF;
+  Wire.beginTransmission(deviceaddress);
+  Wire.send((int)(eeaddress >> 8));    // Address High Byte
+  Wire.send((int)(eeaddress & 0xFF));  // Address Low Byte
+  Wire.endTransmission();
+  Wire.requestFrom(deviceaddress,1);
+  if (Wire.available()) rdata = Wire.receive();
+  return rdata;
+}
+
+// should not read more than 28 bytes at a time!
+
+void i2c_eeprom_read_buffer( int deviceaddress, unsigned int eeaddress, byte *buffer, int length ) {
+  Wire.beginTransmission(deviceaddress);
+  Wire.send((int)(eeaddress >> 8));    // Address High Byte
+  Wire.send((int)(eeaddress & 0xFF));  // Address Low Byte
+  Wire.endTransmission();
+  Wire.requestFrom(deviceaddress,length);
+  //int c = 0;
+  for ( int c = 0; c < length; c++ )
+    if (Wire.available()) buffer[c] = Wire.receive();
+}
+
+
+
+
+end

data/lib/rad/arduino_plugin.rb

@@ -54,6 +54,7 @@ def initialize #:nodoc:
  # $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
@@ -65,6 +66,10 @@ end
 # 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
@@ -96,6 +101,24 @@ 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 {
@@ -160,7 +183,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|uint8_t|static).*\(.*\))/)
+    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... 
@@ -182,13 +205,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|uint8_t|static).*\)).*(\n.*)*^\s*\})/)
-    plugin_signatures << first_process.scan(/^\s((int|void|unsigned|long|short|uint8_t|static).*\(.*\))/)
+    $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*(int|void|unsigned|long|short|uint8_t|static).*(\n.*)*^\s*\}/, ""  )
+    result.gsub(/^\s*(#{PLUGIN_C_VAR_TYPES}).*(\n.*)*^\s*\}/, ""  )
     
   end
   

data/lib/rad/arduino_sketch.rb

@@ -153,23 +153,24 @@
 #   
 
 class ArduinoSketch
-  @@servo_inc = FALSE	# flag to indicate this library instance has been created at least once - BBR
-  @@slcdpa_inc = FALSE	#  same
-  @@slcdsf_inc = FALSE	#  same
-  @@swser_inc = FALSE	#  same
-  @@frequency_inc = FALSE #  same
+  
+  include ExternalVariableProcessing
+  
+  # find another way to do this
+  @@frequency_inc = FALSE
+  @@twowire_inc	= FALSE
   
   def initialize #:nodoc:
     @servo_settings = [] # need modular way to add this
     @debounce_settings = [] # need modular way to add this
     @servo_pins = [] 
     @debounce_pins = []
-    @@array_vars = [] 
-    @@external_vars =[]
+    $external_array_vars = [] 
+    $external_vars =[]
     $external_var_identifiers = []
     $sketch_methods = []
-    $load_libraries = []
-    $include_wire = false
+    $load_libraries ||= []
+    $defines  ||= []
 
     @declarations = []
     @pin_modes = {:output => [], :input => []}
@@ -249,19 +250,19 @@ class ArduinoSketch
               if v.split(",")[0] == "char"
                 ## default is 40 characters
                 if v.split(",")[2]
-                    @@external_vars << "#{v.split(",")[0]}* #{k}[#{v.split(",")[2].lstrip}];"
+                    $external_vars << "#{v.split(",")[0]}* #{k}[#{v.split(",")[2].lstrip}];"
                 else
-                    @@external_vars << "#{v.split(",")[0]} #{k}[40] = \"#{v.split(",")[1].lstrip}\";"
+                    $external_vars << "#{v.split(",")[0]} #{k}[40] = \"#{v.split(",")[1].lstrip}\";"
                 end
               else
-              @@external_vars << "#{v.split(",")[0]} #{k} =#{v.split(",")[1]};"
+              $external_vars << "#{v.split(",")[0]} #{k} =#{v.split(",")[1]};"
               end
             else
               if v.split(",")[0] == "char"
-                @@external_vars << "#{v.split(",")[0]} #{k}[40];"
+                $external_vars << "#{v.split(",")[0]} #{k}[40];"
               else
 
-                @@external_vars << "#{v.split(",")[0]} #{k};"
+                $external_vars << "#{v.split(",")[0]} #{k};"
               end
             end
             # check chars work here
@@ -270,7 +271,7 @@ class ArduinoSketch
       end
     end
 
-
+    # phasing this out
     def add_to_setup(*args)
       if args
          args.each do |arg|
@@ -279,17 +280,70 @@ class ArduinoSketch
        end
     end
 
-    # work in progress
+    # phasing this out
     def external_arrays(*args)
       if args
         args.each do |arg|
-          @@array_vars << arg
+          $external_array_vars << arg
         end
       end
 
     end
+    
+    # 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
+    def array(arg)
+      if arg
+          arg = arg.chomp.rstrip.lstrip
+          name = arg.scan(/\s*(\w*)\[\d*\]?/).first.first
+          if /\w*\[\d*\]\s*\=\s*\{(.*)\}/ =~ arg
+            assignment = arg.scan(/\w*\[\d*\]\s*\=\s*\{(.*)\}/).first.first
+            array_size = assignment.split(",").length
+            if /\[(\s*)\]/ =~ arg
+              arg.gsub!(/(\[\d*\])/, "[#{array_size}]")
+            end
+          end
+          arg = arg.scan(/^((\s*|\w*)*\s*\w*\[\d*\])?/).first.first
+          arg = "#{arg};" unless arg[-1,1] == ";"
+          $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
+    def define(arg)
+      if arg
+          arg = arg.chomp.rstrip.lstrip
+          arg = "#define #{arg}"
+          $defines << arg
+      end
+    end
+    
+    # need better location.. module?
+    def self.add_to_setup(meth) 
+      meth = meth.gsub("setup", "additional_setup")
+      post_process_ruby_to_c_methods(meth)
+    end
+    
+    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
+          e.gsub!(/((#{$external_var_identifiers.join("|")})\(\))/, '\2')  unless $external_var_identifiers.empty? 
+          clean_c_methods << e
+        end
+        return clean_c_methods.join( "\n" )
+    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
   #
@@ -322,11 +376,28 @@ class ArduinoSketch
           return         
         when :freq_out || :freq_gen || :frequency_generator
           frequency_timer(num, opts)
-          return
+        return
+        when :i2c
+          two_wire(num, opts) unless @@twowire_inc
+          return #
+        when :i2c_eeprom
+          two_wire(num, opts) unless @@twowire_inc
+          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 #
         else
-        raise ArgumentError, "today's device choices are: :servo, :original_servo_setup, :pa_lcd, :sf_lcd, and :freq_out, got #{opts[:device]}"
+          raise ArgumentError, "today's device choices are: :servo, :original_servo_setup, :pa_lcd, :sf_lcd, :freq_out,:i2c, :i2c_eeprom, :i2c_ds1307, and :i2c_blinkm  got #{opts[:device]}"
+        end
       end
-    end
     
 # remove the next 14 lines as soon as documentation on new :device => :servo option is out
       
@@ -454,7 +525,7 @@ class ArduinoSketch
       # transitioning to :device => :button syntax
       if opts[:latch] || opts[:device] == :button
         if opts[:device] == :button
-          opts[:latch] ||= :on
+          opts[:latch] ||= :off
         end
         # add debounce settings to dbce struct array
         ArduinoPlugin.add_debounce_struct
@@ -499,7 +570,7 @@ class ArduinoSketch
   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={})
+  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)
     
@@ -512,6 +583,7 @@ class ArduinoSketch
  			accessor << "SoftwareSerial& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
+ 			@@swser_inc ||= FALSE
  			if (@@swser_inc == FALSE) # on second instance this stuff can't be repeated
  				@@swser_inc = TRUE
 	 			accessor << "int read(SoftwareSerial& s) {"
@@ -552,6 +624,7 @@ class ArduinoSketch
  			accessor << "SWSerLCDpa& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
+ 			@@slcdpa_inc ||= FALSE
  			if (@@slcdpa_inc == FALSE)	# on second instance this stuff can't be repeated - BBR
  				@@slcdpa_inc = TRUE
  	 			  accessor << "void print( SWSerLCDpa& s, uint8_t b ) {"
@@ -634,7 +707,7 @@ class ArduinoSketch
  			
  			@signatures << "SWSerLCDpa& #{opts[ :as ]}();"
  
- 			@other_setup << "_#{opts[ :as ]}.begin(#{rate});"
+ 			@other_setup << "\t_#{opts[ :as ]}.begin(#{rate});"
  		end
  	end 	
 
@@ -654,6 +727,7 @@ class ArduinoSketch
  			accessor << "SWSerLCDsf& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
+ 			@@slcdsf_inc ||= FALSE # assign only if nil
  			if (@@slcdsf_inc == FALSE)	# on second instance this stuff can't be repeated - BBR
  				@@slcdsf_inc = TRUE
  	 			accessor << "void print( SWSerLCDsf& s, uint8_t b ) {"
@@ -706,16 +780,14 @@ class ArduinoSketch
  			
  			@signatures << "SWSerLCDsf& #{opts[ :as ]}();"
  
- 			@other_setup << "_#{opts[ :as ]}.begin(#{rate});"
+ 			@other_setup << "\t_#{opts[ :as ]}.begin(#{rate});"
  		end
  	end 	
 
 
 
-
- 
-  	def servo(spin, opts={}) # servo motor routines # how about pin instead of spin
-    raise ArgumentError, "can only define spin from Fixnum, got #{spin.class}" unless spin.is_a?(Fixnum)
+  def servo(pin, opts={}) # servo motor routines #
+    raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum)
         
     minp = opts[:min] ? opts[:min] : 544
     maxp = opts[:max] ? opts[:max] : 2400
@@ -727,7 +799,7 @@ class ArduinoSketch
  			accessor << "Servo& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
-
+      @@servo_inc ||= FALSE
  			if (@@servo_inc == FALSE)	# on second instance this stuff can't be repeated - BBR
  				@@servo_inc = TRUE
  				accessor << "void detach( Servo& s ) {"
@@ -754,16 +826,17 @@ class ArduinoSketch
  			
  			@signatures << "Servo& #{opts[ :as ]}();"
 
- 			@other_setup << "\t_#{opts[ :as ]}.attach(#{spin}, #{opts[:position]}, #{minp}, #{maxp});" if opts[:position]
- 			@other_setup << "\t_#{opts[ :as ]}.attach(#{spin}, #{minp}, #{maxp});" unless opts[:position]
+ 			@other_setup << "\t_#{opts[ :as ]}.attach(#{pin}, #{opts[:position]}, #{minp}, #{maxp});" if opts[:position]
+ 			@other_setup << "\t_#{opts[ :as ]}.attach(#{pin}, #{minp}, #{maxp});" unless opts[:position]
 
  		end
  	end 
  	
- 		def frequency_timer(pin, opts={}) # frequency timer routines
- 		  
+ 	def frequency_timer(pin, opts={}) # frequency timer routines
+
     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
+    
     if opts[:enable]
       raise ArgumentError, "enable option must include the frequency or period option" unless opts[:frequency] || opts[:period]
     end
@@ -777,28 +850,29 @@ class ArduinoSketch
 
    		if opts[:as]
    		  
+   		  @@frequency_inc = TRUE
    		  @declarations << "FrequencyTimer2 _#{opts[ :as ]} = FrequencyTimer2();"
    			accessor = []
    			$load_libraries << "FrequencyTimer2"	
    			accessor << "FrequencyTimer2& #{opts[ :as ]}() {"
    			accessor << "\treturn _#{opts[ :as ]};"
    			accessor << "}"
-
-   			if (@@frequency_inc == FALSE)	# on second instance this stuff can't be repeated - BBR
-   				@@frequency_inc = TRUE
-   				accessor << "void set_frequency( FrequencyTimer2& s, int b ) {"
-   				accessor << "\treturn s.setPeriod( 1000000L/b );"
-   				accessor << "}"
-   				accessor << "void set_period( FrequencyTimer2& s, int b ) {"
-  	 			accessor << "\treturn s.setPeriod( b );"
-   				accessor << "}"
-   				accessor << "void enable( FrequencyTimer2& s ) {"
-   				accessor << "\treturn s.enable();"
-   				accessor << "}"
-   				accessor << "void disable( FrequencyTimer2& s ) {"
-   				accessor << "\treturn s.disable();"
-   				accessor << "}"
-   			end
+   			# add ||=
+#   		if (@@frequency_inc == FALSE)	# on second instance this stuff can't be repeated - BBR
+   			# @@frequency_inc = TRUE
+   			accessor << "void set_frequency( FrequencyTimer2& s, int b ) {"
+   			accessor << "\treturn s.setPeriod( 1000000L/b );"
+   			accessor << "}"
+   			accessor << "void set_period( FrequencyTimer2& s, int b ) {"
+  	 		accessor << "\treturn s.setPeriod( b );"
+   			accessor << "}"
+   			accessor << "void enable( FrequencyTimer2& s ) {"
+   			accessor << "\treturn s.enable();"
+   			accessor << "}"
+   			accessor << "void disable( FrequencyTimer2& s ) {"
+   			accessor << "\treturn s.disable();"
+   			accessor << "}"
+#   		end
 
    			@accessors << accessor.join( "\n" )
 
@@ -810,119 +884,284 @@ class ArduinoSketch
  			  @other_setup << "\tFrequencyTimer2::enable();" if opts[:enable] == :true
  		end
  	end	
- 	
 
- 
- 
+  def one_wire(pin, opts={})
+    raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum)
+
+    if opts[:as]
+      @declarations << "OneWire _#{opts[ :as ]} = OneWire(#{pin});"
+      accessor = []
+      $load_libraries << "OneWire"
+      accessor << "OneWire& #{opts[ :as ]}() {"
+      accessor << "\treturn _#{opts[ :as ]};"
+      accessor << "}"
+      @@onewire_inc ||= FALSE
+      if (@@onewire_inc == FALSE)     # on second instance this stuff can't be repeated - BBR
+        @@onewire_inc = TRUE
+        accessor << "uint8_t reset(OneWire& s) {"
+        accessor << "\treturn s.reset();"
+        accessor << "}"
+        accessor << "void skip(OneWire& s) {"
+        accessor << "\treturn s.skip();"
+        accessor << "}"
+        accessor << "void write(OneWire& s, uint8_t v, uint8_t p = 0) {" # "power = 0"  ?????
+        accessor << "\treturn s.write( v, p );"
+        accessor << "}"
+        accessor << "uint8_t read(OneWire& s) {"
+        accessor << "\treturn s.read();"
+        accessor << "}"
+        accessor << "void write_bit( OneWire& s, uint8_t b ) {"
+        accessor << "\treturn s.write_bit( b );"
+        accessor << "}"
+        accessor << "uint8_t read_bit(OneWire& s) {"
+        accessor << "\treturn s.read_bit();"
+        accessor << "}"
+        accessor << "void depower(OneWire& s) {"
+        accessor << "\treturn s.depower();"
+        accessor << "}"
+      end
+      @accessors << accessor.join( "\n" )
+
+      @signatures << "OneWire& #{opts[ :as ]}();"
+    end
+  end
+
+ 	def two_wire (pin, opts={}) # i2c Two-Wire
+
+    	raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum)
+    	raise ArgumentError, "only pin 19 may be used for i2c, got #{pin}" unless pin == 19
+
+   		if opts[:as]
+
+   			@@twowire_inc = TRUE
+   		    @declarations << "TwoWire _wire = TwoWire();"
+#   		    @declarations << "TwoWire _#{opts[ :as ]} = TwoWire();"
+   			accessor = []
+   			$load_libraries << "Wire"	
+   			accessor << "TwoWire& wire() {"
+   			accessor << "\treturn _wire;"
+#   			accessor << "TwoWire& #{opts[ :as ]}() {"
+#   			accessor << "\treturn _#{opts[ :as ]};"
+   			accessor << "}"
+   			accessor << "void begin( TwoWire& s) {"
+   			accessor << "\treturn s.begin();"
+   			accessor << "}"
+   			accessor << "void begin( TwoWire& s, uint8_t a) {"
+   			accessor << "\treturn s.begin(a);"
+   			accessor << "}"
+   			accessor << "void begin( TwoWire& s, int a) {"
+   			accessor << "\treturn s.begin(a);"
+   			accessor << "}"
+   			accessor << "void beginTransmission( TwoWire& s, uint8_t a ) {"
+   			accessor << "\treturn s.beginTransmission( a );"
+   			accessor << "}"
+   			accessor << "void beginTransmission( TwoWire& s, int a ) {"
+   			accessor << "\treturn s.beginTransmission( a );"
+   			accessor << "}"
+   			accessor << "void endTransmission( TwoWire& s ) {"
+   			accessor << "\treturn s.endTransmission();"
+   			accessor << "}"
+   			accessor << "void requestFrom( TwoWire& s, uint8_t a, uint8_t q) {"
+   			accessor << "\treturn s.requestFrom( a, q );"
+   			accessor << "}"
+   			accessor << "void requestFrom( TwoWire& s, int a, int q) {"
+   			accessor << "\treturn s.requestFrom( a, q );"
+   			accessor << "}"
+   			accessor << "void send( TwoWire& s, uint8_t d) {"
+   			accessor << "\treturn s.send(d);"
+   			accessor << "}"
+   			accessor << "void send( TwoWire& s, int d) {"
+   			accessor << "\treturn s.send(d);"
+   			accessor << "}"
+   			accessor << "void send( TwoWire& s, char* d) {"
+   			accessor << "\treturn s.send(d);"
+   			accessor << "}"
+   			accessor << "void send( TwoWire& s, uint8_t* d, uint8_t q) {"
+   			accessor << "\treturn s.send( d, q );"
+   			accessor << "}"
+   			accessor << "uint8_t available( TwoWire& s) {"
+   			accessor << "\treturn s.available();"
+   			accessor << "}"
+   			accessor << "uint8_t receive( TwoWire& s) {"
+   			accessor << "\treturn s.receive();"
+   			accessor << "}"
+
+   			@accessors << accessor.join( "\n" )
+
+   			@signatures << "TwoWire& wire();"
+#   			@signatures << "TwoWire& #{opts[ :as ]}();"
+
+ 			@other_setup << "\t_wire.begin();" if opts[:enable] == :true
+# 			@other_setup << "\t_#{opts[ :as ]}.begin();" if opts[:enable] == :true
+
+ 		end
+ 	end	
+
+	def ds1307(pin, opts={}) # DS1307 motor routines
+    	raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum)
+        raise ArgumentError, "only pin 19 may be used for i2c, got #{pin}" unless pin == 19
+#		raise ArgumentError, "only one DS1307  may be used for i2c" if @@ds1307_inc == :true
+
+   		if opts[:as]
+ 			@@ds1307_inc = TRUE
+ 			@declarations << "DS1307 _#{opts[ :as ]} = DS1307();"
+ 			accessor = []
+ 			$load_libraries << "DS1307"
+ 			accessor << "DS1307& #{opts[ :as ]}() {"
+ 			accessor << "\treturn _#{opts[ :as ]};"
+ 			accessor << "}"
+ 			accessor << "int get( DS1307& s, int b, boolean r ) {"
+ 			accessor << "\treturn s.get( b, r );"
+ 			accessor << "}"
+ 			accessor << "void set( DS1307& s, int b, int r ) {"
+ 			accessor << "\treturn s.set( b, r );"
+ 			accessor << "}"
+ 			accessor << "void start( DS1307& s ) {"
+ 			accessor << "\treturn s.start();"
+ 			accessor << "}"
+ 			accessor << "void stop( DS1307& s ) {"
+ 			accessor << "\treturn s.stop();"
+ 			accessor << "}"
+
+ 			@accessors << accessor.join( "\n" )
+
+ 			@signatures << "DS1307& #{opts[ :as ]}();"
+ 			@other_setup << "\t_#{opts[ :as ]}.start();" if opts[:rtcstart]
+
+ 		end
+ 	end 
+
+
+
+	def blinkm
+
+	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" )
     
-    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?
+    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 }
 
-    result << comment_box( 'plugin directives' )
-    $plugin_directives.each {|dir| result << dir } unless $plugin_directives.nil? ||  $plugin_directives.empty?
+    plugin_directives << comment_box( 'plugin directives' )
+    $plugin_directives.each {|dir| plugin_directives << dir } unless $plugin_directives.nil? ||  $plugin_directives.empty?
     
-    result << comment_box( 'method signatures' )
-    result << "void loop();"
-    result << "void setup();"
-    result << "// sketch signatures"
-    @signatures.each {|sig| result << sig}
-    result << "// sketch signatures"
-    result << "// plugin signatures"
-    $plugin_signatures.each {|sig| result << sig } unless $plugin_signatures.nil? || $plugin_signatures.empty?
-    result << "\n" + comment_box( "plugin external variables" )
-    $plugin_external_variables.each { |meth| result << meth } unless $plugin_external_variables.nil? || $plugin_external_variables.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 << "\n" + comment_box( "plugin structs" )
-    $plugin_structs.each { |k,v| result << v } unless $plugin_structs.nil? || $plugin_structs.empty?
+    signatures << "\n" + comment_box( "plugin structs" )
+    $plugin_structs.each { |k,v| signatures << v } unless $plugin_structs.nil? || $plugin_structs.empty?
 
-    result << "\n" + comment_box( "sketch external variables" )
+    external_vars << "\n" + comment_box( "sketch external variables" )
     
-    @@external_vars.each {|cv| result << "#{cv}"}
-    result << "" 
-    result << "// servo_settings array"
+    $external_vars.each {|v| external_vars << v }
+    external_vars << "" 
+    external_vars << "// servo_settings array"
 
     array_size = @servo_settings.empty? ? 1 : @servo_pins.max + 1 # conserve space if no variables needed
-    result << "struct servo serv[#{array_size}] = { #{@servo_settings.join(", ")} };" if $plugin_structs[:servo]
-    result << "" 
+    external_vars << "struct servo serv[#{array_size}] = { #{@servo_settings.join(", ")} };" if $plugin_structs[:servo]
+    external_vars << "" 
 
-    result << "// debounce array"
+    external_vars << "// debounce array"
     array_size = @debounce_settings.empty? ? 1 : @debounce_pins.max + 1 # conserve space if no variables needed
-    result << "struct debounce dbce[#{array_size}] = { #{@debounce_settings.join(", ")} };" if $plugin_structs[:debounce]
-    result << ""
+    external_vars << "struct debounce dbce[#{array_size}] = { #{@debounce_settings.join(", ")} };" if $plugin_structs[:debounce]
+    external_vars << ""
     
-    @@array_vars.each { |var| result << var } if @@array_vars
+    $external_array_vars.each { |var| external_vars << var } if $external_array_vars
 
-    result << "\n" + comment_box( "variable and accessors" )
-    @declarations.each {|dec| result << dec}
-    result << ""     
-    @accessors.each {|ac| result << ac}
+    external_vars << "\n" + comment_box( "variable and accessors" )
+    @declarations.each {|dec| external_vars << dec}
+    external_vars << ""     
+    @accessors.each {|ac| external_vars << ac}
 
-    result << "\n" + comment_box( "assembler declarations" )
+    # 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?
-      result << "\t// setup from plugins via add_to_setup method"
-      $add_to_setup.each {|item| result << "\t#{item}"}
+      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"
     
-    result << comment_box( "helper methods" )
-    result << "\n// RAD built-in helpers"
-    result << @helper_methods.lstrip
+    helpers << comment_box( "helper methods" )
+    helpers << "\n// RAD built-in helpers"
+    helpers << @helper_methods.lstrip
     
-    result << "\n" + comment_box( "plugin methods" )  
+    helpers << "\n" + comment_box( "plugin methods" )  
     # need to add plugin name to this... 
-    $plugin_methods.each { |meth| result << "#{meth[0][0]}\n" } unless $plugin_methods.nil? || $plugin_methods.empty?
+    $plugin_methods.each { |meth| helpers << "#{meth[0][0]}\n" } unless $plugin_methods.nil? || $plugin_methods.empty?
     
-    result << "\n// serial helpers"
-    result << serial_boilerplate.lstrip
+    helpers << "\n// serial helpers"
+    helpers << serial_boilerplate.lstrip
     
-    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 << "}"
+
+    main << "\n" + comment_box( "loop!  Autogenerated by RubyToC, sorry it's ugly." )
 
-    result << "\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
   
   
+ 
+  
+  
   # Write inline assembler code. 'Name' is a symbol representing the name of the function to be defined in the assembly code; 'signature' is the function signature for the function being defined; and 'code' is the assembly code itself (both of these last two arguments are strings). See an example here: http://rad.rubyforge.org/examples/assembler_test.html
   def assembler(name, signature, code)
     @assembler_declarations << signature
@@ -943,7 +1182,7 @@ class ArduinoSketch
   def self.pre_process(sketch_string) #:nodoc:
     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 ")}"  )
+    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*/, "") }