Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
parent
83b29284aa
commit
28a2d8ca79
|
@ -9,6 +9,8 @@ FEATURE: Added GFXSINGLEMAKE=yes|no to the ugfx makefile to compile ugfx as a si
|
|||
FEATURE: New board STM32F746G-Discovery
|
||||
FEATURE: New gdisp driver STM32LTDC
|
||||
FEATURE: Better support for Raw32 platforms
|
||||
FEATURE: Renaming GFX_NO_OS_INIT to GFX_OS_NO_INIT
|
||||
|
||||
|
||||
*** Release 2.3 ***
|
||||
FEATURE: Added more events to the slider widget
|
||||
|
|
4
gfx.h
4
gfx.h
|
@ -221,11 +221,11 @@ extern "C" {
|
|||
* @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
|
||||
* 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().
|
||||
* @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
|
||||
* 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
|
||||
* name of a void function with no parameters that is called immediately before
|
||||
* operating system de-initialisation (as ugfx is exiting).
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
// #define GFX_COMPILER GFX_COMPILER_UNKNOWN
|
||||
// #define GFX_CPU GFX_CPU_UNKNOWN
|
||||
// #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_EXTRA_INIT_FUNCTION myOSInitRoutine
|
||||
// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
void _gosInit(void)
|
||||
{
|
||||
#if !GFX_NO_OS_INIT
|
||||
#if !GFX_OS_NO_INIT
|
||||
/* Don't Initialize if the user already has */
|
||||
#if CH_KERNEL_MAJOR == 2
|
||||
if (!chThdSelf()) {
|
||||
|
|
|
@ -11,8 +11,8 @@
|
|||
|
||||
void _gosInit(void)
|
||||
{
|
||||
#if !GFX_NO_OS_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"
|
||||
#if !GFX_OS_NO_INIT
|
||||
#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
|
||||
#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!"
|
||||
|
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
void _gosInit(void)
|
||||
{
|
||||
#if !GFX_NO_OS_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"
|
||||
#if !GFX_OS_NO_INIT
|
||||
#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
|
||||
#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!"
|
||||
|
|
|
@ -128,8 +128,8 @@
|
|||
* system in your application code. Note that on these operating systems the
|
||||
* demo applications will not work without modification.
|
||||
*/
|
||||
#ifndef GFX_NO_OS_INIT
|
||||
#define GFX_NO_OS_INIT FALSE
|
||||
#ifndef GFX_OS_NO_INIT
|
||||
#define GFX_OS_NO_INIT FALSE
|
||||
#endif
|
||||
/**
|
||||
* @brief Turn off warnings about initializing the operating system
|
||||
|
|
|
@ -24,8 +24,8 @@
|
|||
|
||||
void _gosInit(void)
|
||||
{
|
||||
#if !GFX_NO_OS_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"
|
||||
#if !GFX_OS_NO_INIT
|
||||
#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
|
||||
#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!"
|
||||
|
|
Loading…
Reference in New Issue