aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRossTheRoss <msattr@gmail.com>2020-03-21 15:29:07 -0500
committerRossTheRoss <msattr@gmail.com>2020-03-21 15:29:07 -0500
commit2568328885efd75c8753544ab38b6cdc2a4ada9a (patch)
tree8dafa0e468e0ba27f82956c9b10cf02cbb62c32e
parentDo HW3 (diff)
downloadee2361-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
-rw-r--r--HW3.X/dist/default/debug/memoryfile.xml8
-rw-r--r--HW3.X/nbproject/Makefile-default.mk30
-rw-r--r--HW3.X/nbproject/Makefile-genesis.properties4
-rw-r--r--HW3.X/nbproject/configurations.xml4
-rw-r--r--HW3.X/strap012_hw3prob1.c8
-rw-r--r--HW3.X/strap012_hw3prob2.c5
-rw-r--r--HW3.X/strap012_hw3prob3.c3
7 files changed, 30 insertions, 32 deletions
diff --git a/HW3.X/dist/default/debug/memoryfile.xml b/HW3.X/dist/default/debug/memoryfile.xml
index 2ce454b..c74e6e0 100644
--- a/HW3.X/dist/default/debug/memoryfile.xml
+++ b/HW3.X/dist/default/debug/memoryfile.xml
@@ -5,14 +5,14 @@
<memory name="data">
<units>bytes</units>
<length>8192</length>
- <used>4</used>
- <free>8188</free>
+ <used>10</used>
+ <free>8182</free>
</memory>
<memory name="program">
<units>bytes</units>
<length>65274</length>
- <used>558</used>
- <free>64716</free>
+ <used>594</used>
+ <free>64680</free>
</memory>
</executable>
</project>
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>
diff --git a/HW3.X/strap012_hw3prob1.c b/HW3.X/strap012_hw3prob1.c
index 709bb00..dcfd308 100644
--- a/HW3.X/strap012_hw3prob1.c
+++ b/HW3.X/strap012_hw3prob1.c
@@ -39,6 +39,7 @@ void setup(void)
IPC0bits.T1IP = 3;
/* enable Timer 1 interrupt */
+ //DISABLE IF POLLING
IEC0bits.T1IE = 1;
T1CONbits.TON = 1;
@@ -47,11 +48,10 @@ void setup(void)
int main(void)
{
- unsigned long int count = 0;
-
setup();
-
while (1) {
- count++;
+ //Polling stuff
+// while (_T1IF == 0);
+// _T1IF = 0;
}
}
diff --git a/HW3.X/strap012_hw3prob2.c b/HW3.X/strap012_hw3prob2.c
index 4fad1cd..6071e56 100644
--- a/HW3.X/strap012_hw3prob2.c
+++ b/HW3.X/strap012_hw3prob2.c
@@ -84,11 +84,10 @@ void setup(void)
int main(void)
{
- unsigned long int count = 0;
setup();
-
+ int edge = 0;
while (1) {
- count++;
+
}
}
diff --git a/HW3.X/strap012_hw3prob3.c b/HW3.X/strap012_hw3prob3.c
index 259f101..6f3b6b2 100644
--- a/HW3.X/strap012_hw3prob3.c
+++ b/HW3.X/strap012_hw3prob3.c
@@ -69,10 +69,9 @@ void setup()
int main(void)
{
- int count=0;
setup();
while (1){
- count++;
+
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-21 09:46:59 +0000