pi_piper 2.0.beta.1 → 2.0.beta.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cecbad62bc8eeedf7e061bfc03396691f584ee82
-  data.tar.gz: 5c22774ad6b6c737019baa7802c99934668f537a
+  metadata.gz: 14f0ac39d4e0f23013f42d657d6bc68ccca9433b
+  data.tar.gz: 3bb43ad2e9d6a72300f08990ca6b98850eae6026
 SHA512:
-  metadata.gz: dac9621e23d30b021ead1b74f30496fedfa93474346bb1656fb5a9f1a882e7bedfbdff87c28e6b3b4c3c84adb39427599a37c1eedd3c9fde9f318c22e7e3d5c7
-  data.tar.gz: 7167326e0245ee3a3272fc926298b94d7aa2b4e893c5b20f8ce5bb6a84414efca45bb5776adac1454a60f4e8f7c2eb4b3c9d792c623c5926ccbdfa006d89f008
+  metadata.gz: 9a1358e44e9a4648d132323dfcd24bb1494cc2a5e77145499e5292372c6e317659c507421e4aebc34926529b194760b55b1bfe5517997c8166179d3d5230f819
+  data.tar.gz: ce642bff726a8b60382ef781ca85b4097707bfe7f0154b6bb4f50cc442e838e4a8108b053583aa540578a082575b457dce7c303dfff0c51df0901b47cc2d58d5

data/Gemfile

@@ -4,3 +4,4 @@ gem 'echoe'
 gem 'rake'
 gem 'ffi'
 gem 'rspec'
+gem "eventmachine", "~> 1.0.3"

data/Gemfile.lock

@@ -9,6 +9,7 @@ GEM
       rake (>= 0.9.2)
       rdoc (>= 3.6.1)
       rubyforge (>= 2.0.4)
+    eventmachine (1.0.3)
     ffi (1.4.0)
     gemcutter (0.7.1)
     json_pure (1.7.7)
@@ -30,6 +31,7 @@ PLATFORMS
 
 DEPENDENCIES
   echoe
+  eventmachine (~> 1.0.3)
   ffi
   rake
   rspec

data/README.md

@@ -1,5 +1,7 @@
 ## Overview
 
