ELEC2645 (2016/17) / Mbed 2 deprecated 2645_Project_el15as

Dependencies:   mbed

Revision:
7:b54323241435
Parent:
6:33fd1797beb4
Child:
8:c3cf8d1057bb
--- a/main.cpp	Mon May 01 22:47:46 2017 +0000
+++ b/main.cpp	Tue May 02 00:20:44 2017 +0000
@@ -3,12 +3,14 @@
 #include "Gamepad.h"
 #include "Player.h"
 #include "GameEngine.h"
+#include "Menu.h"
 
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
 Serial pc(USBTX, USBRX); // tx, rx
 Gamepad pad;
 GameEngine game;
 Player player;
+Menu menu;
 
 void update_screen();
 
@@ -19,7 +21,7 @@
 
     lcd.normalMode();
     lcd.setBrightness(1);
-    game.init(5);
+    game.init(4);
     lcd.refresh();
 
     while(1) {  // loop forever