madrona-rad 0.2.4 → 0.2.5

data/History.txt

@@ -1,3 +1,13 @@
+== 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 

data/Manifest.txt

@@ -5,19 +5,33 @@ README.rdoc
 Rakefile
 bin/rad
 lib/examples/add_hysteresis.rb
+lib/examples/blink_m_hello.rb
+lib/examples/debounce_methods.rb
+lib/examples/external_variables.rb
+lib/examples/external_variable_fu.rb
 lib/examples/first_sound.rb
 lib/examples/frequency_generator.rb
+lib/examples/hello_eeprom.rb
 lib/examples/hello_servos.rb
 lib/examples/hello_world.rb
+lib/examples/i2c_with_clock_chip.rb
 lib/examples/orig_servo_throttle.rb
 lib/examples/servo_buttons.rb
 lib/examples/servo_throttle.rb
 lib/examples/sparkfun_lcd.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/OneWire/OneWire.cpp
+lib/libraries/OneWire/OneWire.h
+lib/libraries/OneWire/readme.txt
 lib/libraries/Servo/keywords.txt
 lib/libraries/Servo/Servo.cpp
 lib/libraries/Servo/Servo.h
@@ -25,9 +39,17 @@ lib/libraries/SWSerLCDpa/SWSerLCDpa.cpp
 lib/libraries/SWSerLCDpa/SWSerLCDpa.h
 lib/libraries/SWSerLCDsf/SWSerLCDsf.cpp
 lib/libraries/SWSerLCDsf/SWSerLCDsf.h
+lib/libraries/Wire/Wire.cpp
+lib/libraries/Wire/keywords.txt
+lib/libraries/Wire/Wire.h
+lib/libraries/Wire/twi.h
+lib/libraries/Wire/utilities/twi.c
+lib/libraries/Wire/utilities/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/i2c_eeprom.rb
 lib/plugins/input_output_state.rb
 lib/plugins/mem_test.rb
 lib/plugins/servo_pulse.rb
@@ -39,13 +61,17 @@ lib/rad/arduino_sketch.rb
 lib/rad/arduino_plugin.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/tasks/build_and_make.rake
+lib/rad/developer.rake
 lib/rad/tasks/rad.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

data/bin/rad

@@ -103,9 +103,16 @@ puts
 FileUtils.mkdir_p "#{sketch_name}/vendor/libraries"
 puts "Successfully created your libraries directory."
 
+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 Servo into #{sketch_name}/vendor/libraries"
+puts "Installed FrequencyTimer2 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"
@@ -120,6 +127,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/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"
@@ -129,6 +140,14 @@ FileUtils.cp_r "#{File.dirname(__FILE__)}/../lib/examples/.", "#{sketch_name}/ex
 puts "Installed examples into #{sketch_name}/examples"
 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
 
 # Build vendor/plugins:  
 
@@ -151,42 +170,15 @@ File.open("#{sketch_name}/#{sketch_name}.rb", "w") do |file|
   file << <<-EOS
 class #{sketch_name.split("_").collect{|c| c.capitalize}.join("")} < ArduinoSketch
   
-  # quick overview:
-  # external variables can be added.. use a comma separation, colons are added automatically
-  # 
-  #external_vars :foo => "long unsigned, 0", :bar => "int"
-  # result "long unsigned foo = 0" and "int bar;"
-  # note while this is ruby, many methods and some operators you take for granted are not implemented
-  # some examples: blocks, case statements, +=
-  # keep it simple and remember that the arduino uses a simple loop 
-  # you can branch out with your other methods here or use 
-  # add_to_setup to call a method once (todo: look at signatures)
-  # since all the methods are converted to C, assumptions are made regarding variable types
-  # for example if we need integers to call serial_print hack = input + output + 1
-  # pin examples
-  # input_pin 10, :as => :back_on_button, :latch => :off
-  # input_pin 12, :as => :back_off_button, :latch => :off
-  # output_pin 5, :as => :red_led
-  # input_pin 8, :as => :red_button, :latch => :off, :adjust => 250
-  # output_pin 4, :as => :top_servo, :min => 700, :max => 2200
-  
-  # three line servo (don't forget do declare servo_amount')
-  # sensor_position = analogRead(sensor)
-  # servo_amount = (sensor_position*2 + 500)
-  # move_servo top_servo, servo_amount
-  # one line debounce:
-  # debounce_toggle(button, led)
-  # debounce a read (returns high)
-  # do_something if debounce_read(button, led)
-  
-  
+  # 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
   
-  # hello world (uncomment to run)
-  
-  #output_pin 13, :as => :led
-  #  def loop
-  #    blink led, 100 
-  #  end
+    def loop
+     # your code here
+    end
+    
 end
   EOS
 end

data/lib/examples/blink_m_hello.rb

@@ -0,0 +1,14 @@
+class BlinkMHello < ArduinoSketch
+
+  # just a scaffolding for blink_m_demo 
+
+  output_pin 19, :as => :wire, :device => :i2c, :enable => :true
+  
+  def loop
+
+	  x = 4    
+  
+  end
+    
+
+end