+[![Build Status](https://travis-ci.org/jwhitehorn/pi_piper.png)](https://travis-ci.org/jwhitehorn/pi_piper)
+
 Pi Piper brings event driven programming to the Raspberry Pi's GPIO pins. Pi Piper works with all revisions of the Raspberry Pi, 
 and has been tested with Ruby 1.9.3 & 2.0 under both [Raspbian "wheezy"](http://www.raspberrypi.org/downloads) and [Occidentalis v0.2](http://learn.adafruit.com/adafruit-raspberry-pi-educational-linux-distro/occidentalis-v0-dot-2).
 

data/Rakefile

@@ -5,15 +5,16 @@ require 'rake/testtask'
 
 #rake manifest
 #rake build_gemspec
-#rake release
+#gem build pi_piper.gemspec
+#gem push xxx.gem
 
-Echoe.new('pi_piper', '2.0.beta.1') do |p|
+Echoe.new('pi_piper', '2.0.beta.3') do |p|
   p.description     = "Event driven Raspberry Pi GPIO library"
   p.url             = "http://github.com/jwhitehorn/pi_piper"
   p.author          = "Jason Whitehorn"
   p.email           = "jason.whitehorn@gmail.com"
   p.ignore_pattern  = ["examples/**/*", "spec/**/*"]
-  p.dependencies    = ['ffi']
+  p.dependencies    = ['ffi', 'eventmachine 1.0.3']
 end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each { |ext| load ext }

data/lib/pi_piper.rb

@@ -1,4 +1,5 @@
-Dir[File.dirname(__FILE__) + '/pi_piper/*.rb'].each {|file| require file unless file.end_with?('bcm2835.rb') }
+require 'eventmachine'
+Dir[File.dirname(__FILE__) + '/pi_piper/*.rb'].each {|file| require file }#unless file.end_with?('bcm2835.rb') }
 
 module PiPiper
   extend self
@@ -32,8 +33,44 @@ module PiPiper
     options[:trigger] = options.delete(:goes) == :high ? :rising : :falling
     watch options, &block
   end
+  
+  #Defines an event block to be called on a regular schedule. The block will be passed the slave output.
+  #
+  # @param [Hash] options A hash of options.
+  # @option options [Fixnum] :every A frequency of time (in seconds) to poll the SPI slave.
+  # @option options [Fixnum] :slave The slave number to poll.
+  # @option options [Number|Array] :write Data to poll the SPI slave with. 
+  def poll_spi(options, &block)
+    EM::PeriodicTimer.new(options[:every]) do
+      Spi.begin options[:slave] do
+        output = write options[:write]
+        block.call output
+      end
+    end
+  end
+  
+  #Defines an event block to be called when SPI slave output meets certain characteristics. 
+  #The block will be passed the slave output.
+  #
+  # @param [Hash] options A hash of options.
+  # @option options [Fixnum] :every A frequency of time (in seconds) to poll the SPI slave.
+  # @option options [Fixnum] :slave The slave number to poll.
+  # @option options [Number|Array] :write Data to poll the SPI slave with. 
+  # @option options [Fixnum] :eq Tests for SPI slave output equality.
+  # @option options [Fixnum] :lt Tests for SPI slave output less than supplied value.
+  # @option options [Fixnum] :gt Tests for SPI slave output greater than supplied value.
+  def when_spi(options, &block)
+    poll_spi options do |value|
+      if (options[:eq] && value == options[:eq]) || 
+         (options[:lt] && value < options[:lt])  ||
+         (options[:gt] && value > options[:gt])
+          block.call value
+      end
+    end
+  end
 
   #Prevents the main thread from exiting. Required when using PiPiper.watch
+  # @deprecated Please use EventMachine.run instead
   def wait
     loop do sleep 1 end
   end

data/lib/pi_piper/bcm2835.rb

@@ -32,9 +32,9 @@ module PiPiper
       File.open("/sys/class/gpio/gpio#{pin}/value", 'w') {|f| f.write("#{value}") }
     end
     
-    def self.pin_output(pin)
+    def Bcm2835.pin_output(pin)
       File.open("/sys/class/gpio/export", "w") { |f| f.write("#{pin}") }
-      File.open(direction_file, "w") { |f| f.write("out") }
+      File.open("/sys/class/gpio/gpio#{pin}/direction", "w") { |f| f.write("out") }
     end
     
     def self.pin_read(pin)
@@ -54,11 +54,11 @@ module PiPiper
                     :bcm2835_spi_setChipSelectPolarity,              [:uint8, :uint8], :void
 
     #I2C support...
-    attach_function :i2c_begin,      :bcm2835_i2c_begin,             [], :void
-    attach_function :i2c_end,        :bcm2835_i2c_end,               [], :void
-    attach_function :i2c_write,      :bcm2835_i2c_write,             [:pointer, :uint], :uint8
-    attach_function :i2c_set_address,:bcm2835_i2c_setSlaveAddress,   [:uint8], :void
-    attach_function :i2c_set_clock_divider, :bcm2835_i2c_setClockDivider,     [:uint16], :void
+    #attach_function :i2c_begin,      :bcm2835_i2c_begin,             [], :void
+    #attach_function :i2c_end,        :bcm2835_i2c_end,               [], :void
+    #attach_function :i2c_write,      :bcm2835_i2c_write,             [:pointer, :uint], :uint8
+    #attach_function :i2c_set_address,:bcm2835_i2c_setSlaveAddress,   [:uint8], :void
+    #attach_function :i2c_set_clock_divider, :bcm2835_i2c_setClockDivider,     [:uint16], :void
 
     def self.i2c_allowed_clocks
       [100.kilohertz,

data/lib/pi_piper/platform.rb

@@ -1,15 +1,17 @@
+#require 'bcm2835.rb'
 module PiPiper
 
   #Hardware abstraction manager. Not intended for direct use.
   class Platform
+    @@driver = nil
 
     #gets the current platform driver. Defaults to BCM2835.
     def self.driver
       unless @@driver
-        require 'bcm2835.rb'
+        #require 'bcm2835.rb'
         PiPiper::Bcm2835.init
         @@driver = PiPiper::Bcm2835
-        at_exit { PiPiper::Bcm2835.close }
+        at_exit { Bcm2835.close }
       end
       @@driver
     end

data/pi_piper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pi_piper"
-  s.version = "2.0.beta.1"
+  s.version = "2.0.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Whitehorn"]
-  s.date = "2013-09-06"
+  s.date = "2013-09-11"
   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/bcm2835.rb", "lib/pi_piper/frequency.rb", "lib/pi_piper/i2c.rb", "lib/pi_piper/libbcm2835.img", "lib/pi_piper/pin.rb", "lib/pi_piper/platform.rb", "lib/pi_piper/spi.rb"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Pi_piper", "--main", "README.md"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "pi_piper"
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.0"
   s.summary = "Event driven Raspberry Pi GPIO library"
 
   if s.respond_to? :specification_version then
@@ -23,10 +23,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<ffi>, [">= 0"])
+      s.add_runtime_dependency(%q<eventmachine>, ["= 1.0.3"])
     else
       s.add_dependency(%q<ffi>, [">= 0"])
+      s.add_dependency(%q<eventmachine>, ["= 1.0.3"])
     end
   else
     s.add_dependency(%q<ffi>, [">= 0"])
+    s.add_dependency(%q<eventmachine>, ["= 1.0.3"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pi_piper
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.1
+  version: 2.0.beta.3
 platform: ruby
 authors:
 - Jason Whitehorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 description: Event driven Raspberry Pi GPIO library
 email: jason.whitehorn@gmail.com
 executables: []
@@ -78,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.2'
 requirements: []
 rubyforge_project: pi_piper
-rubygems_version: 2.0.3
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Event driven Raspberry Pi GPIO library