From: R. Steve McKown <rsmckown@gmail.com>
Date: Thu, 29 Dec 2011 17:39:37 +0000 (-0700)
Subject: mplabx file updates
X-Git-Tag: 1.1~5
X-Git-Url: https://oss.titaniummirror.com/gitweb?p=rgblamp.git;a=commitdiff_plain;h=c6c87d218f92253412bf8342ed4379d634679953

mplabx file updates
---

diff --git a/nbproject/Makefile-default.mk b/nbproject/Makefile-default.mk
index f3d0f6c..852a2a3 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}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/task.p1 ${OBJECTDIR}/tmr.p1 ${OBJECTDIR}/tmr32.p1
+OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/lfsr.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 ${OBJECTDIR}/tmr32.p1
+OBJECTFILES=${OBJECTDIR}/adc_random.p1 ${OBJECTDIR}/btn.p1 ${OBJECTDIR}/isr.p1 ${OBJECTDIR}/lfsr.p1 ${OBJECTDIR}/main.p1 ${OBJECTDIR}/picinit.p1 ${OBJECTDIR}/rgb.p1 ${OBJECTDIR}/task.p1 ${OBJECTDIR}/tmr.p1 ${OBJECTDIR}/tmr32.p1
 
 
 CFLAGS=
@@ -106,6 +106,14 @@ ${OBJECTDIR}/tmr32.p1: tmr32.c  nbproject/Makefile-${CND_CONF}.mk
 	@cat ${OBJECTDIR}/tmr32.dep >> ${OBJECTDIR}/tmr32.p1.d
 	@${FIXDEPS} "${OBJECTDIR}/tmr32.p1.d" $(SILENT) -ht 
 	
+${OBJECTDIR}/lfsr.p1: lfsr.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} ${OBJECTDIR} 
+	${MP_CC} --pass1 lfsr.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 lfsr.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}/lfsr.p1: > ${OBJECTDIR}/lfsr.p1.d
+	@cat ${OBJECTDIR}/lfsr.dep >> ${OBJECTDIR}/lfsr.p1.d
+	@${FIXDEPS} "${OBJECTDIR}/lfsr.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"
@@ -179,6 +187,14 @@ ${OBJECTDIR}/tmr32.p1: tmr32.c  nbproject/Makefile-${CND_CONF}.mk
 	@cat ${OBJECTDIR}/tmr32.dep >> ${OBJECTDIR}/tmr32.p1.d
 	@${FIXDEPS} "${OBJECTDIR}/tmr32.p1.d" $(SILENT) -ht 
 	
+${OBJECTDIR}/lfsr.p1: lfsr.c  nbproject/Makefile-${CND_CONF}.mk
+	@${MKDIR} ${OBJECTDIR} 
+	${MP_CC} --pass1 lfsr.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 lfsr.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}/lfsr.p1: > ${OBJECTDIR}/lfsr.p1.d
+	@cat ${OBJECTDIR}/lfsr.dep >> ${OBJECTDIR}/lfsr.p1.d
+	@${FIXDEPS} "${OBJECTDIR}/lfsr.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 a133e1f..8606c39 100644
--- a/nbproject/Makefile-genesis.properties
+++ b/nbproject/Makefile-genesis.properties
@@ -1,5 +1,5 @@
 #
-#Wed Dec 14 21:16:28 MST 2011
+#Thu Dec 29 10:38:34 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 9a65a4d..7dba9a8 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -8,6 +8,7 @@
       <itemPath>bit.h</itemPath>
       <itemPath>btn.h</itemPath>
       <itemPath>isr.h</itemPath>
+      <itemPath>lfsr.h</itemPath>
       <itemPath>picinit.h</itemPath>
       <itemPath>rgb.h</itemPath>
       <itemPath>task.h</itemPath>
@@ -31,6 +32,7 @@
       <itemPath>adc_random.c</itemPath>
       <itemPath>btn.c</itemPath>
       <itemPath>isr.c</itemPath>
+      <itemPath>lfsr.c</itemPath>
       <itemPath>main.c</itemPath>
       <itemPath>picinit.c</itemPath>
       <itemPath>rgb.c</itemPath>
@@ -80,13 +82,13 @@
         <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"/>
@@ -111,8 +113,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>