Diff: Game.h

Revision:

7:c0f12f624832

Parent:

5:8a26ad9d9ea1

Child:

8:c63981a45c95

--- a/Game.h	Thu Feb 26 20:29:02 2015 +0000
+++ b/Game.h	Fri Feb 27 20:21:32 2015 +0000
@@ -1,6 +1,7 @@
 #include "mbed.h"
-
-#include "DisplayN18.h"
+#include "Color565.h"
+#include "font_IBM.h"
+#include "LCD_ST7735.h"
 
 #pragma once
 
@@ -21,6 +22,10 @@
     static const int GRAPH_HEIGHT = 40;
     static const int GRAPH_SPACING = 2;
     static const char I2C_ADDR = 0x1C << 1;
+
+    static const int CHAR_WIDTH = 8;
+    static const int CHAR_HEIGHT = 8;
+    static const int CHAR_SPACING = 0;
     
     // Start with a ball.. let's see what becomes
     int ballX;
@@ -50,11 +55,13 @@
     PwmOut pwm;
     AnalogIn ain;
     I2C i2c;
-    DisplayN18 disp;
+    LCD_ST7735 disp;
     
     void readRegisters(char address, char* buffer, int len);
     int writeRegister(char address, char value);
+    void getXY(double& x, double& y);
     void getXYZ(double& x, double& y, double& z);
+
     double convert(char* buffer);
     void printDouble(double value, int x, int y);