madrona-rad 0.2.5 → 0.2.6

data/History.txt

@@ -1,3 +1,17 @@
+== 0.2.6 2008-07-30
+* Tres grand update:
+	- added support for spectra_soft_pots
+	- added support and examples for blinkMs
+	- added multi sensor hysteresis -- formerly one sensor only
+	- added testing for plugin loading
+	- external arrays now have cool instance style plus 
+	- drop down the metal style declarations
+	- iteration on external arrays now works. internal still problematic
+	- defines now work handily
+	- numerous lcd library changes plus enhancements: setxy 0,1, "print_something"
+	- lots of examples
+	- and much more
+
 == 0.2.5 2008-07-21
 * 1ish large post Bastille Day update:
 	- added i2c capability

data/Manifest.txt

@@ -5,78 +5,101 @@ README.rdoc
 Rakefile
 bin/rad
 lib/examples/add_hysteresis.rb
+lib/examples/blink_m_address_assignment.rb
 lib/examples/blink_m_hello.rb
+lib/examples/blink_m_multi.rb
+lib/examples/configure_pa_lcd_boot.rb
 lib/examples/debounce_methods.rb
-lib/examples/external_variables.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_eeprom.rb
+lib/examples/hello_eeprom_lcdpa.rb
+lib/examples/hello_lcd_charset.rb
+lib/examples/hello_pa_lcd.rb
 lib/examples/hello_servos.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/orig_servo_throttle.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/keywords.txt
 lib/libraries/FrequencyTimer2/FrequencyTimer2.cpp
 lib/libraries/FrequencyTimer2/FrequencyTimer2.h
-lib/libraries/OneWire/keywords.txt
+lib/libraries/FrequencyTimer2/keywords.txt
 lib/libraries/OneWire/OneWire.cpp
 lib/libraries/OneWire/OneWire.h
+lib/libraries/OneWire/keywords.txt
 lib/libraries/OneWire/readme.txt
-lib/libraries/Servo/keywords.txt
-lib/libraries/Servo/Servo.cpp
-lib/libraries/Servo/Servo.h
 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/Servo/keywords.txt
+lib/libraries/Stepper/Stepper.cpp
+lib/libraries/Stepper/Stepper.h
+lib/libraries/Stepper/keywords.txt
 lib/libraries/Wire/Wire.cpp
-lib/libraries/Wire/keywords.txt
 lib/libraries/Wire/Wire.h
+lib/libraries/Wire/keywords.txt
 lib/libraries/Wire/twi.h
-lib/libraries/Wire/utilities/twi.c
-lib/libraries/Wire/utilities/twi.h
+lib/libraries/Wire/utility/twi.c
+lib/libraries/Wire/utility/twi.h
 lib/plugins/bitwise_ops.rb
 lib/plugins/blink_m.rb
 lib/plugins/debounce.rb
 lib/plugins/debug_output_to_lcd.rb
+lib/plugins/hysteresis.rb
 lib/plugins/i2c_eeprom.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_sketch.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/init.rb
 lib/rad/rad_processor.rb
 lib/rad/rad_rewriter.rb
-lib/rad/variable_processing.rb
-lib/rad/init.rb
-lib/rad/todo.txt
+lib/rad/rad_type_checker.rb
+lib/rad/sim/arduino_sketch.rb
 lib/rad/tasks/build_and_make.rake
 lib/rad/developer.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
-lib/test/test_array_processing.rb
-lib/test/test_variable_processing.rb
 scripts/txt2html
 setup.rb
 spec/models/spec_helper.rb
 spec/models/arduino_sketch_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
@@ -85,4 +108,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/Rakefile

@@ -8,6 +8,11 @@ require 'rake/rdoctask'
 require 'rake/contrib/rubyforgepublisher'
 require 'fileutils'
 require 'hoe'
+
+RAD_ROOT = File.expand_path(File.dirname(__FILE__))
+
+load "#{RAD_ROOT}/project_dev.rake"
+
 begin
   require 'spec/rake/spectask'
 rescue LoadError

data/bin/rad

@@ -119,6 +119,10 @@ FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/Servo/.", "#{sketch_n
 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
@@ -127,6 +131,10 @@ FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/libraries/SWSerLCDsf/.", "#{ske
 puts "Installed SWSerLCDsf 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/Wire/.", "#{sketch_name}/vendor/libraries/Wire"
 puts "Installed Wire into #{sketch_name}/vendor/libraries"
 puts
@@ -142,12 +150,14 @@ puts
 
 # Build test -- used testing
 
-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
+# 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:  
 

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

data/lib/examples/blink_m_multi.rb

