lib/examples/hello_xbee.rb lib/examples/twitter.rb lib/libraries/AFSoftSerial/AFSoftSerial.cpp lib/libraries/AFSoftSerial/AFSoftSerial.h lib/libraries/AFSoftSerial/keywords.txt lib/libraries/AF_XPort/AF_XPort.cpp lib/libraries/AF_XPort/AF_XPort.h lib/plugins/twitter_connect.rb lib/rad/README.rdoc @@ -23,7 +23,7 @@ class OptionParser #:nodoc: "physical_reset" => false }, "software" => { - "arduino_root" => "/Applications/arduino-0011" + "arduino_root" => "/Applications/arduino-0012" } } @@ -109,6 +109,15 @@ puts FileUtils.mkdir_p "#{sketch_name}/vendor/libraries" puts "Successfully created your libraries directory." +puts + +FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/AF_XPort/.", "#{sketch_name}/vendor/libraries/AF_XPort" +puts "Installed AF_XPort into #{sketch_name}/vendor/libraries" +puts + +FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/AFSoftSerial/.", "#{sketch_name}/vendor/libraries/AFSoftSerial" +puts "Installed AFSoftSerial into #{sketch_name}/vendor/libraries" +puts FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/DS1307/.", "#{sketch_name}/vendor/libraries/DS1307" puts "Installed DS1307 into #{sketch_name}/vendor/libraries" @@ -174,6 +183,7 @@ puts FileUtils.mkdir_p "#{sketch_name}/vendor/plugins" puts "Successfully created your plugins directory." +puts FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/plugins/.", "#{sketch_name}/vendor/plugins" puts "Installed Default plugins into #{sketch_name}/vendor/plugins" @@ -183,6 +193,14 @@ puts FileUtils.mkdir_p "#{sketch_name}/#{sketch_name}" puts "Successfully created your default sketch directory." +puts + +# Copy the README how_to to the sketch directory + +FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/rad/README.rdoc", "#{sketch_name}" +puts "Copied README how_to into #{sketch_name}" +puts + # Build sketch files, etc.: @@ -226,4 +244,10 @@ end puts "Added #{sketch_name}/config/software.yml" puts -puts "Run 'rake -T' inside your sketch dir to learn how to compile and upload it." \ No newline at end of file +puts "Run 'rake -T' inside your sketch dir to learn how to compile and upload it." + +puts "***************************************************" +puts "*** Please note: This version supports ***" +puts "*** Arduino 12 only! ***" +puts "*** run rad install arduino to upgrade ***" +puts "***************************************************" \ No newline at end of file bin/rad @@ -193,100 +193,69 @@ class ArduinoSketch 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" - end - @declarations << "#{type} _#{k} = #{v};" - @accessors << <<-CODE - #{type} #{k}(){ - \treturn _#{k}; - } - CODE - 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, (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 + + 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 - - # 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 - - 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 + # 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 # Configure a single pin for output and setup a method to refer to that pin, i.e.: # @@ -308,9 +277,6 @@ class ArduinoSketch when :servo servo_setup(num, opts) return # don't use declarations, accessor, signatures below - when :lcd || :LCD - lcd_setup(num, opts) - return when :pa_lcd || :pa_LCD pa_lcd_setup(num, opts) return @@ -338,8 +304,11 @@ class ArduinoSketch when :onewire one_wire(num, opts) return # + when :ethernet + ethernet(num, opts) + return # else - 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]}" + 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 @@ -366,68 +335,6 @@ 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 - - # use the servo library - def servo_setup(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 - @@servo_dh ||= FALSE - if (@@servo_dh == FALSE) # on second instance this stuff can't be repeated - BBR - @@servo_dh = TRUE - @declarations << "void servo_refresh(void);" - helper_methods = [] - helper_methods << "void servo_refresh(void)" - helper_methods << "{" - helper_methods << "\tServo::refresh();" - helper_methods << "}" - @helper_methods += "\n#{helper_methods.join("\n")}" - end - end - - ## this won't work at all... no pins - # need help - def lcd_setup(num, opts) - # move to plugin and load plugin - # what's the default rate? - opts[:rate] ||= 9600 - rate = opts[:rate] ? opts[:rate] : 9600 - swser_LCD(num, opts) - end - - # 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 - rate = opts[:rate] ? opts[:rate] : 9600 - swser_LCDpa(num, opts) - end - - # 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 # Configure a single pin for input and setup a method to refer to that pin, i.e.: # @@ -523,477 +430,6 @@ 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={}) - 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) - input_pin(rx) - - 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 << "}" - @@swser_inc ||= FALSE - if (@@swser_inc == FALSE) # on second instance this stuff can't be repeated - @@swser_inc = TRUE - 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 << "}" - end - @accessors << accessor.join( "\n" ) - - @signatures << "SoftwareSerial& #{opts[ :as ]}();" - - @other_setup << "\t_#{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) - - rate = opts[:rate] ? opts[:rate] : 9600 - geometry = opts[:geometry] ? opts[:geometry] : 0 - if opts[:as] - @declarations << "SWSerLCDpa _#{opts[ :as ]} = SWSerLCDpa(#{tx}, #{geometry});" - accessor = [] - $load_libraries << "SWSerLCDpa" - 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 - # ------------------- print generics ------------------------------- - 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 << "}" - # ------------------ PA-LCD specific functions --------------------------------- - accessor << "void clearscr(SWSerLCDpa& s) {" - accessor << "\treturn s.clearscr();" - accessor << "}" - accessor << "void clearscr(SWSerLCDpa& s, const char *str) {" - accessor << "\treturn s.clearscr(str);" - accessor << "}" - accessor << "void clearscr(SWSerLCDpa& s, int n) {" - accessor << "\treturn s.clearscr(n);" - accessor << "}" - accessor << "void clearscr(SWSerLCDpa& s, long n, int b) {" - accessor << "\treturn s.clearscr(n, b);" - accessor << "}" - accessor << "void clearline(SWSerLCDpa& s, int line) {" - accessor << "\treturn s.clearline( line );" - accessor << "}" - accessor << "void clearline(SWSerLCDpa& s, int line, const char *str) {" - accessor << "\treturn s.clearline( line, str );" - accessor << "}" - accessor << "void clearline(SWSerLCDpa& s, int line, int n) {" - accessor << "\treturn s.clearline( line, n );" - accessor << "}" - accessor << "void clearline(SWSerLCDpa& s, int line, long n, int b) {" - accessor << "\treturn s.clearline( line, n, b );" - accessor << "}" - accessor << "void home( SWSerLCDpa& s) {" - accessor << "\treturn s.home();" - accessor << "}" - accessor << "void home( SWSerLCDpa& s, const char *str) {" - accessor << "\treturn s.home( str );" - accessor << "}" - accessor << "void home( SWSerLCDpa& s, int n) {" - accessor << "\treturn s.home( n );" - accessor << "}" - accessor << "void home( SWSerLCDpa& s, long n, int b) {" - accessor << "\treturn s.home( n, b );" - accessor << "}" - accessor << "void setxy( SWSerLCDpa& s, int x, int y) {" - accessor << "\treturn s.setxy( x, y );" - accessor << "}" - accessor << "void setxy( SWSerLCDpa& s, int x, int y, const char *str) {" - accessor << "\treturn s.setxy( x, y, str );" - accessor << "}" - accessor << "void setxy( SWSerLCDpa& s, int x, int y, long n, int b) {" - accessor << "\treturn s.setxy( x, y, n, b );" - accessor << "}" - accessor << "void setxy( SWSerLCDpa& s, int x, int y, int n) {" - accessor << "\treturn s.setxy( x, y, n );" - accessor << "}" - accessor << "void setgeo( SWSerLCDpa& s, int g) {" - accessor << "\treturn s.setgeo( g );" - 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 << "}" - end - - @accessors << accessor.join( "\n" ) - - @signatures << "SWSerLCDpa& #{opts[ :as ]}();" - - @other_setup << "\t_#{opts[ :as ]}.begin(#{rate});" - @other_setup << "\t_#{opts[ :as ]}.clearscr();" if :clear_screen == :true - - end - end - - - - def swser_LCDsf(tx, opts={}) - raise ArgumentError, "can only define tx from Fixnum, got #{tx.class}" unless tx.is_a?(Fixnum) - - rate = opts[:rate] ? opts[:rate] : 9600 - geometry = opts[:geometry] ? opts[:geometry] : 0 - if opts[:as] - @declarations << "SWSerLCDsf _#{opts[ :as ]} = SWSerLCDsf(#{tx}, #{geometry});" - accessor = [] - $load_libraries << "SWSerLCDsf" - 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 ) {" - accessor << "\treturn s.print( b );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, const char *str ) {" - accessor << "\treturn s.print( str );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, char c ) {" - accessor << "\treturn s.print( c );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, int i ) {" - accessor << "\treturn s.print( i );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, unsigned int i ) {" - accessor << "\treturn s.print( i );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, long i ) {" - accessor << "\treturn s.print( i );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, unsigned long i ) {" - accessor << "\treturn s.print( i );" - accessor << "}" - accessor << "void print( SWSerLCDsf& s, long i, int b ) {" - accessor << "\treturn s.print( i, b );" - accessor << "}" - # ------------------ Spark Fun Specific Functions --------------------------------- - accessor << "void clearscr(SWSerLCDsf& s) {" - accessor << "\treturn s.clearscr();" - accessor << "}" - accessor << "void clearscr(SWSerLCDsf& s, const char *str) {" - accessor << "\treturn s.clearscr(str);" - accessor << "}" - accessor << "void clearscr(SWSerLCDsf& s, int n) {" - accessor << "\treturn s.clearscr(n);" - accessor << "}" - accessor << "void clearscr(SWSerLCDsf& s, long n, int b) {" - accessor << "\treturn s.clearscr(n, b);" - accessor << "}" - accessor << "void home( SWSerLCDsf& s) {" - accessor << "\treturn s.home();" - accessor << "}" - accessor << "void home( SWSerLCDsf& s, const char *str) {" - accessor << "\treturn s.home( str );" - accessor << "}" - accessor << "void home( SWSerLCDsf& s, int n) {" - accessor << "\treturn s.home( n );" - accessor << "}" - accessor << "void home( SWSerLCDsf& s, long n, int b) {" - accessor << "\treturn s.home( n, b );" - accessor << "}" - accessor << "void setxy( SWSerLCDsf& s, int x, int y) {" - accessor << "\treturn s.setxy( x, y );" - accessor << "}" - accessor << "void setxy( SWSerLCDsf& s, int x, int y, const char *str) {" - accessor << "\treturn s.setxy( x, y, str );" - accessor << "}" - accessor << "void setxy( SWSerLCDsf& s, int x, int y, int n) {" - accessor << "\treturn s.setxy( x, y, n );" - accessor << "}" - accessor << "void setxy( SWSerLCDsf& s, int x, int y, long n, int b) {" - accessor << "\treturn s.setxy( x, y, n, b );" - accessor << "}" - accessor << "void setgeo( SWSerLCDsf& s, int g) {" - accessor << "\treturn s.setgeo( g );" - accessor << "}" - accessor << "void setintensity( SWSerLCDsf& s, int i ) {" - accessor << "\treturn s.setintensity( i );" - accessor << "}" - accessor << "void setcmd( SWSerLCDsf& s, uint8_t a, uint8_t b) {" - accessor << "\treturn s.setcmd( a, b );" - accessor << "}" - end - @accessors << accessor.join( "\n" ) - - @signatures << "SWSerLCDsf& #{opts[ :as ]}();" - - @other_setup << "\t_#{opts[ :as ]}.begin(#{rate});" - @other_setup << "\t_#{opts[ :as ]}.clearscr();" if :clear_screen == :true - - end - end - - - def loop_timer(opts={}) # loop timer methods # - - if opts[:as] - @declarations << "LoopTimer _#{opts[ :as ]} = LoopTimer();" - accessor = [] - $load_libraries << "LoopTimer" - accessor << "LoopTimer& #{opts[ :as ]}() {" - accessor << "\treturn _#{opts[ :as ]};" - accessor << "}" - @@loptim_inc ||= FALSE - if (@@loptim_inc == FALSE) # on second instance this stuff can't be repeated - BBR - @@limtim_inc = TRUE - accessor << "void track( LoopTimer& s ) {" - accessor << "\treturn s.track();" - accessor << "}" - accessor << "unsigned long get_total( LoopTimer& s ) {" - accessor << "\treturn s.get_total();" - accessor << "}" - end - - @accessors << accessor.join( "\n" ) - - @signatures << "LoopTimer& #{opts[ :as ]}();" - - end - end - - - - def twowire_stepper(pin1, pin2, opts={}) # servo motor routines # - raise ArgumentError, "can only define pin1 from Fixnum, got #{pin1.class}" unless pin1.is_a?(Fixnum) - raise ArgumentError, "can only define pin2 from Fixnum, got #{pin2.class}" unless pin2.is_a?(Fixnum) - - st_speed = opts[:speed] ? opts[:speed] : 30 - st_steps = opts[:steps] ? opts[:steps] : 100 - - if opts[:as] - @declarations << "Stepper _#{opts[ :as ]} = Stepper(#{st_steps},#{pin1},#{pin2});" - accessor = [] - $load_libraries << "Stepper" - accessor << "Stepper& #{opts[ :as ]}() {" - accessor << "\treturn _#{opts[ :as ]};" - accessor << "}" - @@stepr_inc ||= FALSE - if (@@stepr_inc == FALSE) # on second instance this stuff can't be repeated - BBR - @@stepr_inc = TRUE - accessor << "void set_speed( Stepper& s, long sp ) {" - accessor << "\treturn s.set_speed( sp );" - accessor << "}" - accessor << "void set_steps( Stepper& s, int b ) {" - accessor << "\treturn s.set_steps( b );" - accessor << "}" - accessor << "int version( Stepper& s ) {" - accessor << "\treturn s.version();" - accessor << "}" - end - - @accessors << accessor.join( "\n" ) - - @signatures << "Stepper& #{opts[ :as ]}();" - - @other_setup << "\t_#{opts[ :as ]}.set_speed(#{st_speed});" if opts[:speed] - - end - end - - - def fourwire_stepper( pin1, pin2, pin3, pin4, opts={}) # servo motor routines # - raise ArgumentError, "can only define pin1 from Fixnum, got #{pin1.class}" unless pin1.is_a?(Fixnum) - raise ArgumentError, "can only define pin2 from Fixnum, got #{pin2.class}" unless pin2.is_a?(Fixnum) - raise ArgumentError, "can only define pin3 from Fixnum, got #{pin3.class}" unless pin3.is_a?(Fixnum) - raise ArgumentError, "can only define pin4 from Fixnum, got #{pin4.class}" unless pin4.is_a?(Fixnum) - - st_speed = opts[:speed] ? opts[:speed] : 30 - st_steps = opts[:steps] ? opts[:steps] : 100 - - if opts[:as] - @declarations << "Stepper _#{opts[ :as ]} = Stepper(#{st_steps},#{pin1},#{pin2},#{pin3},#{pin4});" - accessor = [] - $load_libraries << "Stepper" - accessor << "Stepper& #{opts[ :as ]}() {" - accessor << "\treturn _#{opts[ :as ]};" - accessor << "}" - @@stepr_inc ||= FALSE - if (@@stepr_inc == FALSE) # on second instance this stuff can't be repeated - BBR - @@stepr_inc = TRUE - accessor << "void set_speed( Stepper& s, long sp ) {" - accessor << "\treturn s.set_speed( sp );" - accessor << "}" - accessor << "void set_steps( Stepper& s, int b ) {" - accessor << "\treturn s.set_steps( b );" - accessor << "}" - accessor << "int version( Stepper& s ) {" - accessor << "\treturn s.version();" - accessor << "}" - end - - @accessors << accessor.join( "\n" ) - - @signatures << "Stepper& #{opts[ :as ]}();" - - @other_setup << "\t_#{opts[ :as ]}.set_speed(#{st_speed});" if opts[:speed] - - end - end - - - 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 - - if opts[:as] - @declarations << "Servo _#{opts[ :as ]} = Servo();" - accessor = [] - $load_libraries << "Servo" - 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 << "uint8_t attach( Servo& s, int p ) {" - accessor << "\treturn s.attach(p);" - accessor << "}" - accessor << "uint8_t attach( Servo& s, int p, int pos ) {" - accessor << "\treturn s.attach(p, pos );" - accessor << "}" - accessor << "uint8_t attach( Servo& s, int p, uint16_t mn, uint16_t mx ) {" - accessor << "\treturn s.attach(p, mn, mx);" - accessor << "}" - accessor << "uint8_t attach( Servo& s, int p, int pos, uint16_t mn, uint16_t mx ) {" - accessor << "\treturn s.attach(p, pos, mn, mx);" - accessor << "}" - accessor << "void detach( Servo& s ) {" - accessor << "\treturn s.detach();" - accessor << "}" - accessor << "void position( Servo& s, int b ) {" - accessor << "\treturn s.position( b );" - accessor << "}" - accessor << "void speed( Servo& s, int b ) {" - accessor << "\treturn s.speed( b );" - accessor << "}" - accessor << "uint8_t read( Servo& s ) {" - accessor << "\treturn s.read();" - accessor << "}" - accessor << "uint8_t attached( Servo& s ) {" - accessor << "\treturn s.attached();" - accessor << "}" - accessor << "static void refresh( Servo& s ) {" - accessor << "\treturn s.refresh();" - accessor << "}" - end - - @accessors << accessor.join( "\n" ) - - @signatures << "Servo& #{opts[ :as ]}();" - - @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 - - @@frequency_inc ||= FALSE - raise ArgumentError, "there can be only one instance of Frequency Timer2" if @@frequency_inc == TRUE - @@frequency_inc = TRUE - - 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 - 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 << "}" - 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 << "}" - - @accessors << accessor.join( "\n" ) - - @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 - end - end - def compose_setup #:nodoc: also composes headers and signatures lib/rad/arduino_sketch.rb @@ -69,7 +69,7 @@ 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 <%= params['twi_c'] %> -CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(SOFTWARE_SERIAL)/SoftwareSerial.cpp<%= params['libraries'].collect{|l| " $(LIBRARY_ROOT)/#{ l }/#{l }.cpp"}.join('') %> +CXXSRC = $(ARDUINO)/HardwareSerial.cpp $(SOFTWARE_SERIAL)/SoftwareSerial.cpp $(ARDUINO)/Print.cpp<%= params['libraries'].collect{|l| " $(LIBRARY_ROOT)/#{ l }/#{l }.cpp"}.join('') %> MCU = <%= params['mcu'] %> <% if params['asm_files'] %>ASRC = <%= params['asm_files'].join(' ') %><% end %> F_CPU = 16000000 lib/rad/generators/makefile/makefile.erb @@ -4,6 +4,547 @@ class HardwareLibrary < ArduinoSketch super 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) + input_pin(rx) + + rate = opts[:rate] ? opts[:rate] : 9600 + if opts[:as] + @declarations << "SoftwareSerial _#{opts[ :as ]} = SoftwareSerial(#{rx}, #{tx});" + accessor = <<-STR + SoftwareSerial& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@swser_inc ||= FALSE + if (@@swser_inc == FALSE) # on second instance this stuff can't be repeated + @@swser_inc = TRUE + accessor += <<-STR + int read(SoftwareSerial& s) { + return s.read(); + } + void println( SoftwareSerial& s, char* str ) { + return s.println( str ); + } + void print( SoftwareSerial& s, char* str ) { + return s.print( str ); + } + void println( SoftwareSerial& s, int i ) { + return s.println( i ); + } + void print( SoftwareSerial& s, int i ) { + return s.print( i ); + } + STR + end + @accessors << accessor + + @signatures << "SoftwareSerial& #{opts[ :as ]}();" + + @other_setup << "\t_#{opts[ :as ]}.begin(#{rate});" + end + end + + # 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 + rate = opts[:rate] ? opts[:rate] : 9600 + swser_LCDpa(num, opts) + end + + def swser_LCDpa(tx, opts={}) + raise ArgumentError, "can only define tx from Fixnum, got #{tx.class}" unless tx.is_a?(Fixnum) + + rate = opts[:rate] ? opts[:rate] : 9600 + geometry = opts[:geometry] ? opts[:geometry] : 0 + if opts[:as] + @declarations << "SWSerLCDpa _#{opts[ :as ]} = SWSerLCDpa(#{tx}, #{geometry});" + $load_libraries << "SWSerLCDpa" + accessor = <<-STR + SWSerLCDpa& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@slcdpa_inc ||= FALSE + if (@@slcdpa_inc == FALSE) # on second instance this stuff can't be repeated - BBR + @@slcdpa_inc = TRUE + # ------------------- print generics ------------------------------- + accessor += <<-STR + void print( SWSerLCDpa& s, uint8_t b ) { + return s.print( b ); + } + void print( SWSerLCDpa& s, const char *str ) { + return s.print( str ); + } + void print( SWSerLCDpa& s, char c ) { + return s.print( c ); + } + void print( SWSerLCDpa& s, int i ) { + return s.print( i ); + } + void print( SWSerLCDpa& s, unsigned int i ) { + return s.print( i ); + } + void print( SWSerLCDpa& s, long i ) { + return s.print( i ); + } + void print( SWSerLCDpa& s, unsigned long i ) { + return s.print( i ); + } + void print( SWSerLCDpa& s, long i, int b ) { + return s.print( i, b ); + } + STR + # ------------------ PA-LCD specific functions --------------------------------- + accessor += <<-STR + void clearscr(SWSerLCDpa& s) { + return s.clearscr(); + } + void clearscr(SWSerLCDpa& s, const char *str) { + return s.clearscr(str); + } + void clearscr(SWSerLCDpa& s, int n) { + return s.clearscr(n); + } + void clearscr(SWSerLCDpa& s, long n, int b) { + return s.clearscr(n, b); + } + void clearline(SWSerLCDpa& s, int line) { + return s.clearline( line ); + } + void clearline(SWSerLCDpa& s, int line, const char *str) { + return s.clearline( line, str ); + } + void clearline(SWSerLCDpa& s, int line, int n) { + return s.clearline( line, n ); + } + void clearline(SWSerLCDpa& s, int line, long n, int b) { + return s.clearline( line, n, b ); + } + void home( SWSerLCDpa& s) { + return s.home(); + } + void home( SWSerLCDpa& s, const char *str) { + return s.home( str ); + } + void home( SWSerLCDpa& s, int n) { + return s.home( n ); + } + void home( SWSerLCDpa& s, long n, int b) { + return s.home( n, b ); + } + void setxy( SWSerLCDpa& s, int x, int y) { + return s.setxy( x, y ); + } + void setxy( SWSerLCDpa& s, int x, int y, const char *str) { + return s.setxy( x, y, str ); + } + void setxy( SWSerLCDpa& s, int x, int y, long n, int b) { + return s.setxy( x, y, n, b ); + } + void setxy( SWSerLCDpa& s, int x, int y, int n) { + return s.setxy( x, y, n ); + } + void setgeo( SWSerLCDpa& s, int g) { + return s.setgeo( g ); + } + void setintensity( SWSerLCDpa& s, int i ) { + return s.setintensity( i ); + } + void intoBignum(SWSerLCDpa& s) { + return s.intoBignum(); + } + void outofBignum(SWSerLCDpa& s) { + return s.outofBignum(); + } + STR + end + + @accessors << accessor + + @signatures << "SWSerLCDpa& #{opts[ :as ]}();" + + @other_setup << "\t_#{opts[ :as ]}.begin(#{rate});" + @other_setup << "\t_#{opts[ :as ]}.clearscr();" if :clear_screen == :true + + end + end + + + # 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 + + def swser_LCDsf(tx, opts={}) + raise ArgumentError, "can only define tx from Fixnum, got #{tx.class}" unless tx.is_a?(Fixnum) + + rate = opts[:rate] ? opts[:rate] : 9600 + geometry = opts[:geometry] ? opts[:geometry] : 0 + if opts[:as] + @declarations << "SWSerLCDsf _#{opts[ :as ]} = SWSerLCDsf(#{tx}, #{geometry});" + + $load_libraries << "SWSerLCDsf" + accessor = <<-STR + SWSerLCDsf& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@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 += <<-STR + void print( SWSerLCDsf& s, uint8_t b ) { + return s.print( b ); + } + void print( SWSerLCDsf& s, const char *str ) { + return s.print( str ); + } + void print( SWSerLCDsf& s, char c ) { + return s.print( c ); + } + void print( SWSerLCDsf& s, int i ) { + return s.print( i ); + } + void print( SWSerLCDsf& s, unsigned int i ) { + return s.print( i ); + } + void print( SWSerLCDsf& s, long i ) { + return s.print( i ); + } + void print( SWSerLCDsf& s, unsigned long i ) { + return s.print( i ); + } + void print( SWSerLCDsf& s, long i, int b ) { + return s.print( i, b ); + } + STR + # ------------------ Spark Fun Specific Functions --------------------------------- + accessor += <<-STR + void clearscr(SWSerLCDsf& s) { + return s.clearscr(); + } + void clearscr(SWSerLCDsf& s, const char *str) { + return s.clearscr(str); + } + void clearscr(SWSerLCDsf& s, int n) { + return s.clearscr(n); + } + void clearscr(SWSerLCDsf& s, long n, int b) { + return s.clearscr(n, b); + } + void home( SWSerLCDsf& s) { + return s.home(); + } + void home( SWSerLCDsf& s, const char *str) { + return s.home( str ); + } + void home( SWSerLCDsf& s, int n) { + return s.home( n ); + } + void home( SWSerLCDsf& s, long n, int b) { + return s.home( n, b ); + } + void setxy( SWSerLCDsf& s, int x, int y) { + return s.setxy( x, y ); + } + void setxy( SWSerLCDsf& s, int x, int y, const char *str) { + return s.setxy( x, y, str ); + } + void setxy( SWSerLCDsf& s, int x, int y, int n) { + return s.setxy( x, y, n ); + } + void setxy( SWSerLCDsf& s, int x, int y, long n, int b) { + return s.setxy( x, y, n, b ); + } + void setgeo( SWSerLCDsf& s, int g) { + return s.setgeo( g ); + } + void setintensity( SWSerLCDsf& s, int i ) { + return s.setintensity( i ); + } + void setcmd( SWSerLCDsf& s, uint8_t a, uint8_t b) { + return s.setcmd( a, b ); + } + STR + end + @accessors << accessor + + @signatures << "SWSerLCDsf& #{opts[ :as ]}();" + + @other_setup << "\t_#{opts[ :as ]}.begin(#{rate});" + @other_setup << "\t_#{opts[ :as ]}.clearscr();" if :clear_screen == :true + + end + end + + + def loop_timer(opts={}) # loop timer methods # + + if opts[:as] + @declarations << "LoopTimer _#{opts[ :as ]} = LoopTimer();" + $load_libraries << "LoopTimer" + accessor = <<-STR + LoopTimer& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@loptim_inc ||= FALSE + if (@@loptim_inc == FALSE) # on second instance this stuff can't be repeated - BBR + @@limtim_inc = TRUE + accessor += <<-STR + void track( LoopTimer& s ) { + return s.track(); + } + unsigned long get_total( LoopTimer& s ) { + return s.get_total(); + } + STR + end + + @accessors << accessor + + @signatures << "LoopTimer& #{opts[ :as ]}();" + + end + end + + # use the servo library + def servo_setup(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 + @@servo_dh ||= FALSE + if (@@servo_dh == FALSE) # on second instance this stuff can't be repeated - BBR + @@servo_dh = TRUE + @declarations << "void servo_refresh(void);" + helper_methods = [] + helper_methods << "void servo_refresh(void)" + helper_methods << "{" + helper_methods << "\tServo::refresh();" + helper_methods << "}" + @helper_methods += "\n#{helper_methods.join("\n")}" + end + end + + 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 + + if opts[:as] + @declarations << "Servo _#{opts[ :as ]} = Servo();" + $load_libraries << "Servo" + accessor = <<-STR + Servo& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@servo_inc ||= FALSE + if (@@servo_inc == FALSE) # on second instance this stuff can't be repeated - BBR + @@servo_inc = TRUE + accessor += <<-STR + uint8_t attach( Servo& s, int p ) { + return s.attach(p); + } + uint8_t attach( Servo& s, int p, int pos ) { + return s.attach(p, pos ); + } + uint8_t attach( Servo& s, int p, uint16_t mn, uint16_t mx ) { + return s.attach(p, mn, mx); + } + uint8_t attach( Servo& s, int p, int pos, uint16_t mn, uint16_t mx ) { + return s.attach(p, pos, mn, mx); + } + void detach( Servo& s ) { + return s.detach(); + } + void position( Servo& s, int b ) { + return s.position( b ); + } + void speed( Servo& s, int b ) { + return s.speed( b ); + } + uint8_t read( Servo& s ) { + return s.read(); + } + uint8_t attached( Servo& s ) { + return s.attached(); + } + static void refresh( Servo& s ) { + return s.refresh(); + } + STR + end + + @accessors << accessor + + @signatures << "Servo& #{opts[ :as ]}();" + + @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 twowire_stepper(pin1, pin2, opts={}) # servo motor routines # + raise ArgumentError, "can only define pin1 from Fixnum, got #{pin1.class}" unless pin1.is_a?(Fixnum) + raise ArgumentError, "can only define pin2 from Fixnum, got #{pin2.class}" unless pin2.is_a?(Fixnum) + + st_speed = opts[:speed] ? opts[:speed] : 30 + st_steps = opts[:steps] ? opts[:steps] : 100 + + if opts[:as] + @declarations << "Stepper _#{opts[ :as ]} = Stepper(#{st_steps},#{pin1},#{pin2});" + $load_libraries << "Stepper" + accessor = <<-STR + Stepper& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@stepr_inc ||= FALSE + if (@@stepr_inc == FALSE) # on second instance this stuff can't be repeated - BBR + @@stepr_inc = TRUE + accessor = <<-STR + void set_speed( Stepper& s, long sp ) { + return s.set_speed( sp ); + } + void set_steps( Stepper& s, int b ) { + return s.set_steps( b ); + } + int version( Stepper& s ) { + return s.version(); + } + STR + end + + @accessors << accessor + + @signatures << "Stepper& #{opts[ :as ]}();" + + @other_setup << "\t_#{opts[ :as ]}.set_speed(#{st_speed});" if opts[:speed] + + end + end + + def fourwire_stepper( pin1, pin2, pin3, pin4, opts={}) # servo motor routines # + raise ArgumentError, "can only define pin1 from Fixnum, got #{pin1.class}" unless pin1.is_a?(Fixnum) + raise ArgumentError, "can only define pin2 from Fixnum, got #{pin2.class}" unless pin2.is_a?(Fixnum) + raise ArgumentError, "can only define pin3 from Fixnum, got #{pin3.class}" unless pin3.is_a?(Fixnum) + raise ArgumentError, "can only define pin4 from Fixnum, got #{pin4.class}" unless pin4.is_a?(Fixnum) + + st_speed = opts[:speed] ? opts[:speed] : 30 + st_steps = opts[:steps] ? opts[:steps] : 100 + + if opts[:as] + @declarations << "Stepper _#{opts[ :as ]} = Stepper(#{st_steps},#{pin1},#{pin2},#{pin3},#{pin4});" + $load_libraries << "Stepper" + accessor = <<-STR + Stepper& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + STR + @@stepr_inc ||= FALSE + if (@@stepr_inc == FALSE) # on second instance this stuff can't be repeated - BBR + @@stepr_inc = TRUE + accessor += <<-STR + void set_speed( Stepper& s, long sp ) { + return s.set_speed( sp ); + } + void set_steps( Stepper& s, int b ) { + return s.set_steps( b ); + } + int version( Stepper& s ) { + return s.version(); + } + STR + end + + @accessors << accessor + + @signatures << "Stepper& #{opts[ :as ]}();" + + @other_setup << "\t_#{opts[ :as ]}.set_speed(#{st_speed});" if opts[:speed] + + end + end + + def frequency_timer(pin, opts={}) # frequency timer routines + + @@frequency_inc ||= FALSE + raise ArgumentError, "there can be only one instance of Frequency Timer2" if @@frequency_inc == TRUE + @@frequency_inc = TRUE + + 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 + 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();" + + $load_libraries << "FrequencyTimer2" + accessor = <<-STR + FrequencyTimer2& #{opts[ :as ]}() { + return _#{opts[ :as ]}; + } + void set_frequency( FrequencyTimer2& s, int b ) { + return s.setPeriod( 1000000L/b ); + } + void set_period( FrequencyTimer2& s, int b ) { + return s.setPeriod( b ); + } + void enable( FrequencyTimer2& s ) { + return s.enable(); + } + void disable( FrequencyTimer2& s ) { + return s.disable(); + } + STR + + @accessors << accessor + + @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 + end + end + def one_wire(pin, opts={}) raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum) @@ -13,34 +554,34 @@ class HardwareLibrary < ArduinoSketch $load_libraries << "OneWire" accessor = <<-STR OneWire& #{opts[ :as ]}() { - return _#{opts[ :as ]}; + return _#{opts[ :as ]}; } STR @@onewire_inc ||= FALSE if (@@onewire_inc == FALSE) # on second instance this stuff can't be repeated - BBR @@onewire_inc = TRUE accessor += <<-STR - uint8_t reset(OneWire& s) { - return s.reset(); - } - void skip(OneWire& s) { - return s.skip(); - } - void write(OneWire& s, uint8_t v, uint8_t p = 0) { - return s.write( v, p ); - } - uint8_t read(OneWire& s) { - return s.read(); - } - void write_bit( OneWire& s, uint8_t b ) { - return s.write_bit( b ); - } - uint8_t read_bit(OneWire& s) { - return s.read_bit(); - } - void depower(OneWire& s) { - return s.depower(); - } + uint8_t reset(OneWire& s) { + return s.reset(); + } + void skip(OneWire& s) { + return s.skip(); + } + void write(OneWire& s, uint8_t v, uint8_t p = 0) { + return s.write( v, p ); + } + uint8_t read(OneWire& s) { + return s.read(); + } + void write_bit( OneWire& s, uint8_t b ) { + return s.write_bit( b ); + } + uint8_t read_bit(OneWire& s) { + return s.read_bit(); + } + void depower(OneWire& s) { + return s.depower(); + } STR end @accessors << accessor @@ -118,6 +659,22 @@ class HardwareLibrary < ArduinoSketch end + # work in progress + def ethernet(pin, opts={}) + raise ArgumentError, "can only define pin from Fixnum, got #{pin.class}" unless pin.is_a?(Fixnum) + if opts[:as] + accessor = [] + $load_libraries << "AF_XPort" + $load_libraries << "AFSoftSerial" + # needs to be more granular: + accessor << "AF_XPort xport = AF_XPort(XPORT_RXPIN, XPORT_TXPIN, XPORT_RESETPIN, XPORT_DTRPIN, XPORT_RTSPIN, XPORT_CTSPIN);" + rate = opts[:rate] ? opts[:rate] : 57600 + @other_setup << "xport.begin(#{rate});" + @accessors << accessor.join( "\n" ) + end + end + + def i2c_eeprom(pin, opts={}) # i2c serial eeprom routines # dev_addr = opts[:address] ? opts[:address] : 0 @@ -170,7 +727,7 @@ class HardwareLibrary < ArduinoSketch $load_libraries << "DS1307" accessor = <<-STR DS1307& #{opts[ :as ]}() { - return _#{opts[ :as ]}; + return _#{opts[ :as ]}; } void get( DS1307& s, byte *buf, boolean r ) { return s.get( buf, r ); lib/rad/hardware_library.rb @@ -1,3 +1,4 @@ +require 'rubygems' require 'ruby_to_ansi_c' class RADProcessor < RubyToAnsiC lib/rad/rad_processor.rb @@ -4,14 +4,15 @@ Gem::Specification.new do |s| s.date = %q{2008-08-18} s.default_executable = %q{rad} - s.summary = "RAD: Ruby Arduino Development - 0.2.5.2" + s.summary = "RAD: Ruby Arduino Development - 0.2.5.5" s.email = "greg@grabb.it" s.executables = ["rad"] s.homepage = "http://github.com/atduskreg/rad" s.description = "Ruby Arduino Development: a framework for programming the Arduino physcial computing platform using Ruby" s.has_rdoc = true s.authors = ["Greg Borenstein", "plugins+: JD Barnhart"] - s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "bin/rad", "lib/examples/add_hysteresis.rb", "lib/examples/basic_blink.rb", "lib/examples/blink_m_address_assignment.rb", "lib/examples/blink_m_hello.rb", "lib/examples/blink_m_multi.rb", "lib/examples/blink_with_serial.rb", "lib/examples/configure_pa_lcd_boot.rb", "lib/examples/debounce_methods.rb", "lib/examples/external_variable_fu.rb", "lib/examples/external_variables.rb", "lib/examples/first_sound.rb", "lib/examples/frequency_generator.rb", "lib/examples/hello_array.rb", "lib/examples/hello_array2.rb", "lib/examples/hello_array_eeprom.rb", "lib/examples/hello_clock.rb", "lib/examples/hello_eeprom.rb", "lib/examples/hello_eeprom_lcdpa.rb", "lib/examples/hello_format_print.rb", "lib/examples/hello_lcd_charset.rb", "lib/examples/hello_pa_lcd.rb", "lib/examples/hello_servos.rb", "lib/examples/hello_spectra_sound.rb", "lib/examples/hello_world.rb", "lib/examples/hysteresis_duel.rb", "lib/examples/i2c_with_clock_chip.rb", "lib/examples/motor_knob.rb", "lib/examples/servo_buttons.rb", "lib/examples/servo_calibrate_continuous.rb", "lib/examples/servo_throttle.rb", "lib/examples/sparkfun_lcd.rb", "lib/examples/spectra_soft_pot.rb", "lib/examples/times_method.rb", "lib/examples/toggle.rb", "lib/examples/two_wire.rb", "lib/libraries/DS1307/DS1307.cpp", "lib/libraries/DS1307/DS1307.h", "lib/libraries/DS1307/keywords.txt", "lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp", "lib/libraries/FrequencyTimer2/FrequencyTimer2.h", "lib/libraries/FrequencyTimer2/keywords.txt", "lib/libraries/I2CEEPROM/I2CEEPROM.cpp", "lib/libraries/I2CEEPROM/I2CEEPROM.h", "lib/libraries/I2CEEPROM/keywords.txt", "lib/libraries/LoopTimer/LoopTimer.cpp", "lib/libraries/LoopTimer/LoopTimer.h", "lib/libraries/LoopTimer/keywords.txt", "lib/libraries/OneWire/OneWire.cpp", "lib/libraries/OneWire/OneWire.h", "lib/libraries/OneWire/keywords.txt", "lib/libraries/OneWire/readme.txt", "lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp", "lib/libraries/SWSerLCDpa/SWSerLCDpa.h", "lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp", "lib/libraries/SWSerLCDsf/SWSerLCDsf.h", "lib/libraries/Servo/Servo.cpp", "lib/libraries/Servo/Servo.h", "lib/libraries/Stepper/Stepper.cpp", "lib/libraries/Stepper/Stepper.h", "lib/libraries/Stepper/keywords.txt", "lib/libraries/Wire/Wire.cpp", "lib/libraries/Wire/Wire.h", "lib/libraries/Wire/keywords.txt", "lib/libraries/Wire/twi.h", "lib/libraries/Wire/utility/twi.c", "lib/libraries/Wire/utility/twi.h", "lib/plugins/bitwise_ops.rb", "lib/plugins/blink.rb", "lib/plugins/blink_m.rb", "lib/plugins/debounce.rb", "lib/plugins/debug_output_to_lcd.rb", "lib/plugins/hysteresis.rb", "lib/plugins/input_output_state.rb", "lib/plugins/lcd_padding.rb", "lib/plugins/mem_test.rb", "lib/plugins/servo_pulse.rb", "lib/plugins/servo_setup.rb", "lib/plugins/smoother.rb", "lib/plugins/spark_fun_serial_lcd.rb", "lib/plugins/spectra_symbol.rb", "lib/rad.rb", "lib/rad/arduino_plugin.rb", "lib/rad/arduino_sketch.rb", "lib/rad/generators/makefile/makefile.erb", "lib/rad/generators/makefile/makefile.rb", "lib/rad/hardware_library.rb", "lib/rad/init.rb", "lib/rad/rad_processor.rb", "lib/rad/rad_rewriter.rb", "lib/rad/rad_type_checker.rb", "lib/rad/sim/arduino_sketch.rb", "lib/rad/sketch_compiler.rb", "lib/rad/tasks/build_and_make.rake", "lib/rad/tasks/rad.rb", "lib/rad/todo.txt", "lib/rad/variable_processing.rb", "lib/rad/version.rb", "scripts/txt2html", "setup.rb", "spec/examples/hello_world.rb", "spec/examples/serial_motor.rb", "spec/models/arduino_sketch_spec.rb", "spec/models/sketch_compiler_spec.rb", "spec/models/spec_helper.rb", "spec/sim/hello_world_spec.rb", "spec/spec.opts", "test/test_array_processing.rb", "test/test_plugin_loading.rb", "test/test_translation_post_processing.rb", "test/test_variable_processing.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.rhtml", "website/examples/assembler_test.rb.html", "website/examples/gps_reader.rb.html", "website/examples/hello_world.rb.html", "website/examples/serial_motor.rb.html"] + s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "lib/libraries/AFSoftSerial/keywords.txt", "lib/libraries/DS1307/keywords.txt", "lib/libraries/FrequencyTimer2/keywords.txt", "lib/libraries/I2CEEPROM/keywords.txt", "lib/libraries/LoopTimer/keywords.txt", "lib/libraries/OneWire/keywords.txt", "lib/libraries/OneWire/readme.txt", "lib/libraries/Stepper/keywords.txt", "lib/libraries/Wire/keywords.txt", "lib/rad/todo.txt", "website/index.txt"] + s.files = ["History.txt", "License.txt", "Manifest.txt", "README.rdoc", "Rakefile", "bin/rad", "lib/examples/add_hysteresis.rb", "lib/examples/basic_blink.rb", "lib/examples/blink_m_address_assignment.rb", "lib/examples/blink_m_hello.rb", "lib/examples/blink_m_multi.rb", "lib/examples/blink_with_serial.rb", "lib/examples/configure_pa_lcd_boot.rb", "lib/examples/debounce_methods.rb", "lib/examples/external_variable_fu.rb", "lib/examples/external_variables.rb", "lib/examples/first_sound.rb", "lib/examples/frequency_generator.rb", "lib/examples/hello_array.rb", "lib/examples/hello_array2.rb", "lib/examples/hello_array_eeprom.rb", "lib/examples/hello_clock.rb", "lib/examples/hello_eeprom.rb", "lib/examples/hello_eeprom_lcdpa.rb", "lib/examples/hello_format_print.rb", "lib/examples/hello_lcd_charset.rb", "lib/examples/hello_pa_lcd.rb", "lib/examples/hello_servos.rb", "lib/examples/hello_spectra_sound.rb", "lib/examples/hello_world.rb", "lib/examples/hello_xbee.rb", "lib/examples/hysteresis_duel.rb", "lib/examples/i2c_with_clock_chip.rb", "lib/examples/midi_beat_box.rb", "lib/examples/midi_scales.rb", "lib/examples/motor_knob.rb", "lib/examples/servo_buttons.rb", "lib/examples/servo_calibrate_continuous.rb", "lib/examples/servo_throttle.rb", "lib/examples/sparkfun_lcd.rb", "lib/examples/spectra_soft_pot.rb", "lib/examples/times_method.rb", "lib/examples/toggle.rb", "lib/examples/twitter.rb", "lib/examples/two_wire.rb", "lib/libraries/AFSoftSerial/AFSoftSerial.cpp", "lib/libraries/AFSoftSerial/AFSoftSerial.h", "lib/libraries/AFSoftSerial/keywords.txt", "lib/libraries/AF_XPort/AF_XPort.cpp", "lib/libraries/AF_XPort/AF_XPort.h", "lib/libraries/DS1307/DS1307.cpp", "lib/libraries/DS1307/DS1307.h", "lib/libraries/DS1307/keywords.txt", "lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp", "lib/libraries/FrequencyTimer2/FrequencyTimer2.h", "lib/libraries/FrequencyTimer2/keywords.txt", "lib/libraries/I2CEEPROM/I2CEEPROM.cpp", "lib/libraries/I2CEEPROM/I2CEEPROM.h", "lib/libraries/I2CEEPROM/keywords.txt", "lib/libraries/LoopTimer/LoopTimer.cpp", "lib/libraries/LoopTimer/LoopTimer.h", "lib/libraries/LoopTimer/keywords.txt", "lib/libraries/OneWire/OneWire.cpp", "lib/libraries/OneWire/OneWire.h", "lib/libraries/OneWire/keywords.txt", "lib/libraries/OneWire/readme.txt", "lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp", "lib/libraries/SWSerLCDpa/SWSerLCDpa.h", "lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp", "lib/libraries/SWSerLCDsf/SWSerLCDsf.h", "lib/libraries/Servo/Servo.cpp", "lib/libraries/Servo/Servo.h", "lib/libraries/Stepper/Stepper.cpp", "lib/libraries/Stepper/Stepper.h", "lib/libraries/Stepper/keywords.txt", "lib/libraries/Wire/Wire.cpp", "lib/libraries/Wire/Wire.h", "lib/libraries/Wire/keywords.txt", "lib/libraries/Wire/twi.h", "lib/libraries/Wire/utility/twi.c", "lib/libraries/Wire/utility/twi.h", "lib/plugins/bitwise_ops.rb", "lib/plugins/blink.rb", "lib/plugins/blink_m.rb", "lib/plugins/debounce.rb", "lib/plugins/debug_output_to_lcd.rb", "lib/plugins/hysteresis.rb", "lib/plugins/input_output_state.rb", "lib/plugins/lcd_padding.rb", "lib/plugins/mem_test.rb", "lib/plugins/midi.rb", "lib/plugins/parallax_ping.rb", "lib/plugins/servo_pulse.rb", "lib/plugins/servo_setup.rb", "lib/plugins/smoother.rb", "lib/plugins/spark_fun_serial_lcd.rb", "lib/plugins/spectra_symbol.rb", "lib/plugins/twitter_connect.rb", "lib/rad.rb", "lib/rad/README.rdoc", "lib/rad/arduino_plugin.rb", "lib/rad/arduino_sketch.rb", "lib/rad/generators/makefile/makefile.erb", "lib/rad/generators/makefile/makefile.rb", "lib/rad/hardware_library.rb", "lib/rad/init.rb", "lib/rad/rad_processor.rb", "lib/rad/rad_rewriter.rb", "lib/rad/rad_type_checker.rb", "lib/rad/sim/arduino_sketch.rb", "lib/rad/sketch_compiler.rb", "lib/rad/tasks/build_and_make.rake", "lib/rad/tasks/rad.rb", "lib/rad/todo.txt", "lib/rad/variable_processing.rb", "lib/rad/version.rb", "scripts/txt2html", "setup.rb", "spec/examples/hello_world.rb", "spec/examples/serial_motor.rb", "spec/models/arduino_sketch_spec.rb", "spec/models/sketch_compiler_spec.rb", "spec/models/spec_helper.rb", "spec/sim/hello_world_spec.rb", "spec/spec.opts", "test/test_array_processing.rb", "test/test_plugin_loading.rb", "test/test_translation_post_processing.rb", "test/test_variable_processing.rb", "website/index.html", "website/index.txt", "website/javascripts/rounded_corners_lite.inc.js", "website/stylesheets/screen.css", "website/template.rhtml", "website/examples/assembler_test.rb.html", "website/examples/gps_reader.rb.html", "website/examples/hello_world.rb.html", "website/examples/serial_motor.rb.html"] s.test_files = [] s.rdoc_options = ["--main", "README.rdoc"] s.require_paths = ["lib"] rad.gemspec cb8a6c43a6a99428b3a86af92038217aa95980d2 41e0c18ef92f278beee2d6bd55d3970b1e74a26b Greg Borenstein greg@mfdz.com http://github.com/atduskgreg/rad/commit/ac37507755f45b2a9358374286e5138c4d140e4e ac37507755f45b2a9358374286e5138c4d140e4e 2008-09-21T17:55:55-07:00 2008-09-21T17:55:55-07:00 merging changes to bin/rad, adding software_serial example 4496c3abebf89691e278788e146f26688adb20cc Greg Borenstein greg@mfdz.com