BBB 0.1.3 → 0.2.0

data/lib/BBB/pins/i2c.rb

@@ -0,0 +1,22 @@
+module BBB
+  module Pins
+    class I2C
+      include Pinnable
+
+      def read(address, size, *params)
+        io.read(address, size, *params)
+      end
+
+      def write(address, *params)
+        io.write(address, *params)
+      end
+
+      private
+
+      def default_io
+        IO::I2C.new(position)
+      end
+
+    end
+  end
+end

data/lib/BBB/pins/io/gpio.rb

@@ -20,7 +20,11 @@ module BBB
 
         def set_mode
           direction_file = gpio_pin_dir + "/direction"
-          file_class.open(direction_file, "w") {|f| f.write(direction)}
+
+          d = "in"  if direction == :input
+          d = "out" if direction == :output
+
+          file_class.open(direction_file, "w") {|f| f.write(d)}
         end
 
         def io
@@ -38,7 +42,7 @@ module BBB
 
         def read
           io.rewind
-          value_map[io.read]
+          value_map.fetch(io.read.to_i)
         end
 
         def value_map

data/lib/BBB/pins/io/i2c.rb

@@ -18,32 +18,33 @@ module BBB
         #
         # @param cape [String] The cape name of the I2C chip.
         #
-        def initialize(cape)
-          @cape = cape
+        def initialize(path)
+          @path = path
           self.export
         end
 
         def position
-          @cape
+          @path
         end
 
         def export
-          tree = pin_map.devicetree
-          system("echo #{tree} > #{cape_dir}")
+          if pin_map.respond_to?(:devicetee)
+            system("echo #{pinmap.devicetree} > #{cape_dir}")
+          end
           sleep(0.2) # Give the kernel time to load the cape
-          @backend = I2C.create(pin_map.path)
+          @backend = ::I2C.create(pin_map.path)
         end
 
         def write(address, *params)
-          @backend.write(address, params)
+          @backend.write(address, *params)
         end
 
         def read(address, size, *params)
-          @backend.read(address, size, params)
+          @backend.read(address, size, *params)
         end
 
         def pin_map_key
-          :devicetree
+          :path
         end
 
       end

data/lib/BBB/pins/io/pin_mapper.rb

@@ -58,7 +58,7 @@ module BBB
         def self.map(pin_symbol)
           @map ||= convert(PIN_MAP_FILE)
           begin
-            sym = pin_symbol.upcase
+            sym = pin_symbol #pin_symbol.upcase
             map = @map.pins.fetch(sym, nil)
             map = @map.i2c.fetch(sym) if map.nil?
 
@@ -207,7 +207,7 @@ module BBB
             end
             instance[:filesystem] = filesystem
 
-            hash[instance.devicetree] = instance
+            hash[filesystem] = instance
           end
 
           return hash

data/lib/BBB/pins/pinnable.rb

@@ -32,7 +32,7 @@ module BBB
       end
 
       ##
-      # Return wheter or not this is a mock pin
+      # Returns if this is a mock pin.
       #
       # @return [Boolean]
       #
@@ -57,12 +57,12 @@ module BBB
       # point the developer into the right direction.
       #
       # The default_io method should return an instantiated object that makes
-      # the inteface between the filesystem, drivers etc, and the ruby code.
+      # the interface between the filesystem, drivers etc, and the ruby code.
       # Probably the object will behave like an IO object, relying on the linux
       # kernel and drivers to get things done on the board.
       #
       def default_io
-        raise NotImplementedError
+        fail NotImplementedError
       end
 
       ##

data/lib/BBB/version.rb

@@ -1,3 +1,3 @@
 module BBB
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/spec/application_spec.rb

@@ -7,31 +7,21 @@ describe BBB::Application do
   end
 
   class TestLedCircuit < BBB::Circuit
-    def initialize
-      attach BBB::Components::Led, pin: :P8_3, as: :led
-    end
+    attach BBB::Components::Led, as: :led
   end
 
   class TestConnectionApp < BBB::Application
-    circuit TestLedCircuit.new
-
-    def run
-      "yeah, this one!"
-    end
+    attach TestLedCircuit, as: :circuit
   end
 
   it "attaches virtual pins to board pins" do
     app = TestConnectionApp.new
-
     app.circuit.respond_to?(:led).should be_true
-    app.circuit.led.should_receive(:on!)
-
-    app.led.should eql(app.circuit.led)
-    app.led.on!
+    app.circuit.led.respond_to?(:on!).should be_true
   end
 
   class FunctionsInApp < BBB::Application
-    circuit TestLedCircuit.new
+    attach TestLedCircuit.new, as: :circuit
 
     def run
       raise StopIteration

data/spec/circuit_spec.rb

@@ -11,31 +11,28 @@ describe BBB::Circuit do
 
   context "#attach" do
     it "initializes object when passed a class" do
-      c.attach led, as: :led
-      c.components.values.first.class.should eql(led)
+      c.class.attach led, as: :led
+      c.led.class.should eql(led)
     end
 
     it "keeps instance when passed an instance" do
       instance = led.new
