diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-11-27 20:39:28 +0100 |
| commit | 5a99092b794373966e444296c57991631e712c70 (patch) | |
| tree | 3e2853ab9730ece7398f508238ac2707e485b346 /src/gos/gos_options.h | |
| parent | eaf0b19fb8428b9e2e47798294d6ba83a56d186e (diff) | |
| parent | f16ee702727a811288749a0722ddb138dd559fa8 (diff) | |
| download | uGFX-5a99092b794373966e444296c57991631e712c70.tar.gz uGFX-5a99092b794373966e444296c57991631e712c70.tar.bz2 uGFX-5a99092b794373966e444296c57991631e712c70.zip | |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
Diffstat (limited to 'src/gos/gos_options.h')
| -rw-r--r-- | src/gos/gos_options.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h index 4b33f5ac..0c6fd7a7 100644 --- a/src/gos/gos_options.h +++ b/src/gos/gos_options.h @@ -181,9 +181,10 @@ #define GFX_FREERTOS_USE_TRACE FALSE #endif /** - * @brief How much RAM should uGFX use for the heap + * @brief How much RAM should uGFX use for the heap when using its own internal heap allocator * @details Defaults to 0. - * @note Only used when the generic ugfx heap code is used (GFX_USE_OS_RAW32, GFX_USE_OS_ARDUINO, GFX_US_OS_KEIL, GFX_USE_OS_CMSIS) + * @note Only used when the internal ugfx heap allocator is used + * (GFX_USE_OS_RAW32, GFX_USE_OS_ARDUINO, GFX_US_OS_KEIL, GFX_USE_OS_CMSIS) * @note If 0 then the standard C runtime malloc(), free() and realloc() * are used. * @note If it is non-zero then this is the number of bytes of RAM |