Merge branch 'master' of gitlab:wintermute/hackover2013-badge-firmware

[hackover2013-badge-firmware.git] / project / commands / drawing / cmd_calibrate.c

diff --git a/project/commands/drawing/cmd_calibrate.c b/project/commands/drawing/cmd_calibrate.c
index 93316b7..548a36a 100644 (file)
--- a/project/commands/drawing/cmd_calibrate.c
+++ b/project/commands/drawing/cmd_calibrate.c
@@ -43,7 +43,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #if defined CFG_TFTLCD
 #include "project/commands.h"       // Generic helper functions
 
 #if defined CFG_TFTLCD

-  #include "drivers/lcd/tft/touchscreen.h"  
+  #include "drivers/displays/tft/lcd.h"
+  #include "drivers/displays/tft/touchscreen.h"  

 
 /**************************************************************************/
 /*! 
 
 /**************************************************************************/
 /*! 


@@ -57,6 +58,9 @@ void cmd_calibrate(uint8_t argc, char **argv)
   // Run through the calibration process
   tsCalibrate();
 
   // Run through the calibration process
   tsCalibrate();
 

+  // Clear the screen to avoid confusion
+  lcdFillRGB(0x0000);
+

   printf("Calibration complete%s", CFG_PRINTF_NEWLINE);
 }
 
   printf("Calibration complete%s", CFG_PRINTF_NEWLINE);
 }