diff options
| author | RossTheRoss <msattr@gmail.com> | 2020-03-21 15:29:07 -0500 |
|---|---|---|
| committer | RossTheRoss <msattr@gmail.com> | 2020-03-21 15:29:07 -0500 |
| commit | 2568328885efd75c8753544ab38b6cdc2a4ada9a (patch) | |
| tree | 8dafa0e468e0ba27f82956c9b10cf02cbb62c32e /HW3.X/nbproject | |
| parent | Do HW3 (diff) | |
| download | ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar.gz ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar.bz2 ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar.lz ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar.xz ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.tar.zst ee2361-2568328885efd75c8753544ab38b6cdc2a4ada9a.zip | |
Fix HW3
Diffstat (limited to 'HW3.X/nbproject')
| -rw-r--r-- | HW3.X/nbproject/Makefile-default.mk | 30 | ||||
| -rw-r--r-- | HW3.X/nbproject/Makefile-genesis.properties | 4 | ||||
| -rw-r--r-- | HW3.X/nbproject/configurations.xml | 4 |
3 files changed, 19 insertions, 19 deletions
diff --git a/HW3.X/nbproject/Makefile-default.mk b/HW3.X/nbproject/Makefile-default.mk index 3fd147b..6187043 100644 --- a/HW3.X/nbproject/Makefile-default.mk +++ b/HW3.X/nbproject/Makefile-default.mk @@ -57,17 +57,17 @@ OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE} DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE} # Source Files Quoted if spaced -SOURCEFILES_QUOTED_IF_SPACED=strap012_hw3prob3.c +SOURCEFILES_QUOTED_IF_SPACED=strap012_hw3prob2.c # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/strap012_hw3prob3.o -POSSIBLE_DEPFILES=${OBJECTDIR}/strap012_hw3prob3.o.d +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/strap012_hw3prob2.o +POSSIBLE_DEPFILES=${OBJECTDIR}/strap012_hw3prob2.o.d # Object Files -OBJECTFILES=${OBJECTDIR}/strap012_hw3prob3.o +OBJECTFILES=${OBJECTDIR}/strap012_hw3prob2.o # Source Files -SOURCEFILES=strap012_hw3prob3.c +SOURCEFILES=strap012_hw3prob2.c @@ -95,20 +95,20 @@ MP_LINKER_FILE_OPTION=,--script=p24FJ64GA002.gld # ------------------------------------------------------------------------------------ # Rules for buildStep: compile ifeq ($(TYPE_IMAGE), DEBUG_RUN) -${OBJECTDIR}/strap012_hw3prob3.o: strap012_hw3prob3.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/strap012_hw3prob2.o: strap012_hw3prob2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" - @${RM} ${OBJECTDIR}/strap012_hw3prob3.o.d - @${RM} ${OBJECTDIR}/strap012_hw3prob3.o - ${MP_CC} $(MP_EXTRA_CC_PRE) strap012_hw3prob3.c -o ${OBJECTDIR}/strap012_hw3prob3.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/strap012_hw3prob3.o.d" -g -D__DEBUG -D__MPLAB_DEBUGGER_SIMULATOR=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16 - @${FIXDEPS} "${OBJECTDIR}/strap012_hw3prob3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + @${RM} ${OBJECTDIR}/strap012_hw3prob2.o.d + @${RM} ${OBJECTDIR}/strap012_hw3prob2.o + ${MP_CC} $(MP_EXTRA_CC_PRE) strap012_hw3prob2.c -o ${OBJECTDIR}/strap012_hw3prob2.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/strap012_hw3prob2.o.d" -g -D__DEBUG -D__MPLAB_DEBUGGER_SIMULATOR=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16 + @${FIXDEPS} "${OBJECTDIR}/strap012_hw3prob2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ else -${OBJECTDIR}/strap012_hw3prob3.o: strap012_hw3prob3.c nbproject/Makefile-${CND_CONF}.mk +${OBJECTDIR}/strap012_hw3prob2.o: strap012_hw3prob2.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" - @${RM} ${OBJECTDIR}/strap012_hw3prob3.o.d - @${RM} ${OBJECTDIR}/strap012_hw3prob3.o - ${MP_CC} $(MP_EXTRA_CC_PRE) strap012_hw3prob3.c -o ${OBJECTDIR}/strap012_hw3prob3.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/strap012_hw3prob3.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16 - @${FIXDEPS} "${OBJECTDIR}/strap012_hw3prob3.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + @${RM} ${OBJECTDIR}/strap012_hw3prob2.o.d + @${RM} ${OBJECTDIR}/strap012_hw3prob2.o + ${MP_CC} $(MP_EXTRA_CC_PRE) strap012_hw3prob2.c -o ${OBJECTDIR}/strap012_hw3prob2.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/strap012_hw3prob2.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off -mdfp=${DFP_DIR}/xc16 + @${FIXDEPS} "${OBJECTDIR}/strap012_hw3prob2.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ endif diff --git a/HW3.X/nbproject/Makefile-genesis.properties b/HW3.X/nbproject/Makefile-genesis.properties index f9e54fe..458c029 100644 --- a/HW3.X/nbproject/Makefile-genesis.properties +++ b/HW3.X/nbproject/Makefile-genesis.properties @@ -1,9 +1,9 @@ #
-#Sat Mar 21 14:41:56 CDT 2020
+#Sat Mar 21 14:52:53 CDT 2020
default.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.35\\packs\\Microchip\\PIC24F-GA-GB_DFP\\1.2.101
default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=859fc649e7017fd01769e2187e1537a7
default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc16\\v1.50\\bin
-configurations-xml=9bfbce08088f68cae6534c291eed577f
+configurations-xml=f503afea90925cb3391f7656571faaea
com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3
default.languagetoolchain.version=1.50
host.platform=windows
diff --git a/HW3.X/nbproject/configurations.xml b/HW3.X/nbproject/configurations.xml index e234e69..e666306 100644 --- a/HW3.X/nbproject/configurations.xml +++ b/HW3.X/nbproject/configurations.xml @@ -624,7 +624,7 @@ </Simulator>
<item path="strap012_hw3prob1.c" ex="true" overriding="false">
</item>
- <item path="strap012_hw3prob2.c" ex="true" overriding="false">
+ <item path="strap012_hw3prob2.c" ex="false" overriding="false">
<C30>
</C30>
<C30-AR>
@@ -638,7 +638,7 @@ <C30Global>
</C30Global>
</item>
- <item path="strap012_hw3prob3.c" ex="false" overriding="false">
+ <item path="strap012_hw3prob3.c" ex="true" overriding="false">
<C30>
</C30>
<C30-AR>
|