Diff: main.cpp

Revision:

2:af5b5d42e835

Parent:

1:12803d645d32

Child:

3:d2cc054e8605

--- a/main.cpp	Mon Mar 07 12:09:22 2016 +0000
+++ b/main.cpp	Mon Mar 21 09:29:46 2016 +0000
@@ -1,39 +1,17 @@
 #include "mbed.h"
 #include "N5110.h"
 #include "stdlib.h"
+#include "main.h"
+
 
 N5110 lcd(PTE26 , PTA0 , PTC4 , PTD0 , PTD2 , PTD1 , PTC3);
 Serial pc(USBTX,USBRX);
 
-#define DIRECTION_TOLERANCE 0.05
-
-InterruptIn button(PTB2);
-AnalogIn xPot(PTB3);
-AnalogIn yPot(PTB10);
 
 Ticker ticker;
 Ticker game_ticker;
 Timeout timeout;
 
-DigitalOut r_led(LED_RED);
-DigitalOut g_led(LED_GREEN);
-DigitalOut b_led(LED_BLUE);
-// K64F on-board switches
-InterruptIn sw2(SW2);
-InterruptIn sw3(SW3);
-PwmOut speaker(PTC11);
-
-enum DirectionName {
-    UP,
-    DOWN,
-    LEFT,
-    RIGHT,
-    CENTRE,
-    UP_LEFT,
-    UP_RIGHT,
-    DOWN_LEFT,
-    DOWN_RIGHT
-};
 
 typedef struct JoyStick Joystick;
 struct JoyStick {
@@ -49,44 +27,6 @@
 
 // error function hangs flashing an LED
 
-volatile int rectY;
-volatile int rectX ;
-volatile int circleX;
-volatile int circleY;
-volatile int heroX;
-volatile int heroY;
-
-volatile int level = 0;
-volatile int count = 0;
-volatile int reset = 0;
-volatile int g_timer_flag = 0;
-volatile int g_game_timer_flag = 0;
-volatile int g_sw2_flag = 0;
-volatile int g_sw3_flag = 0;
-volatile int g_button_flag = 0;
-
-void error();
-// setup serial port
-void init_serial();
-// set-up the on-board LEDs and switches
-void init_K64F();
-void init_game();
-void timer_isr();
-void game_timer_isr();
-void sw2_isr();
-void sw3_isr();
-void button_isr();
-void timeout_isr();
-
-void calibrateJoystick();
-void updateJoystick();
-
-void enemyRect();
-void enemyCircle();
-void hero();
-void guidance();
-void obstacles();
-int menu();
 
 int main()
 {