ELEC2645 (2018/19) / Mbed 2 deprecated el17arm

Dependencies:   mbed

Revision:
4:b92da6a09c8b
Parent:
3:d27ee2440829
Child:
5:0655bddafd9e
Child:
6:866281ce2b44
--- a/main.cpp	Wed Mar 20 18:32:25 2019 +0000
+++ b/main.cpp	Thu Mar 21 21:29:11 2019 +0000
@@ -3,9 +3,11 @@
 #include "Gamepad.h"
 #include "Minerengine.h"
 #include "Levelengine.h"
+#include "Gameengine.h"
 
 Levelengine level;
-Minerengine engine;
+Minerengine miner;
+//Gameengine game;
 Gamepad pad;
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
 AnalogIn pot0(PTB2);
@@ -23,13 +25,13 @@
 
         contrast();
         level.test_level(lcd);
-        engine.miner_gravity(lcd);
-        engine.miner_jump(lcd, pad);
-        engine.read_direction(pad);
-        engine.miner_move(lcd, pad);
-        engine.miner_draw(lcd);
+        miner.miner_gravity(lcd);
+        miner.miner_jump(lcd, pad);
+        miner.read_direction(pad);
+        miner.miner_move(lcd, pad);
+        miner.miner_draw(lcd);
         
-        wait(0.05);
+        wait(0.1);
 
     }
 
@@ -69,5 +71,6 @@
         wait(0.1);
         pad.leds_off();
         wait(0.1);
+        pad.tone(750.0,0.1);
     }
 }
\ No newline at end of file