humble_rpi 0.2.6 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b6df8f7820ca2303b1afa3935c054fb2b88d238
-  data.tar.gz: c539480eef9a3b2a5e16e378c4c3ae915f516f78
+  metadata.gz: 7c3a9e8157cd8c010caa36ecba2bb4ecda48d0fb
+  data.tar.gz: 2b14aaa30e9a91c4447db719b602995a1bb1d3c8
 SHA512:
-  metadata.gz: 23263b66f0c3fc8ec3649e31080d079fee70155a0799d71497f133832787aaef4e7689ee9c2d85f7201a5c8a3625be54066af8d64277f07ecde20632a938a2eb
-  data.tar.gz: 9930656de73f26dd9e0ed9e8d976073c44c95c5df9ba1a875c789eaa439d8e9f007a36705ebfc22ca6f41e10afe3a05c7efc8bd03eb4d3031ff06d95de288387
+  metadata.gz: 0635339012c9ea7c79845a16e3f7a0b76ce55f7dd9d92bd654f7d4749aaa5c43285296ef7f3a62ebead925367e49cfc9072f8b4631ee223056c5727d2b017b99
+  data.tar.gz: 51cf309821d8c3fec72d356cbe9e839038d81eecfd53b8a4fa81ff51aa0d2a7f187e55f61342bb7dd8ddbd95b2cba5c7de09239b6b881893556d32fdbc1762c0

data/lib/humble_rpi.rb

@@ -102,12 +102,17 @@ class HumbleRPi
     address, port = @opt[:sps_address], @opt[:sps_port]
 
     hrpi = self
+    count  = 0
 
     after pin: @opt[:motion_pin].to_i, goes: :high do
-
-      if Time.now > t1 + ChronicDuration.parse('1 minute')  then
-        hrpi.send_message :motion, 'detected'
+      
+      count += 1
+      
+      if Time.now > t1 + ChronicDuration.parse(duration='1 minute')  then
+        hrpi.send_message :motion, "detected %s times within the past %s" \
+                                                            % [count, duration]
         t1 = Time.now
+        count = 0
       end
 
     end
@@ -124,33 +129,7 @@ if __FILE__ == $0 then
   # example of an RPi running with 1 LED and 1 motion sensor
 
   f = HumbleRPi.new device_name: 'fortina', led_pins: [17], sps_address: '192.168.4.170', motion_pin: '7'
-  rpi = f
-
-  onmessage = lambda do |msg,type|
-
-    topic, raw_message = msg.split(/\s*:\s*/,2)
-    r = raw_message.match(/(\d+)\s*(on|off|blink)\s*([\d\.]+)?/)
-
-    if r then
-      index, state, seconds = r.captures
-    elsif raw_message[/mpd|audio/] then
-      
-      h = {'mpd play' => :on, 'mpd stop' => :off, 
-           'audio on' => :on, 'audio off' => :off}
-      index, state = 0, h[raw_message]
-      
-    end
-
-    # seconds should be nil unless state == blink
-    if seconds then            
-      rpi.led[index.to_i].blink seconds.to_f
-    else
-      rpi.led[index.to_i].send(state.to_sym)
-    end
-
-  end
 
-  f.led_listener &onmessage
   sleep 3 # wait for the client to connect
   f.motion_detect 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   999CZL08Zqxa+1DKwhW/XqeiQ9eIZ+1fLAK+XbAKgv6ghNYEPtZLUFiD73uUbsKd
   sBqeV1LF1yKYmA==
   -----END CERTIFICATE-----
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpi
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +62,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,47 +72,47 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.4
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sps-pub
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: rpi_lcd16x2
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: 'Designed for a Raspberry Pi which uses GPIOs for the following: LEDs, a