From 13074875c257b43c238f9ed5aef6d7c7afd8132b Mon Sep 17 00:00:00 2001 From: Kody Stribrny Date: Mon, 27 Oct 2025 13:47:11 -0700 Subject: [PATCH 1/2] Prefer xTaskDelayUntil in config template xTaskDelayUntil is more featured and should be preferred by new users. This change was inspired by https://forums.freertos.org/t/include-xtaskdelayuntil-vs-include-vtaskdelayuntil/24656. --- examples/template_configuration/FreeRTOSConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/template_configuration/FreeRTOSConfig.h b/examples/template_configuration/FreeRTOSConfig.h index 5521adb4d..da1ad8a28 100644 --- a/examples/template_configuration/FreeRTOSConfig.h +++ b/examples/template_configuration/FreeRTOSConfig.h @@ -653,7 +653,7 @@ #define INCLUDE_uxTaskPriorityGet 1 #define INCLUDE_vTaskDelete 1 #define INCLUDE_vTaskSuspend 1 -#define INCLUDE_vTaskDelayUntil 1 +#define INCLUDE_xTaskDelayUntil 1 #define INCLUDE_vTaskDelay 1 #define INCLUDE_xTaskGetSchedulerState 1 #define INCLUDE_xTaskGetCurrentTaskHandle 1 From 8b63f94d8dec55d4a50bc2a1cfec4bd5f39b467f Mon Sep 17 00:00:00 2001 From: Sheng Tai Date: Wed, 29 Oct 2025 23:35:00 +0200 Subject: [PATCH 2/2] Fix: Propagate PICO_SDK_VERSION_* to parent scope in RP2040 port (#1326) --- portable/ThirdParty/GCC/RP2040/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/portable/ThirdParty/GCC/RP2040/CMakeLists.txt b/portable/ThirdParty/GCC/RP2040/CMakeLists.txt index cbd302d93..e1034ebad 100644 --- a/portable/ThirdParty/GCC/RP2040/CMakeLists.txt +++ b/portable/ThirdParty/GCC/RP2040/CMakeLists.txt @@ -45,6 +45,9 @@ if (NOT TARGET _FreeRTOS_kernel_inclusion_marker) set(FREERTOS_KERNEL_PATH ${FREERTOS_KERNEL_PATH} PARENT_SCOPE) set(PICO_CONFIG_HEADER_FILES ${PICO_CONFIG_HEADER_FILES} PARENT_SCOPE) set(PICO_SDK_POST_LIST_FILES ${PICO_SDK_POST_LIST_FILES} PARENT_SCOPE) + set(PICO_SDK_VERSION_MAJOR ${PICO_SDK_VERSION_MAJOR} PARENT_SCOPE) + set(PICO_SDK_VERSION_MINOR ${PICO_SDK_VERSION_MINOR} PARENT_SCOPE) + set(PICO_SDK_VERSION_REVISION ${PICO_SDK_VERSION_REVISION} PARENT_SCOPE) endif() endif() endif()