Diff: main.cpp

Revision:

1:e047847f1cda

Parent:

0:a2d36977aec3

--- a/main.cpp	Sun Aug 05 12:47:00 2012 +0000
+++ b/main.cpp	Fri Dec 21 14:00:03 2012 +0000
@@ -1,7 +1,9 @@
 #include "mbed.h"
 #include "GD.h"
 #include "arduino.h"
+#include "shield.h"
 
+GDClass GD(ARD_MOSI, ARD_MISO, ARD_SCK, ARD_D9, USBTX, USBRX) ;
 SPI spi(ARD_MOSI, ARD_MISO, ARD_SCK);// mosi, miso, sclk
 DigitalOut cs(ARD_D9);
 Serial pc(USBTX, USBRX);
@@ -15,9 +17,9 @@
 // below.
 
 #if 1 // SPARKFUN_JOYSTICK
-#define PIN_L  ARD_D6
-#define PIN_R  ARD_D3
-#define PIN_J  ARD_D4
+#define PIN_L  ARD_A0
+#define PIN_R  ARD_A1
+#define PIN_J  ARD_D6
 #else
 #define PIN_L  ARD_A2
 #define PIN_R  ARD_A3
@@ -28,27 +30,42 @@
 #define CONTROL_RIGHT 2
 #define CONTROL_JUMP  4
 
-DigitalIn jump(p10);
-DigitalIn left(p11);
-DigitalIn right(p12);
+DigitalIn jump(ARD_D4);
+DigitalIn jumpa(ARD_D5);
+DigitalIn jumpb(ARD_D6);
+DigitalIn jumpc(ARD_D7);
+DigitalIn jumpd(ARD_A4);
+DigitalIn left(ARD_A1);
+DigitalIn right(ARD_A0);
 
 static byte setup_control()
 {
-  jump.mode(PullDown);
-  left.mode(PullDown);
-  right.mode(PullDown);
+  jump.mode(PullUp);
+  jumpa.mode(PullUp);
+  jumpb.mode(PullUp);
+  jumpc.mode(PullUp);
+  jumpd.mode(PullUp);
+  left.mode(PullUp);
+  right.mode(PullUp);
 }
 
 static byte control()
 {
   byte r = 0;
-  if (jump)
+  //if (jump)
+  //  r |= CONTROL_JUMP;
+  if (!jumpa)
+    r |= CONTROL_JUMP;
+  if (!jumpb)
     r |= CONTROL_JUMP;
-  if (left)
+  if (!jumpc)
+    r |= CONTROL_JUMP;
+  if (!jumpd)
+    r |= CONTROL_JUMP;
+  if (!left)
     r |= CONTROL_LEFT;
-  if (right)
+  if (!right)
     r |= CONTROL_RIGHT;
-  r = 0;  
   return r;
 }
 
@@ -996,7 +1013,6 @@
 
 
 int main(){
-   arduino_setup();
    setup();
    while(1){
        loop();