Forget to add a bunch of things

oops

7 files changed, 32 insertions, 40 deletions

diff --git a/Lab3.X/nbproject/Makefile-default.mk b/Lab3.X/nbproject/Makefile-default.mk
index 7c32e70..5e07efe 100644
--- a/Lab3.X/nbproject/Makefile-default.mk
+++ b/Lab3.X/nbproject/Makefile-default.mk
@@ -99,21 +99,21 @@ ${OBJECTDIR}/display.o: display.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/display.o.d 
 	@${RM} ${OBJECTDIR}/display.o 
-	${MP_CC} $(MP_EXTRA_CC_PRE)  display.c  -o ${OBJECTDIR}/display.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/display.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
+	${MP_CC} $(MP_EXTRA_CC_PRE)  display.c  -o ${OBJECTDIR}/display.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/display.o.d"      -g -D__DEBUG     -omf=elf -DXPRJ_default=$(CND_CONF)  -legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp=${DFP_DIR}/xc16
 	@${FIXDEPS} "${OBJECTDIR}/display.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
 	
 ${OBJECTDIR}/numpad.o: numpad.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/numpad.o.d 
 	@${RM} ${OBJECTDIR}/numpad.o 
-	${MP_CC} $(MP_EXTRA_CC_PRE)  numpad.c  -o ${OBJECTDIR}/numpad.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/numpad.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
+	${MP_CC} $(MP_EXTRA_CC_PRE)  numpad.c  -o ${OBJECTDIR}/numpad.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/numpad.o.d"      -g -D__DEBUG     -omf=elf -DXPRJ_default=$(CND_CONF)  -legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp=${DFP_DIR}/xc16
 	@${FIXDEPS} "${OBJECTDIR}/numpad.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
 	
 ${OBJECTDIR}/lab3_main_MAYA_C.o: lab3_main_MAYA_C.c  nbproject/Makefile-${CND_CONF}.mk
 	@${MKDIR} "${OBJECTDIR}" 
 	@${RM} ${OBJECTDIR}/lab3_main_MAYA_C.o.d 
 	@${RM} ${OBJECTDIR}/lab3_main_MAYA_C.o 
-	${MP_CC} $(MP_EXTRA_CC_PRE)  lab3_main_MAYA_C.c  -o ${OBJECTDIR}/lab3_main_MAYA_C.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/lab3_main_MAYA_C.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
+	${MP_CC} $(MP_EXTRA_CC_PRE)  lab3_main_MAYA_C.c  -o ${OBJECTDIR}/lab3_main_MAYA_C.o  -c -mcpu=$(MP_PROCESSOR_OPTION)  -MMD -MF "${OBJECTDIR}/lab3_main_MAYA_C.o.d"      -g -D__DEBUG     -omf=elf -DXPRJ_default=$(CND_CONF)  -legacy-libc  $(COMPARISON_BUILD)  -O0 -msmart-io=1 -Wall -msfr-warn=off    -mdfp=${DFP_DIR}/xc16
 	@${FIXDEPS} "${OBJECTDIR}/lab3_main_MAYA_C.o.d" $(SILENT)  -rsi ${MP_CC_DIR}../ 
 	
 else
@@ -157,7 +157,7 @@ endif
 ifeq ($(TYPE_IMAGE), DEBUG_RUN)
 dist/${CND_CONF}/${IMAGE_TYPE}/Lab3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk    
 	@${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} 
-	${MP_CC} $(MP_EXTRA_LD_PRE)  -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}      -mcpu=$(MP_PROCESSOR_OPTION)        -D__DEBUG=__DEBUG -D__MPLAB_DEBUGGER_SIMULATOR=1  -omf=elf -DXPRJ_default=$(CND_CONF)  -legacy-libc  $(COMPARISON_BUILD)      -Wl,,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D__DEBUG=__DEBUG,--defsym=__MPLAB_DEBUGGER_SIMULATOR=1,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST)  -mdfp=${DFP_DIR}/xc16 
+	${MP_CC} $(MP_EXTRA_LD_PRE)  -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}  ${OBJECTFILES_QUOTED_IF_SPACED}      -mcpu=$(MP_PROCESSOR_OPTION)        -D__DEBUG=__DEBUG   -omf=elf -DXPRJ_default=$(CND_CONF)  -legacy-libc  $(COMPARISON_BUILD)      -Wl,,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D__DEBUG=__DEBUG,,$(MP_LINKER_FILE_OPTION),--stack=16,--check-sections,--data-init,--pack-data,--handles,--isr,--no-gc-sections,--fill-upper=0,--stackguard=16,--no-force-link,--smart-io,-Map="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map",--report-mem,--memorysummary,dist/${CND_CONF}/${IMAGE_TYPE}/memoryfile.xml$(MP_EXTRA_LD_POST)  -mdfp=${DFP_DIR}/xc16 
 	
 else
 dist/${CND_CONF}/${IMAGE_TYPE}/Lab3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES}  nbproject/Makefile-${CND_CONF}.mk   
