atduskgreg-rad 0.2.5

data/spec/examples/hello_world.rb

@@ -0,0 +1,11 @@
+# Hardware: LED connected on pin 7
+
+class HelloWorld < ArduinoSketch
+  output_pin 7, :as => :led
+  def loop
+    digitalWrite led, ON
+    delay 500
+    digitalWrite led, OFF
+    delay 500
+  end
+end

data/spec/examples/serial_motor.rb

@@ -0,0 +1,12 @@
+# Hardware: motor control circuit (i.e. TIP-120 control pin)
+#           connected at pin 7.
+#     Demo: http://www.youtube.com/watch?v=7OguEBfdTe0
+
+class SerialMotor < ArduinoSketch
+  output_pin 7, :as => :motor
+  serial_begin
+  
+  def loop
+    digitalWrite(motor, serial_read) if serial_available
+  end
+end

data/spec/models/arduino_sketch_spec.rb

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/rad/arduino_sketch.rb")
+
+context "Arduino#serial_begin" do
+  setup do
+    @as = ArduinoSketch.new
+  end
+  
+  specify "should default baud_rate to 9600" do
+    @as.serial_begin
+    @as.instance_variable_get("@other_setup").should include("Serial.begin(9600);")
+  end
+  specify "should set an alternate baud_rate if told" do
+    @as.serial_begin :rate => 2400
+    @as.instance_variable_get("@other_setup").should include("Serial.begin(2400);")
+  end
+  specify "should add the correct function call to the composed_setup" do
+    @as.serial_begin
+    @as.compose_setup.should match(Regexp.new(Regexp.escape("Serial.begin(9600);")))
+  end
+end
+
+
+context "Arduino Base" do
+  setup do
+    @as = ArduinoSketch.new
+  end
+  
+  specify "output_pin method without :as arg. should add the pin to the pin_mode hash's output list and leave the declarations alone" do
+    @as.output_pin 1
+    @as.instance_variable_get("@declarations").first.should == nil
+    @as.instance_variable_get("@pin_modes")[:output].should include(1)
+  end
+  
+  specify "output_pin method with :as arg. should add the pin to the pin_mode hash's output list write the appropriate declaration and accessor" do
+    @as.output_pin 3, :as => :led
+    @as.instance_variable_get("@declarations").first.should == "int _led = 3;"
+    @as.instance_variable_get("@accessors").first.should == "int led(){\nreturn _led;\n}"
+    @as.instance_variable_get("@pin_modes")[:output].should include(3)
+  end
+  
+  specify "output_pins method should add the pin to the pin_mode hash's output list and leave the declarations and accessors alone" do
+    @as.output_pins [5,4,3,2]
+    @as.instance_variable_get("@pin_modes")[:output].should include(5)
+    @as.instance_variable_get("@pin_modes")[:output].should include(4)
+    @as.instance_variable_get("@pin_modes")[:output].should include(3)
+    @as.instance_variable_get("@pin_modes")[:output].should include(2)
+    @as.instance_variable_get("@declarations").first.should == nil
+    @as.instance_variable_get("@accessors").first.should == nil
+  end
+  
+  specify "input_pin method with :as arg. should add the pin to the pin_mode hash's input list write the appropriate declaration and accessor" do
+    @as.input_pin 1, :as => :knob
+    @as.instance_variable_get("@declarations").first.should == "int _knob = 1;"
+    @as.instance_variable_get("@accessors").first.should == "int knob(){\nreturn _knob;\n}"
+    @as.instance_variable_get("@pin_modes")[:input].should include(1)
+  end
+  
+  specify "input_pins method should add the pins to the pin_mode hash's input list and leave the declarations and accessors alone" do
+    @as.input_pins [5,4,3,2]
+    @as.instance_variable_get("@pin_modes")[:input].should include(5)
+    @as.instance_variable_get("@pin_modes")[:input].should include(4)
+    @as.instance_variable_get("@pin_modes")[:input].should include(3)
+    @as.instance_variable_get("@pin_modes")[:input].should include(2)
+    @as.instance_variable_get("@declarations").first.should == nil
+    @as.instance_variable_get("@accessors").first.should == nil
+  end
+  
+  specify "compose_setup should append each appropriate pinMode statement and :as accessor to the setup_function string with a newline" do
+    @as.output_pins [1, 2]
+    @as.input_pin 3, :as => :button
+    
+    result = @as.send :compose_setup
+    
+    result.should match(Regexp.new(Regexp.escape("pinMode(1, OUTPUT);\n")))
+    result.should match(Regexp.new(Regexp.escape("pinMode(2, OUTPUT);\n")))
+    result.should match(Regexp.new(Regexp.escape("pinMode(3, INPUT);\n")))
+    result.should match(Regexp.new(Regexp.escape("int _button = 3;\n")))
+    result.should match(Regexp.new(Regexp.escape("int button(){\nreturn _button;\n}")))
+  end
+  
+end

