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/?a=commitdiff_plain;ds=sidebyside;h=dc8770201bf2e103dbb2834694fafd32c9ddc325;hp=-c;p=kaka%2Fcakelight.git

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

dc8770201bf2e103dbb2834694fafd32c9ddc325
diff --combined src/kaka/cakelight/Console.java
index 00a1269,fef4301..6339138
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@@ -25,7 -25,7 +25,7 @@@ public class Console extends Thread 
              System.out.print("> ");
              try {
                  String input = reader.readLine();
 -                if (input.equals("0") || input.equals("1") || input.equals("2")) {
 +                if (input.equals("0") || input.equals("1") || input.equals("2") || input.equals("3") || input.equals("4")) {
  		    cakelight.setMode(new AmbientMode(new String[] {input}));
  		    System.out.println("setting ambient mode to " + input);
  		} else if (input.matches("(b|brightness)\\s+[0-9]+")) {
@@@ -33,7 -33,7 +33,7 @@@
  		    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;
  		}