ELEC2645 (2018/19) / Mbed 2 deprecated el17szs

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   mbed

Diff: main.cpp

Revision:
4:55a0509c4874
Parent:
3:bd3465a70a5a
Child:
5:915bcac4e9b9
--- a/main.cpp	Mon Apr 15 13:40:49 2019 +0000
+++ b/main.cpp	Tue Apr 16 09:48:37 2019 +0000
@@ -12,13 +12,13 @@
 #include "Gamepad.h"
 #include "N5110.h"
 #include "Ball.h"
-
+#include "Bat.h"
 
 
 N5110 lcd(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
 Gamepad pad;
 Ball ball;
-
+Bat bat;
 
 void init();
 
@@ -29,7 +29,7 @@
 int main(){
     int fps=8;
     init();
-    welcome();
+    //welcome();
     draw();
     /*
     while (1){
@@ -49,14 +49,14 @@
 void init(){
     lcd.init();
     pad.init();
+    bat.init(4,5);
+    ball.init(2,3);
     //field.init();
     
-    
     lcd.setContrast(0.4);
     lcd.normalMode();      // normal colour mode
     lcd.setBrightness(0.5);
     lcd.clear();
-    ball.init(2,3);
     
 }
 void welcome() {
@@ -82,6 +82,7 @@
     lcd.drawRect(37,11,12,30,FILL_TRANSPARENT);
     ball.draw(lcd);
     ball.set_field(lcd);
+    bat.draw(lcd);
     lcd.refresh();
 }
 void ball_test(){