apa102_rbpi 0.1.0 → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebaede96b65b0998eb0b0240b877099d3fd52acf
-  data.tar.gz: 475dc85eb79b055ba395ad17984c8ce03841df8a
+  metadata.gz: 4824c05aa928d895e39caec20c953fff282aeb9b
+  data.tar.gz: 75e64e657e0ed45327d33e1b1db8e7d554518e01
 SHA512:
-  metadata.gz: 2aa988f8accd6911fc6a3a1b32655f7c44616a94a670ac39fde9e1e0ef56f0774b085b2b3cfd27e73926d513d29f5d889d95417003ef9ed0862dec8079dd33b3
-  data.tar.gz: 161f714ff6c8b79cdce2aaeb18c81f83b626de651a4f01b980e3219274ebf85a63782240e5a94f62d5cb00a2d7ce40ac33171b15fee7ce89654566568b4fc327
+  metadata.gz: 2893802eee9f1b7dcacbe656146f4e463b7c4bc22943588770d13b70ffb01abf0281b50ce1052c5a60403abb0701c3aeae0701284843cd49b7d55ba172feb942
+  data.tar.gz: 56d987c29ca7c9bdf964bc23678643244ffc29fd99c4811b1f598b1c538aaad2e708545ecf7390431d6b3175404de5ea919028a719614bf69d87512eed09e1a9

data/Gemfile.lock

