Tick Tock / SPI_TFTx2

Modified to work with two displays

Dependents:   touch2 default CANary_9341_test CANary_merge

Fork of SPI_TFT by Peter Drescher

Files at this revision

API Documentation at this revision

Revision 11:c39d5b3745af, committed 2013-03-15

Comitter:
TickTock
Date:
Fri Mar 15 04:27:48 2013 +0000
Parent:
10:6693193c1fd6
Child:
12:ff509eb02e37
Commit message:
changed name of window function to avoid conflict with graphic library;

Changed in this revision

GraphicsDisplay.cpp Show annotated file Show diff for this revision Revisions of this file
GraphicsDisplay.h Show annotated file Show diff for this revision Revisions of this file 
--- a/GraphicsDisplay.cpp	Wed Feb 27 03:46:45 2013 +0000
+++ b/GraphicsDisplay.cpp	Fri Mar 15 04:27:48 2013 +0000
@@ -113,7 +113,7 @@
     blitbit(column * 8, row * 8, 8, 8, (char*)&(FONT8x8[value - 0x1F][0]));
 }
 
-void GraphicsDisplay::window(int x, int y, int w, int h) {
+void GraphicsDisplay::gdwindow(int x, int y, int w, int h) {
     // current pixel location
     _x = x;
     _y = y;
@@ -139,7 +139,7 @@
 }
 
 void GraphicsDisplay::fill(int x, int y, int w, int h, int colour) { 
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour);
     }
@@ -150,14 +150,14 @@
 }
     
 void GraphicsDisplay::blit(int x, int y, int w, int h, const int *colour) { 
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i=0; i<w*h; i++) {
         putp(colour[i]);
     }
 }
     
 void GraphicsDisplay::blitbit(int x, int y, int w, int h, const char* colour) {
-    window(x, y, w, h);
+    gdwindow(x, y, w, h);
     for(int i = 0; i < w*h; i++) {
         char byte = colour[i >> 3];
         int offset = i & 0x7;

--- a/GraphicsDisplay.h	Wed Feb 27 03:46:45 2013 +0000
+++ b/GraphicsDisplay.h	Fri Mar 15 04:27:48 2013 +0000
@@ -26,7 +26,7 @@
     virtual int width() = 0;
     virtual int height() = 0;
         
-    virtual void window(int x, int y, int w, int h);
+    virtual void gdwindow(int x, int y, int w, int h);
     virtual void putp(int colour);
     
     virtual void cls();