X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConsole.java;h=422b7a38147e14ce26ffcdc1231dcf71fe95c4be;hb=fa013e4bfdfe17f97ddeab2596ae8daa03337e4a;hp=a856203cbafd7347435eef383b22520acb645a12;hpb=cd28f68c5085af337dc710d04634ad38f7af2438;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index a856203..422b7a3 100644
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -1,5 +1,10 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.AmbientMode;
+import kaka.cakelight.mode.SingleColorMode;
+import kaka.cakelight.mode.TwoColorNoiseMode;
+import kaka.cakelight.mode.VideoMode;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -17,6 +22,14 @@ public class Console extends Thread {
         this.cakelight = cakelight;
 	this.config = config;
 	reader = new BufferedReader(new InputStreamReader(System.in));
+
+    public CakeLight getCakelight() {
+	return cakelight;
+    }
+
+    public Configuration getConfig() {
+	return config;
+    }
     }
 
     @Override
@@ -25,17 +38,40 @@ 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.matches("[0-5]")) {
 		    cakelight.setMode(new AmbientMode(new String[] {input}));
 		    System.out.println("setting ambient mode to " + input);
+		} else if (input.matches("v|video")) {
+                    cakelight.setMode(new VideoMode());
 		} else if (input.matches("(b|brightness)\\s+[0-9]+")) {
 		    String[] split = input.split("\\s+");
 		    config.leds.brightness = Integer.parseInt(split[1]);
-		    System.out.println("setting brightness to " + split[1]);
+		    System.out.println("setting brightness to " + config.leds.brightness);
 		} else if (input.matches("q|quit")) {
-		    cakelight.cleanup();
+		    cakelight.turnOff();
 		    System.out.println("stopping cakelight");
 		    break;
+		} else if (input.matches("(c|col|color)(\\s+[0-9]+){3}")) {
+		    String[] split = input.split("\\s+");
+		    Color c = Color.rgb(
+			    Integer.parseInt(split[1]),
+			    Integer.parseInt(split[2]),
+			    Integer.parseInt(split[3])
+		    );
+		    cakelight.setMode(new SingleColorMode(c));
+		    System.out.println("setting color to " + c);
+		} else if (input.matches("(g|gamma)\\s+[0-9.]+")) {
+		    String[] split = input.split("\\s+");
+		    config.gamma = Double.parseDouble(split[1]);
+		    Color.calculateGammaCorrection(config.gamma);
+		    System.out.println("setting gamma to " + config.gamma);
+		} else if (input.matches("(s|saturation)\\s+[0-9.]+")) {
+		    String[] split = input.split("\\s+");
+		    config.video.saturation = Double.parseDouble(split[1]);
+		    System.out.println("setting saturation to " + config.video.saturation);
+		} else if (input.matches("(n|noise)(\\s+[a-z0-9]+){2}")) {
+		    TwoColorNoiseMode.getCommand().activate(this, input.split("\\s+"));
+		    System.out.println("setting two-color noise mode");
 		}
             } catch (IOException e) {
                 System.out.println("Error reading from command line");
@@ -44,4 +80,8 @@ public class Console extends Thread {
         }
     }
 
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
+    }
 }