pi_piper 1.9.9 → 2.0.beta.1

data/lib/pi_piper/platform.rb

@@ -2,18 +2,14 @@ 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 'pi_piper/bcm2835'
+        require 'bcm2835.rb'
         PiPiper::Bcm2835.init
         @@driver = PiPiper::Bcm2835
-        at_exit do
-          Bcm2835.release_pins
-          Bcm2835.close
-        end
+        at_exit { PiPiper::Bcm2835.close }
       end
       @@driver
     end
@@ -21,5 +17,7 @@ module PiPiper
     def self.driver=(instance)
       @@driver = instance
     end
+
   end
+
 end

data/lib/pi_piper/spi.rb

@@ -28,6 +28,9 @@
 #++
 
 
+
+
+
 module PiPiper
   # class for SPI interfaces on the Raspberry Pi
   class Spi
@@ -45,24 +48,18 @@ module PiPiper
     # No CS, control it yourself
     CHIP_SELECT_NONE = 3
 
-    # SPI Modes
-    SPI_MODE0 = 0
-    SPI_MODE1 = 1
-    SPI_MODE2 = 2
-    SPI_MODE3 = 3 
-
     #Sets the SPI mode. Defaults to mode (0,0).
     def self.set_mode(cpol, cpha)
       mode = SPI_MODE0 #default
       mode = SPI_MODE1 if cpol == 0 and cpha == 1
       mode = SPI_MODE2 if cpol == 1 and cpha == 0
       mode = SPI_MODE3 if cpol == 1 and cpha == 1
-      Platform.driver.spi_set_data_mode mode
+      Bcm2835.spi_set_data_mode mode
     end
 
     #Begin an SPI block. All SPI communications should be wrapped in a block.
     def self.begin(chip=nil, &block)
-      Platform.driver.spi_begin
+      Bcm2835.spi_begin
       chip = CHIP_SELECT_0 if !chip && block_given?
       spi = new(chip)
 
@@ -75,19 +72,7 @@ module PiPiper
 
     # Not needed when #begin is called with a block
     def self.end
-      Platform.driver.spi_end
-    end
-
-    # Uses /dev/spidev0.0 to write to the SPI
-    # NOTE: Requires that you have /dev/spidev0.0
-    #  see: http://learn.adafruit.com/adafruit-raspberry-pi-educational-linux-distro/overview
-    #  most likely requires `chmod 666 /dev/spidev0.0`
-    #
-    # @example Writing red, green, blue to a string of WS2801 pixels
-    #   PiPiper::Spi.spidev_out([255,0,0,0,255,0,0,0,255])
-    #
-    def self.spidev_out(array)
-      Platform.driver.spidev_out(array)
+      Bcm2835.spi_end
     end
 
     # Sets the SPI clock frequency
@@ -107,7 +92,7 @@ module PiPiper
                  20000000 => 16      #20 MHz
                }
       divider = options[frequency]
-      Platform.driver.spi_clock(divider)
+      Bcm2835.spi_clock(divider)
     end
 
     def bit_order(order=MSBFIRST)
@@ -119,7 +104,7 @@ module PiPiper
         end
       end
 
-      Platform.driver.spi_bit_order(order)
+      Bcm2835.spi_bit_order(order)
     end
 
     # Activate a specific chip so that communication can begin
@@ -141,13 +126,13 @@ module PiPiper
     # @yield 
     # @param [optional, CHIP_SELECT_*] chip the chip select line options
     def chip_select(chip=CHIP_SELECT_0)
-      chip = @chip if @chip
-      Platform.driver.spi_chip_select(chip) 
+      chip = @chip if @chip 
+      Bcm2835.spi_chip_select(chip) 
       if block_given?
         begin
           yield
         ensure
-          Platform.driver.spi_chip_select(CHIP_SELECT_NONE)
+          Bcm2835.spi_chip_select(CHIP_SELECT_NONE)
         end
       end
     end
@@ -166,7 +151,7 @@ module PiPiper
       chip = @chip if @chip
       chip = CHIP_SELECT_0 unless chip
 
