apa102_rbpi 1.0.1 → 1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c45c70969c9ca54e9ea97767122830cd10e63608
-  data.tar.gz: fcad57631c27c9b9bbbb0523bc39a5c847cd5175
+  metadata.gz: d61bbbb496c64346da43a00d15ab618651ea5e11
+  data.tar.gz: 0b49de24035db3478f263fad0e4b6c72c79d5207
 SHA512:
-  metadata.gz: d333ca8227c94a6254571ebc8f3e94b3e268882d66fd8e8298494885f4179adc645f1565c752b56b37767a1f9a8e151227821144fe8932f7b306993450fb3145
-  data.tar.gz: 8dffec1f2cfd910843233e8bebba50569c429aa307c5bd8f72cb60eeda98bffedd4298823d46e4d5f2d9897733084abc281a01e656813990f187accabeb6cca4
+  metadata.gz: 6728f8fc5c1dcca3ce6251ca443c4e98e9208b8b5af689a3a764b90164330da67d062a4689a194a734fa55bd90166dea1547c5cc180bab2c9ab39d82e5489539
+  data.tar.gz: ea8fa336f80abbd940a18b36365366fcc9974e1f637f09462a551d1331d50effada96ad5efa312aee5292d2b0c755c437d39a1b86f7a6a49e4a562683f1d9843

data/.gitignore

@@ -5,3 +5,6 @@ pkg/
 .env
 *.gem
 .DS_Store
+
+*.gem
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.2.0
+cache: bundler
+before_install:
+  - gem install bundler -v 1.9
+script:
+  - bundle exec rspec
+notifications:
+  email: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1
+- Improve non-mirrored strip performance
+- Add a benchmark script
+
 ## 1.0.1
 - Fix bug with `set` not being required
 - Add `set_all_pixels` functionality to strip

data/README.md

@@ -1,4 +1,4 @@
-# Apa102Rbpi
+# Apa102Rbpi [![Build Status](https://travis-ci.org/matl33t/apa102_rbpi.svg?branch=master)](https://travis-ci.org/matl33t/apa102_rbpi)
 Simple library to drive APA102/Dotstar LEDs using a Raspberry Pi
 
 ## Setup

data/apa102_rbpi.gemspec

@@ -25,8 +25,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_development_dependency 'rspec', '~> 3.3.0'
   spec.add_development_dependency 'bundler', '~> 1.9'
   spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'benchmark-perf', '~> 0.1.0'
   spec.add_dependency 'pi_piper', '~> 1.9'
   spec.add_dependency 'paint'
 end

data/lib/apa102_rbpi/apa102.rb

@@ -35,7 +35,7 @@ module Apa102Rbpi
     def simulate=(bool)
       @simulate = bool
       if @simulate
-        @interface = ::Apa102Rbpi::SpiSimulator #TODO
+        @interface = ::Apa102Rbpi::SpiSimulator
       else
         @interface = PiPiper::Spi
       end

data/lib/apa102_rbpi/strip.rb

@@ -3,10 +3,11 @@ module Apa102Rbpi
 
     require 'set'
 
-    attr_reader :mirrors, :head, :tail, :num_leds
+    attr_reader :mirrors, :head, :tail, :num_leds, :base
     attr_accessor :led_frame_rgb_offsets, :brightness
 
-    def initialize(len = base.num_leds, opts = {})
+    def initialize(len = Apa102Rbpi.base.num_leds, opts = {})
+      @base = Apa102Rbpi.base
       if len.is_a?(Array)
         @head = len[0]
         @tail = len[1]
@@ -22,8 +23,8 @@ module Apa102Rbpi
 
       @reverse = false
 
-      @led_frame_rgb_offsets = opts[:led_frame_rgb_offsets] || base.led_frame_rgb_offsets
-      @brightness = opts[:brightness] || base.brightness
+      @led_frame_rgb_offsets = opts[:led_frame_rgb_offsets] || @base.led_frame_rgb_offsets
+      @brightness = opts[:brightness] || @base.brightness
       @mirrors = Set.new
     end
 
