diff options
| author | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
|---|---|---|
| committer | JF <jf@codingfield.com> | 2020-07-11 19:09:34 (GMT) |
| commit | 64c14274fc2f025fc48d3df47a1640f08eb968cd (patch) | |
| tree | 262cf8b4e84c556748f42bbf778b48a68210921d /src/CMakeLists.txt | |
| parent | 0bcaf9c22d6183ba8072e10abb9da7aea578b8db (diff) | |
| parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) | |
Merge branch 'develop'
# Conflicts:
# CMakeLists.txt
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a30fb56..ff2e181 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -44,7 +44,7 @@ set(SDK_SOURCE_FILES # FreeRTOS ${NRF5_SDK_PATH}/external/freertos/source/croutine.c ${NRF5_SDK_PATH}/external/freertos/source/event_groups.c - ${NRF5_SDK_PATH}/external/freertos/source/portable/MemMang/heap_1.c + ${NRF5_SDK_PATH}/external/freertos/source/portable/MemMang/heap_4.c ${NRF5_SDK_PATH}/external/freertos/source/list.c ${NRF5_SDK_PATH}/external/freertos/source/queue.c ${NRF5_SDK_PATH}/external/freertos/source/stream_buffer.c @@ -363,7 +363,7 @@ list(APPEND SOURCE_FILES ${TINYCRYPT_SRC} ${NIMBLE_SRC} ${LVGL_SRC} - ${IMAGE_FILES} + #${IMAGE_FILES} ${SDK_SOURCE_FILES} DisplayApp/LittleVgl.cpp @@ -442,6 +442,8 @@ set(INCLUDE_FILES libs/date/includes/date/tz_private.h DisplayApp/LittleVgl.h SystemTask/SystemTask.h + SystemTask/SystemMonitor.h + DisplayApp/Screens/Symbols.h ) include_directories( @@ -547,6 +549,8 @@ add_definitions(-DOS_CPUTIME_FREQ) add_definitions(-DNRF52 -DNRF52832 -DNRF52832_XXAA -DNRF52_PAN_74 -DNRF52_PAN_64 -DNRF52_PAN_12 -DNRF52_PAN_58 -DNRF52_PAN_54 -DNRF52_PAN_31 -DNRF52_PAN_51 -DNRF52_PAN_36 -DNRF52_PAN_15 -DNRF52_PAN_20 -DNRF52_PAN_55 -DBOARD_PCA10040) add_definitions(-DFREERTOS) add_definitions(-DDEBUG_NRF_USER) +add_definitions(-D__STACK_SIZE=8192) +add_definitions(-D__HEAP_SIZE=8192) if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release") |