madrona-rad 0.2.2 → 0.2.3

data/History.txt

@@ -1,3 +1,14 @@
+== 0.2.3 2008-07-10
+* Manyish updates:
+	- updated servo library to support position parameter
+	- plus:
+	- addition of plugins
+	- latest and greatest lcd libraries for pa and sf
+	- multiple methods 
+	- addition of rad_process and rad_rewrite methods methods
+	- options for :device => servo, button, lcd, 
+	- and many more
+
 == 0.2.2 2008-04-27
 * 2ish updates:
 	- updated makefile template and cli to expect arduino-0011

data/Manifest.txt

@@ -4,6 +4,9 @@ Manifest.txt
 README.rdoc
 Rakefile
 bin/rad
+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/libraries/Servo/Servo.h

data/bin/rad

@@ -104,6 +104,10 @@ FileUtils.mkdir_p "#{sketch_name}/vendor/libraries"
 puts "Successfully created your libraries directory."
 
 
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/FrequencyTimer2/.", "#{sketch_name}/vendor/libraries/FrequencyTimer2"
+puts "Installed Servo into #{sketch_name}/vendor/libraries"
+puts
+
 FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/Servo/.", "#{sketch_name}/vendor/libraries/Servo"
 puts "Installed Servo into #{sketch_name}/vendor/libraries"
 puts

data/lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp

@@ -0,0 +1,144 @@
+
+
+
+#include <FrequencyTimer2.h>
+
+#include <avr/interrupt.h>
+
+void (*FrequencyTimer2::onOverflow)() = 0;
+uint8_t FrequencyTimer2::enabled = 0;
+
+#if defined(__AVR_ATmega168__)
+SIGNAL(SIG_OUTPUT_COMPARE2A)
+#else
+SIGNAL(SIG_OUTPUT_COMPARE2)
+#endif
+{
+    static uint8_t inHandler = 0; // protect us from recursion if our handler enables interrupts
+
+    if ( !inHandler && FrequencyTimer2::onOverflow) {
+	inHandler = 1;
+	(*FrequencyTimer2::onOverflow)();
+	inHandler = 0;
+    }
+}
+
+void FrequencyTimer2::setOnOverflow( void (*func)() )
+{
+    FrequencyTimer2::onOverflow = func;
+#if defined(__AVR_ATmega168__)
+    if ( func) TIMSK2 |= _BV(OCIE2A);
+    else TIMSK2 &= ~_BV(OCIE2A);
+#else
+    if ( func) TIMSK |= _BV(OCIE2);
+    else TIMSK &= ~_BV(OCIE2);
+#endif
+}
+
+void FrequencyTimer2::setPeriod(unsigned long period)
+{
+    uint8_t pre, top;
+  
+    if ( period == 0) period = 1;
+    period *= clockCyclesPerMicrosecond();
+ 
+    period /= 2;            // we work with half-cycles before the toggle 
+    if ( period <= 256) {
+	pre = 1;
+	top = period-1;
+    } else if ( period <= 256L*8) {
+	pre = 2;
+	top = period/8-1;
+    } else if ( period <= 256L*32) {
+	pre = 3;
+	top = period/32-1;
+    } else if ( period <= 256L*64) {
+	pre = 4;
+	top = period/64-1;
+    } else if ( period <= 256L*128) {
+	pre = 5;
+	top = period/128-1;
+    } else if ( period <= 256L*256) {
+	pre = 6;
+	top = period/256-1;
+    } else if ( period <= 256L*1024) {
+	pre = 7;
+	top = period/1024-1;
+    } else {
+	pre = 7;
+	top = 255;
+    }
+
+#if defined(__AVR_ATmega168__)
+    TCCR2B = 0;
+    TCCR2A = 0;
+    TCNT2 = 0;
+    ASSR &= ~_BV(AS2);    // use clock, not T2 pin
+    OCR2A = top;
+    TCCR2A = (_BV(WGM21) | ( FrequencyTimer2::enabled ? _BV(COM2A0) : 0));
+    TCCR2B = pre;
+#else
+    TCCR2 = 0;
+    TCNT2 = 0;
+    ASSR &= ~_BV(AS2);    // use clock, not T2 pin
+    OCR2 = top;
+    TCCR2 = (_BV(WGM21) | ( FrequencyTimer2::enabled ? _BV(COM20) : 0)  | pre);
+#endif
+}
+
+unsigned long  FrequencyTimer2::getPeriod()
+{
+#if defined(__AVR_ATmega168__)
+    uint8_t p = (TCCR2B & 7);
+    unsigned long v = OCR2A;
+#else
+    uint8_t p = (TCCR2 & 7);
+    unsigned long v = OCR2;
+#endif
+    uint8_t shift;
+  
+    switch(p) {
+      case 0 ... 1:
+	shift = 0;
+	break;
+      case 2:
+	shift = 3;
+	break;
+      case 3:
+	shift = 5;
+	break;
+      case 4:
+	shift = 6;
+	break;
+      case 5:
+	shift = 7;
+	break;
+      case 6:
+	shift = 8;
+	break;
+      case 7:
+	shift = 10;
+	break;
+    }
+    return (((v+1) << (shift+1)) + 1) / clockCyclesPerMicrosecond();   // shift+1 converts from half-period to period
+}
+
+void FrequencyTimer2::enable()
+{
+    FrequencyTimer2::enabled = 1;
+#if defined(__AVR_ATmega168__)
+    TCCR2A |= _BV(COM2A0);
+#else
+    TCCR2 |= _BV(COM20);
+#endif
+}
+
+void FrequencyTimer2::disable()
+{
+    FrequencyTimer2::enabled = 0;
+#if defined(__AVR_ATmega168__)
+    TCCR2A &= ~_BV(COM2A0);
+#else
+    TCCR2 &= ~_BV(COM20);
+#endif
+}