@@ -0,0 +1,26 @@
+PATH
+  remote: .
+  specs:
+    apa102_rbpi (0.2.0)
+      pi_piper (~> 1.9)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    eventmachine (1.0.9)
+    ffi (1.9.10)
+    pi_piper (1.9.9)
+      eventmachine (= 1.0.9)
+      ffi
+    rake (10.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  apa102_rbpi!
+  bundler (~> 1.9)
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.11.2

data/README.md

@@ -20,7 +20,19 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Simple blinker:
+```ruby
+require 'apa102_rbpi'
+include Apa102Rbpi
+
+led = Apa102.new(1)
+loop do
+  led.set_pixel!(0, 0xffffff)
+  sleep 1
+  led.set_pixel!(0, 0)
+  sleep 1
+end
+```
 
 ## Development
 

data/apa102_rbpi.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'pi_piper', '~> 1.9'
+  spec.add_dependency 'pi_piper', '~> 1.9'
 end

data/lib/apa102_rbpi/apa102.rb

@@ -1,15 +1,18 @@
 require 'pi_piper'
 
 module Apa102Rbpi
-  include PiPiper
-
   class Apa102
+    include PiPiper
+
     START_FRAME = [0x00] * 4
 
     attr_accessor :brightness
+    attr_reader :num_leds, :spi_hz, :led_frame_rgb_offsets
+
+    def initialize(num_leds, opts = {})
+      @num_leds   = num_leds          || 1
 
-    def initialize(opts = {})
-      @num_leds   = opts[:num_leds]   || 1
+      # default brightness, must be within 0-31
       @brightness = opts[:brightness] || 31
       @spi_hz     = opts[:spi_hz]     || 8000000
 
@@ -17,39 +20,45 @@ module Apa102Rbpi
       # set offsets if using a non-default strip
       # offset:    0      1    2    3
       # frame = [header|blue|green|red],
-      @led_frame_blue_offset  = opts[:led_frame_blue_offset]  || 1
-      @led_frame_green_offset = opts[:led_frame_green_offset] || 2
-      @led_frame_red_offset   = opts[:led_frame_red_offset]   || 3
+      @led_frame_rgb_offsets  = opts[:led_frame_rgb_offsets] || { red: 3, green: 2, blue: 1 }
 
       @led_frames = []
       @end_frame = [0x00] * (@num_leds / 2.0).ceil
 
-      # reset all pixels to off
-      (0..@num_leds).each do |l|
-        self.set_pixel_color(l, 0x00)
-      end
-      self.show!
+      clear!
     end
 
     # Sets color of a single pixel at specified position in the strip
     # accepts an array of [r,g,b] values or a single 3 byte value
-    def set_pixel_color(pos, color)
+    def set_pixel(pos, color, brightness = @brightness)
       idx = pos * 4
       if color.is_a?(Integer)
-        @led_frames[idx] = led_frame_hdr
-        @led_frames[idx + @led_frame_red_offset] = (color & 0xFF0000) >> 16
-        @led_frames[idx + @led_frame_green_offset] = (color & 0x00FF00) >> 8
-        @led_frames[idx + @led_frame_blue_offset] = (color & 0x0000FF)
+        @led_frames[idx] = led_frame_hdr(brightness)
+        @led_frames[idx + @led_frame_rgb_offsets[:red]] = (color & 0xFF0000) >> 16
+        @led_frames[idx + @led_frame_rgb_offsets[:green]] = (color & 0x00FF00) >> 8
+        @led_frames[idx + @led_frame_rgb_offsets[:blue]] = (color & 0x0000FF)
       elsif color.is_a?(Array)
-        @led_frames[idx] = led_frame_hdr
-        @led_frames[idx + @led_frame_red_offset] = color[0]
-        @led_frames[idx + @led_frame_green_offset] = color[1]
-        @led_frames[idx + @led_frame_blue_offset] = color[2]
+        @led_frames[idx] = led_frame_hdr(brightness)
+        @led_frames[idx + @led_frame_rgb_offsets[:red]] = color[0]
+        @led_frames[idx + @led_frame_rgb_offsets[:green]] = color[1]
+        @led_frames[idx + @led_frame_rgb_offsets[:blue]] = color[2]
       else
         raise 'Invalid color'
       end
     end
 
+    def set_pixel!(pos, color, brightness = @brightness)
+      set_pixel(pos, color, brightness)
+      show!
+    end
+
+    def clear!
+      @num_leds.times do |l|
+        set_pixel(l, 0)
+      end
+      show!
+    end
+
     # Writes out the led frames to the strip
     def show!
       Spi.begin do |s|
@@ -61,8 +70,8 @@ module Apa102Rbpi
     private
 
     # First 3 bits high, then 5 bits for brightness
-    def led_frame_hdr
-      (@brightness & 0b00011111) | 0b11100000
+    def led_frame_hdr(brightness)
+      (brightness & 0b00011111) | 0b11100000
     end
   end
 end

data/lib/apa102_rbpi/utils.rb

@@ -0,0 +1,31 @@
+module Apa102Rbpi
+  # Input a 1-byte value to get a color
+  # Colors are from r->g->b->r
+  def color_wheel(wheel_pos)
+    wheel_pos &= 255
+
+    if wheel_pos < 85
+      rgb_to_hex(255 - wheel_pos * 3, wheel_pos * 3, 0)
+    elsif wheel_pos < 170
+      wheel_pos -= 85
+      rgb_to_hex(0, 255 - wheel_pos * 3, wheel_pos * 3)
+    else
+      wheel_pos -= 170
+      rgb_to_hex(wheel_pos * 3, 0, 255 - wheel_pos * 3)
+    end
+  end
+
+  # convert to a 3-byte hex color value
+  def rgb_to_hex(red, green, blue)
+    (red << 16) + (green << 8) + blue
+  end
+
+  # convert 3-byte hex color to [red, green, blue]
+  def hex_to_rgb(hex)
+    [
+      (hex & 0xFF0000) >> 16,
+      (hex & 0x00FF00) >> 8,
+      (hex & 0x0000FF)
+    ]
+  end
+end

data/lib/apa102_rbpi/version.rb

@@ -1,3 +1,3 @@
 module Apa102Rbpi
-  VERSION = '0.1.0'
+  VERSION = '0.2.0.pre'
 end

data/lib/apa102_rbpi.rb

@@ -1,4 +1,5 @@
 require 'apa102_rbpi/apa102'
+require 'apa102_rbpi/utils'
 require 'apa102_rbpi/version'
 
 module Apa102Rbpi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apa102_rbpi
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - matl33t
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -62,6 +62,7 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -70,6 +71,7 @@ files:
 - bin/setup
 - lib/apa102_rbpi.rb
 - lib/apa102_rbpi/apa102.rb
+- lib/apa102_rbpi/utils.rb
 - lib/apa102_rbpi/version.rb
 homepage: 
 licenses:
@@ -87,9 +89,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3