data/lib/examples/debounce_methods.rb

@@ -0,0 +1,49 @@
+class DebounceMethods < ArduinoSketch
+  
+  output_pin 13, :as => :led 
+  input_pin 6, :as => :button_one, :device => :button # can also :adjust => 300
+  input_pin 7, :as => :button_two, :device => :button
+  input_pin 8, :as => :button_three, :device => :button
+  input_pin 9, :as => :button_four, :device => :button  
+  input_pin 10, :as => :button_five, :device => :button  
+  
+  # depressing and releasing button_one, button_two or button_four do the same thing
+  # with a slightly different syntax and number of blinks
+  # button_three simply toggles the led with the read_and_toggle method
+  # button_five does it with a twist
+
+     def loop
+       blink_twice if read_input button_one
+       blink_three_times if read_input button_two
+       button_three.read_and_toggle led #  
+       blink_three_times_basic if read_input button_four
+       blink_with_a_twist if read_input button_five
+     end
+     
+     def blink_twice
+        2.times do |i|
+          led.blink 200 + i
+        end
+      end
+     
+     def blink_three_times
+       3.times { led.blink 200 }
+     end
+
+     # no blink helper
+     def blink_three_times_basic
+       4.times do 
+         led.digitalWrite HIGH
+         delay 200
+         led.digitalWrite LOW
+         delay 200
+       end
+     end
+     
+     def blink_with_a_twist
+       20.times do |i|
+         led.blink i * 10
+       end
+     end     
+     
+end

data/lib/examples/external_variable_fu.rb

@@ -0,0 +1,24 @@
+class ExternalVariableFu < ArduinoSketch
+  
+@one = int
+@two = long
+@three = unsigned
+@four = short
+@five = byte
+@six = 1
+@seven = 1.2
+@eight = "0x00"
+@nine = "arduino"
+@ten = true
+@eleven = false
+@twelve = "1, long"
+@thirteen = "1, unsigned"
+@fourteen = "1, byte"
+
+
+
+     def loop
+      delay @six
+     end
+     
+end

data/lib/examples/external_variables.rb

@@ -0,0 +1,31 @@
+class ExternalVariables < ArduinoSketch
+
+  define "DS1307_CTRL 7"
+  define "DS1308_CTRL 7"
+  array "char buffer[32];"
+  array "char bufferz[32];"
+
+
+  @foo = 1
+  @bidda = "badda"
+  @boom = "1, int"
+  @rad = "1.00"
+  
+  
+  
+  def loop
+
+	  delay 1
+	  @foo = 2
+  
+  end
+  
+  def setup # special one time only method
+    delay 100
+    delay 100
+    @foo = 10
+    5.times { delay 200 }
+  end
+    
+
+end

data/lib/examples/hello_eeprom.rb

@@ -0,0 +1,54 @@
+class HelloEeprom < ArduinoSketch
+  
+  output_pin 19, :as => :rtc, :device => :i2c_ds1307, :enable => :true
+  output_pin 19, :as => :mem0, :device => :i2c_eeprom
+
+  output_pin 14, :as => :myLCD, :device => :pa_lcd, :rate => 19200
+    
+  def loop
+	    myLCD.home					# set to 0,0
+	    myLCD.print rtc.get(5, 1)	# refresh registers (=1) get month
+     	myLCD.print "/"
+	    myLCD.print rtc.get(4, 0)	# no need to refresh (=0) get day 
+     	myLCD.print "/"
+	    myLCD.print rtc.get(6, 0)	# get year
+     	myLCD.setxy(1,1)			# set in 1 byte line 1 (second line)
+     	printlz 2					# print hours with lead zero
+     	myLCD.print ":"
+	    printlz 1					# print minutes with lead zero
+     	myLCD.print ":"
+	    printlz 0					# print seconds with lead zero
+	    
+
+		myLCD.setxy 10,0
+		myLCD.print "write test"
+		myLCD.setxy 0,2
+		32.upto(109) do				# write address of byte to that b yte
+			|x| i2c_eeprom_write_byte  0x50, x, x
+			myLCD.print(".") if x%2
+			delay 10
+		end
+
+		delay 2000
+		
+		myLCD.setxy 0,2 	# clears bottom two lines           
+		myLCD.print "?l"
+		myLCD.setxy 0,3
+		myLCD.print "?l"
+
+		myLCD.setxy 10,0
+		myLCD.print "read test "
+		myLCD.setxy 0,2
+									# read and print 39 addresses with printable numbers
+		75.upto(113) { |x| myLCD.print(i2c_eeprom_read_byte(0x50, x)) }
+		delay 10000
+		myLCD.clearscr
+  end
+  
+  def	printlz(w)
+  			i = 0 + rtc.get(w,0)         # the '0 +' is YARH (Yet Another RubyToc Hack)
+  			myLCD.print "0" if i < 10
+  			myLCD.print i
+  end
+
+end

data/lib/examples/i2c_with_clock_chip.rb

