wiringpi 1.1.0 → 2.0.0

data/lib/wiringpi.rb

@@ -1,240 +1,42 @@
 require 'wiringpi/wiringpi'
-
-WPI_MODE_PINS = 0 # Use sane pin numbering
-WPI_MODE_GPIO = 1 # Use Broadcom barmy GPIO pin numbering
-WPI_MODE_SYS  = 2 # Use /sys/class/gpio method
-
-# Constants for mode()
-INPUT = 0
-OUTPUT = 1
-PWM_OUTPUT = 2
-
-# Constants for digitalWrite()
-HIGH = 1
-LOW = 0
-
-PUD_OFF = 0
-PUD_DOWN = 1
-PUD_UP = 2
-
-# Bit-order for shiftOut and shiftIn
-LSBFIRST = 0 # Least Significant Bit First
-MSBFIRST = 1 # Most Significant Bit First
-
 module WiringPi
+  extend self
 
-  class Serial
+  HIGH = 1
+  LOW = 0
 
-    @id = 0
-    @device = '/dev/ttyAMA0'
-    @baud = 9600
+  INPUT = 0
+  OUTPUT = 1
+  PWM_OUTPUT = 1
 
-    def initialize(device='/dev/ttyAMA0',baud=9600)
+  PUD_OFF = 0
+  PUD_DOWN = 1
+  PUD_UP = 2
 
-      @device = device
-      @baud = baud
+  LSPFIRST = 0
+  MSBFIRST = 1
 
-      @id = Wiringpi.serialOpen( @device,@baud )
-
-    end
-
-    def serialClose
-
-      Wiringpi.serialClose( @id )
-      @id = 0
-
-    end
-
-    def serialPutchar( char )
-
-      Wiringpi.serialPutchar( @id, char )
-
-    end
-
-    def serialPuts( string )
-
-      Wiringpi.serialPuts( @id, string )
-
-    end
-
-    def serialDataAvail
-    
-      Wiringpi.serialDataAvail( @id )
-
-    end
+  class Modules
+    class ModuleBase
 
-    def serialGetchar
+      @name = 'Unknown'
+      @pin_base = 0
+      @pin_count = 0
+      @pin_end = 0
 
-      Wiringpi.serialGetchar( @id )
+      attr_reader :name, :pin_base, :pin_count, :pin_end
 
-    end
-
-  end
-
-  class GPIO
-
-    GPIO_PINS = [
-      0,1,4,7,8,9,10,11,14,15,17,18,21,22,23,24,25 # seemingly random indeed!
-      ]
-
-    PINS = [
-      0,1,2,3,4,5,6,7, # basic IO pins
-      8,9,             # i2c with 1k8 pull up resistor
-      10,11,12,13,14,     # SPI pins, can also be used for IO
-      15,16,17
-      ]
-
-    @mode = WPI_MODE_PINS
-
-    @@init = false  # once wiringPiSetup has been called, we don't have to do it again
-
-    def initialize( mode=WPI_MODE_PINS )
-
-	  @mode = mode
-      self.wiringPiSetup unless @@init
-
-    end
-
-    def wiringPiMode( mode )
-
-      @mode = mode
-      Wiringpi.wiringPiGpioMode( @mode )
-
-    end
-
-    def wiringPiSetup
-
-      begin
-        if @mode == WPI_MODE_PINS
-            Wiringpi.wiringPiSetup
-        elsif @mode == WPI_MODE_GPIO
-            Wiringpi.wiringPiSetupGpio
-        elsif @mode == WPI_MODE_SYS
-            Wiringpi.wiringPiSetupSys
-        end
-      rescue Exception=>e
-        raise e
+      def new
+        @pin_end = @pin_base + @pin_count
+        updateName
       end
 
