pi_driver 0.0.2 → 0.0.3

data/lib/pi_driver/device/mcp23017/register/iodir.rb

@@ -0,0 +1,14 @@
+module PiDriver
+  class Device
+    class MCP23017
+      class Iodir < Register
+        def initialize(options)
+          options[:register] = :iodir
+          super(options)
+        end
+
+        mirror_bit_accessors :io
+      end
+    end
+  end
+end

data/lib/pi_driver/device/mcp23017/register/ipol.rb

@@ -0,0 +1,14 @@
+module PiDriver
+  class Device
+    class MCP23017
+      class Ipol < Register
+        def initialize(options)
+          options[:register] = :ipol
+          super(options)
+        end
+
+        mirror_bit_accessors :ip
+      end
+    end
+  end
+end

data/lib/pi_driver/device/mcp23017/register/olat.rb

@@ -0,0 +1,14 @@
+module PiDriver
+  class Device
+    class MCP23017
+      class Olat < Register
+        def initialize(options)
+          options[:register] = :olat
+          super(options)
+        end
+
+        mirror_bit_accessors :ol
+      end
+    end
+  end
+end

data/lib/pi_driver/device/mcp23017/register/register_helper.rb

@@ -0,0 +1,50 @@
+module PiDriver
+  class Device
+    class MCP23017
+      class Register
+        class RegisterHelper
+          IODIR = :iodir
+          IPOL = :ipol
+          GPINTEN = :gpinten
+          DEFVAL = :defval
+          INTCON = :intcon
+          IOCON = :iocon
+          GPPU = :gppu
+          INTF = :intf
+          INTCAP = :intcap
+          GPIO = :gpio
+          OLAT = :olat
+
+          VALID_REGISTERS = [
+            IODIR,
+            IPOL,
+            GPINTEN,
+            DEFVAL,
+            INTCON,
+            IOCON,
+            GPPU,
+            INTF,
+            INTCAP,
+            GPIO,
+            OLAT
+          ]
+
+          def self.address(options)
+            bank = options[:bank]
+            port = options[:port]
+            register = options[:register]
+
+            port_index = Port::VALID_PORTS.index(port)
+            register_index = VALID_REGISTERS.index(register)
+
+            if bank == Utils::State::LOW
+              port_index + register_index * 0x02
+            else
+              port_index * 0x10 + register_index
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/pi_driver/i2c_master.rb

@@ -5,7 +5,6 @@ module PiDriver
       @delta_time = @frequency ** -1.0
       @clock_pin = options[:clock_pin]
       @data_pin = options[:data_pin]
-      @num_bits = 8
       stop
     end
 
@@ -50,9 +49,9 @@ module PiDriver
     private
 
     def send_data(byte)
-      bits = byte_to_bits byte
+      bits = Utils::Byte.byte_to_bits(byte)
       bits.each do |bit|
-        bit == Pin::Value::HIGH ? release_data_pin : drive_data_pin
+        bit == Utils::State::HIGH ? release_data_pin : drive_data_pin
         release_clock_pin
         drive_clock_pin
       end
@@ -60,20 +59,12 @@ module PiDriver
 
     def read_data
       bits = []
-      @num_bits.times do
+      Utils::Byte::NUM_BITS_PER_BYTE.times do
         release_clock_pin
         bits << @data_pin.value
         drive_clock_pin
       end
-      bits_to_byte(bits)
-    end
-
-    def byte_to_bits(byte)
-      byte.to_s(2).rjust(@num_bits, '0').chars.map(&:to_i)
-    end
-
-    def bits_to_byte(bits)
-      bits.join.to_i(2)
+      Utils::Byte.bits_to_byte(bits)
     end
 
     def release_data_pin
@@ -82,7 +73,7 @@ module PiDriver
     end
 
     def drive_data_pin
-      @data_pin.output Pin::Value::LOW
+      @data_pin.output Utils::State::LOW
       observe_speed_requirement
     end
 
@@ -93,7 +84,7 @@ module PiDriver
     end
 
     def drive_clock_pin