-      Platform.driver.spi_chip_select_polarity(chip, active_low ? 0 : 1)
+      Bcm2835.spi_chip_select_polarity(chip, active_low ? 0 : 1)
     end
 
     # Read from the bus
@@ -186,7 +171,7 @@ module PiPiper
       if count
         write([0xFF] * count)
       else
-        enable { Platform.driver.spi_transfer(0) }
+        enable { Bcm2835.spi_transfer(0) }
       end
     end
 
@@ -212,9 +197,9 @@ module PiPiper
       enable do
         case data
         when Numeric
-          Platform.driver.spi_transfer(data)
+          Bcm2835.spi_transfer(data)
         when Enumerable
-          Platform.driver.spi_transfer_bytes(data)
+          Bcm2835.spi_transfer_bytes(data)
         else
           raise ArgumentError.new("#{data.class} is not valid data. Use Numeric or an Enumerable of numbers")
         end

data/pi_piper.gemspec

@@ -1,43 +1,32 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'pi_piper/version'
+# -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "pi_piper"
-  s.version = PiPiper::VERSION
+  s.version = "2.0.beta.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Whitehorn"]
-  s.date = "2013-09-14"
+  s.date = "2013-09-06"
   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.so", "lib/pi_piper/pin.rb", "lib/pi_piper/platform.rb", "lib/pi_piper/spi.rb"]
-  s.files         = `git ls-files -z`.split("\x0")
-  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  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"]
+  s.files = ["Gemfile", "Gemfile.lock", "Manifest", "README.md", "Rakefile", "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", "pi_piper.gemspec"]
   s.homepage = "http://github.com/jwhitehorn/pi_piper"
   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.0"
+  s.rubygems_version = "2.0.3"
   s.summary = "Event driven Raspberry Pi GPIO library"
 
-  if s.respond_to? :specification_version
+  if s.respond_to? :specification_version then
     s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+    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.9"])
     else
       s.add_dependency(%q<ffi>, [">= 0"])
-      s.add_dependency(%q<eventmachine>, ["= 1.0.9"])
     end
   else
     s.add_dependency(%q<ffi>, [">= 0"])
-    s.add_dependency(%q<eventmachine>, ["= 1.0.9"])
   end
-
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'mocha'
-  s.add_development_dependency 'simplecov'
 end

metadata

@@ -1,83 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: pi_piper
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 2.0.beta.1
 platform: ruby
 authors:
 - Jason Whitehorn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !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.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.9
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Event driven Raspberry Pi GPIO library
@@ -90,81 +34,52 @@ extra_rdoc_files:
 - lib/pi_piper/bcm2835.rb
 - lib/pi_piper/frequency.rb
 - lib/pi_piper/i2c.rb
-- lib/pi_piper/libbcm2835.so
+- lib/pi_piper/libbcm2835.img
 - lib/pi_piper/pin.rb
 - lib/pi_piper/platform.rb
 - lib/pi_piper/spi.rb
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Manifest
 - README.md
 - Rakefile
-- examples/2_bit_counter/2_bit_counter.rb
-- examples/7-segment/7-segment.rb
-- examples/dsl_switch/dsl_switch.rb
-- examples/mcp3008/circuit.png
-- examples/mcp3008/mcp3008.rb
-- examples/mcp3008_spi/mcp3008_spi.rb
-- examples/morse_code/circuit.png
-- examples/morse_code/morse_code.rb
-- examples/simple_switch/circuit.png
-- examples/simple_switch/simple_switch.rb
 - lib/pi_piper.rb
 - lib/pi_piper/bcm2835.rb
 - lib/pi_piper/frequency.rb
 - lib/pi_piper/i2c.rb
-- lib/pi_piper/libbcm2835.so
+- lib/pi_piper/libbcm2835.img
 - lib/pi_piper/pin.rb
-- lib/pi_piper/pin_error.rb
-- lib/pi_piper/pin_values.rb
 - lib/pi_piper/platform.rb
 - lib/pi_piper/spi.rb
-- lib/pi_piper/stub_driver.rb
 - pi_piper.gemspec
