diff options
Diffstat (limited to 'drivers/multiple/uGFXnet')
| -rw-r--r-- | drivers/multiple/uGFXnet/gdisp_lld_config.h | 14 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 8 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/ginput_lld_mouse_config.h | 10 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/readme.txt | 14 |
4 files changed, 23 insertions, 23 deletions
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_config.h b/drivers/multiple/uGFXnet/gdisp_lld_config.h index e181d91e..1d2056f6 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_config.h +++ b/drivers/multiple/uGFXnet/gdisp_lld_config.h @@ -17,13 +17,13 @@ // Calling gdispGFlush() is optional for this driver but can be used by the // application to force a display update. eg after streaming. -#define GDISP_HARDWARE_FLUSH TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_FILLS TRUE -#define GDISP_HARDWARE_BITFILLS TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_SCROLL TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_FILLS GFXON +#define GDISP_HARDWARE_BITFILLS GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_SCROLL GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index 01c6ac89..bb8ffbe6 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -27,13 +27,13 @@ #define GDISP_GFXNET_PORT GNETCODE_DEFAULT_PORT #endif #ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY - #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE + #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF #endif #ifndef GDISP_GFXNET_UNSAFE_SOCKETS - #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE + #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF #endif #ifndef GDISP_GFXNET_BROKEN_LWIP_ACCEPT - #define GDISP_GFXNET_BROKEN_LWIP_ACCEPT FALSE + #define GDISP_GFXNET_BROKEN_LWIP_ACCEPT GFXOFF #endif #if GINPUT_NEED_MOUSE @@ -143,7 +143,7 @@ COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.") #endif #undef GDISP_GFXNET_UNSAFE_SOCKETS - #define GDISP_GFXNET_UNSAFE_SOCKETS TRUE + #define GDISP_GFXNET_UNSAFE_SOCKETS GFXON #endif #endif diff --git a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h index 576df7ee..3d8841cf 100644 --- a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h +++ b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h @@ -14,8 +14,8 @@ #if 1 #define GINPUT_MOUSE_EVENT_TYPE GEVENT_MOUSE #define GINPUT_MOUSE_CLICK_TIME TIME_INFINITE // Long click != Context Click - #define GINPUT_MOUSE_NEED_CALIBRATION FALSE - #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE + #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF + #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF #define GINPUT_MOUSE_READ_CYCLES 1 #define GINPUT_MOUSE_MAX_CALIBRATION_ERROR -1 #define GINPUT_MOUSE_MAX_CLICK_JITTER 0 @@ -23,8 +23,8 @@ #else #define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH #define GINPUT_MOUSE_CLICK_TIME 700 // Long click = Context Click - #define GINPUT_MOUSE_NEED_CALIBRATION FALSE // Can be set to TRUE just for testing - #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE + #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF // Can be set to GFXON just for testing + #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF #define GINPUT_MOUSE_READ_CYCLES 1 #define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 2 #define GINPUT_MOUSE_MAX_CLICK_JITTER 2 @@ -36,6 +36,6 @@ //#define GINPUT_MOUSE_POLL_PERIOD 25 // Poll driven // This driver does not require rotation of co-ordinates for orientations other than 0. -#define GINPUT_MOUSE_NO_ROTATION TRUE +#define GINPUT_MOUSE_NO_ROTATION GFXON #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */ diff --git a/drivers/multiple/uGFXnet/readme.txt b/drivers/multiple/uGFXnet/readme.txt index 0cb3ee07..bc380829 100644 --- a/drivers/multiple/uGFXnet/readme.txt +++ b/drivers/multiple/uGFXnet/readme.txt @@ -4,17 +4,17 @@ This driver is special in that it implements both the gdisp low level driver and a touchscreen driver. 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE - b) Optionally #define GFX_USE_GINPUT TRUE - #define GINPUT_USE_MOUSE TRUE + a) #define GFX_USE_GDISP GFXON + b) Optionally #define GFX_USE_GINPUT GFXON + #define GINPUT_USE_MOUSE GFXON c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD d) Optionally the following (with appropriate values): #define GDISP_SCREEN_WIDTH 640 // Virtual display width #define GDISP_SCREEN_HEIGHT 480 // Virtual display height - #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE // Your socket library is not thread-safe - // LWIP automatically sets this to TRUE - #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE // You want a custom Start_LWIP() function (LWIP only) - #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE // Don't halt waiting for the first connection + #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF // Your socket library is not thread-safe + // LWIP automatically sets this to GFXON + #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP GFXOFF // You want a custom Start_LWIP() function (LWIP only) + #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF // Don't halt waiting for the first connection $define GDISP_GFXNET_PORT 13001 // The TCP port the display sits on 2. To your makefile add the following lines: |