Simplifies naming convention for RTOS version tag (#1719)

***NO_CI***

Author: networkfusion

.vscode/cmake-variants.TEMPLATE.json

@@ -42,7 +42,8 @@
           "CHIBIOS_CONTRIB_REQUIRED": "OFF-default-ON-to-include_ChibiOS-Contrib-repository-in-the-build",
           "CHIBIOS_CONTRIB_SOURCE": "<path-to-local-ChibiOS-contrib-source-mind-the-forward-slash>",
           "FREERTOS_BOARD": "<valid-freertos-board-name-from-boards-collection>",
-          "FREERTOS_VERSION": "<valid-freertos-version-if-empty-use-default-set-cmake>",
+          "RTOS_VERSION": "<valid-rtos-git-branch-if-empty-use-default-cmake-setting>",
+          "RTOS_SOURCE": "<path-to-rtos-source-mind-the-forward-slash>",
           "CMSIS_SOURCE": "<path-to-cmsis-source-mind-the-forward-slash>",
           "CMSIS_VERSION": "<valid-cmsis-version-if-empty-use-default-set-cmake>",
           "CHIBIOS_BOARD": "<valid-chibios-board-name-from-boards-collection>",

CMake/ChibiOS.CMakeLists.cmake.in

@@ -15,7 +15,7 @@ ExternalProject_Add(
     PREFIX ChibiOS
     SOURCE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source
     GIT_REPOSITORY  https://github.com/nanoframework/chibios
-    GIT_TAG ${CHIBIOS_GIT_TAG}  # target specified branch
+    GIT_TAG ${RTOS_VERSION}  # target specified branch
     GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
     TIMEOUT 10
     LOG_DOWNLOAD 1

CMake/FreeRTOS.CMakeLists.cmake.in

@@ -15,7 +15,7 @@ ExternalProject_Add(
     PREFIX FreeRTOS
     SOURCE_DIR ${CMAKE_BINARY_DIR}/FreeRTOS_Source
     GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
-    GIT_TAG ${FREERTOS_VERSION_TAG}  # target specified branch
+    GIT_TAG ${RTOS_VERSION}  # target specified branch
     GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
     TIMEOUT 10
     LOG_DOWNLOAD 1

CMake/RTXRTOS.CMakeLists.cmake.in

@@ -15,7 +15,7 @@ include(ExternalProject)
         PREFIX RTXRTOS
         SOURCE_DIR ${CMAKE_BINARY_DIR}/RTXRTOS_Source
         GIT_REPOSITORY  https://github.com/ARM-software/CMSIS_5
-        GIT_TAG master  # target master branch
+        GIT_TAG ${RTOS_VERSION}  # target master branch
         GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
         TIMEOUT 10
         LOG_DOWNLOAD 1

targets/CMSIS-OS/ChibiOS/CMakeLists.txt

@@ -51,7 +51,7 @@ if(NO_RTOS_SOURCE_FOLDER)
     endif()
 
     # ChibiOS version
-    set(CHIBIOS_GIT_TAG "stable_19.1.x")
+    set(RTOS_VERSION "stable_19.1.x")
     message(STATUS "RTOS is: CHIBIOS (latest available code from ${CHIBIOS_GIT_TAG})")
 
     # need to setup a separate CMake project to download the code from the GitHub repository
@@ -75,7 +75,7 @@ if(NO_RTOS_SOURCE_FOLDER)
         PREFIX ChibiOS
         SOURCE_DIR ${CMAKE_BINARY_DIR}/ChibiOS_Source
         GIT_REPOSITORY  https://github.com/nanoframework/chibios
-        GIT_TAG ${CHIBIOS_GIT_TAG}  # target specified branch
+        GIT_TAG ${RTOS_VERSION}  # target specified branch
         GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
         TIMEOUT 10
         LOG_DOWNLOAD 1

targets/FreeRTOS/CMakeLists.txt

@@ -81,7 +81,7 @@ if(NO_RTOS_SOURCE_FOLDER)
         PREFIX FreeRTOS
         SOURCE_DIR ${CMAKE_BINARY_DIR}/FreeRTOS_Source
         GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
-        GIT_TAG ${FREERTOS_VERSION_TAG}  # target specified branch
+        GIT_TAG ${RTOS_VERSION}  # target specified branch
         GIT_SHALLOW 1   # download only the tip of the branch, not the complete history
         TIMEOUT 10
         LOG_DOWNLOAD 1