ledstrip 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b1ac284b6770aaca6536a8e2fe63f808eaf46f9
-  data.tar.gz: ed5c1923fac5ce879322b1dac31219823decff09
+  metadata.gz: cbca0a6c63df8bf873ba6bf2827f82c0b403fe76
+  data.tar.gz: 0a4cc0743cc2f4af63217fcf34b67c7d09a42b19
 SHA512:
-  metadata.gz: 6b4d62797761eb029b1987e684c79d043f655f8130e8040922dfe66f26b9737bc6e795cffe20f0f0606a0b0fe321f064880a292e914f373f41afeb11ff5d912f
-  data.tar.gz: a94fc8728d962bb68c8f1375496e5e22c6dc17d479d516fc85d64021ff3cec58787d1ddb66d1381ee6f87e2488398331ef7d54e4d36be9b8c68e27fb9a387321
+  metadata.gz: a9ba0c042427fdd9d57460f465dd113ddc9fc8c5ccc00f82ddda2ef51c0cbe4c4e6cd9226c8f1cc8d61e4737b5f4277ff1d53e8c45783e5504d26ccc6809b48d
+  data.tar.gz: bad0a16b0ea5247173a953d9f91b67a759652485a4e1a34a44fa5e1654caaf4667b5b816054fb9e5793ce94cb36d8515de274067e99e02ec93971c9b6cb2004c

data/lib/ledstrip/type/lpd6803.rb

@@ -1,47 +1,55 @@
 module Ledstrip
   module Type
     class LPD6803
-      def initialize
+      def initialize(order: [:r, :g, :b])
+        @order = order
       end
 
       def draw(leds)
-        write_start_bytes
-        write_leds(leds)
-        write_end_bytes(leds.size)
+        bytes = []
+        bytes << start_bytes
+        bytes << led_bytes(leds)
+        bytes << end_bytes(leds.size)
+
+        write(bytes.flatten)
       end
 
       def write(array)
-        #PiPiper::Spi.spidev_out(array)
         File.open('/dev/spidev0.0', 'wb'){|f| f.write(array.pack('C*')) }
       end
 
       private
-      def write_start_bytes
+      def start_bytes
         # 32 bits start frame
-        write([0,0,0,0])
+        [0,0,0,0]
       end
 
-      def write_leds(leds)
-        leds.each do |led|
-          write_led(led)
-        end
+      def led_bytes(leds)
+        bytes = leds.collect do |led|
+          led_byte(led)
+        end.flatten
       end
 
-      def write_led(led)
+      def led_byte(led)
         bits = 0b1000000000000000
-        bits |= ((led.r / 255) * 31) << 10
-        bits |= ((led.g / 255) * 31) << 5
-        bits |= ((led.b / 255) * 31) 
+        bits |= ((first_part(led)  / 255) * 31).to_i << 10
+        bits |= ((second_part(led) / 255) * 31).to_i << 5
+        bits |= ((third_part(led)  / 255) * 31).to_i 
 
         output = []
         output[0] = (bits & 0xff00) >> 8
         output[1] = (bits & 0x00ff) >> 0
-        write(output)
+
+        output
       end
 
-      def write_end_bytes(size)
+      def first_part(led);  led.send(@order[0]).to_f; end
+      def second_part(led); led.send(@order[1]).to_f; end
+      def third_part(led);  led.send(@order[2]).to_f; end
+
+      def end_bytes(size)
         # two versions found online, one is to use bits per led other is bytes per led
-        write(Array.new(size / 8 + 1, 0))
+        Array.new(size / 8 + 1, 0)
         # write(Array.new(size, 0))
       end
     end

data/lib/ledstrip/version.rb

@@ -1,3 +1,3 @@
 module Ledstrip
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/ledstrip/type/lpd6803_spec.rb

@@ -7,10 +7,29 @@ describe LPD6803 do
 
   describe "#draw" do
 
-    xit "draws a red led" do
+    it "draws a red led" do
       subject = LPD6803.new
-      red_led = Led.new(r: 255, g: 0, b: 0)
+      red_led = Ledstrip::Led.new(r: 255, g: 0, b: 0)
+
+      allow(subject).to receive(:write)
       subject.draw([red_led])
+
+      result = [0,0,0,0,0b11111100, 0b00000000, 0]
+      expect(subject).to have_received(:write).with(result)
+    end
+
+    context "with different order" do
+      it "draws a red led" do
+        subject = LPD6803.new(order: [:g, :r, :b])
+        red_led = Ledstrip::Led.new(r: 255, g: 0, b: 0)
+
+        allow(subject).to receive(:write)
+
+        result = [0,0,0,0,0b10000011, 0b11100000, 0]
+        subject.draw([red_led])
+
+        expect(subject).to have_received(:write).with(result)
+      end
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ledstrip
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Roy van der Meij
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pi_piper