Updates from main-line code

ugfx_release_2.6
Joel Bodenmann 2013-10-05 02:32:35 +02:00 committed by inmarket
parent d7d02395d0
commit b3ee216bd2
3 changed files with 42 additions and 34 deletions

View File

@ -146,6 +146,7 @@
#define GDISP_LINEBUF_SIZE 128 #define GDISP_LINEBUF_SIZE 128
#define GEVENT_MAXIMUM_SIZE 32 #define GEVENT_MAXIMUM_SIZE 32
#define GEVENT_MAX_SOURCE_LISTENERS 32 #define GEVENT_MAX_SOURCE_LISTENERS 32
#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
#define GTIMER_THREAD_WORKAREA_SIZE 512 #define GTIMER_THREAD_WORKAREA_SIZE 512
#define GADC_MAX_LOWSPEED_DEVICES 4 #define GADC_MAX_LOWSPEED_DEVICES 4
#define GWIN_BUTTON_LAZY_RELEASE FALSE #define GWIN_BUTTON_LAZY_RELEASE FALSE

View File

@ -4,36 +4,43 @@
* *
* http://ugfx.org/license.html * http://ugfx.org/license.html
*/ */
/** /**
* @file include/gtimer/options.h * @file include/gtimer/options.h
* @brief GTIMER sub-system options header file. * @brief GTIMER sub-system options header file.
* *
* @addtogroup GTIMER * @addtogroup GTIMER
* @{ * @{
*/ */
#ifndef _GTIMER_OPTIONS_H #ifndef _GTIMER_OPTIONS_H
#define _GTIMER_OPTIONS_H #define _GTIMER_OPTIONS_H
/** /**
* @name GTIMER Functionality to be included * @name GTIMER Functionality to be included
* @{ * @{
*/ */
/** /**
* @} * @}
* *
* @name GTIMER Optional Sizing Parameters * @name GTIMER Optional Sizing Parameters
* @{ * @{
*/ */
/** /**
* @brief Defines the size of the timer threads work area (stack+structures). * @brief Defines the GTIMER thread priority
* @details Defaults to 512 bytes * @details Defaults to HIGH_PRIORITY
*/ */
#ifndef GTIMER_THREAD_WORKAREA_SIZE #ifndef GTIMER_THREAD_PRIORITY
#define GTIMER_THREAD_WORKAREA_SIZE 512 #define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
#endif #endif
/** @} */ /**
* @brief Defines the size of the timer threads work area (stack+structures).
#endif /* _GTIMER_OPTIONS_H */ * @details Defaults to 512 bytes
/** @} */ */
#ifndef GTIMER_THREAD_WORKAREA_SIZE
#define GTIMER_THREAD_WORKAREA_SIZE 512
#endif
/** @} */
#endif /* _GTIMER_OPTIONS_H */
/** @} */

View File

@ -132,7 +132,7 @@ void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, de
// Start our thread if not already going // Start our thread if not already going
if (!hThread) { if (!hThread) {
hThread = gfxThreadCreate(waTimerThread, sizeof(waTimerThread), HIGH_PRIORITY, GTimerThreadHandler, NULL); hThread = gfxThreadCreate(waTimerThread, sizeof(waTimerThread), GTIMER_PRIORITY, GTimerThreadHandler, NULL);
if (hThread) gfxThreadClose(hThread); // We never really need the handle again if (hThread) gfxThreadClose(hThread); // We never really need the handle again
} }