diff --git a/Lab3.X/nbproject/Makefile-genesis.properties b/Lab3.X/nbproject/Makefile-genesis.properties
index babf995..15e41fa 100644
--- a/Lab3.X/nbproject/Makefile-genesis.properties
+++ b/Lab3.X/nbproject/Makefile-genesis.properties
@@ -1,10 +1,10 @@
 #

-#Fri Feb 28 11:09:32 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=a484db181b70bf7bdb9ff81073d3f011

-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76

-default.languagetoolchain.version=1.41

+#Tue Mar 03 07:32:39 CST 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=2b078e482191bd07283c6043c6ed5e8a

+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3

+default.languagetoolchain.version=1.50

 host.platform=windows

 conf.ids=default

diff --git a/Lab3.X/nbproject/Makefile-local-default.mk b/Lab3.X/nbproject/Makefile-local-default.mk
index 214e7fa..c75d9df 100644
--- a/Lab3.X/nbproject/Makefile-local-default.mk
+++ b/Lab3.X/nbproject/Makefile-local-default.mk
@@ -15,24 +15,24 @@
 # $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ...  
 #
 SHELL=cmd.exe
-PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/
+PATH_TO_IDE_BIN=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/
 # Adding MPLAB X bin directory to path.
-PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
+PATH:=C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/:$(PATH)
 # Path to java used to run MPLAB X when this makefile was created
-MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.30\sys\java\jre1.8.0_181/bin/"
+MP_JAVA_PATH="C:\Program Files (x86)\Microchip\MPLABX\v5.35\sys\java\jre1.8.0_181/bin/"
 OS_CURRENT="$(shell uname -s)"
-MP_CC="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-gcc.exe"
+MP_CC="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-gcc.exe"
 # MP_CPPC is not defined
 # MP_BC is not defined
-MP_AS="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-as.exe"
-MP_LD="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-ld.exe"
-MP_AR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin\xc16-ar.exe"
-DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.30/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
-MP_CC_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
+MP_AS="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-as.exe"
+MP_LD="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-ld.exe"
+MP_AR="C:\Program Files\Microchip\xc16\v1.50\bin\xc16-ar.exe"
+DEP_GEN=${MP_JAVA_PATH}java -jar "C:/Program Files (x86)/Microchip/MPLABX/v5.35/mplab_platform/platform/../mplab_ide/modules/../../bin/extractobjectdependencies.jar"
+MP_CC_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
 # MP_CPPC_DIR is not defined
 # MP_BC_DIR is not defined
-MP_AS_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
-MP_LD_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
-MP_AR_DIR="C:\Program Files (x86)\Microchip\xc16\v1.41\bin"
+MP_AS_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
+MP_LD_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
+MP_AR_DIR="C:\Program Files\Microchip\xc16\v1.50\bin"
 # MP_BC_DIR is not defined
-DFP_DIR="C:/Program Files (x86)/Microchip/MPLABX/v5.30/packs/Microchip/PIC24F-GA-GB_DFP/1.1.74"
+DFP_DIR="C:/Program Files (x86)/Microchip/MPLABX/v5.35/packs/Microchip/PIC24F-GA-GB_DFP/1.2.101"
diff --git a/Lab3.X/nbproject/configurations.xml b/Lab3.X/nbproject/configurations.xml
index fa82250..8048554 100644
--- a/Lab3.X/nbproject/configurations.xml
+++ b/Lab3.X/nbproject/configurations.xml
@@ -14,7 +14,6 @@
     <logicalFolder name="SourceFiles"

                    displayName="Source Files"

                    projectFiles="true">

