humble_rpi-plugin-led 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54eed912b31b17ceb1c877480db6bce0d765ceb7
-  data.tar.gz: 4cab02cd8be02bd8178dcc279d3da9f50c0e865c
+  metadata.gz: e8ada755e047f52911a4d2709fe123bfdcde20c9
+  data.tar.gz: 6915c66dc6a0159b8d662eba3b439ebd917999ab
 SHA512:
-  metadata.gz: 429bb53da5bc417c8c81bf9f84b819ea9829eda5278477d750f9c46af4e829acce228896f339ae65ef8683b2a051598993a21536ed9ae0556602a8746d527b23
-  data.tar.gz: 9efa295725c045590dce57b04a26810c21d89c09cddef8fcec436043299cf7786b09f766ceb86a9666ed4f407d72eb915e1138010bc6e5fc107fce7483e63fcf
+  metadata.gz: d36181b258edd33393f66cb46043cf47f9524bb3e51112bbabc668fc05ea3911cb4b11c7b8c2c577569407b08873548029ff1f3b654c591cb63d14dcb12f04a8
+  data.tar.gz: 0ed31ca0e49dd09d290aec17cb109c0145e03f6657a0b0b873d5d86d37b5b81813dacc15c9b5bb7b36f6faabc863ff7e4e563d00b5ad94f741a0c1740044ac26

data/lib/humble_rpi-plugin-led.rb

@@ -2,10 +2,8 @@
 
 # file: humble_rpi-plugin-led.rb
 
-#require 'rpi_led'
-require 'requestor'
+require 'rpi_led'
 
-eval Requestor.read('http://rorbuilder.info/r/ruby'){|x| x.require 'rpi_led'}
 
 
 class HumbleRPiPluginLed
@@ -14,7 +12,7 @@ class HumbleRPiPluginLed
 
     x = settings[:pins]
     
-    @gpio_pins = case x
+    pins = case x
     when Fixnum
       [x]
     when Integer
@@ -25,11 +23,36 @@ class HumbleRPiPluginLed
       x
     end
     
+    @lookup = {}
+    @gpio_pins = []
+    
+    # each pin can contain an identifier e.g. pins = [{'4': 'record'}, 17]
+    # an LED can be identified by the identifier instead of the numberic index
+
+    pins.each do |x|
+    
+      if x.is_a? Integer then
+
+        @lookup.merge!(x.to_s.to_sym => x )
+        @gpio_pins << x
+
+      elsif x.is_a? Hash
+
+        n = x.keys.first.to_s
+
+        led_name = x[n.to_sym]
+        @lookup.merge!(n.to_sym => n.to_i )
+        @lookup.merge!(led_name.to_sym => n.to_i )
+        @gpio_pins << n.to_i
+      end
+
+    end
+        
   end
   
   def on_led_message(message)
             
-    r = message.match(/(\d+)\s*(on|off|blink)\s*([\d\.]+)?(?:\s*duration\s)?([\d\.]+)?/)
+    r = message.match(/(\w+)\s*(on|off|blink)\s*([\d\.]+)?(?:\s*duration\s)?([\d\.]+)?/)
 
     if r then
       index, state, seconds, raw_duration = r.captures
@@ -48,7 +71,7 @@ class HumbleRPiPluginLed
           [:blink, seconds, duration: duration]
       end
 
-      @led[index.to_i].send(*a)
+      @led[@lookup[index].to_i].send(*a)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-led
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   kuXWaEX0BC/yqishnYeDqOuqzvI1C4/7lvY+i4RJn3y13EP8RbXUlRa2A+PcKx0e
   pi5a3T8Qg0ZT5A==
   -----END CERTIFICATE-----
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rpi_led
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.3
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A humble_rpi plugin for LEDs