From f7dddf06297f415413760f3bedf00f7297e60cf7 Mon Sep 17 00:00:00 2001 From: RossTheRoss Date: Wed, 8 Apr 2020 11:17:47 -0500 Subject: Forget to add a bunch of things oops --- HW3.X/Makefile | 113 ----- HW3.X/dist/default/debug/memoryfile.xml | 18 - HW3.X/dist/default/production/memoryfile.xml | 18 - HW3.X/nbproject/Makefile-default.mk | 161 ------- HW3.X/nbproject/Makefile-genesis.properties | 10 - HW3.X/nbproject/Makefile-impl.mk | 69 --- HW3.X/nbproject/Makefile-local-default.mk | 38 -- HW3.X/nbproject/Makefile-variables.mk | 13 - HW3.X/nbproject/Package-default.bash | 73 --- HW3.X/nbproject/configurations.xml | 657 --------------------------- HW3.X/nbproject/private/configurations.xml | 25 - HW3.X/nbproject/private/private.xml | 9 - HW3.X/nbproject/project.xml | 29 -- HW3.X/strap012_hw3prob1.c | 57 --- HW3.X/strap012_hw3prob2.c | 93 ---- HW3.X/strap012_hw3prob3.c | 77 ---- 16 files changed, 1460 deletions(-) delete mode 100644 HW3.X/Makefile delete mode 100644 HW3.X/dist/default/debug/memoryfile.xml delete mode 100644 HW3.X/dist/default/production/memoryfile.xml delete mode 100644 HW3.X/nbproject/Makefile-default.mk delete mode 100644 HW3.X/nbproject/Makefile-genesis.properties delete mode 100644 HW3.X/nbproject/Makefile-impl.mk delete mode 100644 HW3.X/nbproject/Makefile-local-default.mk delete mode 100644 HW3.X/nbproject/Makefile-variables.mk delete mode 100644 HW3.X/nbproject/Package-default.bash delete mode 100644 HW3.X/nbproject/configurations.xml delete mode 100644 HW3.X/nbproject/private/configurations.xml delete mode 100644 HW3.X/nbproject/private/private.xml delete mode 100644 HW3.X/nbproject/project.xml delete mode 100644 HW3.X/strap012_hw3prob1.c delete mode 100644 HW3.X/strap012_hw3prob2.c delete mode 100644 HW3.X/strap012_hw3prob3.c (limited to 'HW3.X') diff --git a/HW3.X/Makefile b/HW3.X/Makefile deleted file mode 100644 index fca8e2c..0000000 --- a/HW3.X/Makefile +++ /dev/null @@ -1,113 +0,0 @@ -# -# There exist several targets which are by default empty and which can be -# used for execution of your targets. These targets are usually executed -# before and after some main targets. They are: -# -# .build-pre: called before 'build' target -# .build-post: called after 'build' target -# .clean-pre: called before 'clean' target -# .clean-post: called after 'clean' target -# .clobber-pre: called before 'clobber' target -# .clobber-post: called after 'clobber' target -# .all-pre: called before 'all' target -# .all-post: called after 'all' target -# .help-pre: called before 'help' target -# .help-post: called after 'help' target -# -# Targets beginning with '.' are not intended to be called on their own. -# -# Main targets can be executed directly, and they are: -# -# build build a specific configuration -# clean remove built files from a configuration -# clobber remove all built files -# all build all configurations -# help print help mesage -# -# Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and -# .help-impl are implemented in nbproject/makefile-impl.mk. -# -# Available make variables: -# -# CND_BASEDIR base directory for relative paths -# CND_DISTDIR default top distribution directory (build artifacts) -# CND_BUILDDIR default top build directory (object files, ...) -# CONF name of current configuration -# CND_ARTIFACT_DIR_${CONF} directory of build artifact (current configuration) -# CND_ARTIFACT_NAME_${CONF} name of build artifact (current configuration) -# CND_ARTIFACT_PATH_${CONF} path to build artifact (current configuration) -# CND_PACKAGE_DIR_${CONF} directory of package (current configuration) -# CND_PACKAGE_NAME_${CONF} name of package (current configuration) -# CND_PACKAGE_PATH_${CONF} path to package (current configuration) -# -# NOCDDL - - -# Environment -MKDIR=mkdir -CP=cp -CCADMIN=CCadmin -RANLIB=ranlib - - -# build -build: .build-post - -.build-pre: -# Add your pre 'build' code here... - -.build-post: .build-impl -# Add your post 'build' code here... - - -# clean -clean: .clean-post - -.clean-pre: -# Add your pre 'clean' code here... -# WARNING: the IDE does not call this target since it takes a long time to -# simply run make. Instead, the IDE removes the configuration directories -# under build and dist directly without calling make. -# This target is left here so people can do a clean when running a clean -# outside the IDE. - -.clean-post: .clean-impl -# Add your post 'clean' code here... - - -# clobber -clobber: .clobber-post - -.clobber-pre: -# Add your pre 'clobber' code here... - -.clobber-post: .clobber-impl -# Add your post 'clobber' code here... - - -# all -all: .all-post - -.all-pre: -# Add your pre 'all' code here... - -.all-post: .all-impl -# Add your post 'all' code here... - - -# help -help: .help-post - -.help-pre: -# Add your pre 'help' code here... - -.help-post: .help-impl -# Add your post 'help' code here... - - - -# include project implementation makefile -include nbproject/Makefile-impl.mk - -# include project make variables -include nbproject/Makefile-variables.mk diff --git a/HW3.X/dist/default/debug/memoryfile.xml b/HW3.X/dist/default/debug/memoryfile.xml deleted file mode 100644 index c74e6e0..0000000 --- a/HW3.X/dist/default/debug/memoryfile.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - bytes - 8192 - 10 - 8182 - - - bytes - 65274 - 594 - 64680 - - - diff --git a/HW3.X/dist/default/production/memoryfile.xml b/HW3.X/dist/default/production/memoryfile.xml deleted file mode 100644 index 22401db..0000000 --- a/HW3.X/dist/default/production/memoryfile.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - bytes - 8192 - 4 - 8188 - - - bytes - 65274 - 453 - 64821 - - - diff --git a/HW3.X/nbproject/Makefile-default.mk b/HW3.X/nbproject/Makefile-default.mk deleted file mode 100644 index 6187043..0000000 --- a/HW3.X/nbproject/Makefile-default.mk +++ /dev/null @@ -1,161 +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}/HW3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -else -IMAGE_TYPE=production -OUTPUT_SUFFIX=hex -DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/HW3.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=strap012_hw3prob2.c - -# Object Files Quoted if spaced -OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/strap012_hw3prob2.o -POSSIBLE_DEPFILES=${OBJECTDIR}/strap012_hw3prob2.o.d - -# Object Files -OBJECTFILES=${OBJECTDIR}/strap012_hw3prob2.o - -# Source Files -SOURCEFILES=strap012_hw3prob2.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}/HW3.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}/strap012_hw3prob2.o: strap012_hw3prob2.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}" - @${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_hw3prob2.o: strap012_hw3prob2.c nbproject/Makefile-${CND_CONF}.mk - @${MKDIR} "${OBJECTDIR}" - @${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 - -# ------------------------------------------------------------------------------------ -# Rules for buildStep: assemble -ifeq ($(TYPE_IMAGE), DEBUG_RUN) -else -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}/HW3.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}/HW3.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 - -else -dist/${CND_CONF}/${IMAGE_TYPE}/HW3.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}/HW3.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}/HW3.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/HW3.X/nbproject/Makefile-genesis.properties b/HW3.X/nbproject/Makefile-genesis.properties deleted file mode 100644 index 458c029..0000000 --- a/HW3.X/nbproject/Makefile-genesis.properties +++ /dev/null @@ -1,10 +0,0 @@ -# -#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=f503afea90925cb3391f7656571faaea -com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3 -default.languagetoolchain.version=1.50 -host.platform=windows -conf.ids=default diff --git a/HW3.X/nbproject/Makefile-impl.mk b/HW3.X/nbproject/Makefile-impl.mk deleted file mode 100644 index 6ddd273..0000000 --- a/HW3.X/nbproject/Makefile-impl.mk +++ /dev/null @@ -1,69 +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 customization code. -# -# This makefile implements macros and targets common to all configurations. -# -# NOCDDL - - -# Building and Cleaning subprojects are done by default, but can be controlled with the SUB -# macro. If SUB=no, subprojects will not be built or cleaned. The following macro -# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf -# and .clean-reqprojects-conf unless SUB has the value 'no' -SUB_no=NO -SUBPROJECTS=${SUB_${SUB}} -BUILD_SUBPROJECTS_=.build-subprojects -BUILD_SUBPROJECTS_NO= -BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}} -CLEAN_SUBPROJECTS_=.clean-subprojects -CLEAN_SUBPROJECTS_NO= -CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} - - -# Project Name -PROJECTNAME=HW3.X - -# Active Configuration -DEFAULTCONF=default -CONF=${DEFAULTCONF} - -# All Configurations -ALLCONFS=default - - -# build -.build-impl: .build-pre - ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf - - -# clean -.clean-impl: .clean-pre - ${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf - -# clobber -.clobber-impl: .clobber-pre .depcheck-impl - ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default clean - - - -# all -.all-impl: .all-pre .depcheck-impl - ${MAKE} SUBPROJECTS=${SUBPROJECTS} CONF=default build - - - -# dependency checking support -.depcheck-impl: -# @echo "# This code depends on make tool being used" >.dep.inc -# @if [ -n "${MAKE_VERSION}" ]; then \ -# echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \ -# echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \ -# echo "include \$${DEPFILES}" >>.dep.inc; \ -# echo "endif" >>.dep.inc; \ -# else \ -# echo ".KEEP_STATE:" >>.dep.inc; \ -# echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \ -# fi diff --git a/HW3.X/nbproject/Makefile-local-default.mk b/HW3.X/nbproject/Makefile-local-default.mk deleted file mode 100644 index c75d9df..0000000 --- a/HW3.X/nbproject/Makefile-local-default.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Generated Makefile - do not edit! -# -# -# This file contains information about the location of compilers and other tools. -# If you commmit this file into your revision control server, you will be able to -# to checkout the project and build it from the command line with make. However, -# if more than one person works on the same project, then this file might show -# conflicts since different users are bound to have compilers in different places. -# In that case you might choose to not commit this file and let MPLAB X recreate this file -# for each user. The disadvantage of not commiting this file is that you must run MPLAB X at -# least once so the file gets created and the project can be built. Finally, you can also -# avoid using this file at all if you are only building from the command line with make. -# You can invoke make with the values of the macros: -# $ makeMP_CC="/opt/microchip/mplabc30/v3.30c/bin/pic30-gcc" ... -# -SHELL=cmd.exe -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.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.35\sys\java\jre1.8.0_181/bin/" -OS_CURRENT="$(shell uname -s)" -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\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\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.35/packs/Microchip/PIC24F-GA-GB_DFP/1.2.101" diff --git a/HW3.X/nbproject/Makefile-variables.mk b/HW3.X/nbproject/Makefile-variables.mk deleted file mode 100644 index a67eeaf..0000000 --- a/HW3.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=HW3.X.production.hex -CND_ARTIFACT_PATH_default=dist/default/production/HW3.X.production.hex -CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package -CND_PACKAGE_NAME_default=hw3.x.tar -CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/hw3.x.tar diff --git a/HW3.X/nbproject/Package-default.bash b/HW3.X/nbproject/Package-default.bash deleted file mode 100644 index cbe550f..0000000 --- a/HW3.X/nbproject/Package-default.bash +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash -x - -# -# Generated - do not edit! -# - -# Macros -TOP=`pwd` -CND_CONF=default -CND_DISTDIR=dist -TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging -TMPDIRNAME=tmp-packaging -OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/HW3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -OUTPUT_BASENAME=HW3.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -PACKAGE_TOP_DIR=hw3.x/ - -# Functions -function checkReturnCode -{ - rc=$? - if [ $rc != 0 ] - then - exit $rc - fi -} -function makeDirectory -# $1 directory path -# $2 permission (optional) -{ - mkdir -p "$1" - checkReturnCode - if [ "$2" != "" ] - then - chmod $2 "$1" - checkReturnCode - fi -} -function copyFileToTmpDir -# $1 from-file path -# $2 to-file path -# $3 permission -{ - cp "$1" "$2" - checkReturnCode - if [ "$3" != "" ] - then - chmod $3 "$2" - checkReturnCode - fi -} - -# Setup -cd "${TOP}" -mkdir -p ${CND_DISTDIR}/${CND_CONF}/package -rm -rf ${TMPDIR} -mkdir -p ${TMPDIR} - -# Copy files and create directories and links -cd "${TOP}" -makeDirectory ${TMPDIR}/hw3.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/hw3.x.tar -cd ${TMPDIR} -tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/hw3.x.tar * -checkReturnCode - -# Cleanup -cd "${TOP}" -rm -rf ${TMPDIR} diff --git a/HW3.X/nbproject/configurations.xml b/HW3.X/nbproject/configurations.xml deleted file mode 100644 index e666306..0000000 --- a/HW3.X/nbproject/configurations.xml +++ /dev/null @@ -1,657 +0,0 @@ - - - - - - - - - strap012_hw3prob2.c - strap012_hw3prob3.c - strap012_hw3prob1.c - - - Makefile - - - - . - - Makefile - - - - localhost - PIC24FJ64GA002 - - - Simulator - XC16 - 1.50 - 3 - - - - - - - - - - - - - false - false - - - - - - - false - - false - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/HW3.X/nbproject/private/configurations.xml b/HW3.X/nbproject/private/configurations.xml deleted file mode 100644 index 7551fab..0000000 --- a/HW3.X/nbproject/private/configurations.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - Makefile - 0 - - - - C:\Program Files\Microchip\xc16\v1.50\bin - - place holder 1 - place holder 2 - - - - - true - 0 - 0 - 0 - - - - - - diff --git a/HW3.X/nbproject/private/private.xml b/HW3.X/nbproject/private/private.xml deleted file mode 100644 index fc10dfb..0000000 --- a/HW3.X/nbproject/private/private.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - file:/C:/Users/Ross/MPLABXProjects/EE2361Projects/HW3.X/int_first_t1.c - - - diff --git a/HW3.X/nbproject/project.xml b/HW3.X/nbproject/project.xml deleted file mode 100644 index be65d21..0000000 --- a/HW3.X/nbproject/project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - com.microchip.mplab.nbide.embedded.makeproject - - - HW3 - 8463ef2c-cfb9-43df-9b54-21aad4de2c86 - 0 - c - - - - ISO-8859-1 - - - . - - - - default - 2 - - - - false - - - - diff --git a/HW3.X/strap012_hw3prob1.c b/HW3.X/strap012_hw3prob1.c deleted file mode 100644 index dcfd308..0000000 --- a/HW3.X/strap012_hw3prob1.c +++ /dev/null @@ -1,57 +0,0 @@ -#include - -// PIC24FJ64GA002 Configuration Bit Settings -// CW1: FLASH CONFIGURATION WORD 1 (see PIC24 Family Reference Manual 24.1) -#pragma config ICS = PGx1 // Comm Channel Select (Emulator EMUC1/EMUD1 pins are shared with PGC1/PGD1) -#pragma config FWDTEN = OFF // Watchdog Timer Enable (Watchdog Timer is disabled) -#pragma config GWRP = OFF // General Code Segment Write Protect (Writes to program memory are allowed) -#pragma config GCP = OFF // General Code Segment Code Protect (Code protection is disabled) -#pragma config JTAGEN = OFF // JTAG Port Enable (JTAG port is disabled) - - -// CW2: FLASH CONFIGURATION WORD 2 (see PIC24 Family Reference Manual 24.1) -#pragma config POSCMOD = NONE // Primary Oscillator Select (Primary oscillator disabled. - // Primary Oscillator refers to an external osc connected to the OSC1 and OSC2 pins) -#pragma config I2C1SEL = PRI // I2C1 Pin Location Select (Use default SCL1/SDA1 pins) -#pragma config IOL1WAY = OFF // IOLOCK Protection (IOLOCK may be changed via unlocking seq) -#pragma config OSCIOFNC = ON // OSC2/CLKO/RC15 functions as port I/O (RC15) -#pragma config FCKSM = CSECME // Clock Switching and Monitor (Clock switching is enabled, - // Fail-Safe Clock Monitor is enabled) -#pragma config FNOSC = FRCPLL // Oscillator Select (Fast RC Oscillator with PLL module (FRCPLL)) - -volatile unsigned long int msecs = 0; - - -void __attribute__((__interrupt__,__auto_psv__)) _T1Interrupt(void) -{ - IFS0bits.T1IF = 0; - msecs++; -} - -void setup(void) -{ - CLKDIVbits.RCDIV = 0; // make 16MHz - - T1CON = 0; - PR1 = 0xFFFF; - - IFS0bits.T1IF = 0; - IPC0bits.T1IP = 3; - - /* enable Timer 1 interrupt */ - //DISABLE IF POLLING - IEC0bits.T1IE = 1; - - T1CONbits.TON = 1; -} - - -int main(void) -{ - setup(); - while (1) { - //Polling stuff -// while (_T1IF == 0); -// _T1IF = 0; - } -} diff --git a/HW3.X/strap012_hw3prob2.c b/HW3.X/strap012_hw3prob2.c deleted file mode 100644 index 6071e56..0000000 --- a/HW3.X/strap012_hw3prob2.c +++ /dev/null @@ -1,93 +0,0 @@ -#include - -// PIC24FJ64GA002 Configuration Bit Settings -// 'C' source line config statements - -// CONFIG2 -#pragma config POSCMOD = NONE // Primary Oscillator Select (Primary oscillator disabled) -#pragma config I2C1SEL = PRI // I2C1 Pin Location Select (Use default SCL1/SDA1 pins) -#pragma config IOL1WAY = OFF // IOLOCK Protection (IOLOCK may be changed via unlocking seq) -#pragma config OSCIOFNC = OFF // Primary Oscillator Output Function (OSC2/CLKO/RC15 functions as CLKO (FOSC/2)) -#pragma config FCKSM = CSECME // Clock Switching and Monitor (Clock switching is enabled, Fail-Safe Clock Monitor is enabled) -#pragma config FNOSC = FRCPLL // Oscillator Select (Fast RC Oscillator with PLL module (FRCPLL)) -#pragma config SOSCSEL = SOSC // Sec Oscillator Select (Default Secondary Oscillator (SOSC)) -#pragma config WUTSEL = LEG // Wake-up timer Select (Legacy Wake-up Timer) -#pragma config IESO = ON // Internal External Switch Over Mode (IESO mode (Two-Speed Start-up) enabled) - -// CONFIG1 -#pragma config WDTPS = PS32768 // Watchdog Timer Postscaler (1:32,768) -#pragma config FWPSA = PR128 // WDT Prescaler (Prescaler ratio of 1:128) -#pragma config WINDIS = ON // Watchdog Timer Window (Standard Watchdog Timer enabled,(Windowed-mode is disabled)) -#pragma config FWDTEN = OFF // Watchdog Timer Enable (Watchdog Timer is disabled) -#pragma config ICS = PGx1 // Comm Channel Select (Emulator EMUC1/EMUD1 pins are shared with PGC1/PGD1) -#pragma config GWRP = OFF // General Code Segment Write Protect (Writes to program memory are allowed) -#pragma config GCP = OFF // General Code Segment Code Protect (Code protection is disabled) -#pragma config JTAGEN = OFF // JTAG Port Enable (JTAG port is disabled) - -// This program measures the duty cycle (i.e., duration of a signal being 1) in -// terms of num cycles. -// INT0 pin has the external sig. T1 counts #cycles. -// Both programmed as interrupts. - -volatile unsigned int overflow = 0; -volatile unsigned long int numCycles = 0; // duty cycle in terms of # TCY -volatile unsigned int high = 0, low = 0; - -void __attribute__((__interrupt__,__auto_psv__)) _T1Interrupt(void) -{ - IFS0bits.T1IF = 0; - overflow++; -} - -void __attribute__((__interrupt__,__auto_psv__)) _INT0Interrupt(void) -{ - _INT0IF = 0; - - if (_INT0EP == 0){ // I was waiting for a rising edge - TMR1 = 0; - overflow = 0; - } else { // I was waiting for a falling edge - numCycles = TMR1 + 16000L * overflow; -// TMR1 = 0; // uncomment these two lines if you want the period -// overflow = 0; // and not just active duty cycle. also - // delete the if part, and the last line - // that changes polarity of INT0EP - } - - _INT0EP = 1 - _INT0EP; - -} - -void setup(void) -{ - CLKDIVbits.RCDIV = 0; // make 16MHz - // setup INT0 (RB7) pin as input - AD1PCFG = 0x9fff; - LATBbits.LATB7 = 1; - - T1CON = 0; - PR1 = 15999; - TMR1 = 0; - T1CONbits.TON = 1; - - IFS0bits.T1IF = 0; - //IPC0bits.T1IP = 4; - /* enable Timer 1 interrupt */ - IEC0bits.T1IE = 1; - - _INT0EP = 0; - _INT0IF = 0; - _INT0IE = 1; - -} - - -int main(void) -{ - - setup(); - int edge = 0; - while (1) { - - } -} diff --git a/HW3.X/strap012_hw3prob3.c b/HW3.X/strap012_hw3prob3.c deleted file mode 100644 index 6f3b6b2..0000000 --- a/HW3.X/strap012_hw3prob3.c +++ /dev/null @@ -1,77 +0,0 @@ -#include - -// PIC24FJ64GA002 Configuration Bit Settings - -// CONFIG2 -#pragma config POSCMOD = NONE // Primary Oscillator Select (Primary oscillator disabled) -#pragma config I2C1SEL = PRI // I2C1 Pin Location Select (Use default SCL1/SDA1 pins) -#pragma config IOL1WAY = OFF // IOLOCK Protection (IOLOCK may be changed via unlocking seq) -#pragma config OSCIOFNC = OFF // Primary Oscillator Output Function (OSC2/CLKO/RC15 functions as CLKO (FOSC/2)) -#pragma config FCKSM = CSECME // Clock Switching and Monitor (Clock switching is enabled, Fail-Safe Clock Monitor is enabled) -#pragma config FNOSC = FRCPLL // Oscillator Select (Fast RC Oscillator with PLL module (FRCPLL)) -#pragma config SOSCSEL = SOSC // Sec Oscillator Select (Default Secondary Oscillator (SOSC)) -#pragma config WUTSEL = LEG // Wake-up timer Select (Legacy Wake-up Timer) -#pragma config IESO = ON // Internal External Switch Over Mode (IESO mode (Two-Speed Start-up) enabled) - -// CONFIG1 -#pragma config WDTPS = PS32768 // Watchdog Timer Postscaler (1:32,768) -#pragma config FWPSA = PR128 // WDT Prescaler (Prescaler ratio of 1:128) -#pragma config WINDIS = ON // Watchdog Timer Window (Standard Watchdog Timer enabled,(Windowed-mode is disabled)) -#pragma config FWDTEN = OFF // Watchdog Timer Enable (Watchdog Timer is disabled) -#pragma config ICS = PGx1 // Comm Channel Select (Emulator EMUC1/EMUD1 pins are shared with PGC1/PGD1) -#pragma config GWRP = OFF // General Code Segment Write Protect (Writes to program memory are allowed) -#pragma config GCP = OFF // General Code Segment Code Protect (Code protection is disabled) -#pragma config JTAGEN = OFF // JTAG Port Enable (JTAG port is disabled) - -// To test: Window > Simulator > Stimulus. Click on the Pin / Register Actions. -// Click on the top row where it says "Click here to add/remove signals", and add IC1 -// (or RB6). Add entries that change the signal to 1 at time 1000, to zero at 1100, and so on. -// You may want to check the checkbox that says "Repeat from action". - -volatile unsigned int dutyCycle = 0; // positive or negative - -void __attribute__((__interrupt__,__auto_psv__)) _IC1Interrupt(void) -{ - static unsigned int last = 0; - unsigned int current; - _IC1IF = 0; - - current = IC1BUF; - if (current > last) - dutyCycle = current - last; - else -// dutyCycle = ((long)(1<<16) + current) - last; - dutyCycle = ((long)(PR3+1) + current) - last; - - last = current; -} - -void setup() -{ - CLKDIVbits.RCDIV = 0; - AD1PCFG = 0x9fff; // For digital I/O. If you want to use analog, you'll - // need to change this. - _TRISB6 = 1; - __builtin_write_OSCCONL(OSCCON & 0xbf); // unlock PPS - _IC1R = 6 ; //IC! <- RB6; See Table 10-2 on P108 of the datasheet - __builtin_write_OSCCONL(OSCCON | 0x40); // lock PPS - - T3CON = 0; - PR3 = 65535; - TMR3 = 0; - _T3IF = 0; - T3CON = 0x8000; - - IC1CON = 1; // every edge - _IC1IF = 0; - _IC1IE = 1; -} - -int main(void) -{ - setup(); - - while (1){ - - } -} -- cgit v1.2.3