diff options
| -rw-r--r-- | drivers/gdisp/SSD1963/readme.txt | 7 | ||||
| -rw-r--r-- | drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c | 16 | ||||
| -rw-r--r-- | src/gdisp/sys_defs.h | 8 | ||||
| -rw-r--r-- | src/ginput/sys_options.h | 8 | ||||
| -rw-r--r-- | src/gos/gos_win32.c | 2 | ||||
| -rw-r--r-- | src/gos/gos_win32.h | 2 |
6 files changed, 21 insertions, 22 deletions
diff --git a/drivers/gdisp/SSD1963/readme.txt b/drivers/gdisp/SSD1963/readme.txt new file mode 100644 index 00000000..4eda17db --- /dev/null +++ b/drivers/gdisp/SSD1963/readme.txt @@ -0,0 +1,7 @@ +SSD1963 driver modified to handle Displaytech INTXXX displays, which self-initialise. + +To use this mode, add: + +#define GDISP_SSD1963_NO_INIT TRUE + +...either in the board-specific header file, or in gfxconf.h diff --git a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c index acc990c5..12f45645 100644 --- a/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c +++ b/drivers/ginput/touch/MAX11802/gmouse_lld_MAX11802.c @@ -18,17 +18,14 @@ // Get the hardware interface #include "gmouse_lld_MAX11802_board.h" -/* Register values to set */ -#define MAX11802_MODE 0x0E /* Direct conversion with averaging */ +// Register values to set +#define MAX11802_MODE 0x0E // Direct conversion with averaging #define MAX11802_AVG 0x55 #define MAX11802_TIMING 0x77 #define MAX11802_DELAY 0x55 #define Z_MIN 0 -#define Z_MAX 1 - - - +#define Z_MAX 1 static bool_t MouseInit(GMouse* m, unsigned driverinstance) { @@ -71,9 +68,6 @@ static bool_t MouseInit(GMouse* m, unsigned driverinstance) return TRUE; } - - - static bool_t read_xyz(GMouse* m, GMouseReading* pdr) { uint8_t readyCount; @@ -119,7 +113,7 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) aquire_bus(m); gfintWriteCommand(m, MAX11802_CMD_XPOSITION); #if defined(GINPUT_MOUSE_YX_INVERTED) && GINPUT_MOUSE_YX_INVERTED - pdr->y = read_value(m); + pdr->y = read_value(m); pdr->x = read_value(m); #else pdr->x = read_value(m); @@ -166,8 +160,6 @@ static bool_t read_xyz(GMouse* m, GMouseReading* pdr) return TRUE; } - - const GMouseVMT const GMOUSE_DRIVER_VMT[1] = {{ { GDRIVER_TYPE_TOUCH, diff --git a/src/gdisp/sys_defs.h b/src/gdisp/sys_defs.h index e5580e90..f952e41b 100644 --- a/src/gdisp/sys_defs.h +++ b/src/gdisp/sys_defs.h @@ -17,9 +17,9 @@ * * @pre GFX_USE_GDISP must be set to TRUE in gfxconf.h * - * @note Each drawing routine supports a gispXXXX and a gdispGXXXX function. The difference is that the - * gdispXXXX function does not require a display to be specified. Note there is a slight anomoly - * in the naming with gdispGBlitArea() vs gdispBlitAreaEx() and gdispBlitArea(), the later of + * @note Each drawing routine supports a gdispXXXX and a gdispGXXXX function. The difference is that the + * gdispXXXX function does not require a display to be specified. Note there is a slight anomaly + * in the naming with gdispGBlitArea() vs gdispBlitAreaEx() and gdispBlitArea(), the latter of * which is now deprecated. * @{ */ @@ -1094,7 +1094,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #define gdispGSetContrast(g, percent) gdispGControl((g), GDISP_CONTROL_CONTRAST, (void *)(unsigned)(percent)) #define gdispSetContrast(percent) gdispGControl(GDISP, GDISP_CONTROL_CONTRAST, (void *)(unsigned)(percent)) -/* More interesting macro's */ +/* More interesting macros */ /** * @brief Reset the clip area to the full screen diff --git a/src/ginput/sys_options.h b/src/ginput/sys_options.h index e67a03ce..4bc37715 100644 --- a/src/ginput/sys_options.h +++ b/src/ginput/sys_options.h @@ -23,7 +23,7 @@ /** * @brief Should mouse/touch functions be included. * @details Defaults to FALSE - * @note Also add the a mouse/touch hardware driver to your makefile. + * @note Also add a mouse/touch hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/touch/MCU/ginput_lld.mk */ @@ -33,7 +33,7 @@ /** * @brief Should keyboard functions be included. * @details Defaults to FALSE - * @note Also add the a keyboard hardware driver to your makefile. + * @note Also add a keyboard hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/keyboard/XXXX/ginput_lld.mk */ @@ -43,7 +43,7 @@ /** * @brief Should hardware toggle/switch/button functions be included. * @details Defaults to FALSE - * @note Also add the a toggle hardware driver to your makefile. + * @note Also add a toggle hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/toggle/Pal/ginput_lld.mk */ @@ -53,7 +53,7 @@ /** * @brief Should analog dial functions be included. * @details Defaults to FALSE - * @note Also add the a dial hardware driver to your makefile. + * @note Also add a dial hardware driver to your makefile. * Eg. * include $(GFXLIB)/drivers/ginput/dial/analog/ginput_lld.mk */ diff --git a/src/gos/gos_win32.c b/src/gos/gos_win32.c index 5d33314f..0ae9e618 100644 --- a/src/gos/gos_win32.c +++ b/src/gos/gos_win32.c @@ -6,7 +6,7 @@ */ /** - * @file src/gos/gfx_win32.c + * @file src/gos/gos_win32.c * @brief GOS Win32 Operating System support. */ #include "gfx.h" diff --git a/src/gos/gos_win32.h b/src/gos/gos_win32.h index 5e924a44..7e4f051b 100644 --- a/src/gos/gos_win32.h +++ b/src/gos/gos_win32.h @@ -6,7 +6,7 @@ */ /** - * @file src/gos/gfx_win32.h + * @file src/gos/gos_win32.h * @brief GOS - Operating System Support header file for WIN32. */ |