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

Merge branch 'master' into TextEdit 

Conflicts:
	docs/releases.txt
ugfx_release_2.6
Joel Bodenmann 2015-08-16 17:23:05 +02:00
parent 3fea023248 28a2d8ca79
commit 02d493a346
8 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docs/releases.txt
View File

@ -9,12 +9,13 @@ FEATURE: Added GFXSINGLEMAKE=yes|no to the ugfx makefile to compile ugfx as a si
FEATURE: New board STM32F746G-Discovery FEATURE: New board STM32F746G-Discovery
FEATURE: New gdisp driver STM32LTDC FEATURE: New gdisp driver STM32LTDC
FEATURE: Better support for Raw32 platforms FEATURE: Better support for Raw32 platforms
FEATURE: Implementing widget focusing. See gwinSetFocus() and gwinGetFocus() FEATURE: Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
FEATURE: Adding more font metrics (BaselineX and BaselineY) FEATURE: Implementing widget focusing. See gwinSetFocus() and gwinGetFocus()
FEATURE: Adding gdispGetStringWidthCount() FEATURE: Adding more font metrics (BaselineX and BaselineY)
FEATURE: Adding TextEdit widget FEATURE: Adding gdispGetStringWidthCount()
FEATURE: Added color to widget style for focused widgets FEATURE: Adding TextEdit widget
FEATURE: Added GWIN_FOCUS_HIGHLIGHT_WIDTH as an option in the configuration file FEATURE: Added color to widget style for focused widgets
FEATURE: Added GWIN_FOCUS_HIGHLIGHT_WIDTH as an option in the configuration file
*** Release 2.3 *** *** Release 2.3 ***

4
gfx.h
View File

@ -221,11 +221,11 @@ extern "C" {
* @note This will initialise each sub-system that has been turned on. * @note This will initialise each sub-system that has been turned on.
* For example, if GFX_USE_GDISP is defined then display will be initialised * For example, if GFX_USE_GDISP is defined then display will be initialised
* and cleared to black. * and cleared to black.
* @note If you define GFX_NO_OS_INIT as TRUE in your gfxconf.h file then ugfx doesn't try to * @note If you define GFX_OS_NO_INIT as TRUE in your gfxconf.h file then ugfx doesn't try to
* initialise the operating system for you when you call @p gfxInit(). * initialise the operating system for you when you call @p gfxInit().
* @note If you define GFX_OS_EXTRA_INIT_FUNCTION in your gfxconf.h file the macro is the * @note If you define GFX_OS_EXTRA_INIT_FUNCTION in your gfxconf.h file the macro is the
* name of a void function with no parameters that is called immediately after * name of a void function with no parameters that is called immediately after
* operating system initialisation (whether or not GFX_NO_OS_INIT is set). * operating system initialisation (whether or not GFX_OS_NO_INIT is set).
* @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the * @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the
* name of a void function with no parameters that is called immediately before * name of a void function with no parameters that is called immediately before
* operating system de-initialisation (as ugfx is exiting). * operating system de-initialisation (as ugfx is exiting).

2
gfxconf.example.h
View File

@ -42,7 +42,7 @@
// #define GFX_COMPILER GFX_COMPILER_UNKNOWN // #define GFX_COMPILER GFX_COMPILER_UNKNOWN
// #define GFX_CPU GFX_CPU_UNKNOWN // #define GFX_CPU GFX_CPU_UNKNOWN
// #define GFX_OS_HEAP_SIZE 0 // #define GFX_OS_HEAP_SIZE 0
// #define GFX_NO_OS_INIT FALSE // #define GFX_OS_NO_INIT FALSE
// #define GFX_OS_INIT_NO_WARNING FALSE // #define GFX_OS_INIT_NO_WARNING FALSE
// #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine // #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine
// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine // #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine

2
src/gos/gos_chibios.c
View File

@ -35,7 +35,7 @@
void _gosInit(void) void _gosInit(void)
{ {
#if !GFX_NO_OS_INIT #if !GFX_OS_NO_INIT
/* Don't Initialize if the user already has */ /* Don't Initialize if the user already has */
#if CH_KERNEL_MAJOR == 2 #if CH_KERNEL_MAJOR == 2
if (!chThdSelf()) { if (!chThdSelf()) {

4
src/gos/gos_ecos.c
View File

@ -11,8 +11,8 @@
void _gosInit(void) void _gosInit(void)
{ {
#if !GFX_NO_OS_INIT #if !GFX_OS_NO_INIT
#error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h" #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif #endif
#if !GFX_OS_INIT_NO_WARNING #if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call cyg_scheduler_start() before gfxInit() in your application!" #warning "GOS: Operating System initialization has been turned off. Make sure you call cyg_scheduler_start() before gfxInit() in your application!"

4
src/gos/gos_freertos.c
View File

@ -24,8 +24,8 @@
void _gosInit(void) void _gosInit(void)
{ {
#if !GFX_NO_OS_INIT #if !GFX_OS_NO_INIT
#error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h" #error "GOS: Operating System initialization for FreeRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif #endif
#if !GFX_OS_INIT_NO_WARNING #if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call vTaskStartScheduler() before gfxInit() in your application!" #warning "GOS: Operating System initialization has been turned off. Make sure you call vTaskStartScheduler() before gfxInit() in your application!"

4
src/gos/gos_options.h
View File

@ -128,8 +128,8 @@
* system in your application code. Note that on these operating systems the * system in your application code. Note that on these operating systems the
* demo applications will not work without modification. * demo applications will not work without modification.
*/ */
#ifndef GFX_NO_OS_INIT #ifndef GFX_OS_NO_INIT
#define GFX_NO_OS_INIT FALSE #define GFX_OS_NO_INIT FALSE
#endif #endif
/** /**
* @brief Turn off warnings about initializing the operating system * @brief Turn off warnings about initializing the operating system

4
src/gos/gos_rawrtos.c
View File

@ -24,8 +24,8 @@
void _gosInit(void) void _gosInit(void)
{ {
#if !GFX_NO_OS_INIT #if !GFX_OS_NO_INIT
#error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_NO_OS_INIT to TRUE in your gfxconf.h" #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
#endif #endif
#if !GFX_OS_INIT_NO_WARNING #if !GFX_OS_INIT_NO_WARNING
#warning "GOS: Operating System initialization has been turned off. Make sure you call raw_os_start() before gfxInit() in your application!" #warning "GOS: Operating System initialization has been turned off. Make sure you call raw_os_start() before gfxInit() in your application!"