humble_rpi-plugin-pir 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfd39e7a20026132f7281e13c61dca45ff0a4a0
-  data.tar.gz: 33b9e5aa8f1f7b4121cc41dcce44aac3f42ee762
+  metadata.gz: 7c77f7fdcfdd99682f5223785a1dd52fe71e89a2
+  data.tar.gz: 7369518bab17977ab4d25ade875eb11956f692f3
 SHA512:
-  metadata.gz: 8c836e2e892e8b32453aa4910e4fa9047f8a137773476d122d6a280b5f690d9bac5c70bb0942a15a5a633c1179f2856d8c4acad8731b2f6eb20e8622a5e5477d
-  data.tar.gz: e560788a10ce4a45d3de61a91845d360bc9a7832af3433fa2e9627d129f92da38a8da409f1af9d1032616aa337086b7d4df74438697d0c3c1691de95b495b1f9
+  metadata.gz: 05cd47f928086656dd9218d12e626f0ea0ee708d6287b5235543479f035acc72644e16e3c97345b74d8b8e787f02a514afc33a50af3bf516974049059000001c
+  data.tar.gz: 7cf2b9b15f41c06ddaded52d5a151c06e9392d5d078572b5c1992cad3eaf22de5b590e8087845a18173a95fa67d6750fc175e8b34da1a92ac3c700962a1e4fc3

data/lib/humble_rpi-plugin-pir.rb

@@ -2,31 +2,21 @@
 
 # file: humble_rpi-plugin-pir.rb
 
+
+require 'rpi_pinin'
 require 'chronic_duration'
-require 'pi_piper'
+
 
 
 class HumbleRPiPluginPir
-  include PiPiper
+
 
   def initialize(settings: {}, variables: {})
 
-    @pins = settings[:pins]
+    @pins = settings[:pins].map {|x| RPiPinIn.new x}
     @duration = settings[:duration] || '1 minute'
     @notifier = variables[:notifier]
     @device_id = variables[:device_id] || 'pi'
-      
-    at_exit do
-      
-      @pins.each do |pin|
-
-        uexp = open("/sys/class/gpio/unexport", "w")
-        uexp.write(pin)
-        uexp.close
-      
-      end
-    end
-
     
   end
 
@@ -41,29 +31,31 @@ class HumbleRPiPluginPir
     t1 = Time.now - (ChronicDuration.parse(duration) + 10)    
     
     puts 'ready to detect motion'
-    
+        
     @pins.each.with_index do |pin, i|
-
-      after pin: pin.to_i, goes: :high do
+            
+      Thread.new do      
         
-        count += 1
-
-        if Time.now > t1 + ChronicDuration.parse(duration)  then
-
-          notifier.notice "%s/motion/%s: detected %s times within the past %s" \
-                                            % [device_id, i, count, duration]
-          t1 = Time.now
-          count = 0
-        end
-
-      end
+        pin.watch_high do
+          
+          count += 1
+
+          if Time.now > t1 + ChronicDuration.parse(duration)  then
+
+            notifier.notice \
+                "%s/motion/%s: detected %s times within the past %s" % \
+                [device_id, i, count, duration]
+            t1 = Time.now
+            count = 0
+          end
+          
+        end #/ watch_high        
+      end #/ thread      
     end
     
-    PiPiper.wait
-    
   end
   
   alias on_start start
   
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-pir
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   sZmb/8bK00PWuk0XFH654xoL460Lx6jtyKxF+AGbl41ABU8/37TLpQ4JR+zak1pD
   6ChqgwUNdmh5Tw==
   -----END CERTIFICATE-----
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pi_piper
+  name: rpi_pinin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A humble_rpi plugin which detects motion for 1 or more PIR sensor.