From 98a01a021c7f15b792ff776880b87ae5500e49de Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 11 May 2014 13:13:36 +1000 Subject: [PATCH 1/5] spelling --- src/gwin/list.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gwin/list.c b/src/gwin/list.c index 788e8828..2f16e50a 100644 --- a/src/gwin/list.c +++ b/src/gwin/list.c @@ -643,7 +643,7 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { gdispGFillConvexPoly(gw->g.display, gw->g.x+iwidth+((SCROLLWIDTH-ARROW)/2+2), gw->g.y+(ARROW/2+1), upArrow, 3, ps->fill); gdispGFillConvexPoly(gw->g.display, gw->g.x+iwidth+((SCROLLWIDTH-ARROW)/2+2), gw->g.y+gw->g.height-(ARROW+ARROW/2+1), downArrow, 3, ps->fill); #else - #warning "GWIN: Lists display better when GDISP_NEED_CONVEX_POLGON is turned on" + #warning "GWIN: Lists display better when GDISP_NEED_CONVEX_POLYGON is turned on" gdispGFillArea(gw->g.display, gw->g.x+iwidth+((SCROLLWIDTH-ARROW)/2+2), gw->g.y+(ARROW/2+1), ARROW, ARROW, ps->fill); gdispGFillArea(gw->g.display, gw->g.x+iwidth+((SCROLLWIDTH-ARROW)/2+2), gw->g.y+gw->g.height-(ARROW+ARROW/2+1), ARROW, ARROW, ps->fill); #endif From 725e9b98427969062222463560ed47f214197f0e Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 11 May 2014 13:13:18 +1000 Subject: [PATCH 2/5] spacing --- src/gdisp/sys_options.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gdisp/sys_options.h b/src/gdisp/sys_options.h index a38e4c6f..466bbb98 100644 --- a/src/gdisp/sys_options.h +++ b/src/gdisp/sys_options.h @@ -26,7 +26,7 @@ * @details Defaults to TRUE */ #ifndef GDISP_NEED_STARTUP_LOGO - #define GDISP_NEED_STARTUP_LOGO TRUE + #define GDISP_NEED_STARTUP_LOGO TRUE #endif /** * @brief Should drawing operations be automatically flushed. From deb5d912785b39bc23147e60cbfa11574d8b737a Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 11 May 2014 13:12:59 +1000 Subject: [PATCH 3/5] Make gfxconf.example.h list all the default values as comments --- gfxconf.example.h | 310 +++++++++++++++++++++++----------------------- 1 file changed, 157 insertions(+), 153 deletions(-) diff --git a/gfxconf.example.h b/gfxconf.example.h index 6b545307..4dcdf296 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -9,8 +9,12 @@ /** * Copy this file into your project directory and rename it as gfxconf.h * Edit your copy to turn on the uGFX features you want to use. - * The values below are the defaults. You should delete anything - * you are leaving as default. + * The values below are the defaults. + * + * Only remove the comments from lines where you want to change the + * default value. This allows definitions to be included from + * driver makefiles when required and provides the best future + * compatibility for your project. * * Please use spaces instead of tabs in this file. */ @@ -24,7 +28,7 @@ /////////////////////////////////////////////////////////////////////////// //#define GFX_USE_OS_CHIBIOS FALSE //#define GFX_USE_OS_FREERTOS FALSE - #define GFX_FREERTOS_USE_TRACE FALSE +// #define GFX_FREERTOS_USE_TRACE FALSE //#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_LINUX FALSE //#define GFX_USE_OS_OSX FALSE @@ -33,217 +37,217 @@ /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP FALSE +//#define GFX_USE_GDISP FALSE -#define GDISP_NEED_AUTOFLUSH FALSE -#define GDISP_NEED_TIMERFLUSH FALSE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE FALSE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_CONVEX_POLYGON FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_QUERY FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_STREAMING FALSE -#define GDISP_NEED_TEXT FALSE - #define GDISP_NEED_ANTIALIAS FALSE - #define GDISP_NEED_UTF8 FALSE - #define GDISP_NEED_TEXT_KERNING FALSE - #define GDISP_INCLUDE_FONT_UI1 FALSE - #define GDISP_INCLUDE_FONT_UI2 FALSE - #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE - #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE - #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE - #define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE - #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE - #define GDISP_INCLUDE_USER_FONTS FALSE +//#define GDISP_NEED_AUTOFLUSH FALSE +//#define GDISP_NEED_TIMERFLUSH FALSE +//#define GDISP_NEED_VALIDATION TRUE +//#define GDISP_NEED_CLIP TRUE +//#define GDISP_NEED_CIRCLE FALSE +//#define GDISP_NEED_ELLIPSE FALSE +//#define GDISP_NEED_ARC FALSE +//#define GDISP_NEED_CONVEX_POLYGON FALSE +//#define GDISP_NEED_SCROLL FALSE +//#define GDISP_NEED_PIXELREAD FALSE +//#define GDISP_NEED_CONTROL FALSE +//#define GDISP_NEED_QUERY FALSE +//#define GDISP_NEED_MULTITHREAD FALSE +//#define GDISP_NEED_STREAMING FALSE +//#define GDISP_NEED_TEXT FALSE +// #define GDISP_NEED_ANTIALIAS FALSE +// #define GDISP_NEED_UTF8 FALSE +// #define GDISP_NEED_TEXT_KERNING FALSE +// #define GDISP_INCLUDE_FONT_UI1 FALSE +// #define GDISP_INCLUDE_FONT_UI2 FALSE // The smallest preferred font. +// #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE +// #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE +// #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE +// #define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE +// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE +// #define GDISP_INCLUDE_USER_FONTS FALSE -#define GDISP_NEED_IMAGE FALSE - #define GDISP_NEED_IMAGE_NATIVE FALSE - #define GDISP_NEED_IMAGE_GIF FALSE - #define GDISP_NEED_IMAGE_BMP FALSE - #define GDISP_NEED_IMAGE_BMP_1 FALSE - #define GDISP_NEED_IMAGE_BMP_4 FALSE - #define GDISP_NEED_IMAGE_BMP_4_RLE FALSE - #define GDISP_NEED_IMAGE_BMP_8 FALSE - #define GDISP_NEED_IMAGE_BMP_8_RLE FALSE - #define GDISP_NEED_IMAGE_BMP_16 FALSE - #define GDISP_NEED_IMAGE_BMP_24 FALSE - #define GDISP_NEED_IMAGE_BMP_32 FALSE - #define GDISP_NEED_IMAGE_JPG FALSE - #define GDISP_NEED_IMAGE_PNG FALSE - #define GDISP_NEED_IMAGE_ACCOUNTING FALSE +//#define GDISP_NEED_IMAGE FALSE +// #define GDISP_NEED_IMAGE_NATIVE FALSE +// #define GDISP_NEED_IMAGE_GIF FALSE +// #define GDISP_NEED_IMAGE_BMP FALSE +// #define GDISP_NEED_IMAGE_BMP_1 FALSE +// #define GDISP_NEED_IMAGE_BMP_4 FALSE +// #define GDISP_NEED_IMAGE_BMP_4_RLE FALSE +// #define GDISP_NEED_IMAGE_BMP_8 FALSE +// #define GDISP_NEED_IMAGE_BMP_8_RLE FALSE +// #define GDISP_NEED_IMAGE_BMP_16 FALSE +// #define GDISP_NEED_IMAGE_BMP_24 FALSE +// #define GDISP_NEED_IMAGE_BMP_32 FALSE +// #define GDISP_NEED_IMAGE_JPG FALSE +// #define GDISP_NEED_IMAGE_PNG FALSE +// #define GDISP_NEED_IMAGE_ACCOUNTING FALSE -#define GDISP_NEED_STARTUP_LOGO TRUE +//#define GDISP_NEED_STARTUP_LOGO TRUE -#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE -#define GDISP_LINEBUF_SIZE 128 +//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE // If not defined the native hardware orientation is used. +//#define GDISP_LINEBUF_SIZE 128 -#define GDISP_TOTAL_DISPLAYS 1 - #if GDISP_TOTAL_DISPLAYS > 1 - #define GDISP_HARDWARE_STREAM_WRITE FALSE - #define GDISP_HARDWARE_STREAM_READ FALSE - #define GDISP_HARDWARE_STREAM_POS FALSE - #define GDISP_HARDWARE_DRAWPIXEL FALSE - #define GDISP_HARDWARE_CLEARS FALSE - #define GDISP_HARDWARE_FILLS FALSE - #define GDISP_HARDWARE_BITFILLS FALSE - #define GDISP_HARDWARE_SCROLL FALSE - #define GDISP_HARDWARE_PIXELREAD FALSE - #define GDISP_HARDWARE_CONTROL FALSE - #define GDISP_HARDWARE_QUERY FALSE - #define GDISP_HARDWARE_CLIP FALSE - #endif +//#define GDISP_TOTAL_DISPLAYS 1 +// #if GDISP_TOTAL_DISPLAYS > 1 +// // For code and speed optimization define as TRUE or FALSE if all displays have the same capability +// #define GDISP_HARDWARE_STREAM_WRITE FALSE +// #define GDISP_HARDWARE_STREAM_READ FALSE +// #define GDISP_HARDWARE_STREAM_POS FALSE +// #define GDISP_HARDWARE_DRAWPIXEL FALSE +// #define GDISP_HARDWARE_CLEARS FALSE +// #define GDISP_HARDWARE_FILLS FALSE +// #define GDISP_HARDWARE_BITFILLS FALSE +// #define GDISP_HARDWARE_SCROLL FALSE +// #define GDISP_HARDWARE_PIXELREAD FALSE +// #define GDISP_HARDWARE_CONTROL FALSE +// #define GDISP_HARDWARE_QUERY FALSE +// #define GDISP_HARDWARE_CLIP FALSE +// #endif -#define GDISP_TOTAL_CONTROLLERS 1 - #if GDISP_TOTAL_CONTROLLERS > 1 - #define GDISP_CONTROLLER_LIST GDISPVMT_Win32, GDISPVMT_Win32 - #define GDISP_CONTROLLER_DISPLAYS 1, 1 - #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 - #endif +//#define GDISP_TOTAL_CONTROLLERS 1 +// #if GDISP_TOTAL_CONTROLLERS > 1 +// #define GDISP_CONTROLLER_LIST GDISPVMT_Win32, GDISPVMT_Win32 +// #define GDISP_CONTROLLER_DISPLAYS 1, 1 +// #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 +// #endif -#define GDISP_USE_GFXNET FALSE - #define GDISP_GFXNET_PORT 13001 - #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE - #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE - #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE +//#define GDISP_USE_GFXNET FALSE +// #define GDISP_GFXNET_PORT 13001 +// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE +// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE +// #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN FALSE +//#define GFX_USE_GWIN FALSE -#define GWIN_NEED_WINDOWMANAGER FALSE +//#define GWIN_NEED_WINDOWMANAGER FALSE -#define GWIN_NEED_CONSOLE FALSE - #define GWIN_CONSOLE_USE_HISTORY FALSE - #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE - #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE - #define GWIN_CONSOLE_ESCSEQ FALSE - #define GWIN_CONSOLE_USE_BASESTREAM FALSE - #define GWIN_CONSOLE_USE_FLOAT FALSE -#define GWIN_NEED_GRAPH FALSE +//#define GWIN_NEED_CONSOLE FALSE +// #define GWIN_CONSOLE_USE_HISTORY FALSE +// #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE +// #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE +// #define GWIN_CONSOLE_ESCSEQ FALSE +// #define GWIN_CONSOLE_USE_BASESTREAM FALSE +// #define GWIN_CONSOLE_USE_FLOAT FALSE +//#define GWIN_NEED_GRAPH FALSE -#define GWIN_NEED_WIDGET FALSE - #define GWIN_NEED_LABEL FALSE - #define GWIN_LABEL_ATTRIBUTE FALSE - #define GWIN_NEED_BUTTON FALSE - #define GWIN_BUTTON_LAZY_RELEASE FALSE - #define GWIN_NEED_SLIDER FALSE - #define GWIN_NEED_CHECKBOX FALSE - #define GWIN_NEED_IMAGE FALSE - #define GWIN_NEED_IMAGE_ANIMATION FALSE - #define GWIN_NEED_RADIO FALSE - #define GWIN_NEED_LIST FALSE - #define GWIN_NEED_LIST_IMAGES FALSE - #define GWIN_NEED_PROGRESSBAR FALSE - #define GWIN_PROGRESSBAR_AUTO FALSE - #define GWIN_FLAT_STYLING FALSE +//#define GWIN_NEED_WIDGET FALSE +// #define GWIN_NEED_LABEL FALSE +// #define GWIN_LABEL_ATTRIBUTE FALSE +// #define GWIN_NEED_BUTTON FALSE +// #define GWIN_BUTTON_LAZY_RELEASE FALSE +// #define GWIN_NEED_SLIDER FALSE +// #define GWIN_NEED_CHECKBOX FALSE +// #define GWIN_NEED_IMAGE FALSE +// #define GWIN_NEED_IMAGE_ANIMATION FALSE +// #define GWIN_NEED_RADIO FALSE +// #define GWIN_NEED_LIST FALSE +// #define GWIN_NEED_LIST_IMAGES FALSE +// #define GWIN_NEED_PROGRESSBAR FALSE +// #define GWIN_PROGRESSBAR_AUTO FALSE +// #define GWIN_FLAT_STYLING FALSE /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT FALSE +//#define GFX_USE_GEVENT FALSE -#define GEVENT_ASSERT_NO_RESOURCE FALSE -#define GEVENT_MAXIMUM_SIZE 32 -#define GEVENT_MAX_SOURCE_LISTENERS 32 +//#define GEVENT_ASSERT_NO_RESOURCE FALSE +//#define GEVENT_MAXIMUM_SIZE 32 +//#define GEVENT_MAX_SOURCE_LISTENERS 32 /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER FALSE +//#define GFX_USE_GTIMER FALSE -#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY -#define GTIMER_THREAD_WORKAREA_SIZE 2048 +//#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY +//#define GTIMER_THREAD_WORKAREA_SIZE 2048 /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE FALSE +//#define GFX_USE_GQUEUE FALSE -#define GQUEUE_NEED_ASYNC FALSE -#define GQUEUE_NEED_GSYNC FALSE -#define GQUEUE_NEED_FSYNC FALSE -#define GQUEUE_NEED_BUFFERS FALSE +//#define GQUEUE_NEED_ASYNC FALSE +//#define GQUEUE_NEED_GSYNC FALSE +//#define GQUEUE_NEED_FSYNC FALSE +//#define GQUEUE_NEED_BUFFERS FALSE /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT FALSE +//#define GFX_USE_GINPUT FALSE -#define GINPUT_NEED_MOUSE FALSE -#define GINPUT_NEED_KEYBOARD FALSE -#define GINPUT_NEED_TOGGLE FALSE -#define GINPUT_NEED_DIAL FALSE +//#define GINPUT_NEED_MOUSE FALSE +//#define GINPUT_NEED_KEYBOARD FALSE +//#define GINPUT_NEED_TOGGLE FALSE +//#define GINPUT_NEED_DIAL FALSE /////////////////////////////////////////////////////////////////////////// // GFILE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GFILE FALSE +//#define GFX_USE_GFILE FALSE -#define GFILE_NEED_PRINTG FALSE -#define GFILE_NEED_SCANG FALSE -#define GFILE_NEED_STRINGS FALSE -#define GFILE_NEED_STDIO FALSE - #define GFILE_ALLOW_FLOATS FALSE - #define GFILE_ALLOW_DEVICESPECIFIC FALSE - #define GFILE_MAX_GFILES 3 +//#define GFILE_NEED_PRINTG FALSE +//#define GFILE_NEED_SCANG FALSE +//#define GFILE_NEED_STRINGS FALSE +//#define GFILE_NEED_STDIO FALSE +// #define GFILE_ALLOW_FLOATS FALSE +// #define GFILE_ALLOW_DEVICESPECIFIC FALSE +// #define GFILE_MAX_GFILES 3 -#define GFILE_NEED_MEMFS FALSE -#define GFILE_NEED_ROMFS FALSE -#define GFILE_NEED_RAMFS FALSE -#define GFILE_NEED_FATFS FALSE -#define GFILE_NEED_NATIVEFS FALSE -#define GFILE_NEED_CHBIOSFS FALSE +//#define GFILE_NEED_MEMFS FALSE +//#define GFILE_NEED_ROMFS FALSE +//#define GFILE_NEED_RAMFS FALSE +//#define GFILE_NEED_FATFS FALSE +//#define GFILE_NEED_NATIVEFS FALSE +//#define GFILE_NEED_CHBIOSFS FALSE /////////////////////////////////////////////////////////////////////////// // GADC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GADC FALSE +//#define GFX_USE_GADC FALSE -#define GADC_MAX_LOWSPEED_DEVICES 4 +//#define GADC_MAX_LOWSPEED_DEVICES 4 /////////////////////////////////////////////////////////////////////////// // GAUDIO // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDIO FALSE - #define GAUDIO_NEED_PLAY FALSE - #define GAUDIO_NEED_RECORD FALSE +//#define GFX_USE_GAUDIO FALSE +// #define GAUDIO_NEED_PLAY FALSE +// #define GAUDIO_NEED_RECORD FALSE /////////////////////////////////////////////////////////////////////////// // GMISC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GMISC FALSE - -#define GMISC_NEED_ARRAYOPS FALSE -#define GMISC_NEED_FASTTRIG FALSE -#define GMISC_NEED_FIXEDTRIG FALSE -#define GMISC_NEED_INVSQRT FALSE - #define GMISC_INVSQRT_MIXED_ENDIAN FALSE - #define GMISC_INVSQRT_REAL_SLOW FALSE +//#define GFX_USE_GMISC FALSE +//#define GMISC_NEED_ARRAYOPS FALSE +//#define GMISC_NEED_FASTTRIG FALSE +//#define GMISC_NEED_FIXEDTRIG FALSE +//#define GMISC_NEED_INVSQRT FALSE +// #define GMISC_INVSQRT_MIXED_ENDIAN FALSE +// #define GMISC_INVSQRT_REAL_SLOW FALSE #endif /* _GFXCONF_H */ From e35d03f24e7bd571d73f1b2f4e6126b465de95a2 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 11 May 2014 13:12:02 +1000 Subject: [PATCH 4/5] Update releases.txt --- docs/releases.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/releases.txt b/docs/releases.txt index b08f970e..6bd893e8 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -2,7 +2,7 @@ *** Releases *** ***************************************************************************** -current release: 2.0 +*** Changes After 2.0 *** FIX: Significant improvements to the way the MCU touch driver works. FEATURE: Add support for edge to edge touch calibration. FEATURE: Added progressbar widget @@ -36,9 +36,9 @@ FEATURE: Added many GWIN simple demo's and updated the combined widget demo FEATURE: Added gwinEnable() and gwinDisable() FIX: Progressbar widget bug fix that could gwinProgressbarStop() to crash FIX: Imagebox widget bug fix that could cause gwinImageOpenFile() to crash +FEATURE: GWIN containers such as "container" and "frame" - -*** changes after 1.9 *** +*** Release 2.0 *** FEATURE: GDISP Streaming API and demos. DEPRECATE: GDISP_NEED_ASYNC is now deprecated. DEPRECATE: 3rd party boing demo is now deprecated (replaced by GDISP Streaming demo) @@ -66,7 +66,7 @@ FEATURE: Board definitions, example projects and makefiles for the Marlin board. FEATURE: New invsqrt() routine added to GMISC -*** changes after 1.8 *** +*** Release 1.9 *** FEATURE: GWIN list boxes. FIX: POSIX port removed, now dedicated OS-X and Linux ports FIX: Several bugfixes @@ -80,7 +80,7 @@ FEATURE: Added gwinListSetScroll() FEATURE: Added gwinLabelSetBorder() -*** changes after 1.7 *** +*** Release 1.8 *** FEATURE: Rename of the project from ChibiOS/GFX to uGFX FEATURE: Moved from github.com to bitbucket.org FEATURE: New website with a lot more of documentation @@ -92,13 +92,13 @@ FIX: gfxHalt() fix for the Win32 port FIX: Cleaned up board file mess -*** changes after 1.6 *** +*** Release 1.7 *** FEATURE: Added RA8875 GDISP driver FEATURE: Added FT5x06 GINPUT/touch driver FIX: Several bugfixes -*** changes after 1.5 *** +*** Release 1.6 *** FEATURE: Added ILI9325 driver - Thanks to Chris van Dongen aka _Sjaak FEATURE: Added TDISP module FIX: tdispGotoXY() renamed to tdispSetCursor() @@ -130,7 +130,7 @@ FEATURE: Added GOS module (including sub modules such as GQUEUE) FEATURE: Added some functionalities to the TDISP module by user 'Frysk' -*** changes after 1.4 *** +*** Release 1.5 *** FEATURE: GEVENT - for passing event structures from Sources to Listeners FEATURE: GTIMER - thread context based once-off and periodic timers. FEATURE: GINPUT - extensible, multiple device-type, input sub-system. @@ -150,7 +150,7 @@ FEATURE: Added a number of module demo and test programs DEPRECATE: Remove of XPT2046 since full compatibility with ADS7843 -*** changes after 1.3 *** +*** Release 1.4 *** FIX: Nokia 6610 fix FEATURE: New driver: Win32 FEATURE: implementation of gdispFillArc() @@ -162,7 +162,7 @@ FEATURE: GWIN infrastructure FEATURE: now we fully support doxygen -*** changes after 1.2 *** +*** Release 1.3 *** FEATURE: added FSMC for SSD1289 / F4 FEATURE: added calibration storage interface FIX: bugfix in filling functions for SSD1289 @@ -170,7 +170,7 @@ FEATURE: added point_t struct in gdisp.h FEATURE: added graph module -*** changer after 1.1 *** +*** Release 1.2 *** FIX: orientation macros changed FIX: huge internal bugfix in orientation stuff (big thanks to Abhishek) FEATURE: added TOUCHPAD_XY_INVERTED macro @@ -182,7 +182,7 @@ FIX: lcdConsoleXXX() functions have been renamed to gfxConsoleXXX() FEATURE: FSMC for SSD1289 F2/F4 -*** changes after 1.0 *** +*** Release 1.1 *** FIX: removed gdisp and touchpad prefix of driver directories UPDATE: added SSD1963 driver FIX: fixed Validation, VMT driver, console and BitBlit From e3be259024d60af28c448dfc3b35f30163bc2e10 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 11 May 2014 13:10:50 +1000 Subject: [PATCH 5/5] Remove NULLs except in comments as some compilers/OS's give strange definitions. --- demos/modules/gwin/imagebox/main.c | 2 +- demos/modules/gwin/label/main.c | 4 ++-- demos/modules/gwin/list/main.c | 4 ++-- demos/modules/gwin/progressbar/main.c | 2 +- tools/file2c/src/file2c.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/demos/modules/gwin/imagebox/main.c b/demos/modules/gwin/imagebox/main.c index c15f5fb3..d8ebbe73 100644 --- a/demos/modules/gwin/imagebox/main.c +++ b/demos/modules/gwin/imagebox/main.c @@ -41,7 +41,7 @@ static void createWidgets(void) { // create the first image widget wi.g.x = 10; wi.g.y = 10; wi.g.width = 200; wi.g.height = 100; - ghImage1 = gwinImageCreate(NULL, &wi.g); + ghImage1 = gwinImageCreate(0, &wi.g); gwinImageOpenFile(ghImage1, "ugfx_logo_banner.bmp"); } diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c index 175c0d6e..918f2787 100644 --- a/demos/modules/gwin/label/main.c +++ b/demos/modules/gwin/label/main.c @@ -44,13 +44,13 @@ static void createWidgets(void) { // Create the IP label wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80; wi.text = "192.168.1.42"; - ghLabel1 = gwinLabelCreate(NULL, &wi); + ghLabel1 = gwinLabelCreate(0, &wi); gwinLabelSetAttribute(ghLabel1, 100, "Current IP:"); // Create the DHCP label wi.g.width = 200; wi.g.height = 20; wi.g.x = 10, wi.g.y = 100; wi.text = "Off"; - ghLabel2 = gwinLabelCreate(NULL, &wi); + ghLabel2 = gwinLabelCreate(0, &wi); gwinLabelSetAttribute(ghLabel2, 100, "DHCP:"); } diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c index 6d469626..ed5b6905 100644 --- a/demos/modules/gwin/list/main.c +++ b/demos/modules/gwin/list/main.c @@ -43,12 +43,12 @@ static void createWidgets(void) { // Create the label for the first list wi.g.width = 150; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80; wi.text = "List 1: Default"; - ghLabel1 = gwinLabelCreate(NULL, &wi); + ghLabel1 = gwinLabelCreate(0, &wi); // Create the label for the second list wi.g.width = 150; wi.g.height = 20; wi.g.x = 165, wi.g.y = 80; wi.text = "List 2: Smooth scrolling"; - ghLabel1 = gwinLabelCreate(NULL, &wi); + ghLabel1 = gwinLabelCreate(0, &wi); // The first list widget wi.g.width = 150; diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c index 6fb53c2e..8e9e8352 100644 --- a/demos/modules/gwin/progressbar/main.c +++ b/demos/modules/gwin/progressbar/main.c @@ -9,7 +9,7 @@ static void _createWidget(void) { wi.g.show = TRUE; wi.g.y = 10; wi.g.x = 10; wi.g.width = 200; wi.g.height = 20; wi.text = "Progress 1"; - ghProgressbar = gwinProgressbarCreate(NULL, &wi); + ghProgressbar = gwinProgressbarCreate(0, &wi); } int main(void) { diff --git a/tools/file2c/src/file2c.c b/tools/file2c/src/file2c.c index 87ea88e9..079b1a59 100644 --- a/tools/file2c/src/file2c.c +++ b/tools/file2c/src/file2c.c @@ -168,7 +168,7 @@ size_t i; if (opt_inputfile) opt_arrayname = basenameof(strcpy(tname, opt_inputfile)); if (!opt_arrayname || !opt_arrayname[0]) { - srand(time(NULL)); + srand(time(0)); sprintf(tname, "filearray%u", rand()); opt_arrayname = tname; }