rpi_rgb 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd0403a7952d84e4ec168cac35765d0fae28f39
-  data.tar.gz: a2f8ddde8c891a0f32830729f272dace34e98279
+  metadata.gz: '0851e15300976c05106da84ef3333447d15dc4aa'
+  data.tar.gz: cdb7e9a721459598d73d0700d0695cde22b8e565
 SHA512:
-  metadata.gz: 4e751d8d7979bbbbdaef1bfe634252279f0211fa0bf668401f342fced7fd941dfdb3da00522ee5f6f1f30debd447b9b5454a7aea96eff4d95994fa0944a99587
-  data.tar.gz: b7ff5fff9f3627d9bd1202b5bddff6a52294dad1de8ce2824c98f3713165215d047f1a6184356d63303f2b63f0044eba6e1fc1d4691a65eb777697cb12155385
+  metadata.gz: 27d538145b1aa5ff801d17bac311c201863fec094b63523fcabadc1fa8599e4752949d81e9074abe910df13e5717bac6d0958e503172748b594140975b7c5335
+  data.tar.gz: 5d7fe8e3c3a05f4127b5bf1414f6b43b270984784f3f69f5469b301e327481bfb18ccd18e1b45441ae4f09f243b6d4ba3b2d3ded5710ae1de276180d0c4f6350

data/lib/rpi_rgb.rb

@@ -2,6 +2,7 @@
 
 # file: rpi_rgb.rb
 
+require 'rgb'
 require 'rpi_led'
 
 
@@ -10,14 +11,14 @@ require 'rpi_led'
 =begin
 
 presets = {
-  purple: [100,0,100], 
-  yellow: [75, 40, 5, 100],
-  orange: [20, 3, 0],
-  lilac: [20, 3, 60],
-  turquoise: [1, 10, 10]
-}
-
-rgb =  RPiRGB.new(%w(27 17 4), presets: presets, smooth: true)
+  purple: '#800080', 
+  yellow: '#FFFF00',
+  orange: '#FFA500',
+  turquoise: '#40E0D0',
+  steelblue: '#4682B4'
+}  
+
+rgb =  RPiRGB.new(%w(27 17 22), presets: presets, smooth: true)
 rgb.color = 'white'
 sleep 2
 rgb.color = 'purple'
@@ -30,12 +31,14 @@ rgb.color = 'yellow'
 
 =end
 
+# see also: 500+ Named Colours with rgb and hex values http://www.cloford.com/resources/colours/500col.htm
+
 class RPiRGB
 
   attr_accessor :brightness
   attr_reader :red, :green, :blue
 