@@ -45,40 +46,52 @@ module Apa102Rbpi
     end
 
     def show!
-      base.show!
+      @base.show!
     end
 
-    def set_pixel(pos, color, brightness = @brightness)
-      q = [self]
-      seen = Set.new([self])
-      frames = base.led_frames
-      while(substrip = q.pop)
-        substrip.mirrors.each do |mirror|
-          unless seen.include?(mirror)
-            q.push(mirror)
-            seen.add(mirror)
+    def set_pixel(pos, color, brightness = nil)
+      is_hex = if color.is_a?(Integer)
+                  true
+               elsif color.is_a?(Array)
+                 false
+               else
+                 raise 'Invalid color'
+               end
+      if @mirrors.empty?
+         set_color_helper(pos, color, is_hex, brightness || @brightness)
+      else
+        q = [self]
+        seen = Set.new([self])
+        while(substrip = q.pop)
+          substrip.mirrors.each do |mirror|
+            unless seen.include?(mirror)
+              q.push(mirror)
+              seen.add(mirror)
+            end
+            substrip.set_color_helper(pos, color, is_hex, brightness || substrip.brightness)
           end
         end
+      end
+    end
 
-        idx = if substrip.reversed?
-                4 * ((substrip.tail - pos) % base.num_leds)
-              else
-                4 * ((pos + substrip.head) % base.num_leds)
-              end
-
-        if color.is_a?(Integer)
-          frames[idx] = substrip.led_frame_hdr(brightness)
-          frames[idx + substrip.led_frame_rgb_offsets[:red]] = (color & 0xFF0000) >> 16
-          frames[idx + substrip.led_frame_rgb_offsets[:green]] = (color & 0x00FF00) >> 8
-          frames[idx + substrip.led_frame_rgb_offsets[:blue]] = (color & 0x0000FF)
-        elsif color.is_a?(Array)
-          frames[idx] = substrip.led_frame_hdr(brightness)
-          frames[idx + substrip.led_frame_rgb_offsets[:red]] = color[0]
-          frames[idx + substrip.led_frame_rgb_offsets[:green]] = color[1]
-          frames[idx + substrip.led_frame_rgb_offsets[:blue]] = color[2]
-        else
-          raise 'Invalid color'
-        end
+    def set_color_helper(pos, color, is_hex, brightness)
+      led_frame_hdr = (brightness & 0b00011111) | 0b11100000
+      idx = if @reverse
+              4 * ((@tail - pos) % @base.num_leds)
+            else
+              4 * ((pos + @head) % @base.num_leds)
+            end
+
+      if is_hex
+        @base.led_frames[idx] = led_frame_hdr
+        @base.led_frames[idx + @led_frame_rgb_offsets[:red]] = (color & 0xFF0000) >> 16
+        @base.led_frames[idx + @led_frame_rgb_offsets[:green]] = (color & 0x00FF00) >> 8
+        @base.led_frames[idx + @led_frame_rgb_offsets[:blue]] = (color & 0x0000FF)
+      else
+        @base.led_frames[idx] = led_frame_hdr
+        @base.led_frames[idx + @led_frame_rgb_offsets[:red]] = color[0]
+        @base.led_frames[idx + @led_frame_rgb_offsets[:green]] = color[1]
+        @base.led_frames[idx + @led_frame_rgb_offsets[:blue]] = color[2]
       end
     end
 
@@ -108,15 +121,5 @@ module Apa102Rbpi
       clear
       show!
     end
-
-    def led_frame_hdr(brightness = @brightness)
-      (brightness & 0b00011111) | 0b11100000
-    end
-
-    private
-
-    def base
-      Apa102Rbpi.base
-    end
   end
 end

data/lib/apa102_rbpi/version.rb

@@ -1,3 +1,3 @@
 module Apa102Rbpi
-  VERSION = '1.0.1'
+  VERSION = '1.1.pre'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: apa102_rbpi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.pre
 platform: ruby
 authors:
 - matl33t
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: benchmark-perf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: pi_piper
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - AUTHORS
 - CHANGELOG.md
 - Gemfile
@@ -106,9 +135,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