apa102_rbpi 1.1.pre → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61bbbb496c64346da43a00d15ab618651ea5e11
-  data.tar.gz: 0b49de24035db3478f263fad0e4b6c72c79d5207
+  metadata.gz: 84c6e4842fcb0b1d796bd492e6661754fab72cfd
+  data.tar.gz: 9db2f05ceef04b434cb0204b6d8b806868fd24bc
 SHA512:
-  metadata.gz: 6728f8fc5c1dcca3ce6251ca443c4e98e9208b8b5af689a3a764b90164330da67d062a4689a194a734fa55bd90166dea1547c5cc180bab2c9ab39d82e5489539
-  data.tar.gz: ea8fa336f80abbd940a18b36365366fcc9974e1f637f09462a551d1331d50effada96ad5efa312aee5292d2b0c755c437d39a1b86f7a6a49e4a562683f1d9843
+  metadata.gz: d2140ca25427e8c847d551eb3b66025b07d44c98d2f45ed6b03e74699b38073292ee2ec19b9c50805dc36a4ea419b3e0be4ec4577b52b68e137df747ab29ff92
+  data.tar.gz: d736a1bfba1f89f943c670b9e9e9d897c901c6d7c422c0c4356ce0a2711ff0ed891b4c01e044b127e002310375780a1a7ca217db58678dd402f77aa68ef14107

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 # Changelog
 
 ## 1.1
-- Improve non-mirrored strip performance
+- Improve set_pixel performance
 - Add a benchmark script
+- `strip.mirrors` no longer writable
+- Added `strip.clear_mirrors` method used to unmirror a strip.
 
 ## 1.0.1
 - Fix bug with `set` not being required

data/lib/apa102_rbpi/apa102.rb

@@ -18,7 +18,7 @@ module Apa102Rbpi
         red: 3,
         green: 2,
         blue: 1
-       }
+      }
       @spi_hz = 8000000
       @simulate = false
 
@@ -26,10 +26,7 @@ module Apa102Rbpi
       @start_frame = [0x00] * 4
       @end_frame = calculate_end_frame
 
-
       @led_frames = []
-      @substrips = {}
-      @mirrors = {}
     end
 
     def simulate=(bool)
@@ -46,12 +43,8 @@ module Apa102Rbpi
       @end_frame = calculate_end_frame
     end
 
-    def calculate_end_frame
-      [0x00] * (@num_leds / 2.0).ceil
-    end
-
     def show!
-      interface.begin do |s|
+      @interface.begin do |s|
         s.clock(@spi_hz)
         s.write(@start_frame + @led_frames + @end_frame)
       end
@@ -60,6 +53,12 @@ module Apa102Rbpi
     def print
       ::Apa102Rbpi::SpiSimulator.display(@led_frames)
     end
+
+    private
+
+    def calculate_end_frame
+      [0x00] * (@num_leds / 2.0).ceil
+    end
   end
 end
 

data/lib/apa102_rbpi/strip.rb

@@ -1,9 +1,6 @@
 module Apa102Rbpi
   class Strip
-
-    require 'set'
-
-    attr_reader :mirrors, :head, :tail, :num_leds, :base
+    attr_reader :head, :tail, :num_leds, :base, :mirrors
     attr_accessor :led_frame_rgb_offsets, :brightness
 
     def initialize(len = Apa102Rbpi.base.num_leds, opts = {})
@@ -36,15 +33,21 @@ module Apa102Rbpi
       @reverse
     end
 
-    def mirror(strip)
-      if strip.num_leds == @num_leds
-        @mirrors.add(strip)
-        strip.mirrors.add(self)
-      else
-        raise 'Strips must be of same length to be mirrored!'
+    def mirror(other_strip)
+      new_mirrors = @mirrors + other_strip.mirrors + Set.new([self, other_strip])
+      new_mirrors.each do |m|
+        m.mirrors += (new_mirrors - [m])
       end
     end
 
+    def clear_mirrors
+      @mirrors.each do |m|
+        m.mirrors -= [self]
+      end
+
+      @mirrors.clear
+    end
+
     def show!
       @base.show!
     end
@@ -57,24 +60,16 @@ module Apa102Rbpi
                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
+
+      set_pixel_helper(pos, color, is_hex, brightness || @brightness)
+      unless @mirrors.empty?
+        @mirrors.each do |strip|
+          strip.set_pixel_helper(pos, color, is_hex, brightness || strip.brightness)
         end
       end
     end
 
-    def set_color_helper(pos, color, is_hex, brightness)
+    def set_pixel_helper(pos, color, is_hex, brightness)
       led_frame_hdr = (brightness & 0b00011111) | 0b11100000
       idx = if @reverse
               4 * ((@tail - pos) % @base.num_leds)
@@ -121,5 +116,11 @@ module Apa102Rbpi
       clear
       show!
     end
+
+    protected
+
+    def mirrors=(m)
+      @mirrors = m
+    end
   end
 end

data/lib/apa102_rbpi/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apa102_rbpi
 version: !ruby/object:Gem::Version
-  version: 1.1.pre
+  version: '1.1'
 platform: ruby
 authors:
 - matl33t
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-24 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -135,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.3