humble_rpi-plugin-vibrationsensor 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950847ff3067cfde4ad42d65e74e6159865b7038
-  data.tar.gz: 5922f6a702c3dd9a593d83d4a7fe2f9be6e8c4e4
+  metadata.gz: 5bd0c50d664d3f264d0336a0b1c95107ea56c558
+  data.tar.gz: dd7b4f7d483329729945cd69fa05086803abe8ad
 SHA512:
-  metadata.gz: 8e5eb9d8820cac5d64d20d0f1d7d4c159a1b496fdfa48b77bec17c24ffc3b8c84d81c083023ec1bee6a57ecef254da5a342ac568f024c3863d4c219378156443
-  data.tar.gz: ff3c84c4cacafbc21212620677e30103bd1121e75f6aed7929196776ea41b7b7923dca6aeaf01fed22b839d2b00aa014e00d867f28976650bef3172210660c60
+  metadata.gz: 12b6f9c1dec8df612fe84c83d16c66e109b4ad5fa613e4a44e7705605335ee80998ca3a5268543d240a22acaee4e736b47d920230186436b8dd24ae564f66b3d
+  data.tar.gz: 66aa951dc5ca11f46bd7634d9444272c19999dd05e3eddb32926892e8a63546eb1f67963c7fdf995a5af85dab4e1b962ebd793a6b8964a7fed44bcdebb43d3ae

data/lib/humble_rpi-plugin-vibrationsensor.rb

@@ -2,7 +2,7 @@
 
 # file: humble_rpi-plugin-vibrationsensor.rb
 
-require 'rpi_pinin'
+require 'rpi_pinin_msgout'
 require 'chronic_duration'
 
 
@@ -19,75 +19,41 @@ class HumbleRPiPluginVibrationSensor
 
   def initialize(settings: {}, variables: {}, verbose: false)
 
-    @pins = settings[:pins].map {|x| RPiPinIn.new x, pull: :up}
-    @duration = settings[:duration] || '5 seconds'
-    @capture_rate = settings[:capture_rate] || 0.25 # seconds    
-    @notifier = variables[:notifier]
-    @device_id = variables[:device_id] || 'pi'
+    pins = settings[:pins]
+    settings.delete :pins
     
-    @verbose = verbose
+    h1 = {
+      duration: '5 seconds',
+      capture_rate: 0.25, # seconds
+      mode: :default
+      }.merge settings
 
+    h2 = {device_id: 'pi'}.merge variables
     
-  end
-
-  def start()
-
-    count = 0
-    
-    duration = ChronicDuration.parse(@duration)
-    notifier = @notifier
-    device_id = @device_id
+    h3 = {
+      pull: :up, 
+      subtopic: 'vibration', 
+      verbose: verbose
+    }
+        
+    h = h1.merge(h2).merge(h3)
     
-    t0 = Time.now + 1
-    t1 = Time.now - duration + 1
+    @pins = pins.map.with_index do |x,i|
+      
+      RPiPinInMsgOut.new x, h.merge(index: i)
+      
+    end
     
+  end
+  
+  def start()
+        
     puts 'ready to detect vibrations'
     
-    @pins.each.with_index do |pin, i|
-      
-      Thread.new do      
-        
-        pin.watch_high do
-          
-          # ignore any movements that happened 250 
-          #               milliseconds ago since the last movement
-          if t0 + @capture_rate < Time.now then          
-            
-            puts  Time.now.to_s if @verbose
-            
-            count += 1
-            
-            elapsed = Time.now - (t1  + duration)
-            #puts 'elapsed : ' + elapsed.inspect
+    @pins.each {|pin| Thread.new { pin.capture_high } }
 
-            if elapsed > 0 then
-
-              # identify if the movement is consecutive
-              msg = if elapsed < duration then              
-                s = ChronicDuration.output(duration, :format => :long)
-                "%s/vibration/%s: detected %s times within the past %s" \
-                                                      % [device_id, i, count, s ]
-              else              
-                "%s/vibration/%s: detected" % [device_id, i]
-              end
-              
-              notifier.notice msg
-              t1 = Time.now
-              count = 0
-            end
-            
-            t0 = Time.now
-          else
-            #puts 'ignoring ...'
-          end          
-          
-        end #/ watch_high        
-      end #/ thread             
-    end
-
-    
   end
   
-  alias on_start start  
+  alias on_start start
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-vibrationsensor
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -34,7 +34,7 @@ cert_chain:
 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.0
   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.0
 description: 
 email: james@r0bertson.co.uk
 executables: []