mplabx file updates

diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index e7a3059c9487d9ff7983dc4868d02c4eea42f9e9..f3d0f6ced547f87660cd5a7e08aa37a104b092aa 100644 (file)
--- 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}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/task.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 ${OBJECTDIR}/tmr32.p1
 
 # Object Files
-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
+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 ${OBJECTDIR}/tmr32.p1
 
 
 CFLAGS=
@@ -98,6 +98,14 @@ ${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}/tmr32.p1: tmr32.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       ${MP_CC} --pass1 tmr32.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 tmr32.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}/tmr32.p1: > ${OBJECTDIR}/tmr32.p1.d
+       @cat ${OBJECTDIR}/tmr32.dep >> ${OBJECTDIR}/tmr32.p1.d
+       @${FIXDEPS} "${OBJECTDIR}/tmr32.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"
@@ -163,6 +171,14 @@ ${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}/tmr32.p1: tmr32.c  nbproject/Makefile-${CND_CONF}.mk
+       @${MKDIR} ${OBJECTDIR} 
+       ${MP_CC} --pass1 tmr32.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 tmr32.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}/tmr32.p1: > ${OBJECTDIR}/tmr32.p1.d
+       @cat ${OBJECTDIR}/tmr32.dep >> ${OBJECTDIR}/tmr32.p1.d
+       @${FIXDEPS} "${OBJECTDIR}/tmr32.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"

diff --git a/nbproject/Makefile-genesis.properties b/nbproject/Makefile-genesis.properties
index 225f2a2d8584cfc07a90678282ba30170f409a9b..f12b10d34882c606cc2bc3e20afbced4b6d2f635 100644 (file)
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Sat Dec 10 19:32:47 MST 2011
+#Sun Dec 11 19:14:37 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 e4071ab1cc69a94bbbea4c1f71310314a093a62b..872983e89adfd62f64ba829431779dc7f660be15 100644 (file)
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -13,6 +13,7 @@
       <itemPath>task.h</itemPath>
       <itemPath>task_defs.h</itemPath>
       <itemPath>tmr.h</itemPath>
+      <itemPath>tmr32.h</itemPath>
       <itemPath>tmr_defs.h</itemPath>
       <itemPath>unused.h</itemPath>
     </logicalFolder>
@@ -35,6 +36,7 @@
       <itemPath>rgb.c</itemPath>
       <itemPath>task.c</itemPath>
       <itemPath>tmr.c</itemPath>
+      <itemPath>tmr32.c</itemPath>
     </logicalFolder>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -75,16 +77,16 @@
         <property key="what-to-do" value="ignore"/>
         <property key="define-macros" value="__PICCPRO__"/>
         <property key="what-to-do-ex" value="ignore"/>
-        <property key="optimization-assembler-files" value="false"/>
         <property key="warning-level" value="0"/>
+        <property key="optimization-assembler-files" value="false"/>
         <property key="verbose" value="false"/>
-        <property key="optimization-level" value="-9"/>
         <property key="optimization-debug" value="false"/>
+        <property key="optimization-level" value="-9"/>
         <property key="preprocess-assembler" value="false"/>
-        <property key="optimization-global" value="true"/>
         <property key="identifier-length" value="31"/>
-        <property key="optimization-set" value="default"/>
+        <property key="optimization-global" value="true"/>
         <property key="undefine-macros" value=""/>
+        <property key="optimization-set" value="default"/>
         <property key="optimization-speed" value="true"/>
         <property key="optimization-assembler" value="true"/>
         <property key="operation-mode" value="lite"/>
@@ -109,8 +111,8 @@
         <property key="programoptions.preserveprogramrange.start" value="0x0"/>
         <property key="voltagevalue" value="3.25"/>
         <property key="programoptions.preserveprogramrange" value="false"/>
-        <property key="programoptions.eraseb4program" value="true"/>
         <property key="memories.programmemory.start" value="0x0"/>
+        <property key="programoptions.eraseb4program" value="true"/>
         <property key="memories.programmemory.end" value="0xfff"/>
         <property key="poweroptions.powerenable" value="false"/>
       </PICkit3PlatformTool>