From: R. Steve McKown <rsmckown@gmail.com>
Date: Wed, 7 Dec 2011 00:17:50 +0000 (-0700)
Subject: Update mplabx files
X-Git-Tag: 1.0~51
X-Git-Url: https://oss.titaniummirror.com/gitweb?p=rgblamp.git;a=commitdiff_plain;h=a64c5d94e231e54f7500ba0ce3f34d2365b38cff

Update mplabx files
---

diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index b5de86c..33047b0 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}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1
 
 # Object Files
-OBJECTFILES=${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1
+OBJECTFILES=${OBJECTDIR}/buttons.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/timer.p1
 
 
 CFLAGS=
@@ -98,6 +98,14 @@ ${OBJECTDIR}/rgb.p1: rgb.c  nbproject/Makefile-${CND_CONF}.mk
 	@cat ${OBJECTDIR}/rgb.dep >> ${OBJECTDIR}/rgb.p1.d
 	@${FIXDEPS} "${OBJECTDIR}/rgb.p1.d" $(SILENT) -ht 
 	
+${OBJECTDIR}/timer.p1: timer.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} ${OBJECTDIR} 
+	${MP_CC} --pass1 timer.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 timer.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}/timer.p1: > ${OBJECTDIR}/timer.p1.d
+	@cat ${OBJECTDIR}/timer.dep >> ${OBJECTDIR}/timer.p1.d
+	@${FIXDEPS} "${OBJECTDIR}/timer.p1.d" $(SILENT) -ht 
+	
 ${OBJECTDIR}/main.p1: main.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} ${OBJECTDIR} 
 	${MP_CC} --pass1 main.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"
@@ -131,6 +139,14 @@ ${OBJECTDIR}/rgb.p1: rgb.c  nbproject/Makefile-${CND_CONF}.mk
 	@cat ${OBJECTDIR}/rgb.dep >> ${OBJECTDIR}/rgb.p1.d
 	@${FIXDEPS} "${OBJECTDIR}/rgb.p1.d" $(SILENT) -ht 
 	
+${OBJECTDIR}/timer.p1: timer.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} ${OBJECTDIR} 
+	${MP_CC} --pass1 timer.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 timer.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}/timer.p1: > ${OBJECTDIR}/timer.p1.d
+	@cat ${OBJECTDIR}/timer.dep >> ${OBJECTDIR}/timer.p1.d
+	@${FIXDEPS} "${OBJECTDIR}/timer.p1.d" $(SILENT) -ht 
+	
 ${OBJECTDIR}/main.p1: main.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} ${OBJECTDIR} 
 	${MP_CC} --pass1 main.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"
diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index ca6e3e8..a325248 100644
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Tue Dec 06 10:10:21 MST 2011
+#Tue Dec 06 17:00:18 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 b0bae45..8235fd5 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -23,6 +23,8 @@
       <itemPath>picinit.h</itemPath>
       <itemPath>rgb.c</itemPath>
       <itemPath>rgb.h</itemPath>
+      <itemPath>timer.c</itemPath>
+      <itemPath>timer.h</itemPath>
       <itemPath>unused.h</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
@@ -67,13 +69,13 @@
         <property key="warning-level" value="0"/>
         <property key="optimization-assembler-files" value="false"/>
         <property key="verbose" value="false"/>
-        <property key="optimization-debug" value="false"/>
         <property key="optimization-level" value="-9"/>
+        <property key="optimization-debug" value="false"/>
         <property key="preprocess-assembler" value="false"/>
-        <property key="identifier-length" value="31"/>
         <property key="optimization-global" value="true"/>
-        <property key="undefine-macros" value=""/>
+        <property key="identifier-length" value="31"/>
         <property key="optimization-set" value="default"/>
+        <property key="undefine-macros" value=""/>
         <property key="optimization-speed" value="true"/>
         <property key="optimization-assembler" value="true"/>
         <property key="operation-mode" value="lite"/>
@@ -98,8 +100,8 @@
         <property key="programoptions.preserveprogramrange.start" value="0x0"/>
         <property key="voltagevalue" value="5.0"/>
         <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="memories.programmemory.start" value="0x0"/>
         <property key="programoptions.eraseb4program" value="true"/>
+        <property key="memories.programmemory.start" value="0x0"/>
         <property key="memories.programmemory.end" value="0xfff"/>
         <property key="poweroptions.powerenable" value="false"/>
       </PICkit3PlatformTool>