rpi_pinin_msgout 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e256d28802699a4baf8496fb7c9b68059a1fec
-  data.tar.gz: 43f0e93825465c0b8384d5dbd0e09df99a2c359c
+  metadata.gz: 5c4a876ecbc7789eff94a8ade300b8ef2d7320db
+  data.tar.gz: 31f807e5fd7ad237862c8ff562775785debe9c53
 SHA512:
-  metadata.gz: f262efc6ee6aae8e98fabd54d720512e4407d2ece1f80207162d4cbec008008c33d9eca9939ee7b09b85e2ef66a9b9d906674b074efd422305a26a0d42f2ee06
-  data.tar.gz: d644b5f61bb8c872ad11b9ab335b114a9189cff3af701c243e21159a37fe5f00082abb667943a69cdaad59a4c19af84ae1158fe8b61a4aa7f4a9649926a0b10f
+  metadata.gz: 7bcfd00cf738c35741a7cf6d0afbf372293f85e5cdd7ed570214ef23ad5c4e3b8921ab114301886ef8c0f4340f7bd67b6a2b9f8295df90c4ff56a4d545a26054
+  data.tar.gz: 21b29a49c3096dce0e35cf75dc7f5c39fc4d3bcda09f31ccff714aec5f1840da47fa73f24f3de216f27ef9a84e1a2612b5dd8c19d700a5ad499ae6d2dfa3b090

data/lib/rpi_pinin_msgout.rb

@@ -3,6 +3,7 @@
 # file: rpi_pinin_msgout.rb
 
 require 'rpi_pinin'
+require 'secret_knock'
 require 'chronic_duration'
 
 
@@ -13,9 +14,26 @@ class Echo
   end
 end
 
-class RPiPinInMsgOut < RPiPinIn
+class SecretKnockNotifier
+  
+  def initialize(notifier, topic: 'secretknock')
+    
+    @notifier, @topic = notifier, topic
+    
+  end
+  
+  def knock()
+  end
+  
+  def message(s)
+    @notifier.notice "%s: %s" % [topice, s]
+  end
+end
 
+class RPiPinInMsgOut < RPiPinIn
 
+  # duration: Used by sample mode
+  
   def initialize(id, pull: nil, mode: :default, verbose: true, 
                  subtopic: 'sensor', device_id: 'pi', notifier: Echo.new, 
                  duration: '5 seconds', index: 0, capture_rate: 0.5, 
@@ -29,20 +47,9 @@ class RPiPinInMsgOut < RPiPinIn
     
   end
   
-  def capture()
-   
-    case @mode
-      
-    when :default
-      setup { default_mode() }
-    end
-    
-  end  
-
   def capture_high()
-   
-    case @mode
-    when :interval
+       
+    if @mode == :interval or @mode == :sample then
       
       count = 0
       
@@ -54,36 +61,28 @@ class RPiPinInMsgOut < RPiPinIn
         count, t1 = interval_mode(t1, count, duration) 
       end
       
-    when :default
+    elsif @mode == :default
+      
       setup { default_mode() }
+      
+    elsif @mode == :secretknock
+      
+      notifier = SecretKnockNotifier.new(@notifier, topic: @topic)
+      
+      sk = SecretKnock.new \
+          short_delay: 0.55, long_delay: 1.1, external: notifier
+      sk.detect
+      setup { sk.knock }
+      
+      
     end
     
   end
   
+  alias capture capture_high
+  
   private
   
-  def button_setup()
-    
-    t0 = Time.now + 1        
-    
-    self.watch do |v|
-
-      # ignore any movements that happened a short time ago e.g. 250 
-      #               milliseconds ago since the last movement
-      if t0 + @capture_rate < Time.now then     
-        
-        puts  Time.now.to_s if @verbose
-        
-        yield(v) 
-        
-        t0 = Time.now
-        
-      else
-        #puts 'ignoring ...'
-      end   
-      
-    end # /watch 
-  end
   
   def setup()
     
@@ -137,5 +136,5 @@ class RPiPinInMsgOut < RPiPinIn
   def default_mode()
     @notifier.notice "%s: %s" % [@topic, @descriptor]
   end
-    
+      
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpi_pinin_msgout
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -53,6 +53,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: secret_knock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: chronic_duration
   requirement: !ruby/object:Gem::Requirement