humble_rpi-plugin-button 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1255a116c64c496751809f91fa7555d2d509f72e
-  data.tar.gz: 5f4fd3a1a23cb0ef1a674b3ffea9c64508ca8cfc
+  metadata.gz: 4bfe9d964429a76c0064b749de7f9399d98548c2
+  data.tar.gz: 10b7836831dee0dfa4d6e0120ca40deedb2dbfa2
 SHA512:
-  metadata.gz: b380bd8ce58bd7ce323b8a500efeeb14359d64e4a172690829ae820c5ffa8713091823854472fed28c85fc82347bbb12feeba51024f2d7077668152f17a601de
-  data.tar.gz: 7b07fcc7559e10ceb43ab5fbc1c96a08e427a45609ceb899f4537fc60451d13f2625754e2eb867f5fbd149fbf41ecb5a613b63860b0d3a658849ebee5a6bcf6e
+  metadata.gz: 3b16758a535f22cb2205f42b8902ab2d663aade73afd9f039be1333cc1f33c6d40561957abcec4ddbe0be1b83a99a2b67302bd99943a9465232c58059141b4d6
+  data.tar.gz: b528ac8dc1019dd365b7eda0bad1d78cc61e3ff92eb4138380d320c65f2d4ad4d3914904b8fd850ee174321cde82ea15d27e234be4fc4f54c6cf3452b91c40d2

data/lib/humble_rpi-plugin-button.rb

@@ -3,66 +3,48 @@
 # file: humble_rpi-plugin-button.rb
 
 
-require 'rpi_pinin'
+require 'rpi_pinin_msgout'
 
 
 class HumbleRPiPluginButton
 
 
-  def initialize(settings: {ignore_keyup: true}, variables: {})
-
-    @ignore_keyup = settings[:ignore_keyup] || true
-    @pins = settings[:pins].map {|x| RPiPinIn.new x, pull: :up}
-    @notifier = variables[:notifier]
-    @device_id = variables[:device_id] || 'pi'
+  def initialize(settings: {}, variables: {}, verbose: false)
     
-  end
-
-  def start()
+    pins = settings[:pins]
+    settings.delete :pins
     
-    notifier = @notifier
-    device_id = @device_id
+    h1 = {
+      capture_rate: 0.25, # seconds
+      mode: :default
+      }.merge settings
+
+    h2 = {device_id: 'pi'}.merge variables
     
-    t0 = Time.now + 1
+    h3 = {
+      pull: :up, 
+      subtopic: 'button', 
+      descriptor: 'pressed',
+      verbose: verbose
+    }
         
-    puts 'ready to detect buttons'
+    h = h1.merge(h2).merge(h3)
     
-    @pins.each.with_index do |button, i|
+    @pins = pins.map.with_index do |x,i|
       
-      puts 'button %s on GPIO %s enabled ' % [i+1, button]
-            
-      n = (i+1).to_s
-            
-      Thread.new do      
-        
-        button.watch do |value|
-          
-          # ignore any movements that happened 250 
-          #               milliseconds ago since the last movement
-          if t0 + 0.25 < Time.now then                   
-              
-            state = case value
-            when 1
-              @ignore_keyup ? :press : :down
-            when 0
-              :up unless @ignore_keyup
-            end
-
-            if state            
-              notifier.notice "%s/button/%s: key%s" % [device_id, i, state]
-            end
-            
-            t0 = Time.now
-            
-          end
-        end
-        
-      end      
+      RPiPinInMsgOut.new x, h.merge(index: i+1)
       
     end    
-
     
   end
+    
+  def start()
+        
+    puts 'ready to detect buttons'
+    
+    @pins.each {|pin| Thread.new { pin.capture} }
+
+  end  
   
   alias on_start start
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-button
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,10 +31,10 @@ cert_chain:
   BpuaDRLyhUfMJfBG+PlWbU2XPeE6pbRnGWCbBwZtUcCzSfwfEehXiw0aZOMCG6Gu
   OTO58NMjMKNbdQ==
   -----END CERTIFICATE-----
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rpi_pinin
+  name: rpi_pinin_msgout
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -42,7 +42,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,7 +52,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.1
 description: 
 email: james@r0bertson.co.uk
 executables: []