From: Tomas Wenström <tomas.wenstrom@gmail.com>
Date: Mon, 4 Sep 2017 14:23:39 +0000 (+0200)
Subject: Merge branch 'master' of router:/srv/git/kaka/cakelight
X-Git-Url: http://dolda2000.com/gitweb/?p=kaka%2Fcakelight.git;a=commitdiff_plain;h=dc8770201bf2e103dbb2834694fafd32c9ddc325;hp=034031f37f834564ce179cd7526dab1014872d24

Merge branch 'master' of router:/srv/git/kaka/cakelight
---

diff --git a/src/kaka/cakelight/CakeLight.java b/src/kaka/cakelight/CakeLight.java
index 6a00a37..69f6677 100644
--- a/src/kaka/cakelight/CakeLight.java
+++ b/src/kaka/cakelight/CakeLight.java
@@ -39,4 +39,9 @@ public class CakeLight {
 //	byte[] data = frame.getData();
 //	saveFile(data, "/home/kaka/test.img");
     }
+
+    public void turnOff() {
+        cleanup();
+        ledController.onFrame(LedFrame.from(config));
+    }
 }
diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 00a1269..6339138 100644
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -33,7 +33,7 @@ public class Console extends Thread {
 		    config.leds.brightness = Integer.parseInt(split[1]);
 		    System.out.println("setting brightness to " + split[1]);
 		} else if (input.matches("q|quit")) {
-		    cakelight.cleanup();
+		    cakelight.turnOff();
 		    System.out.println("stopping cakelight");
 		    break;
 		}
diff --git a/src/kaka/cakelight/LedFrame.java b/src/kaka/cakelight/LedFrame.java
index 546e78b..18b8f22 100644
--- a/src/kaka/cakelight/LedFrame.java
+++ b/src/kaka/cakelight/LedFrame.java
@@ -8,6 +8,9 @@ public class LedFrame {
     private int 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;