diff options
author | Joel Bodenmann <joel@unormal.org> | 2013-10-05 02:32:35 +0200 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2013-10-06 15:47:59 +1000 |
commit | b3ee216bd2565e8ab9298f1f54b8e6df762b7d58 (patch) | |
tree | cea1f7bb188295522f3484559945fe2317ef74eb | |
parent | d7d02395d0c1afe27bc39eeddc17899084c72de9 (diff) | |
download | uGFX-b3ee216bd2565e8ab9298f1f54b8e6df762b7d58.tar.gz uGFX-b3ee216bd2565e8ab9298f1f54b8e6df762b7d58.tar.bz2 uGFX-b3ee216bd2565e8ab9298f1f54b8e6df762b7d58.zip |
Updates from main-line code
-rw-r--r-- | gfxconf.example.h | 1 | ||||
-rw-r--r-- | include/gtimer/options.h | 73 | ||||
-rw-r--r-- | src/gtimer/gtimer.c | 2 |
3 files changed, 42 insertions, 34 deletions
diff --git a/gfxconf.example.h b/gfxconf.example.h index 1f7d9c2e..e6be90db 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -146,6 +146,7 @@ #define GDISP_LINEBUF_SIZE 128 #define GEVENT_MAXIMUM_SIZE 32 #define GEVENT_MAX_SOURCE_LISTENERS 32 + #define GTIMER_THREAD_PRIORITY HIGH_PRIORITY #define GTIMER_THREAD_WORKAREA_SIZE 512 #define GADC_MAX_LOWSPEED_DEVICES 4 #define GWIN_BUTTON_LAZY_RELEASE FALSE diff --git a/include/gtimer/options.h b/include/gtimer/options.h index 958f89e4..17358abe 100644 --- a/include/gtimer/options.h +++ b/include/gtimer/options.h @@ -4,36 +4,43 @@ * * http://ugfx.org/license.html */ -
-/**
- * @file include/gtimer/options.h
- * @brief GTIMER sub-system options header file.
- *
- * @addtogroup GTIMER
- * @{
- */
-
-#ifndef _GTIMER_OPTIONS_H
-#define _GTIMER_OPTIONS_H
-
-/**
- * @name GTIMER Functionality to be included
- * @{
- */
-/**
- * @}
- *
- * @name GTIMER Optional Sizing Parameters
- * @{
- */
- /**
- * @brief Defines the size of the timer threads work area (stack+structures).
- * @details Defaults to 512 bytes
- */
- #ifndef GTIMER_THREAD_WORKAREA_SIZE
- #define GTIMER_THREAD_WORKAREA_SIZE 512
- #endif
-/** @} */
-
-#endif /* _GTIMER_OPTIONS_H */
-/** @} */
+ +/** + * @file include/gtimer/options.h + * @brief GTIMER sub-system options header file. + * + * @addtogroup GTIMER + * @{ + */ + +#ifndef _GTIMER_OPTIONS_H +#define _GTIMER_OPTIONS_H + +/** + * @name GTIMER Functionality to be included + * @{ + */ +/** + * @} + * + * @name GTIMER Optional Sizing Parameters + * @{ + */ + /** + * @brief Defines the GTIMER thread priority + * @details Defaults to HIGH_PRIORITY + */ + #ifndef GTIMER_THREAD_PRIORITY + #define GTIMER_THREAD_PRIORITY HIGH_PRIORITY + #endif + /** + * @brief Defines the size of the timer threads work area (stack+structures). + * @details Defaults to 512 bytes + */ + #ifndef GTIMER_THREAD_WORKAREA_SIZE + #define GTIMER_THREAD_WORKAREA_SIZE 512 + #endif +/** @} */ + +#endif /* _GTIMER_OPTIONS_H */ +/** @} */ diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c index e789ee74..25b7d804 100644 --- a/src/gtimer/gtimer.c +++ b/src/gtimer/gtimer.c @@ -132,7 +132,7 @@ void gtimerStart(GTimer *pt, GTimerFunction fn, void *param, bool_t periodic, de // Start our thread if not already going
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
}
|