data/spec/models/sketch_compiler_spec.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/rad/sketch_compiler.rb")
+
+context "SketchCompiler#sketch_methods" do
+  before do
+    @as = File.expand_path(File.dirname(__FILE__)) + "/../../lib/examples/i2c_with_clock_chip.rb"
+    @sc = SketchCompiler.new @as
+  end
+  
+  it "should locate all the methods defined in the sketch" do
+    @sc.sketch_methods.should include( "loop")
+    @sc.sketch_methods.should include( "printlz")
+    @sc.sketch_methods.should include( "print_hexbyte")
+    @sc.sketch_methods.should include( "clear_bottom_line")
+  end
+end
+
+context "SketchCompiler#process_constants" do
+  before do
+    @as = File.expand_path(File.dirname(__FILE__)) + "/../../lib/examples/external_variable_fu.rb"
+    @sc = SketchCompiler.new @as
+  end
+  
+  it "should correctly process constants" do
+    @sc.process_constants
+    @sc.body.should_not match(/HIGH/)
+    @sc.body.should_not match(/LOW/)
+    @sc.body.should_not match(/ON/)
+    @sc.body.should_not match(/OFF/)
+  end
+end
+
+context "SketchCompiler.new" do
+  before do
+    @as = File.expand_path(File.dirname(__FILE__)) + "/../../lib/examples/add_hysteresis.rb"
+  end
+  it "should correctly absolutize a path with /../ that starts at /" do
+    SketchCompiler.new(@as).path.should == "/Users/greg/code/rad/lib/examples/add_hysteresis.rb"
+  end
+  
+  it "should correct absolutize a relative path" do
+    SketchCompiler.new("lib/examples/add_hysteresis.rb").path.should == "/Users/greg/code/rad/lib/examples/add_hysteresis.rb"
+  end
+  
+  it "should load the body of the sketch" do
+    sc = SketchCompiler.new @as
+    sc.body.should == open(@as).read
+  end
+    
+end
+
+context "SketchCompiler#sketch_class" do
+  before do
+    @sc = SketchCompiler.new File.expand_path(File.dirname(__FILE__)) + "/../../lib/examples/add_hysteresis.rb"
+  end
+  it "should calculate correctly from the path" do
+    @sc.klass.should == "AddHysteresis"
+  end
+end
+
+context "SketchCompiler#create_build_dir! without a path prefix" do
+  before do
+    @sc = SketchCompiler.new("lib/examples/add_hysteresis.rb")
+  end
+  it "should create the sketch dir in the correct place" do
+    @sc.should_receive( :mkdir_p ).with( "/Users/greg/code/rad/lib/examples/add_hysteresis" )
+    @sc.create_build_dir!
+  end
+end
+
+context "SketchCompiler#create_build_dir! with a path prefix" do
+  before do
+    @sc = SketchCompiler.new("lib/examples/add_hysteresis.rb")
+  end
+  it "should create the sketch dir in the correct place" do
+    @sc.should_receive( :mkdir_p ).with( "prefix/add_hysteresis" )
+    @sc.create_build_dir! "prefix"
+  end
+end
+
+context "SketchCompiler#build_dir" do
+  before do
+    @sc = SketchCompiler.new("lib/examples/add_hysteresis.rb")
+  end
+  
+  
+  it "should be correct with a default target_dir" do
+    @sc.build_dir.should == "/Users/greg/code/rad/lib/examples/add_hysteresis"
+  end
+  
+  it "should be correct with an altered target_dir" do
+    @sc.target_dir = "examples"
+    @sc.build_dir.should == "examples/add_hysteresis"
+  end
+  
+end

data/spec/models/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'spec'

