myfirmata-plugin-pir 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24a6033acea1d918f99f722db7edb6c3de1afc80
-  data.tar.gz: c32aed2902c2db06510754f553d06b79f8c8b682
+SHA256:
+  metadata.gz: 1e34ee48b5aadad771eb23f3c0bfed5a8895d6fc8cfc0ea3749facaa423964de
+  data.tar.gz: 2a78f18396256d2ed2521a235f7a41dfc2bc7b9aa1feb70e0b07596c84e4abc0
 SHA512:
-  metadata.gz: 3a61e8fea855c9cb7188a91bcb7c664486930f861bb71010adb45e0a69e9d442fe5eba90ac55dcc1d3daf6ed60924744550c7408011d5324c5b4600c08cfd5a8
-  data.tar.gz: 3054ca7ae0774dca0c5351a421d2ff894007753fd494a7cfae7fe49d42e1cd5269f91f1dbdc800f80deb6abbe3a8350457ee91cc99568cb018f91d714fd47b13
+  metadata.gz: 01d5d29c0e9b241beaccb11c9ead82a69dea3fb780542fe67e7265e1c1d2a7b297038f081a6d3656c544021ae5c981a2ec816b9317d775e96f442effe7ad6c73
+  data.tar.gz: d6338f05478bb1ceaf82a89fbe154eb754aa415ee25b32ff1b43de737b2c5339ecc6317e22b8bce4e04f03f71e01d69f71e762c4573af3a5bf196f92d390a2b7

data/lib/myfirmata-plugin-pir.rb

@@ -17,7 +17,9 @@ class MyFirmataPluginPir
   def initialize(arduino, settings: {}, variables: {})
     
     @arduino = arduino
-    @settings, @variables = settings, variables
+    @settings, @variables = settings, {debug: false}.merge(variables)
+    @debug = @variables[:debug
+                        ]
     @pinx = @settings[:pin] || 2
 
     @arduino.pin_mode @pinx, ArduinoFirmata::INPUT
@@ -30,28 +32,49 @@ class MyFirmataPluginPir
     count = 0
     
     duration = @duration    
+    puts 'duration: ' + duration.inspect if @debug
     notifier = @variables[:notifier]
     topic = @variables[:device_id]
     msg = @settings[:msg] || 'motion'    
     pinx = @pinx
-    threshold = @settings[:threshold] || 5
+    threshold = if @settings[:threshold] then
+      @settings[:threshold]
+    else
+      ChronicDuration.parse(duration) > 30 ? 5 : 0
+    end
     
     t1 = Time.now - (ChronicDuration.parse(duration) + 10)   
+    puts 't1: ' + t1.inspect if @debug
     
     puts 'ready to detect PIR sensor'    
     
+    debug = @debug
+    
     @arduino.on :digital_read do |pin, high|
 
       if pin == pinx and high then
                 
         count += 1
+        puts 'count: ' + count.inspect if debug
 
         if Time.now > t1 + ChronicDuration.parse(duration)  then
 
           if count > threshold then
-            notifier.notice \
-                "%s/motion: detected %s times within the past %s" % \
+            
+            
+            fqm = if ChronicDuration.parse(duration) == 1 then
+              "%s/motion: detected within the past second" % topic
+            elsif count == 1
+              "%s/motion: detected once within the past %s"% [topic, duration]
+            elsif count == 2
+              "%s/motion: detected twice within the past %s" % \
+                [topic, duration]
+            else
+              "%s/motion: detected %s times within the past %s" % \
                 [topic, count, duration]
+            end
+            
+            notifier.notice fqm 
           end
           t1 = Time.now
           count = 0