-  def initialize(pins, brightness: 100, smooth: false, presets: nil, \
+  def initialize(pins, brightness: 100, smooth: false, presets: {}, \
                  transition_time: 1.5)
     
     @red, @green, @blue = pins.map do |x| 
@@ -62,29 +65,26 @@ class RPiRGB
   def colour=(val)
     
     @colour = val
-
-    case val
-
-    when 'red'
-      mix 100, 0, 0
-
-    when 'green'
-      mix 0, 100, 0
-
-    when 'blue'
-      mix 0, 0, 100
-
-    when 'white'
-      mix 100, 100, 100
-
-    else
+    
+    if val.is_a? String then
       
-      return unless @presets
-
-      preset = @presets[val.to_sym]
-
-      mix(preset) if preset
-
+      return mix( RGB::Color.from_rgb_hex(val).to_rgb) if val =~ /^#/
+      
+      h = {red: '#FF0000', green: '#00FF00', blue: '#0000FF', white: '#FFFFFF'}
+              
+      color = h.merge(@presets)[val.to_sym]
+      
+      if color then
+        
+        if color =~ /^#/ then
+          mix( RGB::Color.from_rgb_hex(color).to_rgb) 
+        else
+          mix color
+        end
+      end
+      
+    elsif val.is_a? Array
+      mix val
     end
   end
   
@@ -95,9 +95,9 @@ class RPiRGB
   alias color= colour=
   alias color colour
   
-  def mix(*values)
+  def mix(*rgb_values)    
     
-    values.flatten!
+    values = rgb_values.flatten.map {|x| (x * 0.392).round }
     
     r, g, b = if values.length < 4 then
       
@@ -118,9 +118,17 @@ class RPiRGB
     red.brightness, green.brightness, blue.brightness = r, g, b
   end
   
-  def off()
-    [@red, @green, @blue].each(&:off)
+  def blink(seconds=0.5, duration: nil)
+    [@red, @green, @blue].each{|x| x.blink(seconds, duration: duration) }
+  end  
+  
+  def off(durationx=nil, duration: nil)
+    [@red, @green, @blue].each{|x| x.off(durationx, duration: duration) }
   end
   
+  def on(durationx=nil, duration: nil)
+    [@red, @green, @blue].each{|x| x.on(durationx, duration: duration) }
+  end  
+  
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rpi_rgb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -12,27 +12,47 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MDQxNDEyMTg1N1oXDTE3MDQxNDEyMTg1N1owSDESMBAG
+  8ixkARkWAmV1MB4XDTE3MDcyODE1MjgzN1oXDTE4MDcyODE1MjgzN1owSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMAChj/xcbnOIwagN80qJgNHWXVV+YUSrkJjfrlO/4JimFWt19o082t62fdA
-  rdq8Uy6FxsactikMd+fBgODjKxOGq6BPDsEGnqyzua4wpItTzBwmg/2n7cdJOFoK
-  oA3YSwOqcxCaJRrSj0kIii8tqEtiUZBL1z9qUi1INm0ZCJLVddnsFq+AJdRHnZde
-  opjCpybXdQ6Ev718SD326F7FRLaE35f8vfFwXrgIUVTJl9PWOFzQcVuyHBG5bPgT
-  OD57PjeT524qpnVy7IQx3Ed7nVxHlwCioyI2Kc4LzUS6fjIGxDLF1UbueRc/1oOM
-  NG0l97FRSZiylYahAYaz0gB40rECAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUhAzi6HlHdoliVF7SEGIaOWzm9LUwJgYDVR0RBB8w
+  ggEBANRJvnoDmDFnrHnAzTWWq/XlmeKXNwrCif1IXYR+sKmOXw4XYa5Tt8OdZ+FP
+  VC01fXcaMXq+IPV1FoBbGHirXFKdV/YRClUD78L3cxi3IFmGvJQhMH5C9q4Npy0s
+  L505+7eoJluZ9mHuDweyHf+7xEGzpkMSWe7xDRkWCv8zKQHFHT9AERtWhYa6/xJM
+  pkxU/7AqCERsjgrdtfwwJxwEY8n6EXPcpDQ4jUsio+jmTaXEpE9rurtzZhc/Jj/G
+  zDg6V5dyPDTqFC16OfI8UbHEsuye8xwej14iO+8cN8FDL89yUDu03H9re20F+S9P
+  eP44fyU9Yq3OZWV7WBXUwmbBtisCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUywfReFAzagbBYgxmxDiykHzzx9swJgYDVR0RBB8w
   HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAgNXzq1We
-  +HnLZ5/USBniTTgjqt9dcs8y+Ynu9HV6W0ZznQQ0/i2kvMyVrWNDSP3WyHyiGhLi
-  ze7goSo5zPFA3vV6EsK2+x2FYm/7HcK2ANQeJo6GKORqpY77dlaGiPJRPKxGXfFw
-  f0nb74GE95ZatRJdPji6h3xU9BTchTWT/PlgL9qZ3PzPv1Zx4zFEULV9Q/lgXXKb
-  Kftg/WY9j+Ubuf4+PEIIwU4Zc5oe9Fat7p8e1o96Ld4V6d0k+qg5jMvoj0Jjbztf
-  GIg4vO7u6V4Oc+4pgKLE/xBs2aBPYOzwugWzJxx1+iXcQGW7yUxDK11cRyh37ZGB
-  fFrcZUe/iDfywA==
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAbldyatKo
+  FxHqT/NmdT4Dfi7Zt52iyq5RvwbkpZz40zVR2P93Djc+O8SLiU/SJj53VX9hyj3F
+  3SsmwZPyA+hkPo0mZT5KkjrqqWVl6awCbJrZc3WpQqjnQn9cQer/CT+t6vxLBg/f
+  q19FbyT1jaldiAyeFtn233gVzAllSkgw9YjVq3QVmAqsl228QKRNoj6OIzmhtXxZ
+  Uol43hZ0cvKAxKmo8nsYFQCeUzoHcYbAQMoS1yEUzmH3NNVDXFJJfQ0IAhCGeGOF
+  t96szHrE8Lac4gfN1AUQIHL1JPpSWSK+o4wHx/weelx2J/YLpj90AwU1xnojMr4u
+  HfpdQuYif0P1gg==
   -----END CERTIFICATE-----
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rgb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rpi_led
   requirement: !ruby/object:Gem::Requirement
@@ -42,7 +62,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,9 +72,9 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Changes the colour of an RGB LED connected via GPIO to a Raspberry Pi

metadata.gz.sig

@@ -1,2 +1,2 @@
-�*݂���T�lpVﰸop�4]��F����oy~?�6��4�-��u�6w��ntp\�T�HS`x�%�,��UApEڕ�g�v���n�1����tdA�o�:f���'aV���Ѹ�Θ�ꨧMI��1��;��q;g���@�m�]���_€����D�y��J
-0���ͳ��9�4��6p�7�;�>�(r"|�W<�)�H�'�$��v��0�H�ӠP�ے�R-�)�R���}i�l�g~'����t��zV'ʅ��b��
++X��$�)��A�i�����t3���2l�R1֣
+�+BR���'�
��0>5�,�R����`�&;�AG��ϗ#Iܔ���������*�v+kMS'$$�%z�� �3R�iGWG�]�87K�X����r�'�W
p�f����౒mE$�����C���(��5�ʳ����i"��%l��v8#L�O��0��/�1���-����k��_?Yj���#�ȏ	�F�~�&K����M�?o�:6