rad 0.2.2 → 0.2.9

data/History.txt

@@ -1,3 +1,37 @@
+== 0.2.5 2008-07-21
+* 1ish large post Bastille Day update:
+	- added i2c capability
+	- added actual Wire library until workaround for os_x file caching is found
+	- added DS1307 and OneWire libraries
+	- added cool instance variable style global variables
+	- added array and define methods
+	- added def setup method, which added to setup 
+	- added numerous examples
+
+== 0.2.4 2008-07-12
+* 1ish large update:
+	- added incredibly primitive tests 
+	- added 11 sketch examples which are compiled or compiled/uploaded
+		- use rake test:compile or rake test:upload
+		- can also use the following to run an example (make:compile also works)
+		- make:upload sketch=examples/hello_servos
+
+== 0.2.3 2008-07-10
+* Manyish updates:
+	- updated servo library to support position parameter
+	- 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
+	- applied David Michael's patch for longs
+	
 == 0.2.1 2008-04-02
 * 6ish updates:
 	- applied Brian Riley's SWSerLCDpa patch

data/Manifest.txt

@@ -1,26 +1,132 @@
 History.txt
 License.txt
 Manifest.txt
-README.txt
+README.rdoc
 Rakefile
 bin/rad
-lib/libraries/SWSerLCDpa/keywords.txt
+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/todo.txt
+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
-lib/rad/generators/makefile/makefile.erb
-lib/rad/generators/makefile/makefile.rb
 scripts/txt2html
 setup.rb
-spec/models/spec_helper.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
@@ -29,4 +135,4 @@ 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
+website/examples/serial_motor.rb.html

data/{README.txt → README.rdoc}

@@ -12,17 +12,29 @@ See also the Arduino Software reference: http://www.arduino.cc/en/Reference/Home
 
 ==Examples
 
-See the examples directory for lots of examples of RAD in action: http://rad.rubyforge.org/examples
+See the examples directory for lots of examples of RAD in action: 
+http://github.com/atduskgreg/rad/tree/master/lib/examples
+
+The atduskgreg/rad wiki also contains a growing library of examples and hardware tutorials:
+http://github.com/atduskgreg/rad/wikis
 
 ==Getting Started
 
-Install the gem:
+To install the edge gem:
+
+ # Update to RubyGems 1.2.0 before proceeding!
+ $ gem sources -a http://gems.github.com (you only have to do this once)
+ $ sudo gem install atduskgreg-rad
+
+A very old and feature poor (though slightly more 'stable' RAD) is available from RubyGems:
+
+ $ sudo gem install rad
 
-$ sudo gem install rad
+We plan to push tagged releases to RubyGems at key points. The 0.3 release should be coming up soon.
 
 Run the rad command to create a new project:
 
-$ rad my_project
+ $ rad my_project
 
 Write a sketch that will blink a single LED every 500ms:
 
@@ -36,7 +48,7 @@ Write a sketch that will blink a single LED every 500ms:
 
 Attach your Arduino and use rake to complile and upload your sketch:
 
-$ rake make:upload
+ $ rake make:upload
 
 ==Get Involved
 

data/Rakefile

@@ -8,6 +8,9 @@ require 'rake/rdoctask'
 require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 require 'hoe'
+
+RAD_ROOT = File.expand_path(File.dirname(__FILE__))
+
 begin
   require 'spec/rake/spectask'
 rescue LoadError

data/bin/rad

@@ -10,7 +10,7 @@ require 'optparse'
 require 'fileutils'
 require 'yaml'
 
-
+require File.expand_path(File.dirname(__FILE__)) + "/../lib/rad/version.rb"
 
 class OptionParser #:nodoc:
     
@@ -60,6 +60,13 @@ Usage: #{File.basename($0)} <sketch_dir_name> <options for config>
               "   (default: #{options['software']['arduino_root']})") do |arduino|
         options["software"]["arduino_root"] = arduino if arduino
       end
+      
+      opts.on("-v", "--version [VERSION]", 
+              "RAD version number",
+              "   (#{Rad::VERSION::STRING})") do 
+        puts Rad::VERSION::STRING
+        exit
+      end
 
       opts.on_tail("-h", "--help", "Show this message") do
         puts opts