data/spec/sim/hello_world_spec.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + './models/spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + "/../../lib/rad/sim/arduino_sketch.rb")
+require File.expand_path(File.dirname(__FILE__) + "/../examples/hello_world.rb" )
+
+context "ArduinoSketch running HelloWorld example" do
+  it "should successfully make an instance" do
+    lambda{HelloWorld.new}.should_not raise_error
+  end
+end
+
+context "HelloWorld#led" do
+  it "should return a correctly configured Pin" do
+    p = HelloWorld.new.led
+    p.type.should == :output
+    p.num.should == 7
+    p.value.should == false
+  end
+end
+
+context "HelloWorld#digitalWrite" do
+  setup do
+    @h = HelloWorld.new
+  end 
+
+  it "should set the value of the pin to true if told to" do
+    @h.digitalWrite(@h.led, ON)
+    @h.led.value.should == true
+  end
+
+  it "should set the value of the pin to false if told to" do
+    @h.digitalWrite(@h.led, OFF)
+    @h.led.value.should == false
+  end
+end
+
+context "HelloWorld#delay" do
+  it "should maybe keep track of the time in some way?"
+end
+
+context "HelloWorld#loop" do
+  it "should execute the loop in the context of the instance"
+end

data/spec/spec.opts

@@ -0,0 +1 @@
+--colour

data/test/test_array_processing.rb

@@ -0,0 +1,179 @@
+$TESTING = true
+
+# need to tell it where we are
+# lets review these
+# neee to remove this constant from tests and pull it from rad
+C_VAR_TYPES = "unsigned|int|long|double|str|char|byte|float|bool"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
+require 'test/unit'
+
+
+class TestArrayProcessing < Test::Unit::TestCase
+
+  def setup
+    @t = ArduinoSketch.new
+    # vars
+  end
+  
+  # with July 25 2008 rework of arrays, this needs reworking/pruning
+  
+  def test_int_array
+    name = "foo_a"
+    value_string = "int tomatoes[]"
+    expected = "int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_semi
+    name = "foo_b"
+    value_string = "int tomatoes[];"
+    expected = "int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_assignment
+    name = "foo_c"
+    value_string = "int tomatoes[] = {1,2,3,4}"
+    expected = "int tomatoes[] = {1,2,3,4};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_int_array_with_assignment_and_semi
+    name = "foo_d"
+    value_string = "int tomatoes[] = {1,2,3};"
+    expected = "int tomatoes[] = {1,2,3};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_unsigned_int_array
+    name = "foo_e"
+    value_string = "unsigned int tomatoes[]"
+    expected = "unsigned int tomatoes[];"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_unsigned_int_array_with_assignment
+    name = "foo_f"
+    value_string = "unsigned int tomatoes[] = {1,2,3};"
+    expected = "unsigned int tomatoes[] = {1,2,3};"
+    result = @t.array(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  ### adding defines
+  
+  def test_define_numbers
+    name = "foo_g"
+    value_string = "NUMBERS 10"
+    expected = "#define NUMBERS 10"
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_numbers_type
+    name = "foo_gg"
+    value_string = "NUMBERS 10"
+    expected = "long"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+  
+  def test_define_value_type_long_via_gvar
+    name = "foo_ggg"
+    value_string = "NUMBERS 10"
+    expected = "long"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["NUMBERS"])
+  end
+  
+  def test_define_string
+    name = "foo_h"
+    value_string = "TEXT word"
+    expected = "#define TEXT \"word\""
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_string_type
+     name = "foo_hh"
+     value_string = "TEXT word"
+     expected = "str"
+     result = @t.define(value_string)
+     assert_equal(expected, result[1])
+   end
+   
+   def test_define_string_type__via_gvar
+     name = "foo_hhh"
+     value_string = "TEXT word"
+     expected = "str"
+     result = @t.define(value_string)
+     assert_equal(expected, $define_types["TEXT"])
+   end
+  
+  def test_define_stings_with_spaces
+    name = "foo_i"
+    value_string = "TEXT words with spaces"
+    expected = "#define TEXT \"words with spaces\""
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_stings_with_spaces_type
+    name = "foo_ii"
+    value_string = "TEXT words with spaces"
+    expected = "str"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+  
+  def test_define_stings_with_spaces_type_via_gvar
+    name = "foo_iii"
+    value_string = "TEXT words with spaces"
+    expected = "str"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["TEXT"])
+  end
+  
+  def test_define_float
+    name = "foo_j"
+    value_string = "FLOAT 10.0"
+    expected = "#define FLOAT 10.0"
+    result = @t.define(value_string)
+    assert_equal(expected, result[0])
+  end
+  
+  def test_define_float_type
+    name = "foo_jj"
+    value_string = "FLOAT 10.0"
+    expected = "float"
+    result = @t.define(value_string)
+    assert_equal(expected, result[1])
+  end
+
+  
+  def test_define_float_type_via_gvar
+    name = "foo_jjj"
+    value_string = "FLOAT 10.0"
+    expected = "float"
+    result = @t.define(value_string)
+    assert_equal(expected, $define_types["FLOAT"])
+  end
+  
+#
+  
+  
+  
+  
+  
+  
+  
+  
+  # question for brian... do we need variable assignment with no value when
+  # we have "" and 0
+end

