uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Revert "Setting the default heap size to 5120 bytes to avoid confusion due to linker errors when no malloc() / free() are available"

Browse Source 
This reverts commit ed9a422d81.
This commit is contained in:
Joel Bodenmann 2016-01-11 08:03:16 +01:00
parent 1ad99cbe4a
commit a76c176840
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/releases.txt
View File

@ -10,7 +10,6 @@ FEATURE: Added Altera-MAX10-NEEK board support
FIX: Vastly improving keyboard widget default rendering FIX: Vastly improving keyboard widget default rendering
FEATURE: Added ILI9342 driver FEATURE: Added ILI9342 driver
FIX: Fixing issues where wrong 'progress' color from widget style palette was used 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 *** *** Release 2.4 ***

2
gfxconf.example.h
View File

@ -48,7 +48,7 @@
// #define GFX_CPU GFX_CPU_UNKNOWN // #define GFX_CPU GFX_CPU_UNKNOWN
// #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE // #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE
// #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN // #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN
// #define GFX_OS_HEAP_SIZE 5120 // #define GFX_OS_HEAP_SIZE 0
// #define GFX_OS_NO_INIT FALSE // #define GFX_OS_NO_INIT FALSE
// #define GFX_OS_INIT_NO_WARNING FALSE // #define GFX_OS_INIT_NO_WARNING FALSE
// #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine // #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine

4
src/gos/gos_options.h
View File

@ -182,7 +182,7 @@
#endif #endif
/** /**
* @brief How much RAM should uGFX use for the heap when using its own internal heap allocator * @brief How much RAM should uGFX use for the heap when using its own internal heap allocator
* @details Defaults to 5120. * @details Defaults to 0.
* @note Only used when the internal ugfx heap allocator is used * @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) * (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() * @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. * is added allowing the user to add extra memory blocks to the heap.
*/ */
#ifndef GFX_OS_HEAP_SIZE #ifndef GFX_OS_HEAP_SIZE
#define GFX_OS_HEAP_SIZE 5120 #define GFX_OS_HEAP_SIZE 0
#endif #endif
/** @} */ /** @} */