aboutsummaryrefslogtreecommitdiffstats
path: root/EE3102Testing.X/nbproject
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--EE3102Testing.X/nbproject/Makefile-default.mk203
-rw-r--r--EE3102Testing.X/nbproject/Makefile-genesis.properties10
-rw-r--r--EE3102Testing.X/nbproject/Makefile-variables.mk13
-rw-r--r--EE3102Testing.X/nbproject/private/private.xml13
-rw-r--r--PICCode.X/nbproject/Makefile-impl.mk (renamed from EE3102Testing.X/nbproject/Makefile-impl.mk)2
-rw-r--r--PICCode.X/nbproject/Makefile-local-default.mk (renamed from EE3102Testing.X/nbproject/Makefile-local-default.mk)26
-rw-r--r--PICCode.X/nbproject/Package-default.bash (renamed from EE3102Testing.X/nbproject/Package-default.bash)12
-rw-r--r--PICCode.X/nbproject/configurations.xml (renamed from EE3102Testing.X/nbproject/configurations.xml)456
-rw-r--r--PICCode.X/nbproject/private/configurations.xml (renamed from EE3102Testing.X/nbproject/private/configurations.xml)50
-rw-r--r--PICCode.X/nbproject/project.xml (renamed from EE3102Testing.X/nbproject/project.xml)58
10 files changed, 301 insertions, 542 deletions
diff --git a/EE3102Testing.X/nbproject/Makefile-default.mk b/EE3102Testing.X/nbproject/Makefile-default.mk
deleted file mode 100644
index 75006f0..0000000
--- a/EE3102Testing.X/nbproject/Makefile-default.mk
+++ /dev/null
@@ -1,203 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Include project Makefile
-ifeq "${IGNORE_LOCAL}" "TRUE"
-# do not include local makefile. User is passing all local related variables already
-else
-include Makefile
-# Include makefile containing local settings
-ifeq "$(wildcard nbproject/Makefile-local-default.mk)" "nbproject/Makefile-local-default.mk"
-include nbproject/Makefile-local-default.mk
-endif
-endif
-
-# Environment
-MKDIR=gnumkdir -p
-RM=rm -f
-MV=mv
-CP=cp
-
-# Macros
-CND_CONF=default
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-IMAGE_TYPE=debug
-OUTPUT_SUFFIX=elf
-DEBUGGABLE_SUFFIX=elf
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-else
-IMAGE_TYPE=production
-OUTPUT_SUFFIX=hex
-DEBUGGABLE_SUFFIX=elf
-FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-endif
-
-ifeq ($(COMPARE_BUILD), true)
-COMPARISON_BUILD=-mafrlcsj
-else
-COMPARISON_BUILD=
-endif
-
-ifdef SUB_IMAGE_ADDRESS
-SUB_IMAGE_ADDRESS_COMMAND=--image-address $(SUB_IMAGE_ADDRESS)
-else
-SUB_IMAGE_ADDRESS_COMMAND=
-endif
-
-# Object Directory
-OBJECTDIR=build/${CND_CONF}/${IMAGE_TYPE}
-
-# Distribution Directory
-DISTDIR=dist/${CND_CONF}/${IMAGE_TYPE}
-
-# Source Files Quoted if spaced
-SOURCEFILES_QUOTED_IF_SPACED=spies046_lab6_asm_v001.s spies046_lab6_buffer_v001.c spies046_lab6_lcdLib_v001.c spies046_lab6_main_v001.c
-
-# Object Files Quoted if spaced
-OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/spies046_lab6_asm_v001.o ${OBJECTDIR}/spies046_lab6_buffer_v001.o ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o ${OBJECTDIR}/spies046_lab6_main_v001.o
-POSSIBLE_DEPFILES=${OBJECTDIR}/spies046_lab6_asm_v001.o.d ${OBJECTDIR}/spies046_lab6_buffer_v001.o.d ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o.d ${OBJECTDIR}/spies046_lab6_main_v001.o.d
-
-# Object Files
-OBJECTFILES=${OBJECTDIR}/spies046_lab6_asm_v001.o ${OBJECTDIR}/spies046_lab6_buffer_v001.o ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o ${OBJECTDIR}/spies046_lab6_main_v001.o
-
-# Source Files
-SOURCEFILES=spies046_lab6_asm_v001.s spies046_lab6_buffer_v001.c spies046_lab6_lcdLib_v001.c spies046_lab6_main_v001.c
-
-
-
-CFLAGS=
-ASFLAGS=
-LDLIBSOPTIONS=
-
-############# Tool locations ##########################################
-# If you copy a project from one host to another, the path where the #
-# compiler is installed may be different. #
-# If you open this project with MPLAB X in the new host, this #
-# makefile will be regenerated and the paths will be corrected. #
-#######################################################################
-# fixDeps replaces a bunch of sed/cat/printf statements that slow down the build
-FIXDEPS=fixDeps
-
-.build-conf: ${BUILD_SUBPROJECTS}
-ifneq ($(INFORMATION_MESSAGE), )
- @echo $(INFORMATION_MESSAGE)
-endif
- ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-
-MP_PROCESSOR_OPTION=24FJ64GA002
-MP_LINKER_FILE_OPTION=,--script=p24FJ64GA002.gld
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: compile
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-${OBJECTDIR}/spies046_lab6_buffer_v001.o: spies046_lab6_buffer_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_buffer_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_buffer_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_buffer_v001.c -o ${OBJECTDIR}/spies046_lab6_buffer_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_buffer_v001.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}/spies046_lab6_buffer_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-${OBJECTDIR}/spies046_lab6_lcdLib_v001.o: spies046_lab6_lcdLib_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_lcdLib_v001.c -o ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_lcdLib_v001.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}/spies046_lab6_lcdLib_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-${OBJECTDIR}/spies046_lab6_main_v001.o: spies046_lab6_main_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_main_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_main_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_main_v001.c -o ${OBJECTDIR}/spies046_lab6_main_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_main_v001.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}/spies046_lab6_main_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-else
-${OBJECTDIR}/spies046_lab6_buffer_v001.o: spies046_lab6_buffer_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_buffer_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_buffer_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_buffer_v001.c -o ${OBJECTDIR}/spies046_lab6_buffer_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_buffer_v001.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}/spies046_lab6_buffer_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-${OBJECTDIR}/spies046_lab6_lcdLib_v001.o: spies046_lab6_lcdLib_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_lcdLib_v001.c -o ${OBJECTDIR}/spies046_lab6_lcdLib_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_lcdLib_v001.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}/spies046_lab6_lcdLib_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-${OBJECTDIR}/spies046_lab6_main_v001.o: spies046_lab6_main_v001.c nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_main_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_main_v001.o
- ${MP_CC} $(MP_EXTRA_CC_PRE) spies046_lab6_main_v001.c -o ${OBJECTDIR}/spies046_lab6_main_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/spies046_lab6_main_v001.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}/spies046_lab6_main_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-endif
-
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: assemble
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-${OBJECTDIR}/spies046_lab6_asm_v001.o: spies046_lab6_asm_v001.s nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_asm_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_asm_v001.o
- ${MP_CC} $(MP_EXTRA_AS_PRE) spies046_lab6_asm_v001.s -o ${OBJECTDIR}/spies046_lab6_asm_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/spies046_lab6_asm_v001.o.d",--defsym=__MPLAB_BUILD=1,--defsym=__ICD2RAM=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,--defsym=__MPLAB_DEBUGGER_PK3=1,-g,--no-relax$(MP_EXTRA_AS_POST) -mdfp=${DFP_DIR}/xc16
- @${FIXDEPS} "${OBJECTDIR}/spies046_lab6_asm_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-else
-${OBJECTDIR}/spies046_lab6_asm_v001.o: spies046_lab6_asm_v001.s nbproject/Makefile-${CND_CONF}.mk
- @${MKDIR} "${OBJECTDIR}"
- @${RM} ${OBJECTDIR}/spies046_lab6_asm_v001.o.d
- @${RM} ${OBJECTDIR}/spies046_lab6_asm_v001.o
- ${MP_CC} $(MP_EXTRA_AS_PRE) spies046_lab6_asm_v001.s -o ${OBJECTDIR}/spies046_lab6_asm_v001.o -c -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/spies046_lab6_asm_v001.o.d",--defsym=__MPLAB_BUILD=1,-g,--no-relax$(MP_EXTRA_AS_POST) -mdfp=${DFP_DIR}/xc16
- @${FIXDEPS} "${OBJECTDIR}/spies046_lab6_asm_v001.o.d" $(SILENT) -rsi ${MP_CC_DIR}../
-
-endif
-
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: assemblePreproc
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-else
-endif
-
-# ------------------------------------------------------------------------------------
-# Rules for buildStep: link
-ifeq ($(TYPE_IMAGE), DEBUG_RUN)
-dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.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}/EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG=__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -mreserve=data@0x800:0x81F -mreserve=data@0x820:0x821 -mreserve=data@0x822:0x823 -mreserve=data@0x824:0x825 -mreserve=data@0x826:0x84F -Wl,,,--defsym=__MPLAB_BUILD=1,--defsym=__MPLAB_DEBUG=1,--defsym=__DEBUG=1,-D__DEBUG=__DEBUG,--defsym=__MPLAB_DEBUGGER_PK3=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
-
-else
-dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.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}/EE3102Testing.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -Wl,,,--defsym=__MPLAB_BUILD=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_DIR}\\xc16-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a -omf=elf -mdfp=${DFP_DIR}/xc16
-
-endif
-
-
-# Subprojects
-.build-subprojects:
-
-
-# Subprojects
-.clean-subprojects:
-
-# Clean Targets
-.clean-conf: ${CLEAN_SUBPROJECTS}
- ${RM} -r build/default
- ${RM} -r dist/default
-
-# Enable dependency checking
-.dep.inc: .depcheck-impl
-
-DEPFILES=$(shell mplabwildcard ${POSSIBLE_DEPFILES})
-ifneq (${DEPFILES},)
-include ${DEPFILES}
-endif
diff --git a/EE3102Testing.X/nbproject/Makefile-genesis.properties b/EE3102Testing.X/nbproject/Makefile-genesis.properties
deleted file mode 100644
index 0219967..0000000
--- a/EE3102Testing.X/nbproject/Makefile-genesis.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#Thu Mar 25 23:27:59 CDT 2021
-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=7dc7f8b68116d1403182a9d96cce1e9d
-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76
-default.languagetoolchain.version=1.41
-host.platform=windows
-conf.ids=default
diff --git a/EE3102Testing.X/nbproject/Makefile-variables.mk b/EE3102Testing.X/nbproject/Makefile-variables.mk
deleted file mode 100644
index e4ed122..0000000
--- a/EE3102Testing.X/nbproject/Makefile-variables.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Generated - do not edit!
-#
-# NOCDDL
-#
-CND_BASEDIR=`pwd`
-# default configuration
-CND_ARTIFACT_DIR_default=dist/default/production
-CND_ARTIFACT_NAME_default=EE3102Testing.X.production.hex
-CND_ARTIFACT_PATH_default=dist/default/production/EE3102Testing.X.production.hex
-CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package
-CND_PACKAGE_NAME_default=ee3102testing.x.tar
-CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/ee3102testing.x.tar
diff --git a/EE3102Testing.X/nbproject/private/private.xml b/EE3102Testing.X/nbproject/private/private.xml
deleted file mode 100644
index c25dc22..0000000
--- a/EE3102Testing.X/nbproject/private/private.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/micha/MPLABXProjects/EE3102Testing.X/spies046_lab6_asm_v001.s</file>
- <file>file:/C:/Users/micha/MPLABXProjects/EE3102Testing.X/spies046_lab6_buffer_v001.c</file>
- <file>file:/C:/Users/micha/MPLABXProjects/EE3102Testing.X/spies046_lab6_lcdLib_v001.h</file>
- <file>file:/C:/Users/micha/MPLABXProjects/EE3102Testing.X/spies046_lab6_lcdLib_v001.c</file>
- <file>file:/C:/Users/micha/MPLABXProjects/EE3102Testing.X/spies046_lab6_main_v001.c</file>
- </group>
- </open-files>
-</project-private>
diff --git a/EE3102Testing.X/nbproject/Makefile-impl.mk b/PICCode.X/nbproject/Makefile-impl.mk
index b3c14e3..7bac8e4 100644
--- a/EE3102Testing.X/nbproject/Makefile-impl.mk
+++ b/PICCode.X/nbproject/Makefile-impl.mk
@@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
# Project Name
-PROJECTNAME=EE3102Testing.X
+PROJECTNAME=PICCode.X
# Active Configuration
DEFAULTCONF=default
diff --git a/EE3102Testing.X/nbproject/Makefile-local-default.mk b/PICCode.X/nbproject/Makefile-local-default.mk
index 214e7fa..c75d9df 100644
--- a/EE3102Testing.X/nbproject/Makefile-local-default.mk
+++ b/PICCode.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/EE3102Testing.X/nbproject/Package-default.bash b/PICCode.X/nbproject/Package-default.bash
index d59127d..267c58e 100644
--- a/EE3102Testing.X/nbproject/Package-default.bash
+++ b/PICCode.X/nbproject/Package-default.bash
@@ -10,9 +10,9 @@ CND_CONF=default
CND_DISTDIR=dist
TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging
TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-OUTPUT_BASENAME=EE3102Testing.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
-PACKAGE_TOP_DIR=ee3102testing.x/
+OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/PICCode.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+OUTPUT_BASENAME=PICCode.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}
+PACKAGE_TOP_DIR=piccode.x/
# Functions
function checkReturnCode
@@ -57,15 +57,15 @@ mkdir -p ${TMPDIR}
# Copy files and create directories and links
cd "${TOP}"
-makeDirectory ${TMPDIR}/ee3102testing.x/bin
+makeDirectory ${TMPDIR}/piccode.x/bin
copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
# Generate tar file
cd "${TOP}"
-rm -f ${CND_DISTDIR}/${CND_CONF}/package/ee3102testing.x.tar
+rm -f ${CND_DISTDIR}/${CND_CONF}/package/piccode.x.tar
cd ${TMPDIR}
-tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/ee3102testing.x.tar *
+tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/piccode.x.tar *
checkReturnCode
# Cleanup
diff --git a/EE3102Testing.X/nbproject/configurations.xml b/PICCode.X/nbproject/configurations.xml
index 7328534..49856c0 100644
--- a/EE3102Testing.X/nbproject/configurations.xml
+++ b/PICCode.X/nbproject/configurations.xml
@@ -1,229 +1,227 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="65">
- <logicalFolder name="root" displayName="root" projectFiles="true">
- <logicalFolder name="HeaderFiles"
- displayName="Header Files"
- projectFiles="true">
- <itemPath>spies046_lab6_asm_v001.h</itemPath>
- <itemPath>spies046_lab6_buffer_v001.h</itemPath>
- <itemPath>spies046_lab6_lcdLib_v001.h</itemPath>
- </logicalFolder>
- <logicalFolder name="LinkerScript"
- displayName="Linker Files"
- projectFiles="true">
- </logicalFolder>
- <logicalFolder name="SourceFiles"
- displayName="Source Files"
- projectFiles="true">
- <itemPath>spies046_lab6_asm_v001.s</itemPath>
- <itemPath>spies046_lab6_buffer_v001.c</itemPath>
- <itemPath>spies046_lab6_lcdLib_v001.c</itemPath>
- <itemPath>spies046_lab6_main_v001.c</itemPath>
- </logicalFolder>
- <logicalFolder name="ExternalFiles"
- displayName="Important Files"
- projectFiles="false">
- <itemPath>Makefile</itemPath>
- </logicalFolder>
- </logicalFolder>
- <sourceRootList>
- <Elem>.</Elem>
- </sourceRootList>
- <projectmakefile>Makefile</projectmakefile>
- <confs>
- <conf name="default" type="2">
- <toolsSet>
- <developmentServer>localhost</developmentServer>
- <targetDevice>PIC24FJ64GA002</targetDevice>
- <targetHeader></targetHeader>
- <targetPluginBoard></targetPluginBoard>
- <platformTool>PK3OBPlatformTool</platformTool>
- <languageToolchain>XC16</languageToolchain>
- <languageToolchainVersion>1.41</languageToolchainVersion>
- <platform>3</platform>
- </toolsSet>
- <packs>
- <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.1.74"/>
- </packs>
- <compileType>
- <linkerTool>
- <linkerLibItems>
- </linkerLibItems>
- </linkerTool>
- <archiverTool>
- </archiverTool>
- <loading>
- <useAlternateLoadableFile>false</useAlternateLoadableFile>
- <parseOnProdLoad>false</parseOnProdLoad>
- <alternateLoadableFile></alternateLoadableFile>
- </loading>
- <subordinates>
- </subordinates>
- </compileType>
- <makeCustomizationType>
- <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
- <makeCustomizationPreStep></makeCustomizationPreStep>
- <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
- <makeCustomizationPostStep></makeCustomizationPostStep>
- <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
- <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
- <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
- </makeCustomizationType>
- <C30>
- <property key="code-model" value="default"/>
- <property key="const-model" value="default"/>
- <property key="data-model" value="default"/>
- <property key="disable-instruction-scheduling" value="false"/>
- <property key="enable-all-warnings" value="true"/>
- <property key="enable-ansi-std" value="false"/>
- <property key="enable-ansi-warnings" value="false"/>
- <property key="enable-fatal-warnings" value="false"/>
- <property key="enable-large-arrays" value="false"/>
- <property key="enable-omit-frame-pointer" value="false"/>
- <property key="enable-procedural-abstraction" value="false"/>
- <property key="enable-short-double" value="false"/>
- <property key="enable-symbols" value="true"/>
- <property key="enable-unroll-loops" value="false"/>
- <property key="extra-include-directories" value=""/>
- <property key="isolate-each-function" value="false"/>
- <property key="keep-inline" value="false"/>
- <property key="oXC16gcc-align-arr" value="false"/>
- <property key="oXC16gcc-cnsts-mauxflash" value="false"/>
- <property key="oXC16gcc-data-sects" value="false"/>
- <property key="oXC16gcc-errata" value=""/>
- <property key="oXC16gcc-fillupper" value=""/>
- <property key="oXC16gcc-large-aggregate" value="false"/>
- <property key="oXC16gcc-mauxflash" value="false"/>
- <property key="oXC16gcc-mpa-lvl" value=""/>
- <property key="oXC16gcc-name-text-sec" value=""/>
- <property key="oXC16gcc-near-chars" value="false"/>
- <property key="oXC16gcc-no-isr-warn" value="false"/>
- <property key="oXC16gcc-sfr-warn" value="false"/>
- <property key="oXC16gcc-smar-io-lvl" value="1"/>
- <property key="oXC16gcc-smart-io-fmt" value=""/>
- <property key="optimization-level" value="0"/>
- <property key="post-instruction-scheduling" value="default"/>
- <property key="pre-instruction-scheduling" value="default"/>
- <property key="preprocessor-macros" value=""/>
- <property key="scalar-model" value="default"/>
- <property key="use-cci" value="false"/>
- <property key="use-iar" value="false"/>
- </C30>
- <C30-AR>
- <property key="additional-options-chop-files" value="false"/>
- </C30-AR>
- <C30-AS>
- <property key="assembler-symbols" value=""/>
- <property key="expand-macros" value="false"/>
- <property key="extra-include-directories-for-assembler" value=""/>
- <property key="extra-include-directories-for-preprocessor" value=""/>
- <property key="false-conditionals" value="false"/>
- <property key="keep-locals" value="false"/>
- <property key="list-assembly" value="false"/>
- <property key="list-section-info" value="false"/>
- <property key="list-source" value="false"/>
- <property key="list-symbols" value="false"/>
- <property key="oXC16asm-extra-opts" value=""/>
- <property key="oXC16asm-list-to-file" value="false"/>
- <property key="omit-debug-dirs" value="false"/>
- <property key="omit-forms" value="false"/>
- <property key="preprocessor-macros" value=""/>
- <property key="relax" value="false"/>
- <property key="warning-level" value="emit-warnings"/>
- </C30-AS>
- <C30-CO>
- <property key="coverage-enable" value=""/>
- </C30-CO>
- <C30-LD>
- <property key="additional-options-use-response-files" value="false"/>
- <property key="boot-eeprom" value="no_eeprom"/>
- <property key="boot-flash" value="no_flash"/>
- <property key="boot-ram" value="no_ram"/>
- <property key="boot-write-protect" value="no_write_protect"/>
- <property key="enable-check-sections" value="false"/>
- <property key="enable-data-init" value="true"/>
- <property key="enable-default-isr" value="true"/>
- <property key="enable-handles" value="true"/>
- <property key="enable-pack-data" value="true"/>
- <property key="extra-lib-directories" value=""/>
- <property key="fill-flash-options-addr" value=""/>
- <property key="fill-flash-options-const" value=""/>
- <property key="fill-flash-options-how" value="0"/>
- <property key="fill-flash-options-inc-const" value="1"/>
- <property key="fill-flash-options-increment" value=""/>
- <property key="fill-flash-options-seq" value=""/>
- <property key="fill-flash-options-what" value="0"/>
- <property key="general-code-protect" value="no_code_protect"/>
- <property key="general-write-protect" value="no_write_protect"/>
- <property key="generate-cross-reference-file" value="false"/>
- <property key="heap-size" value=""/>
- <property key="input-libraries" value=""/>
- <property key="linker-stack" value="true"/>
- <property key="linker-symbols" value=""/>
- <property key="map-file" value="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"/>
- <property key="no-ivt" value="false"/>
- <property key="oXC16ld-extra-opts" value=""/>
- <property key="oXC16ld-fill-upper" value="0"/>
- <property key="oXC16ld-force-link" value="false"/>
- <property key="oXC16ld-no-smart-io" value="false"/>
- <property key="oXC16ld-nostdlib" value="false"/>
- <property key="oXC16ld-stackguard" value="16"/>
- <property key="preprocessor-macros" value=""/>
- <property key="remove-unused-sections" value="false"/>
- <property key="report-memory-usage" value="true"/>
- <property key="secure-eeprom" value="no_eeprom"/>
- <property key="secure-flash" value="no_flash"/>
- <property key="secure-ram" value="no_ram"/>
- <property key="secure-write-protect" value="no_write_protect"/>
- <property key="stack-size" value="16"/>
- <property key="symbol-stripping" value=""/>
- <property key="trace-symbols" value=""/>
- <property key="warn-section-align" value="false"/>
- </C30-LD>
- <C30Global>
- <property key="common-include-directories" value=""/>
- <property key="dual-boot-partition" value="0"/>
- <property key="fast-math" value="false"/>
- <property key="generic-16-bit" value="false"/>
- <property key="legacy-libc" value="true"/>
- <property key="mpreserve-all" value="false"/>
- <property key="oXC16glb-macros" value=""/>
- <property key="output-file-format" value="elf"/>
- <property key="preserve-all" value="false"/>
- <property key="preserve-file" value=""/>
- <property key="relaxed-math" value="false"/>
- <property key="save-temps" value="false"/>
- </C30Global>
- <PK3OBPlatformTool>
- <property key="AutoSelectMemRanges" value="auto"/>
- <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
- <property key="ToolFirmwareFilePath"
- value="Press to browse for a specific firmware version"/>
- <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
- <property key="firmware.download.all" value="false"/>
- <property key="memories.bootflash" value="true"/>
- <property key="memories.configurationmemory" value="true"/>
- <property key="memories.dataflash" value="true"/>
- <property key="memories.eeprom" value="true"/>
- <property key="memories.id" value="true"/>
- <property key="memories.programmemory" value="true"/>
- <property key="memories.programmemory.ranges"
- value="${memories.programmemory.ranges}"/>
- <property key="memories.userotp" value="true"/>
- <property key="poweroptions.powerenable" value="false"/>
- <property key="programoptions.eraseb4program" value="true"/>
- <property key="programoptions.preservedataflash" value="false"/>
- <property key="programoptions.preservedataflash.ranges"
- value="${programoptions.preservedataflash.ranges}"/>
- <property key="programoptions.preserveeeprom" value="false"/>
- <property key="programoptions.preserveeeprom.ranges"
- value="${programoptions.preserveeeprom.ranges}"/>
- <property key="programoptions.preserveprogram.ranges" value=""/>
- <property key="programoptions.preserveprogramrange" value="false"/>
- <property key="programoptions.usehighvoltageonmclr" value="false"/>
- <property key="programoptions.uselvpprogramming" value="false"/>
- <property key="voltagevalue" value="3.25"/>
- </PK3OBPlatformTool>
- </conf>
- </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="65">
+ <logicalFolder name="root" displayName="root" projectFiles="true">
+ <logicalFolder name="HeaderFiles"
+ displayName="Header Files"
+ projectFiles="true">
+ <itemPath>bufferlib.h</itemPath>
+ <itemPath>lcd.h</itemPath>
+ </logicalFolder>
+ <logicalFolder name="LinkerScript"
+ displayName="Linker Files"
+ projectFiles="true">
+ </logicalFolder>
+ <logicalFolder name="SourceFiles"
+ displayName="Source Files"
+ projectFiles="true">
+ <itemPath>bufferlib.c</itemPath>
+ <itemPath>lcd.c</itemPath>
+ <itemPath>main.c</itemPath>
+ </logicalFolder>
+ <logicalFolder name="ExternalFiles"
+ displayName="Important Files"
+ projectFiles="false">
+ <itemPath>Makefile</itemPath>
+ </logicalFolder>
+ </logicalFolder>
+ <sourceRootList>
+ <Elem>.</Elem>
+ </sourceRootList>
+ <projectmakefile>Makefile</projectmakefile>
+ <confs>
+ <conf name="default" type="2">
+ <toolsSet>
+ <developmentServer>localhost</developmentServer>
+ <targetDevice>PIC24FJ64GA002</targetDevice>
+ <targetHeader></targetHeader>
+ <targetPluginBoard></targetPluginBoard>
+ <platformTool>noID</platformTool>
+ <languageToolchain>XC16</languageToolchain>
+ <languageToolchainVersion>1.50</languageToolchainVersion>
+ <platform>3</platform>
+ </toolsSet>
+ <packs>
+ <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.2.101"/>
+ </packs>
+ <compileType>
+ <linkerTool>
+ <linkerLibItems>
+ </linkerLibItems>
+ </linkerTool>
+ <archiverTool>
+ </archiverTool>
+ <loading>
+ <useAlternateLoadableFile>false</useAlternateLoadableFile>
+ <parseOnProdLoad>false</parseOnProdLoad>
+ <alternateLoadableFile></alternateLoadableFile>
+ </loading>
+ <subordinates>
+ </subordinates>
+ </compileType>
+ <makeCustomizationType>
+ <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
+ <makeCustomizationPreStep></makeCustomizationPreStep>
+ <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
+ <makeCustomizationPostStep></makeCustomizationPostStep>
+ <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
+ <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
+ <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
+ </makeCustomizationType>
+ <C30>
+ <property key="code-model" value="default"/>
+ <property key="const-model" value="default"/>
+ <property key="data-model" value="small-data"/>
+ <property key="disable-instruction-scheduling" value="false"/>
+ <property key="enable-all-warnings" value="true"/>
+ <property key="enable-ansi-std" value="false"/>
+ <property key="enable-ansi-warnings" value="false"/>
+ <property key="enable-fatal-warnings" value="false"/>
+ <property key="enable-large-arrays" value="false"/>
+ <property key="enable-omit-frame-pointer" value="false"/>
+ <property key="enable-procedural-abstraction" value="false"/>
+ <property key="enable-short-double" value="false"/>
+ <property key="enable-symbols" value="true"/>
+ <property key="enable-unroll-loops" value="false"/>
+ <property key="extra-include-directories" value=""/>
+ <property key="isolate-each-function" value="false"/>
+ <property key="keep-inline" value="false"/>
+ <property key="oXC16gcc-align-arr" value="false"/>
+ <property key="oXC16gcc-cnsts-mauxflash" value="false"/>
+ <property key="oXC16gcc-data-sects" value="false"/>
+ <property key="oXC16gcc-errata" value=""/>
+ <property key="oXC16gcc-fillupper" value=""/>
+ <property key="oXC16gcc-large-aggregate" value="false"/>
+ <property key="oXC16gcc-mauxflash" value="false"/>
+ <property key="oXC16gcc-mpa-lvl" value=""/>
+ <property key="oXC16gcc-name-text-sec" value=""/>
+ <property key="oXC16gcc-near-chars" value="false"/>
+ <property key="oXC16gcc-no-isr-warn" value="false"/>
+ <property key="oXC16gcc-sfr-warn" value="false"/>
+ <property key="oXC16gcc-smar-io-lvl" value="1"/>
+ <property key="oXC16gcc-smart-io-fmt" value=""/>
+ <property key="optimization-level" value="0"/>
+ <property key="post-instruction-scheduling" value="default"/>
+ <property key="pre-instruction-scheduling" value="default"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="scalar-model" value="default"/>
+ <property key="use-cci" value="false"/>
+ <property key="use-iar" value="false"/>
+ </C30>
+ <C30-AR>
+ <property key="additional-options-chop-files" value="false"/>
+ </C30-AR>
+ <C30-AS>
+ <property key="assembler-symbols" value=""/>
+ <property key="expand-macros" value="false"/>
+ <property key="extra-include-directories-for-assembler" value=""/>
+ <property key="extra-include-directories-for-preprocessor" value=""/>
+ <property key="false-conditionals" value="false"/>
+ <property key="keep-locals" value="false"/>
+ <property key="list-assembly" value="false"/>
+ <property key="list-section-info" value="false"/>
+ <property key="list-source" value="false"/>
+ <property key="list-symbols" value="false"/>
+ <property key="oXC16asm-extra-opts" value=""/>
+ <property key="oXC16asm-list-to-file" value="false"/>
+ <property key="omit-debug-dirs" value="false"/>
+ <property key="omit-forms" value="false"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="relax" value="false"/>
+ <property key="warning-level" value="emit-warnings"/>
+ </C30-AS>
+ <C30-CO>
+ <property key="coverage-enable" value=""/>
+ </C30-CO>
+ <C30-LD>
+ <property key="additional-options-use-response-files" value="false"/>
+ <property key="boot-eeprom" value="no_eeprom"/>
+ <property key="boot-flash" value="no_flash"/>
+ <property key="boot-ram" value="no_ram"/>
+ <property key="boot-write-protect" value="no_write_protect"/>
+ <property key="enable-check-sections" value="false"/>
+ <property key="enable-data-init" value="true"/>
+ <property key="enable-default-isr" value="true"/>
+ <property key="enable-handles" value="true"/>
+ <property key="enable-pack-data" value="true"/>
+ <property key="extra-lib-directories" value=""/>
+ <property key="fill-flash-options-addr" value=""/>
+ <property key="fill-flash-options-const" value=""/>
+ <property key="fill-flash-options-how" value="0"/>
+ <property key="fill-flash-options-inc-const" value="1"/>
+ <property key="fill-flash-options-increment" value=""/>
+ <property key="fill-flash-options-seq" value=""/>
+ <property key="fill-flash-options-what" value="0"/>
+ <property key="general-code-protect" value="no_code_protect"/>
+ <property key="general-write-protect" value="no_write_protect"/>
+ <property key="generate-cross-reference-file" value="false"/>
+ <property key="heap-size" value=""/>
+ <property key="input-libraries" value=""/>
+ <property key="linker-stack" value="true"/>
+ <property key="linker-symbols" value=""/>
+ <property key="map-file" value="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"/>
+ <property key="no-ivt" value="false"/>
+ <property key="oXC16ld-extra-opts" value=""/>
+ <property key="oXC16ld-fill-upper" value="0"/>
+ <property key="oXC16ld-force-link" value="false"/>
+ <property key="oXC16ld-no-smart-io" value="false"/>
+ <property key="oXC16ld-nostdlib" value="false"/>
+ <property key="oXC16ld-stackguard" value="16"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="remove-unused-sections" value="false"/>
+ <property key="report-memory-usage" value="true"/>
+ <property key="secure-eeprom" value="no_eeprom"/>
+ <property key="secure-flash" value="no_flash"/>
+ <property key="secure-ram" value="no_ram"/>
+ <property key="secure-write-protect" value="no_write_protect"/>
+ <property key="stack-size" value="16"/>
+ <property key="symbol-stripping" value=""/>
+ <property key="trace-symbols" value=""/>
+ <property key="warn-section-align" value="false"/>
+ </C30-LD>
+ <C30Global>
+ <property key="common-include-directories" value=""/>
+ <property key="dual-boot-partition" value="0"/>
+ <property key="fast-math" value="false"/>
+ <property key="generic-16-bit" value="false"/>
+ <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=""/>
+ <property key="relaxed-math" value="false"/>
+ <property key="save-temps" value="false"/>
+ </C30Global>
+ <PK3OBPlatformTool>
+ <property key="AutoSelectMemRanges" value="auto"/>
+ <property key="SecureSegment.SegmentProgramming" value="FullChipProgramming"/>
+ <property key="ToolFirmwareFilePath"
+ value="Press to browse for a specific firmware version"/>
+ <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
+ <property key="memories.bootflash" value="true"/>
+ <property key="memories.configurationmemory" value="true"/>
+ <property key="memories.dataflash" value="true"/>
+ <property key="memories.eeprom" value="true"/>
+ <property key="memories.id" value="true"/>
+ <property key="memories.programmemory" value="true"/>
+ <property key="memories.programmemory.ranges"
+ value="${memories.programmemory.ranges}"/>
+ <property key="memories.userotp" value="true"/>
+ <property key="poweroptions.powerenable" value="false"/>
+ <property key="programoptions.eraseb4program" value="true"/>
+ <property key="programoptions.preservedataflash" value="false"/>
+ <property key="programoptions.preservedataflash.ranges"
+ value="${programoptions.preservedataflash.ranges}"/>
+ <property key="programoptions.preserveeeprom" value="false"/>
+ <property key="programoptions.preserveeeprom.ranges"
+ value="${programoptions.preserveeeprom.ranges}"/>
+ <property key="programoptions.preserveprogram.ranges" value=""/>
+ <property key="programoptions.preserveprogramrange" value="false"/>
+ <property key="programoptions.usehighvoltageonmclr" value="false"/>
+ <property key="programoptions.uselvpprogramming" value="false"/>
+ <property key="voltagevalue" value="3.25"/>
+ </PK3OBPlatformTool>
+ </conf>
+ </confs>
+</configurationDescriptor>
diff --git a/EE3102Testing.X/nbproject/private/configurations.xml b/PICCode.X/nbproject/private/configurations.xml
index 3027230..6e8b207 100644
--- a/EE3102Testing.X/nbproject/private/configurations.xml
+++ b/PICCode.X/nbproject/private/configurations.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="65">
- <projectmakefile>Makefile</projectmakefile>
- <defaultConf>0</defaultConf>
- <confs>
- <conf name="default" type="2">
- <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>8108:=&lt;rev>0002:=&lt;man>Digilent:=&lt;prod>chipKitProgrammer:=&lt;sn>DA63B49:=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
- <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.41\bin</languageToolchainDir>
- <mdbdebugger version="1">
- <placeholder1>place holder 1</placeholder1>
- <placeholder2>place holder 2</placeholder2>
- </mdbdebugger>
- <runprofile version="6">
- <args></args>
- <rundir></rundir>
- <buildfirst>true</buildfirst>
- <console-type>0</console-type>
- <terminal-type>0</terminal-type>
- <remove-instrumentation>0</remove-instrumentation>
- <environment>
- </environment>
- </runprofile>
- </conf>
- </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="65">
+ <projectmakefile>Makefile</projectmakefile>
+ <defaultConf>0</defaultConf>
+ <confs>
+ <conf name="default" type="2">
+ <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>
+ </mdbdebugger>
+ <runprofile version="6">
+ <args></args>
+ <rundir></rundir>
+ <buildfirst>true</buildfirst>
+ <console-type>0</console-type>
+ <terminal-type>0</terminal-type>
+ <remove-instrumentation>0</remove-instrumentation>
+ <environment>
+ </environment>
+ </runprofile>
+ </conf>
+ </confs>
+</configurationDescriptor>
diff --git a/EE3102Testing.X/nbproject/project.xml b/PICCode.X/nbproject/project.xml
index 526148c..93f16fa 100644
--- a/EE3102Testing.X/nbproject/project.xml
+++ b/PICCode.X/nbproject/project.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>com.microchip.mplab.nbide.embedded.makeproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/make-project/1">
- <name>EE3102Testing</name>
- <creation-uuid>e761e4c4-63b8-47f9-9845-152cc8625c2c</creation-uuid>
- <make-project-type>0</make-project-type>
- <c-extensions>c</c-extensions>
- <cpp-extensions/>
- <header-extensions>h</header-extensions>
- <asminc-extensions/>
- <sourceEncoding>ISO-8859-1</sourceEncoding>
- <make-dep-projects/>
- <sourceRootList>
- <sourceRootElem>.</sourceRootElem>
- </sourceRootList>
- <confList>
- <confElem>
- <name>default</name>
- <type>2</type>
- </confElem>
- </confList>
- <formatting>
- <project-formatting-style>false</project-formatting-style>
- </formatting>
- </data>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>com.microchip.mplab.nbide.embedded.makeproject</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/make-project/1">
+ <name>PIC Code</name>
+ <creation-uuid>e761e4c4-63b8-47f9-9845-152cc8625c2c</creation-uuid>
+ <make-project-type>0</make-project-type>
+ <c-extensions>c</c-extensions>
+ <cpp-extensions/>
+ <header-extensions>h</header-extensions>
+ <asminc-extensions/>
+ <sourceEncoding>ISO-8859-1</sourceEncoding>
+ <make-dep-projects/>
+ <sourceRootList>
+ <sourceRootElem>.</sourceRootElem>
+ </sourceRootList>
+ <confList>
+ <confElem>
+ <name>default</name>
+ <type>2</type>
+ </confElem>
+ </confList>
+ <formatting>
+ <project-formatting-style>false</project-formatting-style>
+ </formatting>
+ </data>
+ </configuration>
+</project>