diff --git a/sw/airborne/arch/chibios/modules/tlsf/tlsf_malloc_arch.h b/sw/airborne/arch/chibios/modules/tlsf/tlsf_malloc_arch.h index 76407b1b90..11c31e609c 100644 --- a/sw/airborne/arch/chibios/modules/tlsf/tlsf_malloc_arch.h +++ b/sw/airborne/arch/chibios/modules/tlsf/tlsf_malloc_arch.h @@ -29,20 +29,17 @@ #define TLSF_MALLOC_ARCH_H #include #include +#include "mcu_periph/ram_arch.h" -#if defined STM32F4XX -#define NODMA_SECTION ".ram4" -#define DMA_SECTION ".ram0" -#elif defined STM32F7XX -#define NODMA_SECTION ".ram0" -#define DMA_SECTION ".ram3" -#else -#error "section defined only for STM32F4 and STM32F7" -#endif #define HEAP_CCM ccmHeap +// F7 has more than twice RAM than others families +#if defined STM32F7XX +#define HEAP_CCM_SIZE 65536 +#else #define HEAP_CCM_SIZE 16384 -#define HEAP_CCM_SECTION NODMA_SECTION +#endif +#define HEAP_CCM_SECTION FAST_SECTION #define HEAP_DEFAULT HEAP_CCM diff --git a/sw/airborne/boards/apogee/chibios/v1.0/mcuconf.h b/sw/airborne/boards/apogee/chibios/v1.0/mcuconf.h index ccbf014a55..430f69c53b 100644 --- a/sw/airborne/boards/apogee/chibios/v1.0/mcuconf.h +++ b/sw/airborne/boards/apogee/chibios/v1.0/mcuconf.h @@ -387,7 +387,7 @@ #define SDLOG_QUEUE_BUCKETS 1024 #define SDLOG_MAX_MESSAGE_LEN 300 #define SDLOG_NUM_FILES 2 -#define SDLOG_ALL_BUFFERS_SIZE (SDLOG_NUM_FILES*8192) +#define SDLOG_ALL_BUFFERS_SIZE (SDLOG_NUM_FILES*8*1024) diff --git a/sw/airborne/boards/chimera/chibios/v1.0/mcuconf.h b/sw/airborne/boards/chimera/chibios/v1.0/mcuconf.h index 804007fd78..8c0779b3e5 100644 --- a/sw/airborne/boards/chimera/chibios/v1.0/mcuconf.h +++ b/sw/airborne/boards/chimera/chibios/v1.0/mcuconf.h @@ -455,10 +455,10 @@ /* sdlog message buffer and queue configuration */ -#define SDLOG_QUEUE_BUCKETS 1024 -#define SDLOG_MAX_MESSAGE_LEN 252 -#define SDLOG_NUM_FILES 1 -#define SDLOG_ALL_BUFFERS_SIZE (SDLOG_NUM_FILES*4096*2) +#define SDLOG_QUEUE_BUCKETS 1024 +#define SDLOG_MAX_MESSAGE_LEN 300 +#define SDLOG_NUM_FILES 2 +#define SDLOG_ALL_BUFFERS_SIZE (SDLOG_NUM_FILES*16*1024) /* * WDG driver system settings.