diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2016-01-08 21:42:12 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2016-01-08 21:42:12 +0100 |
| commit | ed9a422d81994047edc59794ff26bbcc1f7ea6c5 (patch) | |
| tree | baea09530fe73f71e86b5b1e6197038151efb6bf | |
| parent | 50a3048e59c4165073ff32b3043ab06ec54962ce (diff) | |
| download | uGFX-ed9a422d81994047edc59794ff26bbcc1f7ea6c5.tar.gz uGFX-ed9a422d81994047edc59794ff26bbcc1f7ea6c5.tar.bz2 uGFX-ed9a422d81994047edc59794ff26bbcc1f7ea6c5.zip | |
Setting the default heap size to 5120 bytes to avoid confusion due to linker errors when no malloc() / free() are available
| -rw-r--r-- | docs/releases.txt | 1 | ||||
| -rw-r--r-- | gfxconf.example.h | 2 | ||||
| -rw-r--r-- | src/gos/gos_options.h | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docs/releases.txt b/docs/releases.txt index 2fa6ef0f..361ac5c1 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -10,6 +10,7 @@ FEATURE: Added Altera-MAX10-NEEK board support FIX: Vastly improving keyboard widget default rendering FEATURE: Added ILI9342 driver FIX: Fixing issues where wrong 'progress' color from widget style palette was used +CHANGE: Default heap size set to 5120 byes when using RAW32 port *** Release 2.4 *** diff --git a/gfxconf.example.h b/gfxconf.example.h index 03f1f264..d58a1b0e 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -48,7 +48,7 @@ // #define GFX_CPU GFX_CPU_UNKNOWN // #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE // #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN -// #define GFX_OS_HEAP_SIZE 0 +// #define GFX_OS_HEAP_SIZE 5120 // #define GFX_OS_NO_INIT FALSE // #define GFX_OS_INIT_NO_WARNING FALSE // #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h index 0c6fd7a7..c61b407f 100644 --- a/src/gos/gos_options.h +++ b/src/gos/gos_options.h @@ -182,7 +182,7 @@ #endif /** * @brief How much RAM should uGFX use for the heap when using its own internal heap allocator - * @details Defaults to 0. + * @details Defaults to 5120. * @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() @@ -193,7 +193,7 @@ * is added allowing the user to add extra memory blocks to the heap. */ #ifndef GFX_OS_HEAP_SIZE - #define GFX_OS_HEAP_SIZE 0 + #define GFX_OS_HEAP_SIZE 5120 #endif /** @} */ |