Skip to content

Commit

Permalink
修正include路径问题和FreeRTOS.h
Browse files Browse the repository at this point in the history
  • Loading branch information
WCX1024979076 authored and mysterywolf committed Jul 25, 2023
1 parent a26410e commit 57daec3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion FreeRTOS/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cwd = GetCurrentDir()
src = Glob('*.c')
src += Glob(os.path.join("portable", "rt-thread", "*.c"))

CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "portable", "rt-thread")]
CPPPATH = [os.path.join(cwd, "include", "freertos"), os.path.join(cwd, "include"), os.path.join(cwd, "portable", "rt-thread")]

if GetDepend('PKG_FREERTOS_USING_MEMMANG_HEAP1'):
src += [os.path.join("portable", "MemMang", "heap_1.c")]
Expand Down
7 changes: 3 additions & 4 deletions FreeRTOS/include/freertos/FreeRTOS.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@
#define configMINIMAL_STACK_SIZE 128
#endif

#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP1) ||
defined(PKG_FREERTOS_USING_MEMMANG_HEAP2) ||
#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP1) || \
defined(PKG_FREERTOS_USING_MEMMANG_HEAP2) || \
defined(PKG_FREERTOS_USING_MEMMANG_HEAP4)
#ifndef configTOTAL_HEAP_SIZE
#define configTOTAL_HEAP_SIZE 10240
Expand All @@ -105,7 +105,7 @@
#endif
#endif

#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP4) ||
#if defined(PKG_FREERTOS_USING_MEMMANG_HEAP4) || \
defined(PKG_FREERTOS_USING_MEMMANG_HEAP5)
#ifndef configUSE_FREERTOS_PROVIDED_HEAP
#define configUSE_FREERTOS_PROVIDED_HEAP 1
Expand All @@ -121,7 +121,6 @@

/* The following features are not supported by RT-Thread */
#define INCLUDE_xTimerPendFunctionCall 0
#define configNUM_THREAD_LOCAL_STORAGE_POINTERS 0
#define configUSE_CO_ROUTINES 0
#define configQUEUE_REGISTRY_SIZE 0
#define configUSE_QUEUE_SETS 0
Expand Down

0 comments on commit 57daec3

Please sign in to comment.