Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Revision:
18:999401f359a5
Parent:
13:62e0f7f39ff5
Child:
22:a43df3905863
--- a/displayModes.cpp	Mon Mar 04 04:41:24 2013 +0000
+++ b/displayModes.cpp	Mon Mar 04 14:00:49 2013 +0000
@@ -245,12 +245,36 @@
             break;
         case monitorScreen:
             printLast(changed);
+            if(sMode==1){
+                tt.foreground(Yellow);
+                tt.background(DarkCyan);
+                tt.set_font((unsigned char*) Arial12x12);
+                tt.fillrect(btn31x1,btn31y1,btn31x2,btn31y2,DarkCyan);
+                tt.locate(btn31x1+5,btn31y1+5);
+                printf(" <up>\n");                
+                tt.foreground(Yellow);
+                tt.background(DarkCyan);
+                tt.set_font((unsigned char*) Arial12x12);
+                tt.fillrect(btn33x1,btn31y1,btn33x2,btn31y2,DarkCyan);
+                tt.locate(btn33x1+5,btn31y1+5);
+                printf(" <down>\n");                
+            }
             break;
         case changedScreen:
             printChanged(changed);
             break;
         case cpScreen:
             cpData(changed||showCP);
+            if(sMode==1){
+                tt.foreground(Yellow);
+                tt.background(DarkCyan);
+                tt.set_font((unsigned char*) Arial12x12);
+                tt.fillrect(btn32x1,btn31y1,btn32x2,btn31y2,DarkCyan);
+                tt.locate(btn32x1+5,btn31y1+5);
+                printf(" Request\n");                
+                tt.locate(btn32x1+5,btn31y1+20);
+                printf(" CP data\n");                
+            }
             break;
         default:
             tt.background(Black);
@@ -264,18 +288,18 @@
             tt.foreground(Yellow);
             tt.background(DarkCyan);
             tt.set_font((unsigned char*) Arial12x12);
-            tt.fillrect(btn31x1,btn11y1,btn31x2,btn11y2,DarkCyan);
-            tt.locate(btn31x1+5,btn11y1+5);
+            tt.fillrect(btn31x1,btn33y1,btn31x2,btn33y2,DarkCyan);
+            tt.locate(btn31x1+5,btn33y1+5);
             printf("<-Prev\n");
-            tt.fillrect(btn32x1,btn11y1,btn32x2,btn11y2,DarkCyan);
-            tt.fillrect(btn33x1,btn11y1,btn33x2,btn11y2,DarkCyan);
-            tt.locate(btn33x2-50,btn11y1+5);
+            tt.fillrect(btn32x1,btn33y1,btn32x2,btn33y2,DarkCyan);
+            tt.fillrect(btn33x1,btn33y1,btn33x2,btn33y2,DarkCyan);
+            tt.locate(btn33x2-50,btn33y1+5);
             printf("Next->\n");
             tt.set_display(0);
-            tt.locate(btn32x1+15,btn11y1+5);
+            tt.locate(btn32x1+15,btn33y1+5);
             printf("Select %d\n",dMode[0]);
             tt.set_display(1);
-            tt.locate(btn32x1+15,btn11y1+5);
+            tt.locate(btn32x1+15,btn33y1+5);
             printf("Select %d\n",dMode[1]);
             tt.background(Black);
             break;