-      c.attach instance, as: :instance
-      c.components.values.first.should eql(instance)
+      c.class.attach instance, as: :instance
+      c.instance.should eql(instance)
     end
 
     context "naming" do
       it "downcases class names" do
         l = led.new
-        c.attach l, as: :led
+        c.class.attach l, as: :led
         c.led.should eql(l)
-        c.components[:led].should eql(l)
       end
     end
 
   end
 
   class TestAttachCircuit < BBB::Circuit
-    def initialize
-      attach BBB::Components::Led, pin: :P8_1, as: :led
-    end
+    attach BBB::Components::Led, as: :led
   end
 
   it "knows about the attached led" do

data/spec/components/analog_component_spec.rb

@@ -9,13 +9,13 @@ describe BBB::Components::AnalogComponent do
   end
 
   it "registers AnalogPin" do
-    component_class.pins.should eql([BBB::Pins::AnalogPin])
+    component_class.pin_classes.should eql([BBB::Pins::AnalogPin])
   end
 
   context "initialized" do
     before :each do
       @c = component
-      @c.initialize_pins(:P8_13)
+      @c.connect(:P8_13)
     end
 
     it "#pin" do
@@ -31,6 +31,11 @@ describe BBB::Components::AnalogComponent do
       @c.should_receive(:read)
       @c.value
     end
+
+    it "can intitialize with a pin position" do
+      c = component_class.new(:pin=>:P8_13)
+      c.positions.should == [:P8_13]
+    end
   end
 
 end

data/spec/components/led_spec.rb

@@ -4,7 +4,7 @@ describe BBB::Components::Led do
   let(:led) {BBB::Components::Led.new}
 
   before :each do
-    led.initialize_pins(:P8_4, mock: true)
+    led.connect(:P8_4, mock: true)
   end
 
   it "initializes off" do

data/spec/components/pinnable_spec.rb

@@ -18,11 +18,11 @@ describe BBB::Components::Pinnable do
   let(:dummy) { DummyComponent }
   let(:double_dummy) { DoubleDummyComponent }
 
-  context "#initialize_pins" do
+  context "#connect" do
     it "with single position" do
       DummyPin.should_receive(:new).once.and_return(@mock_pin)
       c = dummy.new
-      c.initialize_pins(:P8_3)
+      c.connect(:P8_3)
       c.pins[0].should eql(@mock_pin)
     end
 
@@ -30,14 +30,14 @@ describe BBB::Components::Pinnable do
       DummyPin.should_receive(:new).with(:P8_3, {:key=>"value"}).once
         .and_return(@mock_pin)
       c = dummy.new
-      c.initialize_pins(:P8_3, key: "value")
+      c.connect(:P8_3, key: "value")
       c.pins[0].should eql(@mock_pin)
     end
 
     it "with multiple positions" do
       DummyPin.should_receive(:new).exactly(2).times.and_return(@mock_pin)
       c = double_dummy.new
-      c.initialize_pins(:P8_3, :P8_4)
+      c.connect(:P8_3, :P8_4)
       c.pins[0].should eql(@mock_pin)
       c.pins[1].should eql(@mock_pin)
     end
@@ -48,7 +48,7 @@ describe BBB::Components::Pinnable do
       DummyPin.should_receive(:new).with(:P8_4, {:key=>"value"}).once
         .and_return(@mock_pin)
       c = double_dummy.new
-      c.initialize_pins(:P8_3, :P8_4, key: "value")
+      c.connect(:P8_3, :P8_4, key: "value")
       c.pins[0].should eql(@mock_pin)
       c.pins[1].should eql(@mock_pin)
     end
@@ -56,7 +56,7 @@ describe BBB::Components::Pinnable do
     it "verifies the pin count" do
       c = dummy.new
       c.should_receive(:verify_pin_position_count).with([:P8_3])
-      c.initialize_pins(:P8_3)
+      c.connect(:P8_3)
     end
   end
 
@@ -81,4 +81,14 @@ describe BBB::Components::Pinnable do
     c = dummy.new
     c.pinnable?.should be_true
   end
+
+  context "callbacks" do
+    context "after_connect" do
+      it "should use send on function name" do
+      end
+
+      it "should call if given a proc" do
+      end
+    end
+  end
 end

data/spec/components/servo_spec.rb

@@ -1,6 +1,52 @@
 require 'spec_helper'
 
 describe BBB::Components::Servo do