-      <itemPath>lab3_main_c.c</itemPath>

       <itemPath>display.c</itemPath>

       <itemPath>numpad.c</itemPath>

       <itemPath>lab3_main_MAYA_C.c</itemPath>

@@ -36,13 +35,13 @@
         <targetDevice>PIC24FJ64GA002</targetDevice>

         <targetHeader></targetHeader>

         <targetPluginBoard></targetPluginBoard>

-        <platformTool>Simulator</platformTool>

+        <platformTool>noID</platformTool>

         <languageToolchain>XC16</languageToolchain>

-        <languageToolchainVersion>1.41</languageToolchainVersion>

+        <languageToolchainVersion>1.50</languageToolchainVersion>

         <platform>3</platform>

       </toolsSet>

       <packs>

-        <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.1.74"/>

+        <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.2.101"/>

       </packs>

       <compileType>

         <linkerTool>

@@ -187,6 +186,7 @@
         <property key="legacy-libc" value="true"/>

         <property key="mpreserve-all" value="false"/>

         <property key="oXC16glb-macros" value=""/>

+        <property key="omit-pack-options" value="1"/>

         <property key="output-file-format" value="elf"/>

         <property key="preserve-all" value="false"/>

         <property key="preserve-file" value=""/>

@@ -647,8 +647,6 @@
                   value=""/>

         <property key="warningmessagebreakoptions.warningmessages" value="holdstate"/>

       </Simulator>

-      <item path="lab3_main_c.c" ex="true" overriding="false">

-      </item>

     </conf>

   </confs>

 </configurationDescriptor>

diff --git a/Lab3.X/nbproject/private/configurations.xml b/Lab3.X/nbproject/private/configurations.xml
index 74e2a26..0e3b9d3 100644
--- a/Lab3.X/nbproject/private/configurations.xml
+++ b/Lab3.X/nbproject/private/configurations.xml
@@ -4,8 +4,8 @@
   <defaultConf>0</defaultConf>

   <confs>

     <conf name="default" type="2">

-      <platformToolSN></platformToolSN>

-      <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.41\bin</languageToolchainDir>

+      <platformToolSN>noToolString</platformToolSN>

+      <languageToolchainDir>C:\Program Files\Microchip\xc16\v1.50\bin</languageToolchainDir>

       <mdbdebugger version="1">

         <placeholder1>place holder 1</placeholder1>

         <placeholder2>place holder 2</placeholder2>

diff --git a/Lab3.X/nbproject/private/private.xml b/Lab3.X/nbproject/private/private.xml
index d82f0d3..284eeec 100644
--- a/Lab3.X/nbproject/private/private.xml
+++ b/Lab3.X/nbproject/private/private.xml
@@ -2,12 +2,6 @@
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">

     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>

     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">

-        <group>

-            <file>file:/C:/Users/MSatt/MPLABXProjects/EE2361Projects/Lab3.X/numpad.h</file>

-            <file>file:/C:/Users/MSatt/MPLABXProjects/EE2361Projects/Lab3.X/lab3_main_c.c</file>

-            <file>file:/C:/Users/MSatt/MPLABXProjects/EE2361Projects/Lab3.X/display.c</file>

-            <file>file:/C:/Users/MSatt/MPLABXProjects/EE2361Projects/Lab3.X/numpad.c</file>

-            <file>file:/C:/Users/MSatt/MPLABXProjects/EE2361Projects/Lab3.X/display.h</file>

-        </group>

+        <group/>

     </open-files>

 </project-private>

diff --git a/Lab3.X/nbproject/project.xml b/Lab3.X/nbproject/project.xml
index 8f58032..2bc22c2 100644
--- a/Lab3.X/nbproject/project.xml
+++ b/Lab3.X/nbproject/project.xml
@@ -4,7 +4,7 @@
     <configuration>

         <data xmlns="http://www.netbeans.org/ns/make-project/1">

             <name>Lab3</name>

-            <creation-uuid>87ceaaaa-2d11-4659-ab7c-7b12fe00629e</creation-uuid>

+            <creation-uuid>f5ffe4b4-9434-45bc-b3dd-3537d7df4a93</creation-uuid>

             <make-project-type>0</make-project-type>

             <c-extensions>c</c-extensions>

             <cpp-extensions/>