-      @clock_pin.output Pin::Value::LOW
+      @clock_pin.output Utils::State::LOW
       observe_speed_requirement
     end
 

data/lib/pi_driver/pin.rb

@@ -1,30 +1,29 @@
-require_relative 'pin/argument_helper'
 require_relative 'pin/board'
 require_relative 'pin/direction'
-require_relative 'pin/edge'
 require_relative 'pin/file_helper'
-require_relative 'pin/value'
 
 module PiDriver
   class Pin
     attr_reader :gpio_number
 
     def initialize(gpio_number, options = {})
-      @argument_helper = ArgumentHelper.new gpio_number
+      @argument_helper = Utils::ArgumentHelper.new prefix: "PiDriver::Pin"
 
       @gpio_number = gpio_number
       @argument_helper.check(:gpio_number, @gpio_number, Board::VALID_NUMBERS)
 
+      @argument_helper.prefix = "PiDriver::Pin ##{gpio_number}"
+
       @direction = options[:direction] || Direction::INPUT
       @argument_helper.check(:direction, @direction, Direction::VALID_DIRECTIONS)
 
-      @value = options[:value] || Value::LOW
-      @argument_helper.check(:value, @value, Value::VALID_VALUES)
+      @state = options[:state] || Utils::State::LOW
+      @argument_helper.check(:state, @state, Utils::State::VALID_STATES)
 
       @file_helper = FileHelper.new @gpio_number
       @file_helper.write_export
       @file_helper.write_direction(@direction)
-      input? ? @file_helper.read_value : @file_helper.write_value(@value)
+      input? ? @file_helper.read_value : @file_helper.write_value(@state)
     end
 
     def input
@@ -36,12 +35,12 @@ module PiDriver
       @direction == Direction::INPUT
     end
 
-    def output(value = Value::LOW)
-      @argument_helper.check(:value, value, Value::VALID_VALUES)
-      @value = value
+    def output(state = Utils::State::LOW)
+      @argument_helper.check(:state, state, Utils::State::VALID_STATES)
+      @state = state
       @direction = Direction::OUTPUT
       @file_helper.write_direction(@direction)
-      @file_helper.write_value(@value)
+      @file_helper.write_value(@state)
     end
 
     def output?
@@ -50,70 +49,47 @@ module PiDriver
 
     def clear
       return unless output?
-      @value = Value::LOW
-      @file_helper.write_value(@value)
-      @value
+      @state = Utils::State::LOW
+      @file_helper.write_value(@state)
+      @state
     end
 
     alias_method :off, :clear
 
     def clear?
-      value == Value::LOW
+      state == Utils::State::LOW
     end
 
     alias_method :off?, :clear?
 
     def set
       return unless output?
-      @value = Value::HIGH
-      @file_helper.write_value(@value)
-      @value
+      @state = Utils::State::HIGH
+      @file_helper.write_value(@state)
+      @state
     end
 
     alias_method :on, :set
 
     def set?
-      value == Value::HIGH
+      state == Utils::State::HIGH
     end
 
     alias_method :on?, :set?
 
-    def value
-      input? ? @file_helper.read_value : @value
+    def state
+      input? ? @file_helper.read_value : @state
     end
 
-    def interrupt(edge = Edge::RISING)
-      @argument_helper.check(:edge, edge, Edge::VALID_EDGES)
+    def interrupt(edge = Utils::Edge::RISING)
+      @argument_helper.check(:edge, edge, Utils::Edge::VALID_EDGES)
       @edge = edge
-
-      @interrupt_thread = Thread.new do
-        last_value = @file_helper.read_value
-        loop do
-          new_value = @file_helper.read_value
-          yield if block_given? && interrupted?(new_value, last_value)
-          last_value = new_value
-        end
-      end
+      @interrupt = Utils::Interrupt.new(@edge) { @file_helper.read_value }
+      @interrupt.start { yield }
     end
 
     def clear_interrupt
