From 6e568391dad1a1c47b5697a2f1ef90a685859a84 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tomas=20Wenstr=C3=B6m?= <tomas.wenstrom@gmail.com>
Date: Mon, 4 Sep 2017 17:51:10 +0200
Subject: [PATCH] Bugfixes

---
 src/kaka/cakelight/CakeLight.java |  3 ++-
 src/kaka/cakelight/LedFrame.java  | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/kaka/cakelight/CakeLight.java b/src/kaka/cakelight/CakeLight.java
index 69f6677..95a3be1 100644
--- a/src/kaka/cakelight/CakeLight.java
+++ b/src/kaka/cakelight/CakeLight.java
@@ -20,6 +20,7 @@ public class CakeLight {
 
     public void cleanup() {
         if (this.mode != null) {
+	    this.mode.setFrameListener(ledFrame -> {}); // To avoid any frame being sent to the controller while the thread is exiting
             this.mode.exit();
         }
     }
@@ -42,6 +43,6 @@ public class CakeLight {
 
     public void turnOff() {
         cleanup();
-        ledController.onFrame(LedFrame.from(config));
+        ledController.onFrame(LedFrame.from(config).fillColor(0, 0, 0));
     }
 }
diff --git a/src/kaka/cakelight/LedFrame.java b/src/kaka/cakelight/LedFrame.java
index 18b8f22..ac3341d 100644
--- a/src/kaka/cakelight/LedFrame.java
+++ b/src/kaka/cakelight/LedFrame.java
@@ -5,12 +5,9 @@ import java.util.Arrays;
 public class LedFrame {
     private Configuration config;
     private byte[] bytes;
-    private int stride;
+    private int start, stride;
     private int roff, goff, boff; // RGB offsets
 
-    /**
-     * @return a frame initiated to black
-     */
     public static LedFrame from(Configuration config) {
         LedFrame frame = new LedFrame();
         frame.config = config;
@@ -19,6 +16,7 @@ public class LedFrame {
              * The WS2801 strip takes its input as a plain list of 24-bit colors in RBG order (at least mine did).
              */
             case WS2801:
+		frame.start = 0;
                 frame.stride = 3;
                 frame.roff = 0;
                 frame.goff = 2;
@@ -35,40 +33,42 @@ public class LedFrame {
              * </ol>
              */
             case APA102:
+		frame.start = 4;
                 frame.stride = 4;
-                frame.roff = 3 + 4;
-                frame.goff = 2 + 4;
-                frame.boff = 1 + 4;
-                frame.bytes = new byte[4 + config.leds.getCount() * frame.stride + 4];
-                Arrays.fill(frame.bytes, 4, frame.bytes.length - 5, (byte)(0b11100000 | config.leds.brightness)); // Initiate the first byte of each LED
-                Arrays.fill(frame.bytes, frame.bytes.length - 5, frame.bytes.length - 1, (byte)0xff); // Initiate the end frame with ones
+                frame.roff = 3;
+                frame.goff = 2;
+                frame.boff = 1;
+                frame.bytes = new byte[4 + config.leds.getCount() * frame.stride + 4 * 2]; // 1 end frame doesn't seem to work, so we add another
+                Arrays.fill(frame.bytes, 4, frame.bytes.length - 9, (byte)(0b11100000 | config.leds.brightness)); // Initiate the first byte of each LED
+                Arrays.fill(frame.bytes, frame.bytes.length - 9, frame.bytes.length, (byte)0xff); // Initiate the end frame(s) with ones
                 break;
         }
         return frame;
     }
 
-    public void fillColor(int r, int g, int b) {
-        fillColor(Color.rgb(r, g, b));
+    public LedFrame fillColor(int r, int g, int b) {
+        return fillColor(Color.rgb(r, g, b));
     }
 
-    public void fillColor(Color color) {
+    public LedFrame fillColor(Color color) {
         byte r = (byte)color.r(), g = (byte)color.g(), b = (byte)color.b(); // Gamma corrected values
-        for (int i = 0; i < bytes.length; i += stride) {
+        for (int i = start, max = start + config.leds.getCount() * stride; i < max; i += stride) {
             bytes[i + roff] = r;
             bytes[i + goff] = g;
             bytes[i + boff] = b;
         }
+	return this;
     }
 
     public void setLedColor(int led, Color color) {
-        int offset = led * stride;
+        int offset = start + led * stride;
         bytes[offset + roff] = (byte)color.r();
         bytes[offset + goff] = (byte)color.g();
         bytes[offset + boff] = (byte)color.b();
     }
 
     public Color getLedColor(int led) {
-        int offset = led * stride;
+        int offset = start + led * stride;
         return Color.rgb(
                 bytes[offset + roff] & 0xff,
                 bytes[offset + goff] & 0xff,
-- 
2.11.0