From 276146c4fea3bbaf0b7bb7df722c961c02ce3e46 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 21:01:17 +0000
Subject: [PATCH 1/2] Initial plan


From aa00e6e6888bfe97dd703ad35bd9d0d1bde3e643 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 11 Jan 2026 21:03:37 +0000
Subject: [PATCH 2/2] Fix RTOS_V2 cmsis_os2.h search path to include
 Drivers/CMSIS/RTOS2

Co-authored-by: Hish15 <29129731+Hish15@users.noreply.github.com>
---
 cmake/FindCMSIS.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmake/FindCMSIS.cmake b/cmake/FindCMSIS.cmake
index d6a1a7c2..59cbe681 100644
--- a/cmake/FindCMSIS.cmake
+++ b/cmake/FindCMSIS.cmake
@@ -285,7 +285,9 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS_FAMILIES})
 
         find_path(CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_PATH
             NAMES "cmsis_os${RTOS_COMP_VERSION}.h"
-            PATHS "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+            PATHS
+                "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+                "${STM32_CUBE_${FAMILY}_PATH}/Drivers/CMSIS/RTOS2/Include"
             NO_DEFAULT_PATH
         )
         if (NOT CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_PATH)
@@ -294,7 +296,9 @@ foreach(COMP ${CMSIS_FIND_COMPONENTS_FAMILIES})
 
         find_file(CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_SOURCE
             NAMES "cmsis_os${RTOS_COMP_VERSION}.c"
-            PATHS "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+            PATHS
+                "${STM32_CUBE_${FAMILY}_PATH}/Middlewares/Third_Party/FreeRTOS/Source/CMSIS_${RTOS_COMP}"
+                "${STM32_CUBE_${FAMILY}_PATH}/Drivers/CMSIS/RTOS2/Template"
             NO_DEFAULT_PATH
         )
         if (NOT CMSIS_${FAMILY}${CORE_U}_${RTOS_COMP}_SOURCE)