diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.ccsproject b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.ccsproject
index 893e3e02fd..18814d8ff8 100644
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.ccsproject
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.ccsproject
@@ -1,13 +1,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.cproject b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.cproject
index 006536a707..16634b48e1 100644
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.cproject
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.cproject
@@ -15,74 +15,78 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -104,7 +108,7 @@
-
-
-
@@ -148,12 +152,12 @@
-
-
@@ -191,7 +195,7 @@
-
-
-
@@ -235,12 +239,12 @@
-
-
@@ -281,7 +285,7 @@
-
-
+
-
-
@@ -320,20 +324,20 @@
-
+
-
-
-
+
@@ -358,14 +362,6 @@
-
-
-
-
-
-
-
-
@@ -389,4 +385,5 @@
-
+
+
\ No newline at end of file
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.gitignore b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.gitignore
new file mode 100644
index 0000000000..9e0f3119eb
--- /dev/null
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.gitignore
@@ -0,0 +1,9 @@
+# Build output
+RM48 without FPU/
+RM48 with FPU/
+TMS570 without FPU/
+TMS570 with FPU/
+
+# CCS/Eclipse user settings
+.settings/
+.launches/
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.project b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.project
index 4b13f734b3..82c39c4877 100644
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.project
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.project
@@ -80,4 +80,249 @@
org.eclipse.cdt.core.ccnature
org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+
+
+ Common-Demo-Source
+ 2
+ ROOT_LOC/Demo/Common
+
+
+ FreeRTOS
+ 2
+ ROOT_LOC/Source
+
+
+
+
+ 1727678957787
+ Common-Demo-Source
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-include
+
+
+
+ 1727678957808
+ Common-Demo-Source
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-Minimal
+
+
+
+ 1727678957836
+ Common-Demo-Source
+ 6
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-*
+
+
+
+ 1727695622467
+ FreeRTOS
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-include
+
+
+
+ 1727695622468
+ FreeRTOS
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-portable
+
+
+
+ 1727695622470
+ FreeRTOS
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-tasks.c
+
+
+
+ 1727695622471
+ FreeRTOS
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-queue.c
+
+
+
+ 1727695622474
+ FreeRTOS
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-list.c
+
+
+
+ 1727695622475
+ FreeRTOS
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-timers.c
+
+
+
+ 1727695042802
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-dynamic.c
+
+
+
+ 1727695042806
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-BlockQ.c
+
+
+
+ 1727695042808
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-death.c
+
+
+
+ 1727695042809
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-blocktim.c
+
+
+
+ 1727695042811
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-semtest.c
+
+
+
+ 1727695042812
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-PollQ.c
+
+
+
+ 1727695042814
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-GenQTest.c
+
+
+
+ 1727695042815
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-recmutex.c
+
+
+
+ 1727695042816
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-countsem.c
+
+
+
+ 1727695042817
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-integer.c
+
+
+
+ 1727695042819
+ Common-Demo-Source/Minimal
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-comtest.c
+
+
+
+ 1727678828162
+ FreeRTOS/portable
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-CCS
+
+
+
+ 1727678828188
+ FreeRTOS/portable
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-MemMang
+
+
+
+ 1727678828212
+ FreeRTOS/portable
+ 6
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-*
+
+
+
+ 1727678866769
+ FreeRTOS/portable/CCS
+ 9
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-ARM_Cortex-R4
+
+
+
+ 1727678841562
+ FreeRTOS/portable/MemMang
+ 5
+
+ org.eclipse.ui.ide.multiFilter
+ 1.0-name-matches-false-false-heap_4.c
+
+
+
+
+
+ ROOT_LOC
+ $%7BPARENT-2-PROJECT_LOC%7D
+
+
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.codan.core.prefs b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.codan.core.prefs
deleted file mode 100644
index 98b6350279..0000000000
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.codan.core.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-inEditor=false
-onBuild=false
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.debug.core.prefs b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.debug.core.prefs
deleted file mode 100644
index 58d4fb29d6..0000000000
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.cdt.debug.core.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.cdt.debug.core.toggleBreakpointModel=com.ti.ccstudio.debug.CCSBreakpointMarker
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.core.resources.prefs b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 3cd646a2d9..0000000000
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,107 +0,0 @@
-eclipse.preferences.version=1
-encoding//RM48\ with\ FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/Library/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/Library/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/makefile=UTF-8
-encoding//RM48\ with\ FPU/objects.mk=UTF-8
-encoding//RM48\ with\ FPU/sources.mk=UTF-8
-encoding//RM48\ with\ FPU/startup/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/startup/subdir_vars.mk=UTF-8
-encoding//RM48\ with\ FPU/subdir_rules.mk=UTF-8
-encoding//RM48\ with\ FPU/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/Library/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/Library/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/makefile=UTF-8
-encoding//RM48\ without\ FPU/objects.mk=UTF-8
-encoding//RM48\ without\ FPU/sources.mk=UTF-8
-encoding//RM48\ without\ FPU/startup/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/startup/subdir_vars.mk=UTF-8
-encoding//RM48\ without\ FPU/subdir_rules.mk=UTF-8
-encoding//RM48\ without\ FPU/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/Library/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/Library/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/makefile=UTF-8
-encoding//TMS570\ with\ FPU/objects.mk=UTF-8
-encoding//TMS570\ with\ FPU/sources.mk=UTF-8
-encoding//TMS570\ with\ FPU/startup/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/startup/subdir_vars.mk=UTF-8
-encoding//TMS570\ with\ FPU/subdir_rules.mk=UTF-8
-encoding//TMS570\ with\ FPU/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/Library/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/Library/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/makefile=UTF-8
-encoding//TMS570\ without\ FPU/objects.mk=UTF-8
-encoding//TMS570\ without\ FPU/sources.mk=UTF-8
-encoding//TMS570\ without\ FPU/startup/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/startup/subdir_vars.mk=UTF-8
-encoding//TMS570\ without\ FPU/subdir_rules.mk=UTF-8
-encoding//TMS570\ without\ FPU/subdir_vars.mk=UTF-8
-encoding//With_FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//With_FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//With_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//With_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//With_FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//With_FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//With_FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//With_FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//With_FPU/Library/subdir_rules.mk=UTF-8
-encoding//With_FPU/Library/subdir_vars.mk=UTF-8
-encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8
-encoding//With_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8
-encoding//With_FPU/makefile=UTF-8
-encoding//With_FPU/objects.mk=UTF-8
-encoding//With_FPU/sources.mk=UTF-8
-encoding//With_FPU/startup/subdir_rules.mk=UTF-8
-encoding//With_FPU/startup/subdir_vars.mk=UTF-8
-encoding//With_FPU/subdir_rules.mk=UTF-8
-encoding//With_FPU/subdir_vars.mk=UTF-8
-encoding//Without_FPU/Common-Demo-Source/subdir_rules.mk=UTF-8
-encoding//Without_FPU/Common-Demo-Source/subdir_vars.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_rules.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/portable/CCS/ARM_Cortex-R4/subdir_vars.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_rules.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/portable/MemMang/subdir_vars.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/subdir_rules.mk=UTF-8
-encoding//Without_FPU/FreeRTOS/subdir_vars.mk=UTF-8
-encoding//Without_FPU/Library/subdir_rules.mk=UTF-8
-encoding//Without_FPU/Library/subdir_vars.mk=UTF-8
-encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_rules.mk=UTF-8
-encoding//Without_FPU/RM48_FreeRTOS_Demo/source/subdir_vars.mk=UTF-8
-encoding//Without_FPU/makefile=UTF-8
-encoding//Without_FPU/objects.mk=UTF-8
-encoding//Without_FPU/sources.mk=UTF-8
-encoding//Without_FPU/startup/subdir_rules.mk=UTF-8
-encoding//Without_FPU/startup/subdir_vars.mk=UTF-8
-encoding//Without_FPU/subdir_rules.mk=UTF-8
-encoding//Without_FPU/subdir_vars.mk=UTF-8
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/CreateProjectDirectoryStructure.bat
deleted file mode 100644
index e3af12c9fe..0000000000
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/CreateProjectDirectoryStructure.bat
+++ /dev/null
@@ -1,59 +0,0 @@
-REM This file should be executed from the command line prior to the first
-REM build. It will be necessary to refresh the Eclipse project once the
-REM .bat file has been executed (normally just press F5 to refresh).
-
-REM Copies all the required files from their location within the standard
-REM FreeRTOS directory structure to under the Eclipse project directory.
-REM This permits the Eclipse project to be used in 'managed' mode and without
-REM having to setup any linked resources.
-
-REM Standard paths
-SET FREERTOS_SOURCE=..\..\Source
-SET COMMON_SOURCE=..\Common\minimal
-SET COMMON_INCLUDE=..\Common\include
-
-REM Have the files already been copied?
-IF EXIST .\FreeRTOS_Source Goto END
-
- REM Create the required directory structure.
- MD FreeRTOS
- MD FreeRTOS\include
- MD FreeRTOS\portable
- MD FreeRTOS\portable\CCS
- MD FreeRTOS\portable\CCS\ARM_Cortex-R4
- MD FreeRTOS\portable\MemMang
- MD Common-Demo-Source
- MD Common-Demo-Source\include
-
- REM Copy the core kernel files into the project directory
- copy %FREERTOS_SOURCE%\tasks.c FreeRTOS
- copy %FREERTOS_SOURCE%\queue.c FreeRTOS
- copy %FREERTOS_SOURCE%\list.c FreeRTOS
- copy %FREERTOS_SOURCE%\timers.c FreeRTOS
-
- REM Copy the common header files into the project directory
- copy %FREERTOS_SOURCE%\include\*.* FreeRTOS\include
-
- REM Copy the portable layer files into the project directory
- copy %FREERTOS_SOURCE%\portable\CCS\ARM_Cortex-R4\*.* FreeRTOS\portable\CCS\ARM_Cortex-R4
-
- REM Copy the memory allocation files into the project directory
- copy %FREERTOS_SOURCE%\portable\MemMang\heap_4.c FreeRTOS\portable\MemMang
-
- REM Copy the files that define the common demo tasks.
- copy %COMMON_SOURCE%\dynamic.c Common-Demo-Source
- copy %COMMON_SOURCE%\BlockQ.c Common-Demo-Source
- copy %COMMON_SOURCE%\death.c Common-Demo-Source
- copy %COMMON_SOURCE%\blocktim.c Common-Demo-Source
- copy %COMMON_SOURCE%\semtest.c Common-Demo-Source
- copy %COMMON_SOURCE%\PollQ.c Common-Demo-Source
- copy %COMMON_SOURCE%\GenQTest.c Common-Demo-Source
- copy %COMMON_SOURCE%\recmutex.c Common-Demo-Source
- copy %COMMON_SOURCE%\countsem.c Common-Demo-Source
- copy %COMMON_SOURCE%\integer.c Common-Demo-Source
- copy %COMMON_SOURCE%\comtest.c Common-Demo-Source
-
- REM Copy the common demo file headers.
- copy %COMMON_INCLUDE%\*.h Common-Demo-Source\include
-
-: END
diff --git a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h
index 070cd6cf7b..49cf89656f 100644
--- a/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/CORTEX_R4_RM48_TMS570_CCS5/FreeRTOSConfig.h
@@ -24,14 +24,6 @@
*
*/
-/*
- * The following #error directive is to remind users that a batch file must be
- * executed prior to this project being built. Once it has been executed
- * remove the #error line below.
- */
-#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above.
-
-
#ifndef FREERTOS_CONFIG_H
#define FREERTOS_CONFIG_H