i2c 0.2.22 → 0.4.0

data/README.rdoc

@@ -8,9 +8,9 @@ Raspberry Pi, but should work with any linux i2c-dev I2C-hardware.
 == Structure
 
 The library is split into two parts: 
- - A backend for accessing the I2C bus (right now only through the i2c-dev 
+* A backend for accessing the I2C bus (right now only through the i2c-dev 
    in Linux, other impementations are possible).
- - Drivers for I2C enabled ICs. 
+* Drivers for I2C enabled ICs. 
 
 == Installation
 
@@ -57,8 +57,11 @@ Datasheet: http://ww1.microchip.com/downloads/en/DeviceDoc/21919e.pdf
 The low-level IO (mainly in i2c-dev.rb) was extracted from Ruby-I2C 
 (http://rubyforge.org/projects/i2c/) by Jonas Bähr <jonas.baehr@fs.ei.tum.de> 
 
-Bugfixes by
- - Pierre Paques
+=== Contributions 
+* [Gaëtan Duchaussois](https://github.com/gaetronik) I2C::Dev.read_byte.
+
+=== Bugfixes
+* Pierre Paques
 
 == Copyright / Licence
 

data/lib/i2c.rb

@@ -8,8 +8,8 @@
 
 require 'i2c/i2c.rb'
 require 'i2c/backends/i2c-dev.rb'
-require 'i2c/drivers/mcp23008.rb'
-require 'i2c/drivers/mcp23017.rb'
+require 'i2c/drivers/mcp230xx.rb'
+#require 'i2c/drivers/mcp23017.rb'
 
 
 

data/lib/i2c/backends/i2c-dev.rb

@@ -43,7 +43,16 @@ module I2C
       ret = @device.sysread(size)
       return ret
     end
-
+    
+    # Read a byte from the current address. Return a one char String which
+    # can be treated with String#unpack
+    def read_byte(address)
+      ret=""
+      @device.ioctl(I2C_SLAVE,address)
+      ret=@device.sysread(1)
+      return ret
+    end
+    
     private
     def initialize(device_path)
       @device = File.new(device_path, 'r+')

data/lib/i2c/drivers/mcp230xx.rb

@@ -0,0 +1,253 @@
+# -*- coding: utf-8 -*-
+# I2C IO-Expander drivers. 
+#
+# Copyright (c) 2012 Christoph Anderegg <christoph@christoph-anderegg.ch>
+# This file may be distributed under the terms of the GNU General Public
+# License Version 2.
+#
+
+require 'i2c/i2c.rb'
+
+# Constants for mode()
+INPUT = 1 unless defined? INPUT
+OUTPUT = 0 unless defined? OUTPUT
+
+# Constants for write()
+HIGH = 1 unless defined? HIGH
+LOW = 0 unless defined? LOW
+
+module I2C
+  module Drivers
+    # Driver class for the Microchip MPC230xx IO-Expanders.
+    #
+    # The interface is mostly compatible to the interface
+    # of the WiringPi gem. PWM is not supported though.
+    # On the other hand a more rubyesque interface is also
+    # provided.
+    module MCP230xx
+      # Creates an instance representing exactly one
+      # MCP230xx on one I2C-bus.
+      #
+      # @todo This implementation currently assumes
+      #   that all registers of the same type are
+      #   on a continuos address range. Implement
+      #   a (less efficient) case for other
+      #   situations.
+      #
+      # @param device [IO, String] I2C-device file 
+      #   (usually /dev/i2c-0). Or an intantiated 
+      #   io class that supports the necessary 
+      #   operations (#read, #write and #ioctl).
+      # @param address [Integer] Device address on the bus.
+      def initialize(device, address)
+        if device.kind_of?(String)
+          @device = ::I2C.create(device)
+        else
+          [ :read, :write ].each do |m|
+            raise IncompatibleDeviceException, 
+            "Missing #{m} method in device object." unless device.respond_to?(m)
+          end
+          @device = device
+        end
+        @address = address
+        
+        @iodir = Array.new
+        max_port_no.times { @iodir << 0xFF } # Direction is input initially
+        @device.write(@address, port_count, iodir[0], @iodir)
+        
+        @data = Array.new
+        max_port_no.times { @data << 0xFF }
+        @unpack_string = "C" * port_count
+        @data = @device.read(@address, port_count, gpio[0]).unpack(@unpack_string)
+        @dir = @device.read(@address, port_count, iodir[0]).unpack(@unpack_string)
+      end  
+
+      # Reads the mode of a IO-pin.
+      # @param pin [Integer] Pin number to check.
+      # @return [Integer] Pin mode. Either INPUT or OUTPUT. 
+      def mode?(pin)
+        check_pin(pin) # Raises if the pin is not valid
+        @dir = @device.read(@address, port_count, iodir[0]).unpack(@unpack_string)
+        index = port_for_pin(pin)
+
+        (@dir[index[0]] >> index[1]) & 0x01
+      end
+
+      # Sets the mode of a IO-pin.
+      # @param pin [Integer] Pin number to set.
+      # @param pin_mode [Integer] Pin mode. Either INPUT or OUTPUT. 
+      def mode(pin, pin_mode)
+        check_pin(pin) # Raises if the pin is not valid
+        raise ArgumentError, 'invalid value' unless [0,1].include?(pin_mode)
+        index = port_for_pin(pin)
+
+        @dir[index[0]] = set_bit_value(@dir[index[0]], index[1], pin_mode)
+        @device.write(@address, iodir[0], *@dir)
+       end
+
+      # Sets a IO-pin value.
+      # @param pin [Integer] Pin number to set.
+      # @param value [Integer] Pin value. Either HIGH or LOW. 
+      def []=(pin, value)
+        check_pin(pin) # Raises if the pin is not valid
+        raise ArgumentError, 'invalid value' unless [0,1].include?(value)
+        index = port_for_pin(pin)
+        @data[index[0]] = set_bit_value(@data[index[0]], index[1], value)
+        @device.write(@address, gpio[0], *@data)
+      end
+
+      #  Alias for a WiringPi compatible naming.
+      alias :write :[]= 
+        
+      # Reads a IO-pin value.
+      # @param pin [Integer] Pin number to set.
+      # @return [Integer] Pin value. Either HIGH or LOW. 
+      def [](pin)
+        check_pin(pin) # Raises if the pin is not valid
+        index = port_for_pin(pin)
+        @data = @device.read(@address, port_count, gpio[0]).unpack(@unpack_string)
+        index = port_for_pin(pin)
+
+        (@data[index[0]] >> index[1]) & 0x01
+      end
+
+      #  Alias for a WiringPi compatible naming.
+      alias_method :read, :[]
+
+#      private
+      # Checks a pin number for validity.
+      # Raises an exception if not valid. Returns nil otherwise.
+      # @param pin [Integer] IO pin number.
+      # @return nil Raises an exception in all other cases.
+      def check_pin(pin)
+        raise ArgumentError, "Pin not 0-#{max_pin_no}" unless (0..max_pin_no).include?(pin)
+        nil
+      end
+
+      # Checks a port number for validity.
+      # Raises an exception if not valid. Returns nil otherwise.
+      # @param no [Integer] IO port number.
+      # @return nil Raises an exception in all other cases.
+      def check_port(no)
+        raise ArgumentError, "Only Ports 0-#{max_port_no} available." unless (0..max_port_no).include?(no)
+        nil
+      end
+
+      # Returns a port no, index in port pair for a pin number.
+      #
+      # E.g. Pin 14 is the is bit 7 of port 1. So the method returns [1,7].
+      #
+      # @param pin [Integer] Pin number, begining at 0.
+      # @return [Array<Integer, Integer>] Port number and index in the port 
+      #    of the passed continuos pin number. 
+      def port_for_pin(pin)
+        check_pin(pin)
+        [pin / 8, pin % 8]
+      end
+
+      # Sets a bit in a byte to a defied state not touching the other bits.
+      #
+      # @param byte [Integer] Byte to manipulate (LSB).
+      # @param bit [Integer] Bit number to manipulate.
+      # @param value [Integer] 1 or 0; the new value of the bit.
+      # @return [Integer] The new byte
+      def set_bit_value(byte, bit, value)
+        [byte, bit, value].each do |p|
+          raise ArgumentError, "Arguments must be Integer" unless p.kind_of? Integer
+        end
+        raise ArgumentError, "Only bits 0..7 are available." unless bit < 8
+        raise ArgumentError, "Value needs to be 0 or 1." unless (value == 0) or (value == 1)
+        mask = 0x00
+        mask = (0x01 << bit)
+        case value
+        when 0
+          byte = (byte & ((~mask) & 0xFF)) & 0xFF
+        when 1
+          byte = (byte |  mask) & 0xFF
+        else
+          raise ArgumentError, "Bit not 0-7."
+        end
+        byte
+      end
+
+      # @!method iodir(no)
+      # Returns the address of the IO direction register 
+      # for an IO port.
+      #
+      # @param no [Integer] Port number, begining at 0.
+      # @return Address of the IO direction register 
+      #   corresponding to passed IO port number.
+      
+      # @!method gpio(no)
+      # Returns the address of the GPIO register 
+      # for an IO port.
+      #
+      # @param no [Integer] Port number, begining at 0.
+      # @return [Integer] Address of the GPIO register 
+      #   corresponding to passed IO port number.
+
+      # @!method pin_count
+      # Returns the number of pins in the io expander.
+      #
+      # @return [Integer] Number of pins.
+
+      # @!method max_pin_no
+      # Returns the highest pin index. Usually #pin_count - 1.
+      #
+      # @return [Integer] Highest pin index.
+
+      # @!method port_count
+      # Returns the number of ports in the io expander.
+      #
+      # @return [Integer] Number of ports.
+
+      # @!method max_port_no
+      # Returns the highest port index. Usually #port_count - 1.
+      #
+      # @return [Integer] Highest port index.
+    end
+    
+    # Defines a class for a chip implementation.
+    #
+    # @param name Class name
+    def self.define_mcp230xx_chip(name, parameters)
+      raise ArgumentError, "Expecting options hash." unless parameters.kind_of? Hash
+      [ [ :pin_count, Integer ],
+        [ :port_count, Integer ],
+        [ :iodir, Array ],
+        [ :gpio, Array ] ].each do |expected_key| 
+        raise ArgumentError, "Missing option #{expected_key[0]}" unless 
+          parameters.has_key? expected_key[0] 
+        raise ArgumentError, "Option #{expected_key[0]} expected to be a #{expected_key[1]}" unless 
+          parameters[expected_key[0]].kind_of? expected_key[1] 
+      end
+      chip_class = self.const_set(name.to_sym, Class.new)
+      chip_class.instance_eval do
+        include MCP230xx
+        parameters.each do |method_name, return_value|
+          #puts "Defining #{name}##{method_name.to_sym}"
+          define_method method_name.to_sym do
+            return_value
+          end
+        end
+        define_method :max_pin_no do 
+          parameters[:pin_count] - 1 
+        end 
+        define_method :max_port_no do 
+          parameters[:port_count] - 1 
+        end 
+      end
+      chip_class
+    end
+    define_mcp230xx_chip :MCP23008,       
+      :pin_count => 8,
+      :port_count => 1,
+      :iodir => [ 0x00 ],
+      :gpio => [ 0x09 ]
+    define_mcp230xx_chip :MCP23017,
+      :pin_count => 16,
+      :port_count => 2,
+      :iodir => [ 0x00, 0x01 ],
+      :gpio => [ 0x12, 0x13 ]
+  end
+end    

data/test/mcp230xx_spec.rb

@@ -0,0 +1,239 @@
+require 'i2c'
+
+class MockI2CIO
+  attr_reader :registers
+  attr_reader :last_address
+
+  def initialize
+    @registers = Hash.new
+    # Initialize according to data sheet
+    (0x00..0x01).each do |reg| 
+      @registers[reg] = 0xFF
+    end
+    (0x02..0x13).each do |reg|
+      @registers[reg] = 0x00
+    end
+  end
+
+  def write(address, *params)
+    @last_address = address
+    if params.count >= 1
+      reg_addr = params.shift
+      index = 0
+      params.each do |p|
+        @registers[reg_addr+index] = p
+        index += 1
+      end
+    end
+  end
+
+  def read(address, size, *params)
+    @last_address = address
+    answer = String.new
+    answer.force_encoding("US-ASCII")
+    if (size > 0) && (params.count >= 1)
+      reg_addr = params.shift
+      size.times do |index|
+        answer << (@registers[reg_addr+index] & 0xFF)
+      end
+    end
+    answer
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#port_count" do
+  it "returns the number of ports." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    mcp.port_count.should eq(2)
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#max_port_no" do
+  it "returns the highest port number." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    mcp.max_port_no.should eq(1)
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#pin_count" do
+  it "returns the number of pins." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    mcp.pin_count.should eq(16)
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#max_pin_no" do
+  it "returns the highest pin number." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    mcp.max_pin_no.should eq(15)
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#check_pin" do
+  it "raises an exception for out of range pin indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [-1000, -1, 16, 1000].each do |pin|
+      expect { mcp.check_pin(pin) }.to raise_error
+    end
+  end
+
+  it "returns nil for valid indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    16.times do |pin|
+      mcp.check_pin(pin).should eq nil
+    end
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#check_port" do
+  it "raises an exception for out of range port indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [-1000, -1, 2, 1000].each do |port|
+      expect { mcp.check_port(port) }.to raise_error
+    end
+  end
+
+  it "returns nil for valid indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    2.times do |port|
+      mcp.check_port(port).should eq nil
+    end
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#port_for_pin" do
+  it "returns correctly split pin and port numbers for 16bit IO expanders." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    expected =
+      [[0, 0],
+       [0, 1],
+       [0, 2],
+       [0, 3],
+       [0, 4],
+       [0, 5],
+       [0, 6],
+       [0, 7],
+       [1, 0],
+       [1, 1],
+       [1, 2],
+       [1, 3],
+       [1, 4],
+       [1, 5],
+       [1, 6],
+       [1, 7]]
+      expected.each_index do |pin|
+      mcp.port_for_pin(pin).should eq(expected[pin])
+    end
+  end
+
+  it "raises an exception for out of range arguments." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [1000, 16, -1, -1000].each do |pin|
+      expect { mcp.port_for_pin(pin) }.to raise_error
+    end
+  end
+end 
+
+describe I2C::Drivers::MCP23017, "#set_bit_value" do
+  it "raises on non-integer arguments for the first argument" do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    expect { mcp.set_bit_value("Hello", 0, 0) }.to raise_error
+  end
+  it "raises on non-integer arguments for the second argument" do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    expect { mcp.set_bit_value(0, "Hello", 0) }.to raise_error
+  end
+  it "raises on arguments other than 0 and 1 for the third argument" do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [1000, 2, -1, -1000].each do |value|
+      expect { mcp.set_bit_value(0, 0, value) }.to raise_error
+    end
+  end
+  it "sets the correct bits in a byte" do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    # Original, bit no, new value, result
+    [
+     [ 0b11111111, 0, 0, 0b11111110 ],
+     [ 0b00000000, 0, 1, 0b00000001 ],
+     [ 0b11111111, 7, 0, 0b01111111 ],
+     [ 0b00000000, 7, 1, 0b10000000 ],
+     [ 0b11111111, 0, 1, 0b11111111 ],
+     [ 0b00000000, 0, 0, 0b00000000 ]
+    ].each do |test|
+      mcp.set_bit_value(test[0], test[1], test[2]).should eq test[3]
+    end
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#mode" do
+  it "raises an exception for out of range pin indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [-1000, -1, 16, 1000].each do |pin|
+      expect { mcp.mode(pin, HIGH) }.to raise_error
+    end
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#mode?" do
+  it "raises an exception for out of range pin indices." do
+    io = MockI2CIO.new
+    mcp = I2C::Drivers::MCP23017.new(io, 0x20)
+    [-1000, -1, 16, 1000].each do |pin|
+      expect { mcp.mode?(pin) }.to raise_error
+    end
+  end
+
+  it "initially returns 1 for all pin modes" do
+    io = MockI2CIO.new
+    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
+    (0..15).each do |pin|
+      mcp23017.mode?(pin).should eq(1)
+    end
+  end
+
+  it "returns what has been set through #mode" do
+    io = MockI2CIO.new
+    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
+    (0..500).each do |pin|
+      pin = rand(16)
+      mode = rand(2)
+      mcp23017.mode(pin, mode)
+      mcp23017.mode?(pin).should eq(mode)
+    end
+  end
+end
+
+describe I2C::Drivers::MCP23017, "#[]" do
+  it "initially returns 0 for all I/O pins" do
+    io = MockI2CIO.new
+    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
+    (0..15).each do |pin|
+      mcp23017[pin].should eq(0)
+    end
+  end
+  it "returns what has been set through #[]=" do
+    io = MockI2CIO.new
+    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
+    (0..500).each do |pin|
+      pin = rand(16)
+      value = rand(2)
+      mcp23017[pin] = value
+      mcp23017[pin].should eq(value)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i2c
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-15 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies: []
 description: Interface to I2C (aka TWI) implementations. Also provides abstractions
   for some I2c-devices. Created with the Raspberry Pi in mind.
@@ -22,10 +22,8 @@ files:
 - lib/i2c.rb
 - lib/i2c/i2c.rb
 - lib/i2c/backends/i2c-dev.rb
-- lib/i2c/drivers/mcp23017.rb
-- lib/i2c/drivers/mcp23008.rb
-- test//mcp23017_spec.rb
-- test//mcp23008_spec.rb
+- lib/i2c/drivers/mcp230xx.rb
+- test//mcp230xx_spec.rb
 - rules/88-i2c.rules
 - README.rdoc
 homepage: https://github.com/andec/i2c
@@ -48,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: I2C access library (for Linux).

data/lib/i2c/drivers/mcp23008.rb

@@ -1,98 +0,0 @@
-# -*- coding: utf-8 -*-
-# I2C IO-Expander driver 
-# for the MCP23008 8-bit IO-Expander.
-#
-# The interface is compatible to the interface
-# of the WiringPi gem. PWM is not supported though.
-#
-# Copyright (c) 2012 Christoph Anderegg <christoph@christoph-anderegg.ch>
-# This file may be distributed under the terms of the GNU General Public
-# License Version 2.
-#
-
-require 'i2c/i2c.rb'
-
-# Constants for mode()
-INPUT = 1   unless defined?(INPUT)
-OUTPUT = 0  unless defined?(OUTPUT)
-
-# Constants for write()
-HIGH = 1    unless defined?(HIGH)
-LOW = 0     unless defined?(LOW)
-      
-module I2C
-  module Drivers
-    class MCP23008
-      # Registers
-      IODIR = 0x00
-      GPIO = 0x09
-      
-      # Creates an instance representing exactly one
-      # MCP23008 on one I2C-bus.
-      #
-      # device: I2C-device file (usually /dev/i2c-0).
-      #         Or an intantiated io class that supports
-      #         the necessary operations (#read, #write
-      #         and #ioctl).
-      # address: Device address on the bus.
-      def initialize(device, address)
-        if device.kind_of?(String)
-          @device = ::I2C.create(device)
-        else
-          [ :read, :write ].each do |m|
-            raise IncompatibleDeviceException, 
-            "Missing #{m} method in device object." unless device.respond_to?(m)
-          end
-          @device = device
-        end
-        @address = address
-        
-        @dir = 0xFF # Direction is input initially 
-        @device.write(@address, IODIR, @dir)
-        @data = @device.read(@address, 1, GPIO).unpack("C")[0]   
-      end  
-      
-      def mode?(pin)
-        @dir = @device.read(@address, 1, IODIR).unpack("C")[0]
-        return (@dir >> pin) & 0x01
-      end
-      
-      def mode(pin, pin_mode)
-        raise ArgumentError, "Pin not 0-7" unless (0..7).include?(pin)
-        raise ArgumentError, 'invalid value' unless [0,1].include?(pin_mode)
-        @dir = set_bit_value(@dir, pin, pin_mode)
-        @device.write(@address, IODIR, @dir)
-      end
-      
-      def []=(pin, value)
-        raise ArgumentError, "Pin not 0-7" unless (0..7).include?(pin)
-        raise ArgumentError, 'invalid value' unless [0,1].include?(value)
-        @data = set_bit_value(@data, pin, value)
-        @device.write(@address, GPIO, @data)
-      end
-      alias :write :[]= 
-        
-      def [](pin)
-        raise ArgumentError, "Pin not 0-7." unless (0..7).include?(pin)
-        @data = @device.read(@address, 1, GPIO).unpack("C")[0]
-        return (@data >> pin) & 0x01        
-      end
-      alias :read :[]
-      
-      private
-      def set_bit_value(byte, bit, value)
-        mask = 0x00
-        mask = (0x01 << bit)
-        case value
-        when 0
-          byte = (byte & ((~mask) & 0xFF)) & 0xFF
-        when 1
-          byte = (byte |  mask) & 0xFF
-        else
-          raise ArgumentError, "Bit not 0-7."
-        end
-        byte
-      end
-    end
-  end
-end

data/lib/i2c/drivers/mcp23017.rb

@@ -1,124 +0,0 @@
-# -*- coding: utf-8 -*-
-# I2C IO-Expander driver 
-# for the MCP23017 16-bit IO-Expander.
-#
-# The interface is compatible to the interface
-# of the WiringPi gem. PWM is not supported though.
-#
-# Copyright (c) 2012 Christoph Anderegg <christoph@christoph-anderegg.ch>
-# This file may be distributed under the terms of the GNU General Public
-# License Version 2.
-#
-
-require 'i2c/i2c.rb'
-
-# Constants for mode()
-INPUT = 1   unless defined?(INPUT)
-OUTPUT = 0  unless defined?(OUTPUT)
-
-# Constants for write()
-HIGH = 1    unless defined?(HIGH)
-LOW = 0     unless defined?(LOW)
-      
-module I2C
-  module Drivers
-    class MCP23017
-      # Registers
-      IODIRA = 0x00
-      IODIRB = 0x01
-      GPIOA = 0x12
-      GPIOB = 0x13
-      
-      # Creates an instance representing exactly one
-      # MCP23017 on one I2C-bus.
-      #
-      # device: I2C-device file (usually /dev/i2c-0).
-      #         Or an intantiated io class that supports
-      #         the necessary operations (#read, #write
-      #         and #ioctl).
-      # address: Device address on the bus.
-      def initialize(device, address)
-        if device.kind_of?(String)
-          @device = ::I2C.create(device)
-        else
-          [ :read, :write ].each do |m|
-            raise IncompatibleDeviceException, 
-            "Missing #{m} method in device object." unless device.respond_to?(m)
-          end
-          @device = device
-        end
-        @address = address
-        
-        @dir_a = 0xFF # Direction is input initially 
-        @dir_b = 0xFF # Direction is input initially
-        @device.write(@address, IODIRA, @dir_a, @dir_b)
-        
-        @data_a = 0xFF # Initial data
-        @data_b = 0xFF # Initial data
-        @data_a, @data_b = @device.read(@address, 2, GPIOA).unpack("CC")   
-      end  
-      
-      def mode?(pin)
-        @dir_a, @dir_b = @device.read(@address, 2, IODIRA).unpack("CC")
-        dir = @dir_a
-        if 8 <= pin
-          dir = @dir_b
-          pin -= 8
-        end
-        return (dir >> pin) & 0x01
-      end
-      
-      def mode(pin, pin_mode)
-        raise ArgumentError, "Pin not 0-15" unless (0..15).include?(pin)
-        raise ArgumentError, 'invalid value' unless [0,1].include?(pin_mode)
-        if 8 <= pin
-          @dir_b = set_bit_value(@dir_b, (pin-8), pin_mode)
-        else
-          @dir_a = set_bit_value(@dir_a, pin, pin_mode)
-        end
-        @device.write(@address, IODIRA, @dir_a, @dir_b)
-      end
-      
-      def []=(pin, value)
-        raise ArgumentError, "Pin not 0-15" unless (0..15).include?(pin)
-        raise ArgumentError, 'invalid value' unless [0,1].include?(value)
-        if 8 <= pin
-          @data_b = set_bit_value(@data_b, (pin-8), value)
-        else
-          @data_a = set_bit_value(@data_a, pin, value)
-        end
-        @device.write(@address, GPIOA, @data_a, @data_b)
-      end
-      alias :write :[]= 
-        
-      def [](pin)
-        raise ArgumentError, "Pin not 0-15." unless (0..15).include?(pin)
-        @data_a, @data_b = @device.read(@address, 2, GPIOA).unpack("CC")
-        data = @data_a
-        if 8 <= pin
-          data  = @data_b;
-          pin -= 8
-        end
-        return (data >> pin) & 0x01        
-      end
-      alias :read :[]
-      
-      private
-      def set_bit_value(byte, bit, value)
-        mask = 0x00
-        mask = (0x01 << bit)
-        case value
-        when 0
-          byte = (byte & ((~mask) & 0xFF)) & 0xFF
-        when 1
-          byte = (byte |  mask) & 0xFF
-        else
-          raise ArgumentError, "Bit not 0-7."
-        end
-#        puts "Byte: (0x#{"%X" % byte}) 0b#{"%B" % byte}; " +
-#          "Mask: 0b#{"%B" % mask}; Bit: #{bit}; Value: #{value}"
-        byte
-      end
-    end
-  end
-end

data/test/mcp23008_spec.rb

@@ -1,86 +0,0 @@
-require 'i2c'
-
-class MockI2CIO
-  attr_reader :registers
-  attr_reader :last_address
-
-  def initialize
-    @registers = Hash.new
-    # Initialize according to data sheet
-    @registers[0x00] = 0xFF
-    (0x01..0x0A).each do |reg|
-      @registers[reg] = 0x00
-    end
-  end
-
-  def write(address, *params)
-    @last_address = address
-    if params.count >= 1
-      reg_addr = params.shift
-      index = 0
-      params.each do |p|
-        @registers[reg_addr+index] = p
-        index += 1
-      end
-    end
-  end
-
-  def read(address, size, *params)
-    @last_address = address
-    answer = String.new
-    answer.force_encoding("US-ASCII")
-    if (size > 0) && (params.count >= 1)
-      reg_addr = params.shift
-      (0...size).each do |index|
-        answer << (@registers[reg_addr+index] & 0xFF)
-      end
-    end
-    answer
-  end
-end
-
-describe I2C::Drivers::MCP23008, "#mode?" do
-  it "initially returns 1 for all pin modes" do
-    io = MockI2CIO.new
-    mcp23008 = I2C::Drivers::MCP23008.new(io, 0x20)
-    (0..7).each do |pin|
-      mcp23008.mode?(pin).should eq(1)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23008, "#mode?" do
-  it "returns what has been set through #mode" do
-    io = MockI2CIO.new
-    mcp23008 = I2C::Drivers::MCP23008.new(io, 0x20)
-    (0..500).each do |pin|
-      pin = rand(8)
-      mode = rand(2)
-      mcp23008.mode(pin, mode)
-      mcp23008.mode?(pin).should eq(mode)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23008, "#[]" do
-  it "initially returns 0 for all I/O pins" do
-    io = MockI2CIO.new
-    mcp23008 = I2C::Drivers::MCP23008.new(io, 0x20)
-    (0..7).each do |pin|
-      mcp23008[pin].should eq(0)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23008, "#[]" do
-  it "returns what has been set through #[]=" do
-    io = MockI2CIO.new
-    mcp23008 = I2C::Drivers::MCP23008.new(io, 0x20)
-    (0..500).each do |pin|
-      pin = rand(8)
-      value = rand(2)
-      mcp23008[pin] = value
-      mcp23008[pin].should eq(value)
-    end
-  end
-end

data/test/mcp23017_spec.rb

@@ -1,88 +0,0 @@
-require 'i2c'
-
-class MockI2CIO
-  attr_reader :registers
-  attr_reader :last_address
-
-  def initialize
-    @registers = Hash.new
-    # Initialize according to data sheet
-    (0x00..0x01).each do |reg| 
-      @registers[reg] = 0xFF
-    end
-    (0x02..0x15).each do |reg|
-      @registers[reg] = 0x00
-    end
-  end
-
-  def write(address, *params)
-    @last_address = address
-    if params.count >= 1
-      reg_addr = params.shift
-      index = 0
-      params.each do |p|
-        @registers[reg_addr+index] = p
-        index += 1
-      end
-    end
-  end
-
-  def read(address, size, *params)
-    @last_address = address
-    answer = String.new
-    answer.force_encoding("US-ASCII")
-    if (size > 0) && (params.count >= 1)
-      reg_addr = params.shift
-      (0...size).each do |index|
-        answer << (@registers[reg_addr+index] & 0xFF)
-      end
-    end
-    answer
-  end
-end
-
-describe I2C::Drivers::MCP23017, "#mode?" do
-  it "initially returns 1 for all pin modes" do
-    io = MockI2CIO.new
-    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
-    (0..15).each do |pin|
-      mcp23017.mode?(pin).should eq(1)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23017, "#mode?" do
-  it "returns what has been set through #mode" do
-    io = MockI2CIO.new
-    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
-    (0..500).each do |pin|
-      pin = rand(16)
-      mode = rand(2)
-      mcp23017.mode(pin, mode)
-      mcp23017.mode?(pin).should eq(mode)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23017, "#[]" do
-  it "initially returns 0 for all I/O pins" do
-    io = MockI2CIO.new
-    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
-    (0..15).each do |pin|
-      mcp23017[pin].should eq(0)
-    end
-  end
-end
-
-describe I2C::Drivers::MCP23017, "#[]" do
-  it "returns what has been set through #[]=" do
-    io = MockI2CIO.new
-    mcp23017 = I2C::Drivers::MCP23017.new(io, 0x20)
-    (0..500).each do |pin|
-      pin = rand(16)
-      value = rand(2)
-      mcp23017[pin] = value
-      mcp23017[pin].should eq(value)
-    end
-  end
-end