@@ -0,0 +1,61 @@
+class BlinkMMulti < ArduinoSketch
+
+  # demonstrate control of individual blinkms
+  # this assumes the leds have been assigned addresses 10, 11, 12
+  # which can be done with blink m address assignment
+
+  # two ways to address the blinkms, array and individual variables
+  @blink_addresses = [10,11,12]
+  @addr_all = "0, byte" 
+  @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
+  input_pin 10,  :as => :button_four, :device => :button
+  
+  # display the action on a 4x20 pa_lcd, yours may be 9200 instead of 19,200
+
+  output_pin 5, :as => :my_lcd, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+  
+  
+  def loop  
+    stop_and_fade(@addr1) if button_one.read_input
+    stop_and_fade(@addr2) if button_two.read_input 
+    stop_and_fade(@addr3) if button_three.read_input 
+    dance if button_four.read_input 
+  end
+  
+  def stop_and_fade(addr)
+    f = 1 + addr # hack to coerce addr to int
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "blinkm # "
+    my_lcd.print addr
+    delay 700
+    BlinkM_stopScript addr
+    my_lcd.setxy 0,1, "stopping script.."
+    delay 700
+    my_lcd.setxy 0,2, "fade to purple.."
+    BlinkM_fadeToRGB(addr, 0xff,0x00,0xff)
+  end
+  
+  def dance
+    BlinkM_setFadeSpeed(@addr_all, 20) # 1-255, with 1 producing the slowest fade
+    my_lcd.clearscr
+    my_lcd.setxy 0,0, "Do the shimmy.."
+    my_lcd.setxy 0,1
+    @blink_addresses.each do |a|
+      BlinkM_fadeToRGB(a, 1,166,138)
+      delay 100
+    end
+    @blink_addresses.each do |a|
+      BlinkM_fadeToRGB(a, 35,0,112)
+      delay 100
+    end
+  end
+    
+
+end

data/lib/examples/configure_pa_lcd_boot.rb

@@ -0,0 +1,91 @@
+class ConfigurePaLcdBoot < ArduinoSketch
+  
+## important!  
+## most pa_lcd rates are set to 9200, but there are some newer at 19200
+## if you have a 19200, uncomment the end of line 38
+  
+## purpose:  
+## change cursor to none
+## and add custom boot screen
+## 
+## jd's preferred setup for pa_lcd
+## 
+## assumes 4 x 20 pa_lcd
+## 
+## no blinking cursor press button 1
+## configure custom start up screen - press button 2
+## configure lcd to use custom startup screen - press button 3
+## 
+## press buttons one, two and three 
+## or season to taste
+##
+## refernce
+## K107 LCD Controller Board Manual
+## page 11 for cursors
+## page 13 for custom boot
+## http://wulfden.org/downloads/manuals/K107manual.pdf
+##
+##
+
+## set pins to your setup
+
+
+   input_pin 8,  :as => :button_one, :device => :button
+   input_pin 9,  :as => :button_two, :device => :button
+   input_pin 10, :as => :button_three, :device => :button
+   
+   ## note, most of these controllers are set to 9200
+   output_pin 14, :as => :my_lcd, :device => :pa_lcd #, :rate => 19200
+
+   
+   def loop
+     set_cursor     if button_one.read_input 
+     set_custom_screen      if button_two.read_input 
+     change_boot_to_custom  if button_three.read_input 
+   end
+   
+   ## assumes 4 x 20 screen
+   ## maintain 20 characters after ?Cn
+   ## wny delays?  the controller needs them to give it 
+   ## enough time to write 20 bytes to internl EEPROM
+   def set_custom_screen
+     my_lcd.clearscr
+     my_lcd.print "?C0   RAD & Arduino    "
+     delay 400
+     my_lcd.print "?C1    Development     "
+     delay 400
+     my_lcd.print "?C2                    "
+     delay 400
+     my_lcd.print "?C3      v0.3.0        "
+   end
+   
+   
+   ## ?c0 for no cursor
+   ## ?c2 for non blinking cursor
+   ## ?c3 for blinking cursor
+   def set_cursor
+     my_lcd.clearscr
+     my_lcd.print "Changing to "
+     my_lcd.setxy 0,1
+     my_lcd.print "no cursor. "
+     my_lcd.setxy 0,3
+     my_lcd.print "Reboot to view... "
+     
+     my_lcd.print("?c0")
+   end
+   
+   ## "?S0 for blank screen 
+   ## ?S1 for configuration settings 
+   ## ?S2 for custom text screen
+   def change_boot_to_custom
+     my_lcd.clearscr
+     my_lcd.print "Changing to "
+     my_lcd.setxy 0,1
+     my_lcd.print "custom boot screen. "
+     my_lcd.setxy 0,3
+     my_lcd.print "Reboot to view... "
+     my_lcd.print("?S2")
+   end
+
+  
+end