humble_rpi-plugin-led 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 504a177d097dedb367b77257648c3f81a1a927f7
-  data.tar.gz: 3c97a67ec27cf379108d7b8bc6de9d174afc21c0
+  metadata.gz: 8f0db3a3d669a825cda9e65e2dce717fa81f5f28
+  data.tar.gz: 144a7ca9b84650124bf5e7c1657933cc4360b928
 SHA512:
-  metadata.gz: 8740654e5ed3df3e8864cb1e2f1262121617cf833b04fcbea426f72bf2b0b4bdc537a79d7b06d715ad09c54d0d3be9cf132b235cb09d5c30988f330f48e56f8e
-  data.tar.gz: 445c382bd7b84be389e847b7b70a7f366a97072f61bf5cc6bf349be278933cc901c3228d692568b1e491e8200a6466ea5b1f1d0fbeca6bef688a33b05ca8eac1
+  metadata.gz: 2c09a5861e1307e2a858d23382c3b8e79fe52bcd53797f0533004de958bf326e81d79fa43ea5e98be9ef388baba02d8a4389b6dcbeda22bb38297f3a9f4a331b
+  data.tar.gz: aeb3e751796ce623c0fe81e0e20fd146ccc7efecd20511ce8ef1fe110870c7c53e75ec36aa02d76d385d4c9144a3381bc04c08ee6d0fd60390ef6930cb5a67ad

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-ZbQ28��V���u�E���j��2�y��t�mV��ʽ���*����P���_1�tiG���}
�R�-ܓ\�Xl�<8�m�Vhnff�O!�e�?�k���4������q�:{:<]M$P�2,�n�m>-�
~�5ϑ�1OZ����[�%s;������on���.��$^�8�{��\��Z�~c��s�D�`��UB4Jo�b>ߞǞ6d.��&�Ypt��O�5�P�����j�)؀x����(Տ¹
+<�����������n0z���u�����9TF�Z>��i��Z��!ӵ*!��5j~I%�<��9�2>�
+�t����8�ezb>YewD��z�ŽG(vE;�Uu�kя�{�;Rd�W�?u.��	�R+� �M�n
����I�����>~E������8��^�T�]�Z��83��:�2N�TC3���e�o�1�.Q��6
+O2f�� �������&�L�����&�Y�|���ũo?�h)���=

data/lib/humble_rpi-plugin-led.rb

@@ -2,15 +2,17 @@
 
 # file: humble_rpi-plugin-led.rb
 
-require 'rpi_led'
+require 'rpi_rgb'
 
 
 
 class HumbleRPiPluginLed
+      
 
   def initialize(settings: {}, variables: {})
 
-    x = settings[:pins]
+    x = settings[:pins] || []
+    rgb = settings[:rgb]
     
     pins = case x
     when Fixnum
@@ -25,16 +27,54 @@ class HumbleRPiPluginLed
     
     @lookup = {}
     @gpio_pins = []
+    @led = []
     
     # 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
 
+    initialize_leds(pins) {|pin| RPiLed.new pin} if pins.any?
+
+    if rgb then
+      
+
+      colours = %i(red green blue)
+      
+      named_pins = rgb[:pins].zip(colours).map do |pin, colour| 
+        {pin.to_s.to_sym => colour.to_s}
+      end
+      
+      
+      presets = {
+        purple: '#800080', 
+        yellow: '#FFFF00',
+        orange: '#FFA500',
+        turquoise: '#40E0D0',
+        steelblue: '#4682B4'
+      }            
+      
+      rgb_led = RPiRGB.new(rgb[:pins], presets: presets)
+      index = @led.length
+      @lookup[:red] = @lookup[index.to_s.to_sym] = index
+      @lookup[:green]  = @lookup[(index+1).to_s.to_sym]= index
+      @lookup[:blue]  = @lookup[(index+2).to_s.to_sym]= index
+      
+      presets.each {|preset| @lookup[preset] = index}
+
+      
+      @led <<  rgb_led
+
+    end
+        
+  end
+  
+  def initialize_leds(pins)
+    
     pins.each.with_index do |x, i|
  
-      if x.is_a? String or x.is_a? Integer then
+      pin = if x.is_a? String or x.is_a? Integer then
 
-        @lookup.merge!(x.to_s.to_sym => x.to_s )
-        @gpio_pins << x.to_s
+        @lookup.merge!(i.to_s.to_sym => i )
+        x
 
       elsif x.is_a? Hash
 
@@ -43,11 +83,14 @@ class HumbleRPiPluginLed
         led_name = x[n.to_sym]
         @lookup.merge!(i.to_s.to_sym => i )
         @lookup.merge!(led_name.to_sym => i )
-        @gpio_pins << n.to_i
+        n
+
       end
+      
+      @gpio_pins << pin.to_i
+      @led <<  yield(pin.to_i) if block_given?                
 
     end    
-        
   end
   
   def on_led_message(message)
@@ -55,8 +98,11 @@ class HumbleRPiPluginLed
     r = message.match(/(\w+)\s*(on|off|blink)\s*([\d\.]+)?(?:\s*duration\s)?([\d\.]+)?/)
 
     if r then
-      index, state, seconds, raw_duration = r.captures
+      
+      identifier, state, seconds, raw_duration = r.captures
       duration = raw_duration ? raw_duration.to_f : nil
+      
+      seconds = seconds ? seconds.to_f : 0.5      
 
       a = case state
 
@@ -67,19 +113,46 @@ class HumbleRPiPluginLed
           [:off]
 
         when 'blink'
-          seconds = seconds ? seconds.to_f : 0.5
+
           [:blink, seconds, duration: duration]
       end
 
-      @led[@lookup[index.to_sym].to_i].send(*a)
+      
+      led = @led[@lookup[identifier.to_sym].to_i]
+
+      if led.is_a? RPiLed then
+        
+        led.send(*a)
+        
+      elsif led.is_a? RPiRGB
+
+        if  state == 'on' then
+          
+          a = ((@led.length-1)..@led.length+1).map{|x| x.to_s.to_sym}
+          h = a.zip(%w(red green blue)).to_h
+          #puts 'h: ' + h.inspect
+          colour = h[identifier.to_sym]
+
+
+          led.colour = colour || identifier
+          led.on duration
+          
+        elsif state == 'off' 
+          
+          led.off
+          
+        elsif state == 'blink' 
+          
+          led.blink seconds, duration: duration
+          
+        end
+        
+      end
     end
   end
 
   def start()
-    
-    if @gpio_pins.any?  then
-      @led = @gpio_pins.map{|x| RPiLed.new x}
-    end
+
     
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: humble_rpi-plugin-led
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,28 @@ cert_chain:
   kuXWaEX0BC/yqishnYeDqOuqzvI1C4/7lvY+i4RJn3y13EP8RbXUlRa2A+PcKx0e
   pi5a3T8Qg0ZT5A==
   -----END CERTIFICATE-----
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rpi_led
+  name: rpi_rgb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        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.3
+        version: 0.2.0
 description: 
 email: james@jamesrobertson.eu
 executables: []