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

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

diff --git a/project/commands/drawing/cmd_tswait.c b/project/commands/drawing/cmd_tswait.c
index 6a75183..1c7861f 100644 (file)
--- a/project/commands/drawing/cmd_tswait.c
+++ b/project/commands/drawing/cmd_tswait.c
@@ -45,7 +45,7 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    

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

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


@@ -80,12 +80,12 @@ void cmd_tswait(uint8_t argc, char **argv)
   if (error == TS_ERROR_NONE)
   {
     // A valid touch event occurred ... parse data
   if (error == TS_ERROR_NONE)
   {
     // A valid touch event occurred ... parse data

-    printf("%d, %d%s",(int)data.xlcd, (int)data.ylcd, CFG_PRINTF_NEWLINE);
+    printf("%d,%d%s",(int)data.xlcd, (int)data.ylcd, CFG_PRINTF_NEWLINE);

   }
   else
   {
     // Display error code
   }
   else
   {
     // Display error code

-    printf("%d %s", (int)error, CFG_PRINTF_NEWLINE);
+    printf("%d%s", (int)error, CFG_PRINTF_NEWLINE);

   }
 
   return;
   }
 
   return;