Merge pull request #13 from electretmike/freertos-v11.1.0

Update to FreeRTOS 11.1.0
jonenz · Oct 11, 2024 · d058e54 · d058e54
2 parents 76f4d6f + 4eb48ad
commit d058e54
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp b/FreeRTOS-Cpp/include/FreeRTOS/Kernel.hpp
@@ -352,7 +352,7 @@ inline void suspendAll() { vTaskSuspendAll(); }
  */
 inline bool resumeAll() { return (xTaskResumeAll() == pdTRUE); }
 
-#if configUSE_TICKLESS_IDLE
+#if (configUSE_TICKLESS_IDLE != 0)
 /**
  * Kernel.hpp
  *
@@ -373,7 +373,7 @@ inline bool resumeAll() { return (xTaskResumeAll() == pdTRUE); }
 inline void stepTick(const TickType_t ticksToJump) {
   vTaskStepTick(ticksToJump);
 }
-#endif
+#endif /* configUSE_TICKLESS_IDLE */
 
 /**
  * Kernel.hpp

diff --git 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
    *
@@ -348,7 +350,7 @@ class TaskBase {
   inline configSTACK_DEPTH_TYPE getStackHighWaterMark2() const {
     return uxTaskGetStackHighWaterMark2(handle);
   }
-#endif /* INCLUDE_uxTaskGetStackHighWaterMark */
+#endif /* INCLUDE_uxTaskGetStackHighWaterMark2 */
 
 #if (INCLUDE_eTaskGetState == 1)
   /**

diff --git a/FreeRTOS-Kernel b/FreeRTOS-Kernel
diff --git 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