@@ -0,0 +1,124 @@
+class I2cWithClockChip < ArduinoSketch
+  
+# ----------------------------------------------------------------------------------
+#   <b>Time and Temp  (20 July 2008)</b>
+#   Example #1 - Brian Riley, Underhill Center, VT USA <brianbr@wulden.org>
+#   
+#   Connections
+#     I2C bus - DS1307 Real Time Clock chip
+#     Analog 0 (a.k.a Digital 14) - Wulfden K107 seria LCD Controller
+#                                   Peter Anderson chip
+#     Digital 8 - Dallas SemiConductor DS18B20 One-Wire temperature Sensor (12 bit)
+#
+#   Comment
+#     - This is a straight forward, program with minimal error checking and brute force
+#     delay() calls waiting for temperature conversion readings
+#
+#     - for the external data busses make sure you have 4.7K pullup resistors on the 
+#     data line (OnewWire) and the SDA/SCL (I2C)
+
+# ----------------------------------------------------------------------------------
+ 
+    @hi_byte    = int
+    @lo_byte    = int
+    @t_reading  = int
+    @device_crc = int
+    @sign_bit   = int
+    @tc_100     = int
+                              # implicit in :device => Z:ds1307 is that this i i2c
+                              # :enable => true issues the Wire.begin to ick over i2c
+    output_pin 19, :as => :rtc, :device => :i2c_ds1307, :enable => :true
+                              # software serial tx drives LCD display, screen cleared at startup
+                              # defines the softare protocol for controller as Peter Anderson
+    output_pin 14, :as => :myLCD, :device => :pa_lcd, :rate => 19200, :clear_screen => :true
+                              # defines  this pin as being connected to a DalSemi 1-Wire device
+                              # no specific device drivers yet, the specific device code is on you
+    output_pin 8, :as => :myTemp, :device => :onewire
+
+
+    def loop
+  		  until myTemp.reset do   # reset bus, verify its clear and high
+  		    clear_bottom_line
+  		    myLCD.print " <1Wire Buss Error>"
+  		    delay 2000
+  		  end
+   		
+    		myTemp.skip                 # "listen up - everybody!"
+    		myTemp.write 0x44, 1        # temperature sensors, strta conversion
+
+    		myLCD.setxy 6,0             # while they do that, lets print date/time
+  	    myLCD.print rtc.get(5, 1)
+       	myLCD.print "/"
+  	    myLCD.print rtc.get(4, 0)
+       	myLCD.print "/"
+  	    myLCD.print rtc.get(6, 0)
+       	myLCD.setxy 6,1
+       	printlz rtc.get(2, 0)
+       	myLCD.print ":"
+  	    printlz rtc.get(1, 0)
+       	myLCD.print ":"
+  	    printlz rtc.get(0, 0)
+
+    		delay 800                   # conversion takes about 750 msecs
+
+    		until myTemp.reset do       # reset bus, verify its clear and high
+    		  clear_bottom_line
+    		  myLCD.print " <1Wire Buss Error>"
+    		  delay 2000
+    		end
+     		myTemp.skip                 # listen up!
+    		myTemp.write 0xBE, 1        # send me your data conversions
+
+        @lo_byte = myTemp.read      # get irst byte
+        @hi_byte = myTemp.read      # get second byte
+        
+        # -------------------------------------------------------------
+        clear_bottom_line       # this code is debug - not necessary
+        myLCD.setxy 4,3         # raw hex display of temp value
+        myLCD.print "raw = 0x"
+        print_hexbyte @hi_byte  # prints 2 digit hex w/lead 0
+        print_hexbyte @lo_byte
+        # -------------------------------------------------------------
+
+        7.times { @device_crc = myTemp.read } # get next 6 bytes, drop them on floor
+                                              # next byte the ninth byte is the CRC
+        
+                                # DS18B20 brings data temperature back as 12 bits
+                                # in degrees centigrade with 4 bits fractional, that is 
+                                # each bit s 1/16 of a degreeC
+                                
+        @t_reading  =   build_int @hi_byte, @lo_byte
+        @sign_bit   =   bit_and @t_reading, 0x8000
+        @t_reading  =   twos_comp @t_reading   if @sign_bit  # negative
+
+        @tc_100 = (6 * @t_reading) + (@t_reading / 4)   #multiply by (100 * 0.0625) or 6.25
+
+        myLCD.setxy 2,2
+        if @sign_bit
+            myLCD.print "-"
+        else
+            myLCD.print " "
+        end
+        myLCD.print(@tc_100 / 100)             # separate off the whole 
+        myLCD.print "."
+        printlz(@tc_100 % 100)                  # and fractional portions
+        myLCD.print " degrees C"
+
+    end
+
+    def	printlz(w)
+    			myLCD.print "0" if w < 10
+    			myLCD.print w
+    end
+
+    def	print_hexbyte(w)
+    			myLCD.print "0" if w < 0x10
+    			myLCD.print w, 0x10
+    end
+
+    def clear_bottom_line
+		      myLCD.setxy 0,3
+		      myLCD.print "?l"
+    end
+    
+end