data/lib/libraries/FrequencyTimer2/FrequencyTimer2.h

@@ -0,0 +1,42 @@
+#ifndef FREQUENCYTIMER2_IS_IN
+#define FREQUENCYTIMER2_IS_IN
+
+/*
+  FrequencyTimer2.h - A frequency generator and interrupt generator library
+  Author: Jim Studt, jim@federated.com
+  Copyright (c) 2007 David A. Mellis.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+
+#include <wiring.h>
+
+class FrequencyTimer2
+{
+  private:
+    static uint8_t enabled;
+  public:
+    static void (*onOverflow)(); // not really public, but I can't work out the 'friend' for the SIGNAL
+    
+  public:
+    static void setPeriod(unsigned long);
+    static unsigned long getPeriod();
+    static void setOnOverflow( void (*)() );
+    static void enable();
+    static void disable();
+};
+
+#endif

data/lib/libraries/FrequencyTimer2/keywords.txt

@@ -0,0 +1,22 @@
+#######################################
+# Syntax Coloring Map FrequencyTimer2
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+FrequencyTimer2  KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+setPeriod KEYWORD2
+getPeriod KEYWORD2
+enable KEYWORD2
+disable KEYWORD2
+setOnOverflow KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################

data/lib/libraries/Servo/Servo.cpp

@@ -1,3 +1,24 @@
+/*
+  Servo.h - Arduino Software Servo Library
+  Author: ????
+  Modified: Brian Riley <brianbr@wulfden.org> Jun/Jul 2008
+  Copyright (c) 2007 David A. Mellis.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #include "WConstants.h"
 #include <Servo.h>
 
@@ -5,7 +26,7 @@ Servo *Servo::first;
 
 #define NO_ANGLE (0xff)
 
-Servo::Servo() : pin(0),angle(NO_ANGLE),pulse0(0),next(0)
+Servo::Servo() : pin(0),angle(NO_ANGLE),pulse0(0),min16(DEFLT_MINP),max16(DEFLT_MAXP),next(0)
 {}
 
 
@@ -18,26 +39,34 @@ uint8_t Servo::attach(int pinArg)
     first = this;
     digitalWrite(pin,0);
     pinMode(pin,OUTPUT);
-    min16	= 34;
-    max16	= 150;
+    return 1;
+}
+
+uint8_t Servo::attach(int pinArg, int angleArg)
+{
+	attach(pinArg);
+	write(angleArg);
     return 1;
 }
 
 
 uint8_t Servo::attach(int pinArg, uint16_t minp, uint16_t maxp)
 {
-    pin = pinArg;
-    angle = NO_ANGLE;
-    pulse0 = 0;
-    next = first;
-    first = this;
-    digitalWrite(pin,0);
-    pinMode(pin,OUTPUT);
+	attach(pinArg);
     min16	= minp/16;
     max16	= maxp/16;
     return 1;
 }
 
+uint8_t Servo::attach(int pinArg, int angleArg, uint16_t minp, uint16_t maxp)
+{
+	attach(pinArg);
+    min16	= minp/16;
+    max16	= maxp/16;
+	write(angleArg);
+    return 1;
+}
+
 void Servo::detach()
 {
     for ( Servo **p = &first; *p != 0; p = &((*p)->next) ) {
@@ -96,37 +125,46 @@ void Servo::refresh()
     static unsigned long lastRefresh = 0;
     unsigned long m = millis();
 
-    // if we haven't wrapped millis, and 20ms have not passed, then don't do anything
+    // if we haven't wrapped millis, and 20ms have not passed,
+    // then don't do anything
+    
     if ( m >= lastRefresh && m < lastRefresh + 20) return;
     lastRefresh = m;
 
     for ( p = first; p != 0; p = p->next ) if ( p->pulse0) count++;
+    
     if ( count == 0) return;
   
     // gather all the servos in an array
+    
     Servo *s[count];
-    for ( p = first; p != 0; p = p->next ) if ( p->pulse0) s[i++] = p;
+ 
+ 	for ( p = first; p != 0; p = p->next ) if ( p->pulse0) s[i++] = p;
 
     // bubblesort the servos by pulse time, ascending order
+    
     for(;;) {
-	uint8_t moved = 0;
-	for ( i = 1; i < count; i++) {
-	    if ( s[i]->pulse0 < s[i-1]->pulse0) {
-		Servo *t = s[i];
-		s[i] = s[i-1];
-		s[i-1] = t;
-		moved = 1;
-	    }
-	}
-	if ( !moved) break;
+		uint8_t moved = 0;
+		for ( i = 1; i < count; i++) {
+	    	if ( s[i]->pulse0 < s[i-1]->pulse0) {
+				Servo *t = s[i];
+				s[i] = s[i-1];
+				s[i-1] = t;
+				moved = 1;
+	    	}
+		}
+		if ( !moved) break;
     }
   
-    // turn on all the pins
-    // Note the timing error here... when you have many servos going, the
-    // ones at the front will get a pulse that is a few microseconds too long.
-    // Figure about 4uS/servo after them. This could be compensated, but I feel
-    // it is within the margin of error of software servos that could catch
-    // an extra interrupt handler at any time.
+    /*********************************************************************
+     * Turn on all the pins
+     * Note the timing error here... when you have many servos going, the
+     * ones at the front will get a pulse that is a few microseconds too long.
+     * Figure about 4uS/servo after them. This could be compensated, but I feel
+     * it is within the margin of error of software servos that could catch
+     * an extra interrupt handler at any time.
+     ********************************************************************/
+
     for ( i = 0; i < count; i++) digitalWrite( s[i]->pin, 1);
 
     uint8_t start = TCNT0;
