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

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

diff --git a/project/commands/drawing/cmd_pixel.c b/project/commands/drawing/cmd_pixel.c
index 9aeffb8..0055aaa 100644 (file)
--- a/project/commands/drawing/cmd_pixel.c
+++ b/project/commands/drawing/cmd_pixel.c
@@ -43,8 +43,8 @@
 #include "project/commands.h"       // Generic helper functions
 
 #ifdef CFG_TFTLCD    
-  #include "drivers/lcd/tft/lcd.h"    
-  #include "drivers/lcd/tft/drawing.h"  
+  #include "drivers/displays/tft/lcd.h"    
+  #include "drivers/displays/tft/drawing.h"  
 
 /**************************************************************************/
 /*! 
@@ -83,10 +83,11 @@ void cmd_getpixel(uint8_t argc, char **argv)
   getNumber (argv[0], &x);
   getNumber (argv[1], &y);
 
-  uint16_t value = lcdGetPixel(x, y);
+  // Get pixel and switch R and B
+  uint16_t value = colorsBGR2RGB(lcdGetPixel(x, y));
 
   // Output the results
-  printf("%d%s", value, CFG_PRINTF_NEWLINE);
+  printf("0x%04X%s", value, CFG_PRINTF_NEWLINE);
 }
 
 #endif