From 0bbb580959d51e9921dd8df9e5987432ef3ddf66 Mon Sep 17 00:00:00 2001 From: Michiel van Leeuwen Date: Thu, 10 Oct 2024 11:43:48 +0200 Subject: [PATCH 1/2] Update to FreeRTOS 11.1.0 --- FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp | 2 ++ FreeRTOS-Cpp/include/FreeRTOS/Task.hpp | 2 ++ FreeRTOS-Kernel | 2 +- examples/config/FreeRTOSConfig.h | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp b/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp index 0f28646..b737ac7 100644 --- a/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp +++ b/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp @@ -352,6 +352,7 @@ inline void suspendAll() { vTaskSuspendAll(); } */ inline bool resumeAll() { return (xTaskResumeAll() == pdTRUE); } +#if (configUSE_TICKLESS_IDLE != 0) /** * Kernel.hpp * @@ -372,6 +373,7 @@ inline bool resumeAll() { return (xTaskResumeAll() == pdTRUE); } inline void stepTick(const TickType_t ticksToJump) { vTaskStepTick(ticksToJump); } +#endif /** * Kernel.hpp diff --git a/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp b/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp index 7321546..64112b8 100644 --- a/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp +++ b/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp @@ -321,7 +321,9 @@ class TaskBase { inline UBaseType_t getStackHighWaterMark() const { return uxTaskGetStackHighWaterMark(handle); } +#endif /* INCLUDE_uxTaskGetStackHighWaterMark */ +#if (INCLUDE_uxTaskGetStackHighWaterMark2 == 1) /** * Task.hpp * diff --git a/FreeRTOS-Kernel b/FreeRTOS-Kernel index a4b28e3..dbf7055 160000 --- a/FreeRTOS-Kernel +++ b/FreeRTOS-Kernel @@ -1 +1 @@ -Subproject commit a4b28e35103d699edf074dfff4835921b481b301 +Subproject commit dbf70559b27d39c1fdb68dfb9a32140b6a6777a0 diff --git a/examples/config/FreeRTOSConfig.h b/examples/config/FreeRTOSConfig.h index 444fb65..14f36f8 100644 --- a/examples/config/FreeRTOSConfig.h +++ b/examples/config/FreeRTOSConfig.h @@ -102,6 +102,7 @@ #define configUSE_NEWLIB_REENTRANT 0 #define configENABLE_BACKWARD_COMPATIBILITY 1 #define configNUM_THREAD_LOCAL_STORAGE_POINTERS 5 +#define configENABLE_MPU 0 /* Used memory allocation (heap_x.c) */ #define configFRTOS_MEMORY_SCHEME 4 From 4eb48adef64e7a532c6a5372a38a5c9741c0e014 Mon Sep 17 00:00:00 2001 From: Jon Enz Date: Thu, 10 Oct 2024 22:38:59 -0500 Subject: [PATCH 2/2] Fix comment. --- FreeRTOS-Cpp/include/FreeRTOS/Task.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp b/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp index 64112b8..ee6a887 100644 --- a/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp +++ b/FreeRTOS-Cpp/include/FreeRTOS/Task.hpp @@ -350,7 +350,7 @@ class TaskBase { inline configSTACK_DEPTH_TYPE getStackHighWaterMark2() const { return uxTaskGetStackHighWaterMark2(handle); } -#endif /* INCLUDE_uxTaskGetStackHighWaterMark */ +#endif /* INCLUDE_uxTaskGetStackHighWaterMark2 */ #if (INCLUDE_eTaskGetState == 1) /**