Merge branch 'master' of gitorious.org:punchingbag/punchingbag

Conflicts:
	PunchingBag/src/PunchingBagGUI.java

1 files changed, 25 insertions, 2 deletions

diff --git a/Arduino/LEDMatrix/LEDMatrix.pde b/Arduino/LEDMatrix/LEDMatrix.pde
index 4a07bfc..1a709be 100644
--- a/Arduino/LEDMatrix/LEDMatrix.pde
+++ b/Arduino/LEDMatrix/LEDMatrix.pde
@@ -24,10 +24,29 @@ void setup ( )
 
 void loop ( )
 {
-  for (int i=0; i<(chips * 8); i++) {
-    buffer[i] = 0b10101010;//random(-128,127); // Just Green 
+  /*buffer[0] = 127;
+   buffer[1] = 0b10101010;
+   buffer[2] = 0b01010101;
+   for (int i=3; i<(chips * 8); i++) {
+   buffer[i] = 0;//random(-128,127); // Just Green 0b10101010
+   }
+   matrix.Update();*/
+
+
+  while (true) {
+    int read = Serial.read();
+    if ((byte) read == (byte) 108) {
+      for (int b=0; b< (chips * 8); ) {
+        if ((read = Serial.read()) != -1) {
+          buffer[b] = (byte) read;
+          b++;
+        }
+      }
+      break;
+    }
   }
   matrix.Update();
+
 }
 
 
@@ -38,3 +57,7 @@ void loop ( )
 
 
 
+
+
+
+