pi_piper 1.0.2 → 1.1

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'  
 require 'echoe'  
   
-Echoe.new('pi_piper', '1.0.2') do |p|  
+Echoe.new('pi_piper', '1.1') do |p|  
   p.description     = "Event driven Raspberry Pi GPIO library"  
   p.url             = "http://github.com/jwhitehorn/pi_piper"  
   p.author          = "Jason Whitehorn"  

data/lib/pi_piper.rb

@@ -4,10 +4,9 @@ module PiPiper
 
   def PiPiper.watch(options)
     Thread.new do
+      pin = PiPiper::Pin.new(options)
       loop do
-        sleep_time = options[:poll] || 0.1 
-        pin = PiPiper::Pin.new(:pin => options[:pin])      
-        until pin.changed? do sleep sleep_time end
+        pin.wait_for_change 
         yield pin
       end 
     end.abort_on_exception = true  

data/lib/pi_piper/pin.rb

@@ -1,20 +1,20 @@
 module PiPiper
   class Pin
-    attr_reader :pin, :last_value, :direction, :invert
+    attr_reader :pin, :last_value, :value, :direction, :invert
     
     def initialize(options)
       @pin = options[:pin]
       @direction = options[:direction].nil? ? :in : options[:direction]
       @invert = options[:invert].nil? ? false : options[:invert]
-      
+     
       File.open("/sys/class/gpio/export", "w") { |f| f.write("#{@pin}") }
-      File.open("/sys/class/gpio/gpio#{pin}/direction", "w") { |f| f.write(@direction == :out ? "out" : "in") }
+      File.open(direction_file, "w") { |f| f.write(@direction == :out ? "out" : "in") }
       
-      @last_value = value
+      read 
     end
     
     def on
-      File.open(filename, 'w') {|f| f.write("1") } if direction == :out
+      File.open(value_file, 'w') {|f| f.write("1") } if direction == :out
     end
     
     def on?
@@ -22,7 +22,7 @@ module PiPiper
     end
     
     def off
-      File.open(filename, 'w') {|f| f.write("0") } if direction == :out
+      File.open(value_file, 'w') {|f| f.write("0") } if direction == :out
     end
     
     def off?
@@ -32,16 +32,36 @@ module PiPiper
     def changed?
       last_value != value
     end
+
+    def wait_for_change
+      fd = File.open(value_file, "r")
+      File.open(edge_file, "w") { |f| f.write("both") }
+      loop do
+        fd.read
+        IO.select(nil, nil, [fd], nil)
+        read 
+        break if changed?
+      end
+    end
     
-    def value
-      val = File.read(filename).to_i
-      invert ? (val ^ 1) : val
+    def read 
+      @last_value = @value
+      val = File.read(value_file).to_i
+      @value = invert ? (val ^ 1) : val
     end
     
     private
-    def filename
+    def value_file
       "/sys/class/gpio/gpio#{pin}/value"
     end
+
+    def edge_file
+      "/sys/class/gpio/gpio#{pin}/edge"
+    end
+
+    def direction_file
+      "/sys/class/gpio/gpio#{pin}/direction"
+    end
   
   end
 end

data/pi_piper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pi_piper"
-  s.version = "1.0.2"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Whitehorn"]
-  s.date = "2013-01-11"
+  s.date = "2013-01-12"
   s.description = "Event driven Raspberry Pi GPIO library"
   s.email = "jason.whitehorn@gmail.com"
   s.extra_rdoc_files = ["README.md", "lib/pi_piper.rb", "lib/pi_piper/pin.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pi_piper
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: '1.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies: []
 description: Event driven Raspberry Pi GPIO library
 email: jason.whitehorn@gmail.com