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

Conflicts:
	PunchingBag/src/PunchingBag.java

1 files changed, 8 insertions, 6 deletions

diff --git a/Arduino/ButtonMatrix/ButtonMatrix.pde b/Arduino/ButtonMatrix/ButtonMatrix.pde
index 1ed494c..41ae6ab 100755
--- a/Arduino/ButtonMatrix/ButtonMatrix.pde
+++ b/Arduino/ButtonMatrix/ButtonMatrix.pde
@@ -1,8 +1,7 @@
- #include <Keypad.h> // Needs to be the modified version
+#include <Keypad.h> // Needs to be the modified version
 
 const byte ROWS = 19;
-const byte COLS = 8;
-
+const byte COLS = 8;   
 
 // these constants describe the pins for the acellarometer . They won't change:
 const int groundpin = 18;             // analog input pin 4 -- ground
@@ -10,6 +9,7 @@ const int powerpin = 19;              // analog input pin 5 -- voltage
 const int xpin = A3;                  // x-axis of the accelerometer
 const int ypin = A2;                  // y-axis
 const int zpin = A1;                  // z-axis (only on 3-axis models)
+const int selfTest = A0;
 
 /* Each of the buttons can be refered to by a number 
    At the moment the byte overflow for the 127+ numbers is dealt with at the 
@@ -38,7 +38,7 @@ byte rowPins[ROWS] = {14, 15, 16, 17, 18, 19, 20, 21, 22, 24, 26, 28, 30, 32, 34
 Keypad keypad = Keypad( makeKeymap(keys), colPins, rowPins, COLS, ROWS); 
 
 void setup(){
-  Serial.begin(115200);
+  Serial.begin(9600);
   Serial.println("Go");
 
   // Provide ground and power by using the analog inputs as normal
@@ -47,8 +47,10 @@ void setup(){
   // GND pins on the Arduino, you can remove these lines.
   pinMode(groundpin, OUTPUT);
   pinMode(powerpin, OUTPUT);
+  //pinMode(selfTest, OUTPUT);
   digitalWrite(groundpin, LOW);
   digitalWrite(powerpin, HIGH);
+  //digitalWrite(selfTest, HIGH);
 }
 /* Send numbers back and forth to test the integrity of the serial communication 
    Computer sends the first byte
@@ -80,10 +82,10 @@ void loop(){
   // print a tab between values:
   Serial.print("\t");
   Serial.print(analogRead(ypin));
-  // print a tab between values:
+    // print a tab between values:
   Serial.print("\t");
   Serial.print(analogRead(zpin));
   Serial.println();
   // delay before next reading:
-  delay(100);
+  delay(10);
 }