-      #Wiringpi.wiringPiGpioMode( @mode )
-      @@init = true
-    
-    end
-
-    def checkPin(pin)
-
-      ( @mode = WPI_MODE_PINS and PINS.include?(pin) ) or ( @mode = WPI_MODE_GPIO and GPIO_PINS.include?(pin) )
-
-    end
-
-    def pinError(pin)
-      "invalid #{pin}, available gpio pins: #{PINS}" if @mode == WPI_MODE_PINS
-      "invalid #{pin}, available gpio pins: #{GPIO_PINS}" if @mode == WPI_MODE_GPIO
-    end
-
-    def read(pin)
-
-      raise ArgumentError, pinError(pin) unless checkPin(pin)
-
-      Wiringpi.digitalRead(pin)
-
-    end
-
-    def pwmWrite(pin,value)
-
-      raise ArgumentError, pinError(pin) unless checkPin(pin)
-
-      Wiringpi.pwmWrite(pin,value)
-
-    end
-
-    def write(pin,value)
-    
-      raise ArgumentError, pinError(pin) unless checkPin(pin)
-      raise ArgumentError, 'invalid value' unless [0,1].include?(value)
-
-      Wiringpi.digitalWrite(pin,value)
-
-    end
-
-    def mode(pin,mode)
-
-      raise ArgumentError, pinError(pin) unless checkPin(pin)
-      raise ArgumentError, "invalid mode" unless [INPUT,OUTPUT,PWM_OUTPUT].include?(mode)
-
-      Wiringpi.pinMode(pin, mode)
-
-    end
-
-=begin
-shiftOutArray int dataPin, int clockPin, int latchPin, int[] bits
-Shifts out an array of ints by converting them into bytes
-and handing to Wiringpi.shiftOut, must contain only 1s or 0s
-=end
-    def shiftOutArray(dataPin, clockPin, latchPin, bits)
-
-      raise ArgumentError, "invalid data pin, available gpio pins: #{PINS}" unless checkPin(dataPin)
-      raise ArgumentError, "invalid clock pin, available gpio pins: #{PINS}" unless checkPin(clockPin)
-      raise ArgumentError, "invalid latch pin, available gpio pins: #{PINS}" unless checkPin(latchPin)
-
-      Wiringpi.digitalWrite( latchPin, LOW )
-
-      bits.each_slice(8) do |slice|
-        Wiringpi.shiftOut(dataPin, clockPin, LSBFIRST, slice.reverse.join.to_i(2)) 
-      end
-
-      Wiringpi.digitalWrite( latchPin, HIGH )
-
-    end
-
-=begin
-shiftOut int dataPin, int clockPin, int latchPin, char
-Shift out a single 8-bit integer 0-255
-=end
-    def shiftOut(dataPin, clockPin, byteOrder, char)
-
-      #raise ArgumentError, "invalid data pin, available gpio pins: #{PINS}" unless checkPin(dataPin)
-      #raise ArgumentError, "invalid clock pin, available gpio pins: #{PINS}" unless checkPin(clockPin)
-      #raise ArgumentError, "invalid latch pin, available gpio pins: #{PINS}" unless checkPin(latchPin)
-        
-      #Wiringpi.digitalWrite( latchPin, LOW )
-
-      Wiringpi.shiftOut(dataPin, clockPin, byteOrder, char)
-
-      #Wiringpi.digitalWrite( latchPin, HIGH )
-
-    end
-
-=begin
-readAll
-Reads values of all pins and returns them as a hash
-=end
-    def readAll
-
-      pinValues = Hash.new
-
-      if @mode == WPI_MODE_GPIO
-
-        GPIO_PINS.each do |pin|
-        
-          pinValues[pin] = self.read(pin)
-        
-        end
-
-      else
-      
-        PINS.each do |pin|
-        
-          pinValues[pin] = self.read(pin)
-        
-        end
-
+      def updateName
+        @name = ' at offset ' + @pin_base.to_s
       end
 
-      pinValues
-
     end
-
   end
 
 end
+Dir[File.dirname(__FILE__) + '/wiringpi/*.rb'].each {|file| require file }

data/lib/wiringpi/event.rb

@@ -0,0 +1,21 @@
+module WiringPi
+	class GPIO
+		def interrupt(pin, edge, &block)
+			Thread.new do
+				@value = digital_read(pin)
+				@last_value = value
+				loop do
+					@last_value = @value
+					@value = digital_read(pin)
+
+					if @value != @last_value
+						next if @value == 0 and edge == :falling_edge
+						next if @value == 1 and edge == :rising_edge
+						break
+					end
+					block.call @value				
+				end
+			end
+		end
+	end
+end

data/lib/wiringpi/gpio.rb

