diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-07-01 00:14:18 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-07-01 00:14:18 +1000 |
| commit | a51ffd5b6891a9fb87ac3a903ae6b415fc32c726 (patch) | |
| tree | 425b4682d120f8dc8db2b7a44af420a7d90c2013 | |
| parent | 8ed9e763c0f97f2946990a911bb940f8c80ff761 (diff) | |
| parent | d45bba45e178940015eb31dc93e97eba9aebc93e (diff) | |
| download | uGFX-a51ffd5b6891a9fb87ac3a903ae6b415fc32c726.tar.gz uGFX-a51ffd5b6891a9fb87ac3a903ae6b415fc32c726.tar.bz2 uGFX-a51ffd5b6891a9fb87ac3a903ae6b415fc32c726.zip | |
Merge remote-tracking branch 'origin/master' into GWIN
| -rw-r--r-- | drivers/ginput/touch/FT5x06/ft5x06.h | 2 | ||||
| -rw-r--r-- | drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h | 4 | ||||
| -rw-r--r-- | include/gdisp/lld/emulation.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ginput/touch/FT5x06/ft5x06.h b/drivers/ginput/touch/FT5x06/ft5x06.h index e0d212ce..2442606e 100644 --- a/drivers/ginput/touch/FT5x06/ft5x06.h +++ b/drivers/ginput/touch/FT5x06/ft5x06.h @@ -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. * * @addtogroup GINPUT diff --git a/drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h b/drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h index f8381b65..06b408dd 100644 --- a/drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h +++ b/drivers/ginput/touch/FT5x06/ginput_lld_mouse_board.h @@ -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. * * @defgroup Mouse Mouse @@ -30,7 +30,7 @@ static const I2CConfig i2ccfg2 = { * @notapi */ static void init_board(void) { - i2cStart(&I2CD2, &i2ccfg2); + } diff --git a/include/gdisp/lld/emulation.c b/include/gdisp/lld/emulation.c index c64f8259..49a26697 100644 --- a/include/gdisp/lld/emulation.c +++ b/include/gdisp/lld/emulation.c @@ -54,7 +54,7 @@ GDISPDriver GDISP; if (x1 > x0) gdisp_lld_fill_area(x0, y0, x1-x0+1, 1, color); else - gdisp_lld_fill_area(x0, y1, x0-x1+1, 1, color); + gdisp_lld_fill_area(x1, y0, x0-x1+1, 1, color); return; } #endif |