-  let(:servo) { BBB::Components::Servo.new }
+  let(:servo) { BBB::Components::Servo }
+
+  it "initializes with a pin as options" do
+    s = servo.new(:pin=>:P8_13)
+    s.positions.should eql([:P8_13])
+  end
+
+  %w(period min_duty max_duty max_degrees).each do |method|
+    it "#{method} as option" do
+      s = servo.new(method.to_sym=>123)
+      s.send(method.to_sym).should eql(123)
+    end
+  end
+
+  context "after initialization" do
+    before :each do
+      @servo = servo.new
+      @pin = double(BBB::Pins::PWMPin)
+      allow(@servo).to receive(:pin).and_return(@pin)
+    end
+
+    it "sets the period, duty and run" do
+      %w(period duty run).each do |method|
+        @pin.should_receive("#{method}=".to_sym)
+      end
+      @servo.send(:after_pin_initialization)
+    end
+  end
+
+  context "setting angles" do
+    before :each do
+      @servo = servo.new
+      @pin = double("pin")
+      allow(@servo).to receive(:pin).and_return(@pin)
+      allow(@pin).to receive(:"duty=")
+    end
+
+    it "#angle calls pin.duty" do
+      @pin.should_receive(:"duty=")
+      @servo.angle(100)
+    end
+
+    it "#angle converts angle to duty" do
+      @servo.should_receive(:degrees_to_ns).with(100)
+      @servo.angle(100)
+    end
+  end
 
 end

data/spec/examples/led_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe "Blinking a Led" do
+
+  ##
+  # Setup the actual Application
+  #
+  class LedExampleApplication < BBB::Application
+    # Connect the led
+    attach BBB::Components::Led, as: :led
+
+    def initialize
+      led.connect(:P8_10, mock: true)
+    end
+
+    # This is the basic run loop
+    def run
+      led.on!  # this does what you think it does
+      sleep(1) # sleep for 1 second, kind of blunt, since it blocks everthing.
+      led.off!
+      sleep(1)
+    end
+  end
+
+  # Initialize and run the LedExampleApplication
+
+  it "should initialize" do
+    lambda{ LedExampleApplication.new}.should_not raise_error
+  end
+
+  it "should respond to led" do
+    app = LedExampleApplication.new
+    app.respond_to?(:led).should be_true
+  end
+
+  it "should be able to turn led on" do
+    app = LedExampleApplication.new
+    lambda {app.led.on!}.should_not raise_error
+  end
+end

data/spec/pins/digital_pin_spec.rb

@@ -63,4 +63,5 @@ describe BBB::Pins::DigitalPin do
       input.send(:default_io)
     end
   end
+
 end

data/spec/pins/io/pin_mapper_spec.rb

@@ -7,10 +7,6 @@ describe BBB::Pins::IO::PinMapper do
     mapper.map(:P8_3).gpio.should eql(38)
   end
 
-  it "should upcase" do
-    mapper.map(:p8_3).gpio.should eql(38)
-  end
-
   it "should raise an error when requesting an unknown pin" do
     lambda{ mapper.map(:P10_1) }.should raise_exception(BBB::UnknownPinException)
   end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: BBB
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Wilco van Duinkerken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i2c
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -56,28 +56,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Helper functions to ruby around on the BeagleBone Black
@@ -91,24 +91,33 @@ files:
 - .travis.yml
 - BBB.gemspec
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - examples/analog_pin.rb
+- examples/ldr_light_switch.rb
 - examples/led.rb
 - examples/light_switch.rb
+- examples/nunchuck.rb
 - examples/servo_ldr.rb
 - examples/sketches.rb
 - lib/BBB.rb
 - lib/BBB/application.rb
 - lib/BBB/circuit.rb
+- lib/BBB/components.rb
 - lib/BBB/components/analog_component.rb
+- lib/BBB/components/button.rb
 - lib/BBB/components/esc.rb
 - lib/BBB/components/led.rb
+- lib/BBB/components/nunchuck.rb
 - lib/BBB/components/pinnable.rb
 - lib/BBB/components/servo.rb
+- lib/BBB/components/wii_motion_plus.rb
 - lib/BBB/exceptions.rb
+- lib/BBB/pins.rb
 - lib/BBB/pins/analog_pin.rb
 - lib/BBB/pins/digital_pin.rb
+- lib/BBB/pins/i2c.rb
 - lib/BBB/pins/io/ain.rb
 - lib/BBB/pins/io/cape.rb
 - lib/BBB/pins/io/gpio.rb
@@ -127,6 +136,7 @@ files:
 - spec/components/led_spec.rb
 - spec/components/pinnable_spec.rb
 - spec/components/servo_spec.rb
+- spec/examples/led_spec.rb
 - spec/pins/analog_pin_spec.rb
 - spec/pins/digital_input_pin_spec.rb
 - spec/pins/digital_output_pin_spec.rb
@@ -147,17 +157,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Helper functions to ruby around on the BeagleBone Black
@@ -168,6 +178,7 @@ test_files:
 - spec/components/led_spec.rb
 - spec/components/pinnable_spec.rb
 - spec/components/servo_spec.rb
+- spec/examples/led_spec.rb
 - spec/pins/analog_pin_spec.rb
 - spec/pins/digital_input_pin_spec.rb
 - spec/pins/digital_output_pin_spec.rb
@@ -178,4 +189,3 @@ test_files:
 - spec/pins/pinnable_spec.rb
 - spec/pins/pwm_pin_spec.rb
 - spec/spec_helper.rb
-has_rdoc: