4DGL-uLCD-SE with removed color defines

Fork of 4DGL-uLCD-SE by jim hamblen

Files at this revision

API Documentation at this revision

Comitter:
Reiko
Date:
Fri Nov 21 18:27:18 2014 +0000
Parent:
7:e39a44de229a
Commit message:
Removed color defines

Changed in this revision

uLCD_4DGL.h Show annotated file Show diff for this revision Revisions of this file
uLCD_4DGL_main.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r e39a44de229a -r e69d654ee30f uLCD_4DGL.h
--- a/uLCD_4DGL.h	Sat Nov 30 02:05:15 2013 +0000
+++ b/uLCD_4DGL.h	Fri Nov 21 18:27:18 2014 +0000
@@ -85,8 +85,8 @@
 
 
 // Screen states
-#define OFF          '\x00'
-#define ON           '\x01'
+#define SCREEN_OFF          '\x00'
+#define SCREEN_ON           '\x01'
 
 // Graphics modes
 #define SOLID        '\x00'
@@ -132,13 +132,13 @@
 #define BAUD_3000000 0
 
 // Defined Colors
-#define WHITE 0xFFFFFF
+/*#define WHITE 0xFFFFFF
 #define BLACK 0x000000
 #define RED   0xFF0000
 #define GREEN 0x00FF00
 #define BLUE  0x0000FF
 #define LGREY 0xBFBFBF
-#define DGREY 0x5F5F5F
+#define DGREY 0x5F5F5F*/
 
 // Mode data
 #define BACKLIGHT    '\x00'
diff -r e39a44de229a -r e69d654ee30f uLCD_4DGL_main.cpp
--- a/uLCD_4DGL_main.cpp	Sat Nov 30 02:05:15 2013 +0000
+++ b/uLCD_4DGL_main.cpp	Fri Nov 21 18:27:18 2014 +0000
@@ -48,7 +48,7 @@
     cls();       // clear screen
     current_col         = 0;            // initial cursor col
     current_row         = 0;            // initial cursor row
-    current_color       = WHITE;        // initial text color
+    current_color       = 0xFFFFFF;        // initial text color
     current_orientation = IS_PORTRAIT;  // initial screen orientation
     current_hf = 1;
     current_wf = 1;