From 8584c7dd3bf9ad3362f285f065d66c8524340ef4 Mon Sep 17 00:00:00 2001 From: "R. Steve McKown" Date: Fri, 9 Dec 2011 19:26:33 -0700 Subject: [PATCH] mplabx file updates --- nbproject/Makefile-default.mk | 52 +++++++++++++++++---------- nbproject/Makefile-genesis.properties | 2 +- nbproject/configurations.xml | 17 +++++---- nbproject/project.xml | 2 +- 4 files changed, 46 insertions(+), 27 deletions(-) diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk index f27a5f5..91a6aa1 100644 --- a/nbproject/Makefile-default.mk +++ b/nbproject/Makefile-default.mk @@ -35,10 +35,10 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/tmr.p1 +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/task.p1 ${OBJECTDIR}/tmr.p1 # Object Files -OBJECTFILES=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/tmr.p1 +OBJECTFILES=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/task.p1 ${OBJECTDIR}/tmr.p1 CFLAGS= @@ -98,14 +98,6 @@ ${OBJECTDIR}/picinit.p1: picinit.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/picinit.dep >> ${OBJECTDIR}/picinit.p1.d @${FIXDEPS} "${OBJECTDIR}/picinit.p1.d" $(SILENT) -ht -${OBJECTDIR}/buttons.p1: buttons.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} ${OBJECTDIR} - ${MP_CC} --pass1 buttons.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" - ${MP_CC} --scandep --pass1 buttons.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" - @echo ${OBJECTDIR}/buttons.p1: > ${OBJECTDIR}/buttons.p1.d - @cat ${OBJECTDIR}/buttons.dep >> ${OBJECTDIR}/buttons.p1.d - @${FIXDEPS} "${OBJECTDIR}/buttons.p1.d" $(SILENT) -ht - ${OBJECTDIR}/rgb.p1: rgb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${OBJECTDIR} ${MP_CC} --pass1 rgb.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" @@ -138,6 +130,22 @@ ${OBJECTDIR}/adc_random.p1: adc_random.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/adc_random.dep >> ${OBJECTDIR}/adc_random.p1.d @${FIXDEPS} "${OBJECTDIR}/adc_random.p1.d" $(SILENT) -ht +${OBJECTDIR}/task.p1: task.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 task.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 task.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/task.p1: > ${OBJECTDIR}/task.p1.d + @cat ${OBJECTDIR}/task.dep >> ${OBJECTDIR}/task.p1.d + @${FIXDEPS} "${OBJECTDIR}/task.p1.d" $(SILENT) -ht + +${OBJECTDIR}/btn.p1: btn.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 btn.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 btn.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 -D__DEBUG --debugger=pickit3 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/btn.p1: > ${OBJECTDIR}/btn.p1.d + @cat ${OBJECTDIR}/btn.dep >> ${OBJECTDIR}/btn.p1.d + @${FIXDEPS} "${OBJECTDIR}/btn.p1.d" $(SILENT) -ht + else ${OBJECTDIR}/isr.p1: isr.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${OBJECTDIR} @@ -155,14 +163,6 @@ ${OBJECTDIR}/picinit.p1: picinit.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/picinit.dep >> ${OBJECTDIR}/picinit.p1.d @${FIXDEPS} "${OBJECTDIR}/picinit.p1.d" $(SILENT) -ht -${OBJECTDIR}/buttons.p1: buttons.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} ${OBJECTDIR} - ${MP_CC} --pass1 buttons.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" - ${MP_CC} --scandep --pass1 buttons.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" - @echo ${OBJECTDIR}/buttons.p1: > ${OBJECTDIR}/buttons.p1.d - @cat ${OBJECTDIR}/buttons.dep >> ${OBJECTDIR}/buttons.p1.d - @${FIXDEPS} "${OBJECTDIR}/buttons.p1.d" $(SILENT) -ht - ${OBJECTDIR}/rgb.p1: rgb.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} ${OBJECTDIR} ${MP_CC} --pass1 rgb.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" @@ -195,6 +195,22 @@ ${OBJECTDIR}/adc_random.p1: adc_random.c nbproject/Makefile-${CND_CONF}.mk @cat ${OBJECTDIR}/adc_random.dep >> ${OBJECTDIR}/adc_random.p1.d @${FIXDEPS} "${OBJECTDIR}/adc_random.p1.d" $(SILENT) -ht +${OBJECTDIR}/task.p1: task.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 task.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 task.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/task.p1: > ${OBJECTDIR}/task.p1.d + @cat ${OBJECTDIR}/task.dep >> ${OBJECTDIR}/task.p1.d + @${FIXDEPS} "${OBJECTDIR}/task.p1.d" $(SILENT) -ht + +${OBJECTDIR}/btn.p1: btn.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} ${OBJECTDIR} + ${MP_CC} --pass1 btn.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --summary=default,-psect,-class,+mem,-hex --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + ${MP_CC} --scandep --pass1 btn.c $(MP_EXTRA_CC_PRE) -q --chip=$(MP_PROCESSOR_OPTION) -P --outdir=${OBJECTDIR} -D__PICCPRO__ -N31 --warn=0 --runtime=default,+clear,+init,-keep,+osccal,-resetbits,-download,+stackcall,+clib --opt=default,+asm,-asmfile,+speed,-space,-debug,-9 --double=24 --float=24 --addrqual=ignore --mode=lite -g --asmlist "--errformat=%f:%l: error: %s" "--msgformat=%f:%l: advisory: %s" "--warnformat=%f:%l warning: %s" + @echo ${OBJECTDIR}/btn.p1: > ${OBJECTDIR}/btn.p1.d + @cat ${OBJECTDIR}/btn.dep >> ${OBJECTDIR}/btn.p1.d + @${FIXDEPS} "${OBJECTDIR}/btn.p1.d" $(SILENT) -ht + endif # ------------------------------------------------------------------------------------ diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties index 77211a0..cdadce7 100644 --- a/nbproject/Makefile-genesis.properties +++ b/nbproject/Makefile-genesis.properties @@ -1,5 +1,5 @@ # -#Thu Dec 08 14:42:22 MST 2011 +#Fri Dec 09 18:52:59 MST 2011 default.languagetoolchain.dir=/usr/hitech/picc/9.82/bin com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=11bb82e71763925c87fa30f6c65473b1 default.languagetoolchain.version=9.82 diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml index 1a18301..4bf6fa6 100644 --- a/nbproject/configurations.xml +++ b/nbproject/configurations.xml @@ -6,10 +6,12 @@ projectFiles="true"> adc_random.h bit.h - buttons.h + btn.h isr.h picinit.h rgb.h + task.h + task_defs.h tmr.h tmr_defs.h unused.h @@ -26,11 +28,12 @@ displayName="Source Files" projectFiles="true"> adc_random.c - buttons.c + btn.c isr.c main.c picinit.c rgb.c + task.c tmr.c - + - + - - + + @@ -106,8 +109,8 @@ - + diff --git a/nbproject/project.xml b/nbproject/project.xml index a109dca..f62232d 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -4,7 +4,7 @@ picdimmy - 4e878e05-cc73-4d31-9d36-ae9f3f6f62ef + edb99ec9-2c71-4461-a761-1abe0aa0f999 0 c -- 2.39.2