@@ -0,0 +1,139 @@
+module WiringPi
+  class GPIO
+
+    @modules = Array.new
+    @pins = Array.new
+
+    attr_reader :modules, :pins
+
+    def initialize(&block)
+      Wiringpi.wiringPiSetup
+      @pins = Array.new
+      instance_eval &block if block_given?
+    end
+
+    def read_byte(starting_pin)
+      bits = Array.new
+      8.times do |time|
+        bits << Wiringpi.digitalRead(starting_pin + time)
+      end
+      bits.join
+    end
+
+    def write_byte(starting_pin, byte)
+      byte = byte.to_s(2) unless byte.length = 8
+      offset = starting_pin
+      byte.each_char do |bit|
+        Wiringpi.digitalWrite(offset, bit)
+        offset += 1
+      end
+    end
+
+    def digital_read(pin)
+      if pin.respond_to?(:each)
+        pin.collect do |pin|
+          Wiringpi.digitalRead(pin)
+        end
+      else
+        Wiringpi.digitalRead(pin)
+      end
+    end
+
+    def digital_write(pin, value)
+      if pin.respond_to?(:each)
+        pin.each do |pin|
+          Wiringpi.digitalWrite(pin, value)
+        end
+      else
+        Wiringpi.digitalWrite(pin, value)
+      end
+    end
+
+    def pin_mode(pin, mode)
+      Wiringpi.pinMode(pin, mode)
+    end
+
+    def pull_up_dn_control(pin,mode)
+      Wiringpi.pullUpDnControl(pin, mode)
+    end
+
+	def delay(ms)
+	  Wiringpi.delay(ms)
+	end
+
+	def delay_microseconds(ms)
+	  Wiringpi.delayMicroseconds(ms)
+	end
+
+	def millis()
+	  return Wiringpi.millis()
+	end
+
+	def micros()
+	  return Wiringpi.micros()
+	end
+
+       def pi_board_rev()
+          return Wiringpi.piBoardRev()
+       end
+
+       def wpi_pin_to_gpio(pin)
+          return Wiringpi.wpiPinToGpio(pin)
+       end
+
+       def phys_pin_to_gpio(pin)
+          return Wiringpi.physPinToGpio(pin)
+       end
+
+	def pwm_set_mode(mode)
+	  return Wiringpi.pwmSetMode(mode)
+	end
+
+	def pwm_set_range(range)
+	  return Wiringpi.pwmSetRange(range)
+	end
+
+	def pwm_set_clock(divisor)
+	  return Wiringpi.pwmSetClock(divisor)
+	end
+
+  def soft_pwm_create(pin, initial_value, pwm_range)
+    return Wiringpi.softPwmCreate(pin, initial_value, pwm_range)
+  end
+
+  def soft_pwm_write(pin, value)
+    Wiringpi.softPwmWrite(pin, value)
+  end
+
+	def gpio_clock_set(pin, freq)
+	  return Wiringpi.gpioClockSet(pin, freq)
+	end
+
+	def wait_for_interrupt(pin, ms)
+	  Wiringpi.waitForInterrupt(pin, ms)
+	end
+
+	def wiringpi_isr(pin, mode, fn)
+	  Wiringpi.wiringPiISR(pin, mode, fn)
+	end
+
+	def shift_out(dpin, cpin, order, val )
+	  Wiringpi.shiftOut(dpin,cpin,order,val)
+	end
+
+	def shift_in(dpin, cpin, order)
+	  Wiringpi.shiftIn(dpin,cpin,order)
+	end
+
+    def add_module(module_instance)
+      @modules = Array.new if @modules.nil?
+
+      @modules << module_instance
+      puts 'Added module ' + module_instance.name.to_s
+
+      module_instance.pin_count.times do |offset|
+        @pins[offset + module_instance.pin_base] = 'ENABLED'
+      end
+    end
+  end
+end

data/lib/wiringpi/i2c.rb

@@ -0,0 +1,26 @@
+module WiringPi
+  class I2C
+	@device_id = 0
+	def initialize(device_address)
+	  @device_id = Wiringpi.wiringPiI2CSetup(device_address)
+	end
+	def read()
+	  return Wiringpi.wiringPiI2CRead(@device_id)
+	end
+	def write(data)
+	  return Wiringpi.wiringPiI2CWrite(@device_id,data)
+	end
+	def read_reg_8(reg)
+	  return Wiringpi.wiringPiI2CReadReg8(@device_id,reg)
+	end
+	def write_reg_8(reg,data)
+	  return Wiringpi.wiringPiI2CWriteReg8(@device_id,reg,data)
+	end
+	def read_reg_16(reg)
+	  return Wiringpi.wiringPiI2CReadReg16(@device_id,reg)
+	end
+	def write_reg_16(reg,data)
+	  return Wiringpi.wiringPiI2CWriteReg16(@device_id,reg,data)
+	end
+  end
+end