rad 0.2.2 → 0.2.9

data/lib/rad/variable_processing.rb

@@ -0,0 +1,153 @@
+module ExternalVariableProcessing
+  # issues 
+  # testing 
+  # add checking for colon
+
+    
+    ## need to clean this up
+    ## need to test 
+    def process_external_vars(klass)
+      vars = eval "#{klass}.instance_variables"
+      local_vars = []
+      vars.each { |v| local_vars << ":#{v.gsub("@", "")}" }
+      loc_vars = local_vars.join(", ")
+      # add accessors 
+      klass.module_eval "class << self; attr_accessor #{loc_vars} end"
+      local_vars.each do |symbol|
+        name = symbol.gsub(":","")
+        t_var = eval "#{klass}.#{name}"
+        pre_process_vars(name, t_var)
+      end
+    end
+    
+    
+    def pre_process_vars(name, var)
+        # puts 
+        # puts
+        case var
+        when Integer
+          # puts "pre_process: #{name}, #{var}, #{var.inspect} got #{var.class} 29"
+          value = var
+          type = "int"
+          post_process_vars(name, type, value)
+        when Float
+          # puts "pre_process: #{name}, #{var}, #{var.inspect} got #{var.class} 34"
+          value = var
+          type = "float"
+          post_process_vars(name, type, value)
+        when String
+          # puts "pre_process: #{name}, #{var.inspect} got #{var.class} on 39"
+          if var.match(",").nil? && var =~ /long|byte|unsigned|int|short/
+            # puts "pre_process #{name}, #{var.inspect} got #{var.class} level three sublevel"
+            type = var
+            value = nil
+            post_process_vars(name, type, value)
+          else
+            value = var.split(",").first.lstrip
+            type = var.split(",")[1].nil? ?  nil : var.split(",")[1].lstrip
+            translate_variables( name , type, value )
+          end
+        when TrueClass
+          # puts "pre_process: #{name}, #{var}, #{var.inspect} got #{var.class} on 50"
+          value = 1
+          type = "bool"
+          post_process_vars(name, type, value)
+        when FalseClass
+          # puts "pre_process: #{name}, #{var}, #{var.inspect} got #{var.class} on 55"
+          value = 0
+          type = "bool"
+          post_process_vars(name, type, value)
+        when Array
+          post_process_arrays(name, var)
+        else
+          raise ArgumentError, "not sure what to do here...  got #{name} with value #{var} which is a #{var.class}" 
+        end      
+    end     
+    
+    
+    def translate_variables(name, type = nil, value = nil)
+      
+      unless type.nil?
+        check_variable_type(type)
+      end
+
+      # classify the values
+      if value.class == Fixnum 
+        # puts "translate_variables: #{name}, #{value}, #{type} is a fixnum, got #{value.class} on 74"
+      elsif value.class == Float 
+        # puts "translate_variables: #{name}, #{value}, #{type} is a float, got #{value.class} on 76"
+      elsif value =~ /^-(\d|x)*$/ 
+        value = value.to_i
+        type = "int" if type.nil?
+      elsif value =~ /^-(\d|\.|x)*$/ 
+        value = value.to_f
+        unless type.nil?
+          raise ArgumentError, "#{value} should be a float got  #{type}" unless type == "float"
+        end
+        type = "float" if type.nil?   
+
+      elsif value[0,1] !~ /\d/
+        # puts value[0,1]
+        # puts "translate_variables: #{name}, #{value}, #{type} is a number of some type, got #{value.class} on 79"
+        type = "char*"
+        value = "\"#{value}\""
+      elsif value !~ /(\.|x)/
+        # puts "translate_variables: #{name}, #{value}, #{type} is an integer, got #{value.class} on 83"
+        value = value.to_i
+        type = "int" if type.nil?
+      elsif value =~ /(\d*\.\d*)/ # and no 
+        # puts "translate_variables: #{name}, #{value}, #{type} is a float, got #{value.class} on 87"
+        value = value.to_f
+        type = "float"
+      elsif value =~ /0x\d\d/
+        # puts "translate_variables: #{name}, #{value}, #{type} is a byte, got #{value.class} on 91"
+        type = "byte"
+      else
+        raise ArgumentError, "not sure what to do with a value of #{value} with a type like #{type}" 
+      end
+     
+      post_process_vars(name, type, value)
+    end
+    
+
+    
+    def post_process_vars(name, type, value = nil)
+      value = " = #{value}" if value 
+      $external_var_identifiers << "__#{name}" unless $external_var_identifiers.include?("__#{name}")
+      $external_vars << "#{type} __#{name}#{value};"
+    end
+    
+    def post_process_arrays(name, var)
+      type = c_type(var[0])
+      $array_types[name] = type
+      assignment = var.inspect.gsub("[","{").gsub("]","}")      
+      c_style_array = "#{type} __#{name}[] = #{assignment};"
+      $external_var_identifiers << "__#{name}" unless $external_var_identifiers.include?("__#{name}")
+      $external_array_vars << c_style_array unless $external_array_vars.include?(c_style_array)
+    end
+    
+    def check_variable_type(type)
+      unless type =~ /#{C_VAR_TYPES}/
+        raise ArgumentError, "the following variable types are supported \n #{C_VAR_TYPES.gsub("|",", ")} got #{type}" 
+      end
+    end
+    
+    def c_type(typ)
+      type = 
+        case typ 
+        when Integer
+          "int"
+        when String
+          "char*"
+        when TrueClass
+          "bool"
+        when FalseClass
+          "bool"
+        else
+          raise "Bug! Unknown type #{typ.inspect} in c_type"
+        end
+
+        type
+    end
+   
+end

data/lib/rad/version.rb

@@ -2,7 +2,7 @@ module Rad #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

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/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/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/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