data/test/test_plugin_loading.rb

@@ -0,0 +1,151 @@
+#!/usr/local/bin/ruby -w
+
+$TESTING = true
+
+# this is a test stub for now
+# lets review these
+# neee to remove this constant from tests and pull it from rad
+PLUGIN_C_VAR_TYPES = "int|void|unsigned|long|short|uint8_t|static|char\\*|byte"
+
+require "rubygems"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_processor.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_rewriter.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/rad_type_checker.rb"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/variable_processing"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_sketch"
+require "#{File.expand_path(File.dirname(__FILE__))}/../lib/rad/arduino_plugin"
+require 'test/unit'
+
+
+
+
+class TestPluginLoading < Test::Unit::TestCase
+
+  
+
+
+  def setup
+    $external_var_identifiers = ["__foo", "__toggle", "wiggle"]   
+    $define_types = { "KOOL" => "long", "ZAK" => "str"}
+    $array_types = { "my_array" => "int"}  
+    $plugin_directives = []
+    $plugin_external_variables = []
+    $plugin_signatures =[]
+    $plugin_methods = []
+    $add_to_setup = []
+    $load_libraries = []
+    $plugin_structs = {}
+    $plugin_methods_hash = {}  
+    $plugins_to_load = []  
+    plugin_signatures = []
+    plugin_methods = []
+     
+    @plugin_string =<<-STR
+    class PluginTesting < ArduinoPlugin
+
+
+
+     #
+     #
+     #  BlinkM_funcs.h -- Arduino library to control BlinkM
+     #  --------------
+     #
+     #
+     #  Note: original version of this file lives with the BlinkMTester sketch
+     #
+     #  2007, Tod E. Kurt, ThingM, http://thingm.com/
+     #
+     #  version: 20080203
+     #
+     #  history:
+     #   20080101 - initial release
+     #   20080203 - added setStartupParam(), bugfix receiveBytes() from Dan Julio
+     #	20080727 - ported to rad jd barnhart
+     #
+     #   first step, declare output pin 19 as i2c
+     ##  output_pin 19, :as => :wire, :device => :i2c, :enable => :true # reminder, true issues wire.begin
+
+
+     include_wire
+
+     add_blink_m_struct
+
+
+
+     # Not needed when pin is declared with :enable => :true 
+
+     static int BlinkM_sendBack(byte addr)
+     {
+       int num = 0x11;
+       char buf[5];
+       itoa(num, buf, 16);
+       return "cool"
+     }
+ 
+     static char* another_method(byte addr)
+     {
+       int num = 0x11;
+       char buf[5];
+       itoa(num, buf, 16);
+       return "cool"
+     }
+
+    end
+    STR
+
+    @sketch_string =<<-STR
+    class SanMiquel < 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
+         delay 100
+         my_lcd.home "k"
+         my_lcd.setxy 0,1
+
+         BlinkM_sendBack 10
+         delay 1000
+         test_address
+       end
+
+
+    end
+
+    STR
+    
+  end
+  
+  # remove these external variables and parens on variables
+  # need to actually run code through ruby_to_c for some of these tests
+  
+  def test_int
+    name = "foo_a"
+    # check_for_plugin_use(sketch_string, plugin_string, file_name)
+    ArduinoPlugin.check_for_plugin_use(@sketch_string, @plugin_string, "hello_plugins")
+    value_string = "int(__toggle = 0);"
+    expected =  ["hello_plugins"]
+    result = $plugins_to_load
+    assert_equal(expected, result)
+  end
+  
+  def test_two
+    name = "foo_a"
+    # check_for_plugin_use(sketch_string, plugin_string, file_name)
+    ArduinoPlugin.check_for_plugin_use(@sketch_string, @plugin_string, "hello_plugins")
+    value_string = "int(__toggle = 0);"
+    expected = {"hello_plugins"=>["BlinkM_sendBack", "another_method"]}
+    result = $plugin_methods_hash
+    assert_equal(expected, result)
+  end
+  
+  
+  
+  ## need to look at unsigned long 
+  ## need parens removal tests
+  
+
+
+end