uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into GWIN

Browse source
This commit is contained in:
inmarket 2013-07-01 00:14:18 +10:00
commit a51ffd5b68
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/ginput/touch/FT5x06/ft5x06.h
View file

@ -6,7 +6,7 @@
*/ */
/** /**
* @file drivers/ginput/touch/FT5x06/ft5x05.h * @file drivers/ginput/touch/FT5x06/ft5x06.h
* @brief Register definition header for the STMPE811 touch controller. * @brief Register definition header for the STMPE811 touch controller.
* *
* @addtogroup GINPUT * @addtogroup GINPUT

4
drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h
View file

@ -6,7 +6,7 @@
*/ */
/** /**
* @file drivers/ginput/touch/FT5x06/ginput_lld_mouse_board_.h * @file drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h
* @brief GINPUT Touch low level driver source for the FT5x06. * @brief GINPUT Touch low level driver source for the FT5x06.
* *
* @defgroup Mouse Mouse * @defgroup Mouse Mouse
@ -30,7 +30,7 @@ static const I2CConfig i2ccfg2 = {
* @notapi * @notapi
*/ */
static void init_board(void) { static void init_board(void) {
i2cStart(&I2CD2, &i2ccfg2);
} }

2
include/gdisp/lld/emulation.c
View file

@ -54,7 +54,7 @@ GDISPDriver GDISP;
if (x1 > x0) if (x1 > x0)
gdisp_lld_fill_area(x0, y0, x1-x0+1, 1, color); gdisp_lld_fill_area(x0, y0, x1-x0+1, 1, color);
else else
gdisp_lld_fill_area(x0, y1, x0-x1+1, 1, color); gdisp_lld_fill_area(x1, y0, x0-x1+1, 1, color);
return; return;
} }
#endif #endif