-- spec/i2c_spec.rb
-- spec/pin_spec.rb
-- spec/pull_mode_spec.rb
-- spec/spec_helper.rb
-- spec/spi_spec.rb
-- spec/stub_driver_spec.rb
 homepage: http://github.com/jwhitehorn/pi_piper
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--line-numbers"
-- "--inline-source"
-- "--title"
+- --line-numbers
+- --inline-source
+- --title
 - Pi_piper
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: pi_piper
-rubygems_version: 2.4.5
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Event driven Raspberry Pi GPIO library
-test_files:
-- spec/i2c_spec.rb
-- spec/pin_spec.rb
-- spec/pull_mode_spec.rb
-- spec/spec_helper.rb
-- spec/spi_spec.rb
-- spec/stub_driver_spec.rb
-has_rdoc: 
+test_files: []

data/.gitignore

@@ -1,4 +0,0 @@
-pkg/*
-*.swp
-*.gem
-coverage/*

data/.rspec

@@ -1,3 +0,0 @@
---color
---format documentation
---require spec_helper

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.3
-  - 2.0.0
-
-before_install:
-  - gem install bundler
-  - gem update

data/examples/2_bit_counter/2_bit_counter.rb

@@ -1,22 +0,0 @@
-require 'pi_piper'
-
-puts "Press the switch to get started"
-pin17 = PiPiper::Pin.new(:pin => 17, :direction => :out)
-pin27 = PiPiper::Pin.new(:pin => 27, :direction => :out)
-
-pin17.off
-pin27.off
-
-sum = 0
-
-PiPiper.watch :pin => 22, :trigger => :rising do |pin|
-  sum = sum + 1
-  display = sum % 4
-  puts sum 
-
-  pin17.update_value(display == 2 || display == 3)
-  pin27.update_value(display == 1 || display == 3)
-end
-
-PiPiper.wait
-

data/examples/7-segment/7-segment.rb

@@ -1,37 +0,0 @@
-require 'pi_piper'
-
-s1 = PiPiper::Pin.new(:direction => :out, :pin => 27)
-s2 = PiPiper::Pin.new(:direction => :out, :pin => 24)
-s3 = PiPiper::Pin.new(:direction => :out, :pin => 23)
-s4 = PiPiper::Pin.new(:direction => :out, :pin => 25)
-s5 = PiPiper::Pin.new(:direction => :out, :pin => 18)
-s6 = PiPiper::Pin.new(:direction => :out, :pin => 22)
-s7 = PiPiper::Pin.new(:direction => :out, :pin => 17)
-
-
-pins = [s1, s2, s3, s4, s5, s6, s7]
-
-zero = Proc.new { s1.on; s2.on; s3.on; s4.on; s5.on; s6.on; s7.off; }
-one = Proc.new { s1.off; s2.off; s3.on; s4.on; s5.off; s6.off; s7.off; }
-two = Proc.new { s1.off; s2.on; s3.on; s4.off; s5.on; s6.on; s7.on; }
-three = Proc.new { s1.off; s2.on; s3.on; s4.on; s5.on; s6.off; s7.on; }
-four = Proc.new { s1.on; s2.off; s3.on; s4.on;; s5.off; s6.off; s7.on; }
-five = Proc.new { s1.on; s2.on; s3.off; s4.on; s5.on; s6.off; s7.on; }
-six = Proc.new { s1.on; s2.on; s3.off; s4.on; s5.on; s6.on; s7.on; }
-seven = Proc.new { s1.off; s2.on; s3.on; s4.on; s5.off; s6.off; s7.off; }
-eight = Proc.new { s1.on; s2.on; s3.on; s4.on; s5.on; s6.on; s7.on; }
-nine = Proc.new { s1.on; s2.on; s3.on; s4.on; s5.off; s6.off; s7.on; }
-
-numbers = [zero, one, two, three, four, five, six, seven, eight, nine]
-
-pins.each { |p| p.off }
-
-PiPiper.watch :pin => 4, :trigger => :rising do
-  (0..250).each do
-    pins.each { |p| p.update_value(Random.rand(2) == 1) }
-  end
-  number = Random.rand(10)
-  numbers[number].call
-end
-
-PiPiper.wait