ELEC2645 (2018/19) / Mbed 2 deprecated el17ajf

Dependencies:   mbed

Fork of el17ajf by Angus Findlay

Revision:
10:5762d7fae033
Parent:
9:3a7776a29a11
Child:
11:fba7d54fd36b
--- a/Graphics/Graphics.cpp	Fri Mar 15 20:30:01 2019 +0000
+++ b/Graphics/Graphics.cpp	Fri Mar 15 21:16:39 2019 +0000
@@ -1,5 +1,7 @@
 #include "Graphics.h"
 
+N5110 * Graphics::lcd;
+
 void Graphics::init() {
     lcd = new N5110(PTC9,PTC0,PTC7,PTD2,PTD1,PTC11);
     lcd->init();
@@ -10,10 +12,6 @@
     delete lcd;
 }
 
-void Graphics::update() {
-    // TODO (needed?)
-}
-
 void Graphics::clear() {
     lcd->clear();
 }
@@ -50,12 +48,12 @@
 }
 
 void Graphics::drawBorder() {
-    Graphics::drawDottedLine(0, 0, 0, HEIGHT - 1);
-    Graphics::drawDottedLine(1, 1, 1, HEIGHT - 2);
+    Graphics::drawDottedLine(0, 0, 0, SCREEN_HEIGHT - 1);
+    Graphics::drawDottedLine(1, 1, 1, SCREEN_HEIGHT - 2);
     
-    Graphics::drawDottedLine(0, HEIGHT - 1, WIDTH - 1, HEIGHT - 1);
-    Graphics::drawDottedLine(1, HEIGHT - 2, WIDTH - 2, HEIGHT - 2);
+    Graphics::drawDottedLine(0, SCREEN_HEIGHT - 1, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1);
+    Graphics::drawDottedLine(1, SCREEN_HEIGHT - 2, SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2);
     
-    Graphics::drawDottedLine(WIDTH - 1, HEIGHT - 1, WIDTH - 1, 0);
-    Graphics::drawDottedLine(WIDTH - 2, HEIGHT - 2, WIDTH - 2, 1);
+    Graphics::drawDottedLine(SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1, SCREEN_WIDTH - 1, 0);
+    Graphics::drawDottedLine(SCREEN_WIDTH - 2, SCREEN_HEIGHT - 2, SCREEN_WIDTH - 2, 1);
 }
\ No newline at end of file