Diff: main.cpp

Revision:

21:a50739772892

Parent:

20:92b3e641b306

Child:

22:2bdc80e45f3b

--- a/main.cpp	Fri Sep 02 16:24:10 2016 +0000
+++ b/main.cpp	Wed Sep 07 23:11:49 2016 +0000
@@ -103,10 +103,10 @@
                 font_title =    31,
                 font_author =   21;
 
-const ft_char8_t    text_menu[32]   = {"Data Logger\0"},
+const ft_char8_t    text_menu[32]   = {"Curt's test software\0"},
                     text_a[32]      = {"Plot adc\0"},
                     text_b[32]      = {"Settings\0"},
-                    text_c[32]      = {"ISE40A\0"},
+                    text_c[32]      = {"Wireless\0"},
                     text_back[32]   = {"Back\0"},
                     text_author[32] = {"by Curtis Mattull\0"};
 
@@ -245,14 +245,14 @@
     TFT.DL(CLEAR(1,1,1));                                               // clear buffers -> color buffer,stencil buffer, tag buffer
 
     //bitmaps
-    TFT.DL(TAG(0));     // assign TAG value 0 to bitmap
-    TFT.DL(BITMAP_SOURCE(RAM_G));
-    TFT.DL(BITMAP_LAYOUT(RGB565,x_size*2,y_size));
-    TFT.DL(BITMAP_SIZE(NEAREST,BORDER,BORDER,x_size,y_size));
-
-    TFT.DL(BEGIN(BITMAPS));     //start drawing bitmaps
-    TFT.DL(VERTEX2II(10,10,0,0));                                      // draw logo image with bit handle 0
-    TFT.DL(END());
+    //TFT.DL(TAG(0));     // assign TAG value 0 to bitmap
+//    TFT.DL(BITMAP_SOURCE(RAM_G));
+//    TFT.DL(BITMAP_LAYOUT(RGB565,x_size*2,y_size));
+//    TFT.DL(BITMAP_SIZE(NEAREST,BORDER,BORDER,x_size,y_size));
+//
+//    TFT.DL(BEGIN(BITMAPS));     //start drawing bitmaps
+//    TFT.DL(VERTEX2II(10,10,0,0));                                      // draw logo image with bit handle 0
+//    TFT.DL(END());
 
     //buttons
     TFT.DL(COLOR_RGB(0xFF,  0xFF,   0xFF)); //this sets the button text color
@@ -408,7 +408,7 @@
 *************************/
 void mode_b(uint32_t tracker, uint8_t tag)
 {
-    static uint8_t val = 50;
+    static uint8_t val = 128;
     
     //start new display list
     TFT.DLstart();                                                      // start a new display command list
@@ -416,15 +416,15 @@
     TFT.DL(CLEAR(1,1,1));                                               // clear buffers -> color buffer,stencil buffer, tag buffer
 
 
-    //bitmaps
-    TFT.DL(TAG(0));     // assign TAG value 0 to bitmap
-    TFT.DL(BITMAP_SOURCE(RAM_G));
-    TFT.DL(BITMAP_LAYOUT(RGB565,x_size*2,y_size));
-    TFT.DL(BITMAP_SIZE(NEAREST,BORDER,BORDER,x_size,y_size));
-
-    TFT.DL(BEGIN(BITMAPS));     //start drawing bitmaps
-    TFT.DL(VERTEX2II(10,10,0,0));                                      // draw logo image with bit handle 0
-    TFT.DL(END());
+//    //bitmaps
+//    TFT.DL(TAG(0));     // assign TAG value 0 to bitmap
+//    TFT.DL(BITMAP_SOURCE(RAM_G));
+//    TFT.DL(BITMAP_LAYOUT(RGB565,x_size*2,y_size));
+//    TFT.DL(BITMAP_SIZE(NEAREST,BORDER,BORDER,x_size,y_size));
+//
+//    TFT.DL(BEGIN(BITMAPS));     //start drawing bitmaps
+//    TFT.DL(VERTEX2II(10,10,0,0));                                      // draw logo image with bit handle 0
+//    TFT.DL(END());
 
     //buttons
     TFT.DL(COLOR_RGB(0xFF,  0xFF,   0xFF)); //this sets the button text color
@@ -439,7 +439,7 @@
     //backlight slider
     TFT.Track( (TFT.DispWidth*1/3), 200, (TFT.DispWidth*1/3), 50, 1);    // track aree of backlight slider
     TFT.DL(TAG(1));
-    TFT.Slider((TFT.DispWidth*1/3), 200, (TFT.DispWidth*1/3), 50,0, val , 127 );                         // assign TAG value 5 to text_back button
+    TFT.Slider((TFT.DispWidth*1/3), 200, (TFT.DispWidth*1/3), 50,0, val , 128 );                         // assign TAG value 5 to text_back button
 
 //check if slider is touched
     if (tag == 1) {