Diff: GPIOJoystick.cpp

Revision:

2:018f204f6037

Parent:

1:89c1c7f9245a

Child:

4:4f6e38b6c07e

diff -r 89c1c7f9245a -r 018f204f6037 GPIOJoystick.cpp
--- a/GPIOJoystick.cpp	Mon Dec 01 21:07:44 2014 +0000
+++ b/GPIOJoystick.cpp	Mon Dec 01 21:33:36 2014 +0000
@@ -11,60 +11,52 @@
 {
     bool quit = false ;
     while(1) {
-        char ch = uart.getc();
-        switch(ch) {
-            case 'a':
-                pressLeft();
-                break;
-            case 's':
-                pressDown();
-                break;
-            case 'd':
-                pressRight();
-                break;
-            case 'w':
-                pressUp();
-                break;
-            case ' ':
-                pressJump();
-                break;
-            case 'n':
-                pressFire1();
-                break;
-            case 'm':
-                pressFire2();
-                break;
-            case '\n':
-                pressMenuSelect1();
-                break;
-            case '\r':
-                pressMenuSelect1();
-                break;
-            case '1':
-                pressMenuSelect2();
-                break;
-            case 0x1b:
-                pressMenuSelect3();
-                break;
-            case 'u':
-                uart.printf("pi\r\n");
-                router.sendEvent(USER);
-                break;
-            case 'p':
-                uart.printf("raspberry\r\n");
-                router.sendEvent(PASS);
-                break;
-            case 'k':
-                uart.printf("/home/pi/mame/mame4all_comp/mame_run/mame  \r\n");
-                router.sendEvent(RUN);
-                break;
-            case 'q':
-                uart.printf("Quitting now !! \r\n");
-                quit = true ;
-                break;
-
-        }
-        if(quit) break;
+        if(Left == ON)
+            pressLeft();
+        if(Down == ON)
+            pressDown();
+        if(Right == ON)
+            pressRight();
+        if(Up == ON)
+            pressUp();
+        if(Jump == ON)
+            pressJump();
+        if(Fire1 == ON)
+            pressFire1();
+        if(Fire2 == ON)
+            pressFire2();
+//                break;
+//            case '\n':
+//                pressMenuSelect1();
+//                break;
+//            case '\r':
+//                pressMenuSelect1();
+//                break;
+//            case '1':
+//                pressMenuSelect2();
+//                break;
+//            case 0x1b:
+//                pressMenuSelect3();
+//                break;
+//            case 'u':
+//                uart.printf("pi\r\n");
+//                router.sendEvent(USER);
+//                break;
+//            case 'p':
+//                uart.printf("raspberry\r\n");
+//                router.sendEvent(PASS);
+//                break;
+//            case 'k':
+//                uart.printf("/home/pi/mame/mame4all_comp/mame_run/mame  \r\n");
+//                router.sendEvent(RUN);
+//                break;
+//            case 'q':
+//                uart.printf("Quitting now !! \r\n");
+//                quit = true ;
+//                break;
+//
+//        }
+//        if(quit) break;
     }
 }