@@ -102,17 +109,115 @@ 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"
+puts
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/FrequencyTimer2/.", "#{sketch_name}/vendor/libraries/FrequencyTimer2"
+puts "Installed FrequencyTimer2 into #{sketch_name}/vendor/libraries"
+puts
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/I2CEEPROM/.", "#{sketch_name}/vendor/libraries/I2CEEPROM" 
+puts "Installed I2CEEPROM into #{sketch_name}/vendor/libraries" 
+puts
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/LoopTimer/.", "#{sketch_name}/vendor/libraries/LoopTimer" 
+puts "Installed LoopTimer into #{sketch_name}/vendor/libraries" 
+puts
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/OneWire/.", "#{sketch_name}/vendor/libraries/OneWire"
+puts "Installed OneWire 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
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/Stepper/.", "#{sketch_name}/vendor/libraries/Stepper"
+puts "Installed Stepper into #{sketch_name}/vendor/libraries"
+puts
 
 FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/SWSerLCDpa/.", "#{sketch_name}/vendor/libraries/SWSerLCDpa"
 puts "Installed SWSerLCDpa into #{sketch_name}/vendor/libraries"
 puts
 
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/SWSerLCDsf/.", "#{sketch_name}/vendor/libraries/SWSerLCDsf"
+puts "Installed SWSerLCDsf into #{sketch_name}/vendor/libraries"
+puts
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/Wire/.", "#{sketch_name}/vendor/libraries/Wire"
+puts "Installed Wire into #{sketch_name}/vendor/libraries"
+puts
+
+# Build examples -- used for basic testing
+
+FileUtils.mkdir_p "#{sketch_name}/vendor/libraries"
+puts "Successfully created your examples directory."
+
+FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/examples/.", "#{sketch_name}/examples"
+puts "Installed examples into #{sketch_name}/examples"
+puts
+
+# Build test -- used testing
+
+# FIXME: this should put the tests into the vendor/tests directory instead.
+ 
+# FileUtils.mkdir_p "#{sketch_name}/test"
+# puts "Successfully created your test directory."
+# 
+# FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/test/.", "#{sketch_name}/test"
+# puts "Installed tests into #{sketch_name}/test"
+# puts
+
+# Build vendor/plugins:  
+
+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"
+puts
+
+# Add an default sketch directory # needed to run test:compile
+
+FileUtils.mkdir_p "#{sketch_name}/#{sketch_name}"
+puts "Successfully created your default sketch directory."
+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.:  
 
 FileUtils.touch "#{sketch_name}/#{sketch_name}.rb"
 File.open("#{sketch_name}/#{sketch_name}.rb", "w") do |file|
   file << <<-EOS
 class #{sketch_name.split("_").collect{|c| c.capitalize}.join("")} < ArduinoSketch
+  
+  # looking for hints?  check out the examples directory
+  # example sketches can be uploaded to your arduino with
+  # rake make:upload sketch=examples/hello_world
+  # just replace hello_world with other examples
+  
+    def loop
+     # your code here
+    end
+    
 end
   EOS
 end

data/lib/examples/add_hysteresis.rb

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

data/lib/examples/basic_blink.rb

@@ -0,0 +1,10 @@
+class BasicBlink < ArduinoSketch
+  # hello world (uncomment to run)
+  
+  output_pin 13, :as => :led
+  
+  def loop
+    blink led, 100 
+    x = 4
+  end
+end

data/lib/examples/blink_m_address_assignment.rb

@@ -0,0 +1,104 @@
+class BlinkMAddressAssignment < ArduinoSketch
+
+  # want to use more than one blink m?
+  # since each blink m arrives with the same address, 
+  # we can't address each one individually
+  # 
+  # so the first thing we need to do is give each one a new address
+  # that's the purpose of this sketch
+  # 
+  # install one blinkm at a time
+  # a pa_lcd screen makes this easier
+  # the screen will start at address ten and increment approximately every
+  # four seconds.  Pressing during the first four seconds sets the blnikm 
+  # address to 10, during the next four seconds to 11 and so on
+  # difficult without a screen.
+  # if you need to, program an led to help with the timing
+   
+
+  @blink_m_start_address = 10
+  @flag = false
+  @addr1 = "10, byte"
+  @addr2 = "11, byte"
+  @addr3 = "12, byte"
+  
+  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+  input_pin 7,  :as => :button_one, :device => :button
+  input_pin 8,  :as => :button_two, :device => :button
+  input_pin 9,  :as => :button_three, :device => :button
+  
+  output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  
+  def setup
+    delay 1000
+    my_lcd.setxy 0,0, "bienvenue"
+        delay 5000
+  end
+  
+  def loop  
+ 
+    if @flag == false
+      staging
+    else
+      test_address 
+    end
+    delay 100
+  end
+  
+  def staging
+    my_lcd.setxy 0,0, "press button one to"
+    my_lcd.setxy 0,1, "set address to "
+    my_lcd.print @blink_m_start_address
+    my_lcd.setxy 0,2, "or two for status"
+    delay 60
+    my_lcd.setxy 0,3, "                "
+    my_lcd.setxy 0,3
+    800.times do |i|
+      return 0 if @flag == true
+      my_lcd.print "." if i % 50 == 0 
+      delay 5
+      if button_one.read_input
+        assign_address 
+      elsif button_two.read_input
+        test_address
+      end 
+    end
+    @blink_m_start_address += 1 
+  end
+  
+  def assign_address
+    @flag = true
+    my_lcd.clearscr "setting to "
+    my_lcd.print @blink_m_start_address
+    delay 100
+    BlinkM_setAddress @blink_m_start_address
+    my_lcd.clearscr "done"
+    control_it
+  end
+  
+  def control_it
+    delay 500
+    my_lcd.clearscr "stopping script"
+    BlinkM_stopScript @blink_m_start_address
+    my_lcd.clearscr "stopping script.."
+    delay 500
+    my_lcd.clearscr "fade to purple.."
+    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+    my_lcd.clearscr "fade to purple"
+    delay 500
+    BlinkM_fadeToRGB(@blink_m_start_address, 0xff,0x00,0xff)
+  end
+  
+  
+  def test_address
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "testing address"
+    my_lcd.setxy 0,1
+    my_lcd.print blink_m_check_address_message @blink_m_start_address
+    delay 5000
+  end
+
+  
+    
+
+end