@@ -64,4 +87,4 @@ class MyFirmataPluginPir
   
   alias on_start start
     
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myfirmata-plugin-pir
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE3MDQxNTIxMDIwM1oXDTE4MDQxNTIxMDIwM1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMDc0PS1Bz+cNDQiY3jrcoLPRQt7Ct5pKohM+p66I22yX2ePYRltVPIBKIlr
-  Vjisq8mJto/XIX6ss4gBr1V3BIs48Qteh6TxrqGj1kuaIH9gcyWBFg+4TSICcIot
-  XsEHrnj7u5iGtGzruJU0nqgmEOAliUf5CxVyu5nMxZzrtgJ28Q75TdaKsoRrRGId
-  vfhr8BVKu5PkSqFahd7qeQvwj7URHOs669FRZhpg2rJeVI0kRuiq080xMgHIC2i7
-  coWdLi5WrQ3XEcJa1R1LiiQLHE5edtUi7TdMtGFgnxQRXEULgnuRPwh8RtDQTSac
-  F9C6bmQ2BVL4YYBOAWKVRWy7K8ECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUf2WO8slXXo5BtJecl8vDdxEOB3QwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAG/vs2ysn
-  9hEKcRbGjLtenw2nc615QrnjCp4MXhEdRCZySBLfvr9oznnt4hN2AnCB4Amq92Da
-  SLkMOLzcPhACVzgJxXZf40Z9zn7ciIDSQyFAt9G60k3ORL1HfiwIDhzWUVJH3v5j
-  N3ii+Yi3hqstlmZE01cX6wWbbIj9gM2z/OnhMFAo3tt+Dgp6UOTtIX+QC/RE1B0F
-  isI6b+kBoRenIT/VRx3QYZ2WQGCaG8bpelsyYTwiDvWBJWxvqFpe0QgpJRmaiP7e
-  qMYLyGZ6oqlJmCNJX+A9uVxKxLexn/B/52sLuZG+r6bZ0zGkKX1nmazfaBg7FM/4
-  RFgXKXS9Q8TOzA==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgxMDA3MTUxNTU4WhcN
+  MTkxMDA3MTUxNTU4WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDMxhzM
+  j/5/QpWfT+0pKWV+8W6r9LlHE7K/HIAT/2rW6WmfNVuqM41MyPJ0TFik+roARH5W
+  QH0gg1CN3BDVbTQ99PQEBHQqwauULZqp6csGDluieLSClgHuttvb4ymxhO4F4rYO
+  P4se9y+K+0d8t1jFOLX9YOPmFWqcUiHF1JyOPsM59LrssDxEKoFctnZqtXawsgUD
+  OfYmdPYlT/TQrSQMvqLUrZYigaPdCIO8USVcy60PQEExFCVQrdIc2m/2IlUJcmdj
+  yp5Z7SldaBoV9E/7QU31QwOAgCN/jP6wmB+y7E0OLx7zkx8TJ0DSWCUWk32oRRS/
+  ACBhCL6dPHic5rI1CtM+YntBxyaujG7feAKHLoh0y3jIk29e8Phzy5VrQ6608v1w
+  +GTtkQr9MmbmiHO6k6YKP408b0IU8+N9g5aH3MFndxW8RcuZbZbQx6SxPlAhn/st
+  0Hg4Wlqu66YbZrs5picvF95M83sJeGTCin2MUAC9MJPywsdz61IiYcAT090CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUxwYELJ6r
+  LLs8mnef7QMx6c5JDhswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAKLl0/B9FpKO/HZE6bdzAg/vggPe/RF80/0xwOqDR
+  V7/tswbEseGKHMSpFdxZ2bj84B4HMIMe1gy7cJHjyJbS37MavawwHOvyUSMVEtNZ
+  xGFpysPkVanU6ueFDSG+6Vj30xLaK0GYsFcrZqB3rcnLAdejy8sAlmajN2rJWdE5
+  eYpJEqE14t3ZbJCJ5MWeqDIxIVFZg1R/vkaVy/vObr5RknBKYM05hqLbyuGETHAy
+  eSxpYZb7Ireskjj40arzukRaOPoCH6OdLrNbSHja+N9NPfpaWtG63sR6xnejnHHT
+  9mgqG6kEOWi6UOePIG7p8dwqLd0aqzNKR6YTVsCDllrwzvSYnL2QX39z6T4Fxs1K
+  50nzuR2cBqeUB3IXTa7CBPRkn+Ckncq/OWkzppClehwc4HmqGerByyQq1Bn3pJiD
+  B6RGukwevhrVxssJnRyPuEjYURxILqaBynKnS7mb+A/XbFiaWk7dH4hNRFFEQp4A
+  QtMcn44MoVHUH9Uh4q0FFx6x
   -----END CERTIFICATE-----
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2018-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -80,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A PIR motion sensing plugin for the MyFirmata gem. Publishes a message to