Diff: main.cpp

Revision:

1:7952d133e78c

Parent:

0:aa55c6eb6867

Child:

2:a4c01cf97666

--- a/main.cpp	Thu Mar 03 16:32:08 2016 +0000
+++ b/main.cpp	Mon Mar 14 17:07:53 2016 +0000
@@ -18,18 +18,21 @@
 
 #ifdef Nucleo_F303K8
 FT800 TFT(PB_5,PB_4,PB_3,PA_11,PA_8,PF_1); // the FT800 is connected to SPI 5-7, then we have CS, INT, PD
+//SDFileSystem sd(D11, D12, D13, D7, "sd"); 
 #endif
 
 #ifdef K22
 FT800 TFT(D11,D12,D13,D10,D9,D8); // the FT800 is connected to SPI 5-7, then we have CS, INT, PD
 #endif
 
+
+
 //Analog inputs and outputs are normalized
 AnalogIn Feedback(A0);  
 AnalogOut Control(A3);
 
 // global Vars
-unsigned int r,b,g,PressDown, PressUp ;
+unsigned int r,b,g,PressDown, PressUp, CalVal0, CalVal1, CalVal2, CalVal3, CalVal4 ;
 double xyz = 10.13;
 char buffer[50];
 
@@ -126,6 +129,7 @@
     TFT.DL(COLOR_RGB(0xff,0xff,0xff));     // set current color to white
     sprintf(buffer, "%.2f", xyz);
     TFT.Text(500, 71, 31, 0, buffer);
+    TFT.Number(500, 120, 31,0, CalVal0);
    
     //TFT.Number(545, 135, 31, 0, printf(buffer, "%f", xyz));
     TFT.DL(TAG(1));                        // assign TAG value 1
@@ -206,13 +210,18 @@
     Start_Screen("3");                // Show start screen
     Start_Screen("2");                // Show start screen
     Start_Screen("1");                // Show start screen
-    TFT.Calibrate();                               // calibrate the touch screen
+    TFT.Calibrate();                  // calibrate the touch screen
+   
+  
+   
 
     /* Set the tracker for the dial -  define the Area for touching */
     TFT.Track(249, 86, 1, 1, 1);                   // Dial  - dimension 1,1 means rotary
     TFT.Track(179, 199, 277, 48, 2);               // Slider
     TFT.Flush_Co_Buffer();                         // Download the commands into fifo
     TFT.WaitCmdfifo_empty();                       // Wait till coprocessor completes the operation
+    TFT.RegRead(0x8001,CalVal0);                    // Read Calibration Value
+    
     screen_1(color,bright);                        // paint screen
 
     /* the demo is updating the screen in a endless loop                                    */