@@ -134,19 +172,21 @@ void Servo::refresh()
     uint8_t last = now;
   
     // Now wait for each pin's time in turn..
+    
     for ( i = 0; i < count; i++) {
-	uint16_t go = start + s[i]->pulse0;
+		uint16_t go = start + s[i]->pulse0;
     
-	// loop until we reach or pass 'go' time
-	for (;;) {
-	    now = TCNT0;
-	    if ( now < last) base += 256;
-	    last = now;
+		// loop until we reach or pass 'go' time
+
+		for (;;) {
+	    	now = TCNT0;
+	    	if ( now < last) base += 256;
+	    	last = now;
   
-	    if ( base+now > go) {
-		digitalWrite( s[i]->pin,0);
-		break;
-	    }
-	}
+	    	if ( base+now > go) {
+				digitalWrite( s[i]->pin,0);
+				break;
+	    	}
+		}
     }
 }

data/lib/libraries/Servo/Servo.h

@@ -1,17 +1,40 @@
+/*
+  Servo.h - Arduino Software Servo Library
+  Author: ????
+  Modified: Brian Riley <brianbr@wulfden.org> Jun/Jul 2008
+  Copyright (c) 2007 David A. Mellis.  All right reserved.
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 #ifndef SERVO_IS_IN
 #define SERVO_IS_IN
 
 #include <inttypes.h>
 #include <wiring.h>
 
+#define	DEFLT_MINP	34
+#define	DEFLT_MAXP	150
+
 class Servo
 {
   private:
     uint8_t pin;
     uint8_t angle;       // in degrees
     uint16_t pulse0;     // pulse width in TCNT0 counts
-    uint8_t min16;       // minimum pulse, 16uS units  (default is 34)
-    uint8_t max16;       // maximum pulse, 16uS units, 0-4ms range (default is 150)
+    uint8_t min16;       // minimum pulse, 16uS units  (default is DEFLT_MINP)
+    uint8_t max16;       // maximum pulse, 16uS units, 0-4ms range (default is DEFLT_MAXP)
     class Servo *next;
     static Servo* first;
     void write(int);         // specify the angle in degrees, 0 to 180
@@ -19,15 +42,20 @@ class Servo
     Servo();
     uint8_t attach(int);     // attach to a pin, sets pinMode, returns 0 on failure, won't
                              // position the servo until a subsequent write() happens
+    uint8_t attach(int,int);
+                             // same, except position is also is specified
     uint8_t attach(int,uint16_t,uint16_t);
                              // same, except min/max pulse is specified
+    uint8_t attach(int,int,uint16_t,uint16_t);
+                             // same, except position and min/max pulse is specified
     void detach();
-    void position(int);		// enter an angle from 0 to 180
-    void speed(int);		// enter a speed from -100 to +100
+    void position(int);		 // enter an angle from 0 to 180
+    void speed(int);		 // enter a speed from -90 to +90
     uint8_t read();
     uint8_t attached();
-    static void refresh();    // must be called at least every 50ms or so to keep servo alive
-                              // you can call more often, it won't happen more than once every 20ms
+    static void refresh();   // must be called at least every 50ms or so to keep servo alive
+                             // you can call more often, it won't happen more than once 
+                             // every 20ms
 };
 
 #endif

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.2+     ");
+  Serial.print(" RAD 0.2.3+     ");
   Serial.print(0x7C, BYTE);   // decimal 124, command flag for backlight stuff
   Serial.print(10, BYTE);
 }

data/lib/rad/arduino_sketch.rb

@@ -157,6 +157,7 @@ class ArduinoSketch
   @@slcdpa_inc = FALSE	#  same
   @@slcdsf_inc = FALSE	#  same
   @@swser_inc = FALSE	#  same
+  @@frequency_inc = FALSE #  same
   
   def initialize #:nodoc:
     @servo_settings = [] # need modular way to add this
@@ -167,7 +168,8 @@ class ArduinoSketch
     @@external_vars =[]
     $external_var_identifiers = []
     $sketch_methods = []
-        
+    $load_libraries = []
+
     @declarations = []
     @pin_modes = {:output => [], :input => []}
     @pullups = []
@@ -304,6 +306,7 @@ 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
@@ -316,7 +319,12 @@ class ArduinoSketch
           return 
         when :sf_lcd || :sf_LCD
           sf_lcd_setup(num, opts)
-          return 
+          return         
+        when :freq_out || :freq_gen || :frequency_generator
+          frequency_timer(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]}"
       end
     end
     
@@ -377,9 +385,11 @@ class ArduinoSketch
   
   # use the servo library
   def new_servo_setup(num, opts)
-    opts[:minp] = opts[:min] ? opts[:min] : 544
-    opts[:maxp] = opts[:max] ? opts[:max] : 2400
-    servo(num, opts)  
+    if opts[:position]
+      raise ArgumentError, "position must be an integer from 0 to 360, got #{opts[:position].class}" unless opts[:position].is_a?(Fixnum)
+      raise ArgumentError, "position must be an integer from 0 to 360---, got #{opts[:position]}" if opts[:position] < 0 || opts[:position] > 360
+    end
+    servo(num, opts)
     # move this to better place ... 
     # should probably go along with servo code into plugin
     @declarations << "void servo_refresh(void);"
@@ -403,6 +413,10 @@ class ArduinoSketch
   
   # use the pa lcd library
   def pa_lcd_setup(num, opts)
+    if opts[:geometry]
+      raise ArgumentError, "can only define pin from Fixnum, got #{opts[:geometry]}" unless opts[:geometry].is_a?(Fixnum)
+      raise ArgumentError, "pa_lcd geometry must be 216, 220, 224, 240, 416, 420, got #{opts[:geometry]}" unless opts[:geometry].to_s =~ /(216|220|224|240|416|420)/
+    end
     # move to plugin and load plugin
     # what's the default?
      opts[:rate] ||= 9600
@@ -412,12 +426,15 @@ class ArduinoSketch
   
   # use the sf (sparkfun) library
   def sf_lcd_setup(num, opts)
+    if opts[:geometry]
+      raise ArgumentError, "can only define pin from Fixnum, got #{opts[:geometry]}" unless opts[:geometry].is_a?(Fixnum)
+      raise ArgumentError, "sf_lcd geometry must be 216, 220, 416, 420, got #{opts[:geometry]}" unless opts[:geometry].to_s =~ /(216|220|416|420)/
+    end
     # move to plugin and load plugin
      opts[:rate] ||= 9600
     rate = opts[:rate] ? opts[:rate] : 9600
     swser_LCDsf(num, opts)
   end
-
   
   # Confiugre a single pin for input and setup a method to refer to that pin, i.e.:
   #
@@ -531,6 +548,7 @@ class ArduinoSketch
  		if opts[:as] 
  			@declarations << "SWSerLCDpa _#{opts[ :as ]} = SWSerLCDpa(#{tx}, #{geometry});"
  			accessor = []
+ 			$load_libraries << "SWSerLCDpa"
  			accessor << "SWSerLCDpa& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
@@ -632,6 +650,7 @@ class ArduinoSketch
  		if opts[:as] 
  			@declarations << "SWSerLCDsf _#{opts[ :as ]} = SWSerLCDsf(#{tx}, #{geometry});"
  			accessor = []
+ 			$load_libraries << "SWSerLCDsf"
  			accessor << "SWSerLCDsf& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
@@ -698,12 +717,13 @@ class ArduinoSketch
   	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)
         
-    minp = opts[:minp] ? opts[:minp] : 544
-    maxp = opts[:maxp] ? opts[:maxp] : 2400
+    minp = opts[:min] ? opts[:min] : 544
+    maxp = opts[:max] ? opts[:max] : 2400
 
    		if opts[:as]
  			@declarations << "Servo _#{opts[ :as ]} = Servo();"
  			accessor = []
+ 			$load_libraries << "Servo"
  			accessor << "Servo& #{opts[ :as ]}() {"
  			accessor << "\treturn _#{opts[ :as ]};"
  			accessor << "}"
@@ -733,11 +753,61 @@ class ArduinoSketch
  			@accessors << accessor.join( "\n" )
  			
  			@signatures << "Servo& #{opts[ :as ]}();"
- 			
- 			@other_setup << "_#{opts[ :as ]}.attach(#{spin}, #{minp}, #{maxp});"
+
+ 			@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]
 
  		end
- 	end 	
+ 	end 
+ 	
+ 		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
+    raise ArgumentError, "the frequency or period option must be included.  Example: :frequecy => 700" unless opts[:frequency] || opts[:period]
+    if opts[:frequency]
+      raise ArgumentError, "the frequency option must be an integer, got #{opts[:frequency].class}" unless opts[:frequency].is_a?(Fixnum)
+    end
+    if opts[:period]
+      raise ArgumentError, "the frequency option must be an integer, got #{opts[:period].class}" unless opts[:period].is_a?(Fixnum) 
+    end
+    # refer to: http://www.arduino.cc/playground/Code/FrequencyTimer2
+
+   		if opts[:as]
+   		  
+   		  @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
+
+   			@accessors << accessor.join( "\n" )
+
+   			@signatures << "FrequencyTimer2& #{opts[ :as ]}();"
+	
+ 			  @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
+ 		end
+ 	end	
+ 	
 
  
  
@@ -748,9 +818,7 @@ class ArduinoSketch
     
     result << "#include <WProgram.h>\n"
     result << "#include <SoftwareSerial.h>\n"
-    result << "#include <SWSerLCDpa.h>"
-    result << "#include <SWSerLCDsf.h>"
-    result << "#include <Servo.h>"
+    $load_libraries.each { |lib| result << "#include <#{lib}.h>" } unless $load_libraries.nil?
 
     result << comment_box( 'plugin directives' )
     $plugin_directives.each {|dir| result << dir } unless $plugin_directives.nil? ||  $plugin_directives.empty?

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

@@ -10,7 +10,7 @@ class Makefile
       params['target'] = sketch_name
       
       params['libraries_root'] = "#{File.expand_path(RAD_ROOT)}/vendor/libraries"
-      params['libraries'] = libraries
+      params['libraries'] = $load_libraries # load only libraries used 
       
       params['asm_files'] = Dir.entries( File.expand_path(RAD_ROOT) + "/" + PROJECT_DIR_NAME ).select{|e| e =~ /\.S/}            
             
@@ -21,9 +21,9 @@ class Makefile
       end
     end
     
-    def libraries
-      Dir.entries("#{RAD_ROOT}/vendor/libraries").select{|e| !(e =~ /\./)}
-    end
+    # def libraries
+    #   Dir.entries("#{RAD_ROOT}/vendor/libraries").select{|e| !(e =~ /\./)}
+    # end
     
     def hardware_params
       return @hardware_params if @hardware_params

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: madrona-rad
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Greg Borenstein
@@ -48,6 +48,9 @@ files:
 - README.rdoc
 - Rakefile
 - bin/rad
+- 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/libraries/Servo/Servo.h
@@ -115,6 +118,6 @@ rubyforge_project: rad
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: Fork of the Ruby Arduino Development - 0.2.4.4.7
+summary: Fork of the Ruby Arduino Development - 0.2.4.5.3
 test_files: []