diff options
| -rw-r--r-- | Lab_2B.X/dist/default/production/memoryfile.xml | 4 | ||||
| -rw-r--r-- | Lab_2B.X/lab2b_c.c | 2 | ||||
| -rw-r--r-- | Lab_2B.X/nbproject/Makefile-default.mk | 24 | ||||
| -rw-r--r-- | Lab_2B.X/nbproject/Makefile-genesis.properties | 4 | ||||
| -rw-r--r-- | Lab_2B.X/nbproject/configurations.xml | 1 | ||||
| -rw-r--r-- | Lab_2B.X/nbproject/project.xml | 2 |
6 files changed, 26 insertions, 11 deletions
diff --git a/Lab_2B.X/dist/default/production/memoryfile.xml b/Lab_2B.X/dist/default/production/memoryfile.xml index 94e91e3..33031ab 100644 --- a/Lab_2B.X/dist/default/production/memoryfile.xml +++ b/Lab_2B.X/dist/default/production/memoryfile.xml @@ -11,8 +11,8 @@ <memory name="program"> <units>bytes</units> <length>65274</length> - <used>591</used> - <free>64683</free> + <used>618</used> + <free>64656</free> </memory> </executable> </project> diff --git a/Lab_2B.X/lab2b_c.c b/Lab_2B.X/lab2b_c.c index 4976231..d2dd8e4 100644 --- a/Lab_2B.X/lab2b_c.c +++ b/Lab_2B.X/lab2b_c.c @@ -46,6 +46,7 @@ void writeColor(short r, short g, short b) { } else {
write_0();
}
+
r >>= 1;
++i;
}
@@ -108,7 +109,6 @@ void loop(void) { // write_0();
// write_0();
// write_0();
-//
writeColor(255, 155, 0);
}
}
diff --git a/Lab_2B.X/nbproject/Makefile-default.mk b/Lab_2B.X/nbproject/Makefile-default.mk index 1a98ea7..5ab6334 100644 --- a/Lab_2B.X/nbproject/Makefile-default.mk +++ b/Lab_2B.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=lab2b_asm.s +SOURCEFILES_QUOTED_IF_SPACED=lab2b_asm.s lab2b_c.c # Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/lab2b_asm.o -POSSIBLE_DEPFILES=${OBJECTDIR}/lab2b_asm.o.d +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/lab2b_asm.o ${OBJECTDIR}/lab2b_c.o +POSSIBLE_DEPFILES=${OBJECTDIR}/lab2b_asm.o.d ${OBJECTDIR}/lab2b_c.o.d # Object Files -OBJECTFILES=${OBJECTDIR}/lab2b_asm.o +OBJECTFILES=${OBJECTDIR}/lab2b_asm.o ${OBJECTDIR}/lab2b_c.o # Source Files -SOURCEFILES=lab2b_asm.s +SOURCEFILES=lab2b_asm.s lab2b_c.c @@ -95,7 +95,21 @@ MP_LINKER_FILE_OPTION=,--script=p24FJ64GA002.gld # ------------------------------------------------------------------------------------ # Rules for buildStep: compile ifeq ($(TYPE_IMAGE), DEBUG_RUN) +${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/lab2b_c.o.d + @${RM} ${OBJECTDIR}/lab2b_c.o + ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -D__DEBUG -D__MPLAB_DEBUGGER_PK3=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}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + else +${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/lab2b_c.o.d + @${RM} ${OBJECTDIR}/lab2b_c.o + ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.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}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + endif # ------------------------------------------------------------------------------------ diff --git a/Lab_2B.X/nbproject/Makefile-genesis.properties b/Lab_2B.X/nbproject/Makefile-genesis.properties index 8858704..b653323 100644 --- a/Lab_2B.X/nbproject/Makefile-genesis.properties +++ b/Lab_2B.X/nbproject/Makefile-genesis.properties @@ -1,9 +1,9 @@ # -#Sun Feb 09 11:33:23 CST 2020 +#Sun Feb 09 12:48:13 CST 2020 default.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.30\\packs\\Microchip\\PIC24F-GA-GB_DFP\\1.1.74 default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=3de759bc6af06f5ee7453ec146192402 default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc16\\v1.41\\bin -configurations-xml=2eaa5545d402158412725c16a60e9fc5 +configurations-xml=f8c4c2e15011928baba8ded05860f0e0 com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76 default.languagetoolchain.version=1.41 host.platform=windows diff --git a/Lab_2B.X/nbproject/configurations.xml b/Lab_2B.X/nbproject/configurations.xml index cf139a5..e5940e9 100644 --- a/Lab_2B.X/nbproject/configurations.xml +++ b/Lab_2B.X/nbproject/configurations.xml @@ -14,6 +14,7 @@ projectFiles="true"> <itemPath>lab2b_asm.s</itemPath> <itemPath>lab2b_header.h</itemPath> + <itemPath>lab2b_c.c</itemPath> </logicalFolder> <logicalFolder name="ExternalFiles" displayName="Important Files" diff --git a/Lab_2B.X/nbproject/project.xml b/Lab_2B.X/nbproject/project.xml index 678f75d..564eff0 100644 --- a/Lab_2B.X/nbproject/project.xml +++ b/Lab_2B.X/nbproject/project.xml @@ -6,7 +6,7 @@ <name>LAB_2B</name> <creation-uuid>ad7fe9ed-f02a-439c-9233-24f02477fa64</creation-uuid> <make-project-type>0</make-project-type> - <c-extensions/> + <c-extensions>c</c-extensions> <cpp-extensions/> <header-extensions>h</header-extensions> <asminc-extensions/> |