-      @interrupt_thread.kill if @interrupt_thread
-    end
-
-    private
-
-    def interrupted?(new_value, last_value)
-      rising_edge = new_value == Value::HIGH && last_value == Value::LOW
-      falling_edge = new_value == Value::LOW && last_value == Value::HIGH
-
-      case @edge
-      when :rising
-        rising_edge
-      when :falling
-        falling_edge
-      when :both
-        rising_edge || falling_edge
-      end
+      @interrupt.clear if @interrupt
     end
   end
 end

data/lib/pi_driver/pin/board.rb

@@ -0,0 +1,65 @@
+module PiDriver
+  class Pin
+    class Board
+      PIN11 = 0
+      PIN12 = 1
+      PIN13 = 2
+      PIN15 = 3
+      PIN16 = 4
+      PIN18 = 5
+      PIN22 = 6
+      PIN07 = 7
+      PIN03 = 8
+      PIN05 = 9
+      PIN24 = 10
+      PIN26 = 11
+      PIN19 = 12
+      PIN21 = 13
+      PIN23 = 14
+      PIN08 = 15
+      PIN10 = 16
+      PIN29 = 21
+      PIN31 = 22
+      PIN33 = 23
+      PIN35 = 24
+      PIN37 = 25
+      PIN32 = 26
+      PIN36 = 27
+      PIN38 = 28
+      PIN40 = 29
+      PIN27 = 30
+      PIN28 = 31
+
+      VALID_NUMBERS = [
+        PIN11,
+        PIN12,
+        PIN13,
+        PIN15,
+        PIN16,
+        PIN18,
+        PIN22,
+        PIN07,
+        PIN03,
+        PIN05,
+        PIN24,
+        PIN26,
+        PIN19,
+        PIN21,
+        PIN23,
+        PIN08,
+        PIN10,
+        PIN29,
+        PIN31,
+        PIN33,
+        PIN35,
+        PIN37,
+        PIN32,
+        PIN36,
+        PIN38,
+        PIN40,
+        PIN27,
+        PIN28
+      ]
+    end
+  end
+end

data/lib/pi_driver/pin/direction.rb

@@ -0,0 +1,13 @@
+module PiDriver
+  class Pin
+    class Direction
+      INPUT = :in
+      OUTPUT = :out
+
+      VALID_DIRECTIONS = [
+        INPUT,
+        OUTPUT
+      ]
+    end
+  end
+end

data/lib/pi_driver/pin/directory_helper.rb

@@ -0,0 +1,32 @@
+module PiDriver
+  class Pin
+    class DirectoryHelper
+      # TODO figure out environment variables for test
+      # DIR_BASE = '/sys/class'
+      DIR_BASE = File.expand_path '~/pi/gpio/sys/class'
+      DIR_GPIO = "#{DIR_BASE}/gpio"
+
+      def initialize(gpio_number)
+        @gpio_number = gpio_number
+      end
+
+      def direction
+        "#{dir_pin}/direction"
+      end
+
+      def export
+        "#{DIR_GPIO}/export"
+      end
+
+      def value
+        "#{dir_pin}/value"
+      end
+
+      private
+
+      def dir_pin
+        "#{DIR_GPIO}/gpio#{@gpio_number}"
+      end
+    end
+  end
+end

data/lib/pi_driver/pin/file_helper.rb

@@ -0,0 +1,32 @@
+require_relative 'directory_helper'
+
+module PiDriver
+  class Pin
+    class FileHelper
+      def initialize(gpio_number)
+        @gpio_number = gpio_number
+        @directory_helper = DirectoryHelper.new @gpio_number
+      end
+
+      def read_direction
+        File.read(@directory_helper.direction).to_sym
+      end
+
+      def read_value
+        File.read(@directory_helper.value).to_i
+      end
+
+      def write_direction(direction)
+        File.write(@directory_helper.direction, direction)
+      end
+
+      def write_export
+        File.write(@directory_helper.export, @gpio_number)
+      end
+
+      def write_value(value)
+        File.write(@directory_helper.value, value)
+      end
+    end
+  end
+end