wiringpi-ruby 2.1.0 → 2.1.5

data/lib/wiringpi.rb

@@ -1,7 +1,14 @@
 require 'wiringpi/wiringpi'
+
 module WiringPi
   extend self
 
+  # GPIO WiringPi PIN layout mode
+  GPIO_WPI = 0
+  GPIO_NORMAL = 1
+  GPIO_PHYSICAL = 2
+  GPIO_SYSTEM = 3
+
   # GPIO signal
   HIGH = 1
   LOW = 0
@@ -10,6 +17,7 @@ module WiringPi
   FALLING = :falling
   RISING = :rising
 
+  # PIN mode
   INPUT = 0
   OUTPUT = 1
   PWM_OUTPUT = 1

data/lib/wiringpi/gpio.rb

@@ -2,8 +2,25 @@ module WiringPi
   class GPIO
     attr_reader :modules, :pins
 
+    @@system_ready = false
+
+    def self.setup(pin_layout = GPIO_WPI)
+      return if @@system_ready
+
+      case pin_layout
+      when GPIO_WPI; Wiringpi.wiringPiSetup
+      when GPIO_NORMAL; Wiringpi.wiringPiSetupGpio
+      when GPIO_PHYSICAL; Wiringpi.wiringPiSetupPhys
+      when GPIO_SYSTEM; Wiringpi.wiringPiSetupSys
+      else raise 'unknown pin layout to setup'
+      end
+
+      @@system_ready = true
+    end
+
     def initialize(&block)
-      Wiringpi.wiringPiSetup
+      raise 'system is not ready, please call WiringPi::GPIO.setup first' unless @@system_ready
+
       @pins = []
       @modules = []
       instance_eval &block if block_given?
@@ -23,13 +40,25 @@ module WiringPi
     end
 
     def digital_read(pin)
-      pin = [pin] unless pin.respond_to?(:each)
-      pin.collect { |pin| Wiringpi.digitalRead(pin) }
+      pins = [pin] unless pin.is_a?(Array)
+      res = pins.collect { |pin| Wiringpi.digitalRead(pin) }
+      res.count == 1 ? res.first : res
     end
 
     def digital_write(pin, value)
-      pin = [pin] unless pin.respond_to?(:each)
-      pin.each { |pin| Wiringpi.digitalWrite(pin, value) }
+      pins = [pin] unless pin.is_a?(Array)
+      pins.each { |pin| Wiringpi.digitalWrite(pin, value) }
+    end
+
+    def analog_read(pin)
+      pins = [pin] unless pin.is_a?(Array)
+      res = pins.collect { |pin| Wiringpi.analogRead(pin) }
+      res.count == 1 ? res.first : res
+    end
+
+    def analog_write(pin, value)
+      pins = [pin] unless pin.is_a?(Array)
+      pins.each { |pin| Wiringpi.analogWrite(pin, value) }
     end
 
     def pin_mode(pin, mode)

data/lib/wiringpi/modules/mcp23s17.rb

@@ -1,14 +1,16 @@
 module WiringPi
-  class Mcp23s17 < ModuleBase
-    attr_reader :spi_port, :device_id
+  class Modules
+    class Mcp23s17 < ModuleBase
+      attr_reader :spi_port, :device_id
 
-    def initialize(pin_base, spi_port, device_id)
-      super
-      @pin_base = pin_base
-      @pin_count = 16
-      @spi_port = spi_port || 0
-      @device_id = device_id || 0
-      Wiringpi.mcp23s17Setup(pin_base, spi_port, device_id)
+      def initialize(pin_base, spi_port, device_id)
+        super
+        @pin_base = pin_base
+        @pin_count = 16
+        @spi_port = spi_port || 0
+        @device_id = device_id || 0
+        Wiringpi.mcp23s17Setup(pin_base, spi_port, device_id)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wiringpi-ruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.5
 platform: ruby
 authors:
 - Rifqi