From 409acbd1e27059b6afe2cc416fef440287e243f1 Mon Sep 17 00:00:00 2001 From: rtel Date: Thu, 30 Jul 2015 11:37:33 +0000 Subject: [PATCH] Preparing for the next release... PIC32MZ demo application: - Update to use the latest XC32 compiler. git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2358 1d2547de-c912-0410-9cb9-b8ca96c0e9e2 --- .../RTOSDemo.X/nbproject/Makefile-genesis.properties | 7 ++++--- .../nbproject/Makefile-local-PIC32MZ2048_SK.mk | 8 ++++---- .../RTOSDemo.X/nbproject/private/configurations.xml | 2 +- .../RTOSDemo.X/nbproject/private/private.xml | 12 +++++++----- .../PIC32MZ_MPLAB/RTOSDemo.X/nbproject/project.xml | 3 ++- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-genesis.properties b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-genesis.properties index 30ef2f1fa..e13ccd139 100644 --- a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-genesis.properties +++ b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-genesis.properties @@ -1,8 +1,9 @@ # -#Wed Jan 14 19:25:35 GMT 2015 +#Wed Jun 24 18:51:30 BST 2015 PIC32MZ2048_SK.languagetoolchain.dir=C\:\\DevTools\\Microchip\\xc32\\v1.34\\bin PIC32MZ2048_SK.languagetoolchain.version=1.34 -com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=d73bd66f11f6ea6d7c6dc1b9c424aa07 +configurations-xml=68562b6839a3ad04af65579a10c3115b +com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=47805b5596804b87cda41e61096929be host.platform=windows conf.ids=PIC32MZ2048_SK -PIC32MZ2048_SK.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=656b15d7ce81905cc6c1e79939101b1d +PIC32MZ2048_SK.com-microchip-mplab-nbide-toolchainXC32-XC32LanguageToolchain.md5=a29d9df60dd9a7849837c8f5ca17a004 diff --git a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-local-PIC32MZ2048_SK.mk b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-local-PIC32MZ2048_SK.mk index 52ce9eb70..82bb366fa 100644 --- a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-local-PIC32MZ2048_SK.mk +++ b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/Makefile-local-PIC32MZ2048_SK.mk @@ -15,11 +15,11 @@ # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... # SHELL=cmd.exe -PATH_TO_IDE_BIN=C:/DevTools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/ +PATH_TO_IDE_BIN=C:/DevTools/Microchip/MPLABX/v3.05/mplab_ide/mplab_ide/modules/../../bin/ # Adding MPLAB X bin directory to path. -PATH:=C:/DevTools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/:$(PATH) +PATH:=C:/DevTools/Microchip/MPLABX/v3.05/mplab_ide/mplab_ide/modules/../../bin/:$(PATH) # Path to java used to run MPLAB X when this makefile was created -MP_JAVA_PATH="C:\DevTools\Microchip\MPLABX\sys\java\jre1.7.0_67/bin/" +MP_JAVA_PATH="C:\DevTools\Microchip\MPLABX\v3.05\sys\java\jre1.7.0_67/bin/" OS_CURRENT="$(shell uname -s)" MP_CC="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-gcc.exe" MP_CPPC="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-g++.exe" @@ -27,7 +27,7 @@ MP_CPPC="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-g++.exe" MP_AS="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-as.exe" MP_LD="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-ld.exe" MP_AR="C:\DevTools\Microchip\xc32\v1.34\bin\xc32-ar.exe" -DEP_GEN=${MP_JAVA_PATH}java -jar "C:/DevTools/Microchip/MPLABX/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" +DEP_GEN=${MP_JAVA_PATH}java -jar "C:/DevTools/Microchip/MPLABX/v3.05/mplab_ide/mplab_ide/modules/../../bin/extractobjectdependencies.jar" MP_CC_DIR="C:\DevTools\Microchip\xc32\v1.34\bin" MP_CPPC_DIR="C:\DevTools\Microchip\xc32\v1.34\bin" # MP_BC_DIR is not defined diff --git a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/configurations.xml b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/configurations.xml index 0e985ef15..e7c4e3738 100644 --- a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/configurations.xml +++ b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/configurations.xml @@ -4,7 +4,7 @@ 0 - + :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>8107:=<rev>0002:=<man>Microchip Technology Incorporated:=<prod>PIC32MZ EC Family:=<sn>BUR135112430:=<drv>x:=<xpt>h:=end C:\DevTools\Microchip\xc32\v1.34\bin place holder 1 diff --git a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/private.xml b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/private.xml index 6482b9300..a324c250b 100644 --- a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/private.xml +++ b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/private/private.xml @@ -1,8 +1,10 @@ - + + - - file:/C:/E/Dev/FreeRTOS/WorkingCopy/FreeRTOS/Demo/PIC32MZ_MPLAB/main.c - file:/C:/E/Dev/FreeRTOS/WorkingCopy/FreeRTOS/Demo/PIC32MZ_MPLAB/main_blinky.c - file:/C:/E/Dev/FreeRTOS/WorkingCopy/FreeRTOS/Demo/PIC32MZ_MPLAB/main_full.c + + + + file:/C:/E/Dev/FreeRTOS/WorkingCopy/FreeRTOS/Demo/PIC32MZ_MPLAB/main.c + diff --git a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/project.xml b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/project.xml index 50cee77ab..cc2d7ba5e 100644 --- a/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/project.xml +++ b/FreeRTOS/Demo/PIC32MZ_MPLAB/RTOSDemo.X/nbproject/project.xml @@ -1,4 +1,5 @@ - + + com.microchip.mplab.nbide.embedded.makeproject -- 2.39.5