From: richardbarry Date: Wed, 13 Feb 2013 12:03:13 +0000 (+0000) Subject: Update the LPC1768 project to only copy across one heap_x.c file as the addition... X-Git-Tag: V7.4.0~5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4eb0e19640e29f347aad658bc37a4448ea6e4313;p=freertos Update the LPC1768 project to only copy across one heap_x.c file as the addition of heap_4.c without it being excluded from the project was breaking the build. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1826 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.cproject b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.cproject index 8b14ac94d..002260673 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.cproject +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.cproject @@ -2,866 +2,194 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <?xml version="1.0" encoding="UTF-8"?> <TargetConfig> <Properties property_0="" property_1="" property_2="" property_3="NXP" property_4="LPC1768" property_count="5" version="1"/> <infoList vendor="NXP"> @@ -935,5 +263,346 @@ </info> </infoList> </TargetConfig> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.settings/language.settings.xml b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.settings/language.settings.xml new file mode 100644 index 000000000..05c347560 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/.settings/language.settings.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/CreateProjectDirectoryStructure.bat b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/CreateProjectDirectoryStructure.bat index 7f47f1d43..a189206bf 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/CreateProjectDirectoryStructure.bat +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/CreateProjectDirectoryStructure.bat @@ -31,7 +31,7 @@ IF EXIST src\FreeRTOS Goto END copy ..\..\Source\portable\GCC\ARM_CM3\*.* src\FreeRTOS\portable\GCC\ARM_CM3 REM Copy the basic memory allocation files - copy ..\..\Source\portable\MemMang\*.* src\FreeRTOS\portable\MemMang + copy ..\..\Source\portable\MemMang\heap_4.c src\FreeRTOS\portable\MemMang REM Copy the files that define the common demo tasks. copy ..\Common\minimal\BlockQ.c "src\Common Demo Tasks" diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h index 0aa9979e1..2b8a2a749 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h @@ -75,7 +75,7 @@ * executed from within the IDE! Once it has been executed, re-open or refresh * the Eclipse project and remove the #error line below. */ -#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above. +//#error Ensure CreateProjectDirectoryStructure.bat has been executed before building. See comment immediately above. #include "LPC17xx.h" diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LPCUSB/USB_CDC.c b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LPCUSB/USB_CDC.c index 8b88bef3d..aa3f78feb 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LPCUSB/USB_CDC.c +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/LPCUSB/USB_CDC.c @@ -46,6 +46,7 @@ */ #include "FreeRTOS.h" +#include "task.h" #include "queue.h" #include diff --git a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c index 95d811c7c..b50171bbc 100644 --- a/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c +++ b/FreeRTOS/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c @@ -67,10 +67,6 @@ */ -#error The batch file Demo\CORTEX_LPC1768_GCC_RedSuite\CreateProjectDirectoryStructure.bat must be executed before the first build. After executing the batch file hit F5 to refrech the Eclipse project, then delete this line. - - - /* * Creates all the demo application tasks, then starts the scheduler. The WEB * documentation provides more details of the standard demo application tasks