From 249c77c7eb87b1dfa5e17ddc6d82470968dd9aba Mon Sep 17 00:00:00 2001 From: richardbarry Date: Tue, 25 Jan 2011 15:26:53 +0000 Subject: [PATCH] Update the PIC32 project to better structure the files in the MPLAB project window, and test that it works with the latest V1.12 C32 compiler. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@1264 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- Demo/PIC32MX_MPLAB/RTOSDemo.mcp | 73 ++++++++++++++++---------------- Demo/PIC32MX_MPLAB/RTOSDemo.mcw | Bin 1895936 -> 1120768 bytes 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/Demo/PIC32MX_MPLAB/RTOSDemo.mcp b/Demo/PIC32MX_MPLAB/RTOSDemo.mcp index 2d64effdd..2f79d4b99 100644 --- a/Demo/PIC32MX_MPLAB/RTOSDemo.mcp +++ b/Demo/PIC32MX_MPLAB/RTOSDemo.mcp @@ -1,6 +1,7 @@ [HEADER] magic_cookie={66E99B07-E706-4689-9E80-9B2582898A13} file_version=1.0 +device=PIC32MX360F512L [PATH_INFO] BuildDirPolicy=BuildDirIsProjectDir dir_src= @@ -17,7 +18,7 @@ filter_obj=*.o filter_lib=*.a filter_lkr=*.ld [CAT_SUBFOLDERS] -subfolder_src= +subfolder_src=FreeRTOS Source;Standard Demo Source subfolder_inc= subfolder_obj= subfolder_lib= @@ -34,19 +35,19 @@ file_007=. file_008=. file_009=. file_010=. -file_011=. -file_012=. -file_013=. -file_014=. -file_015=. -file_016=. -file_017=. -file_018=. -file_019=. -file_020=. -file_021=. -file_022=. -file_023=. +file_011=FreeRTOS Source +file_012=FreeRTOS Source +file_013=FreeRTOS Source +file_014=FreeRTOS Source +file_015=FreeRTOS Source +file_016=Standard Demo Source +file_017=Standard Demo Source +file_018=Standard Demo Source +file_019=Standard Demo Source +file_020=Standard Demo Source +file_021=Standard Demo Source +file_022=FreeRTOS Source +file_023=Standard Demo Source file_024=. file_025=. file_026=. @@ -133,28 +134,28 @@ file_034=yes [FILE_INFO] file_000=main.c file_001=ParTest\ParTest.c -file_002=..\..\Source\portable\MPLAB\PIC32MX\port.c -file_003=..\..\Source\list.c -file_004=..\..\Source\queue.c -file_005=..\..\Source\tasks.c -file_006=..\..\Source\portable\MPLAB\PIC32MX\port_asm.S -file_007=RegisterTestTasks.s -file_008=..\..\Source\portable\MemMang\heap_2.c -file_009=..\Common\Minimal\flash.c -file_010=..\Common\Minimal\QPeek.c -file_011=..\Common\Minimal\semtest.c -file_012=..\Common\Minimal\GenQTest.c -file_013=..\Common\Minimal\blocktim.c -file_014=lcd.c -file_015=serial\serial.c -file_016=..\Common\Minimal\comtest.c -file_017=serial\serial_isr.S -file_018=timertest.c -file_019=timertest_isr.S -file_020=..\Common\Minimal\IntQueue.c -file_021=IntQueueTimer.c -file_022=IntQueueTimer_isr.S -file_023=printf-stdarg.c +file_002=RegisterTestTasks.s +file_003=lcd.c +file_004=serial\serial.c +file_005=serial\serial_isr.S +file_006=timertest.c +file_007=timertest_isr.S +file_008=IntQueueTimer.c +file_009=IntQueueTimer_isr.S +file_010=printf-stdarg.c +file_011=..\..\Source\portable\MPLAB\PIC32MX\port.c +file_012=..\..\Source\portable\MPLAB\PIC32MX\port_asm.S +file_013=..\..\Source\queue.c +file_014=..\..\Source\tasks.c +file_015=..\..\Source\list.c +file_016=..\Common\Minimal\blocktim.c +file_017=..\Common\Minimal\comtest.c +file_018=..\Common\Minimal\flash.c +file_019=..\Common\Minimal\semtest.c +file_020=..\Common\Minimal\QPeek.c +file_021=..\Common\Minimal\IntQueue.c +file_022=..\..\Source\portable\MemMang\heap_2.c +file_023=..\Common\Minimal\GenQTest.c file_024=FreeRTOSConfig.h file_025=..\..\Source\portable\MPLAB\PIC32MX\portmacro.h file_026=..\..\Source\include\portable.h diff --git a/Demo/PIC32MX_MPLAB/RTOSDemo.mcw b/Demo/PIC32MX_MPLAB/RTOSDemo.mcw index 3fc81c2c6022937e531393e5fd326c2ea447b1b3..d68a7fa06dfbb18c74bd71f4619564f49d59eb54 100644 GIT binary patch delta 8449 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 X=+{Wr^4~6ulye