From e9f3d4a56d10de933c9c22646a7b084ec3cff20f Mon Sep 17 00:00:00 2001 From: RossTheRoss Date: Fri, 24 Apr 2020 13:16:17 -0500 Subject: Add MORE stuff I forget to commit --- Lab6.X/Makefile | 113 +++++++++++++ Lab6.X/circBuffer.c | 28 ++++ Lab6.X/circBuffer.h | 19 +++ Lab6.X/dist/default/production/memoryfile.xml | 18 +++ Lab6.X/lab6_main.c | 103 ++++++++++++ Lab6.X/nbproject/Makefile-default.mk | 175 ++++++++++++++++++++ Lab6.X/nbproject/Makefile-genesis.properties | 10 ++ Lab6.X/nbproject/Makefile-impl.mk | 69 ++++++++ Lab6.X/nbproject/Makefile-local-default.mk | 38 +++++ Lab6.X/nbproject/Makefile-variables.mk | 13 ++ Lab6.X/nbproject/Package-default.bash | 73 +++++++++ Lab6.X/nbproject/configurations.xml | 224 ++++++++++++++++++++++++++ Lab6.X/nbproject/private/configurations.xml | 25 +++ Lab6.X/nbproject/private/private.xml | 11 ++ Lab6.X/nbproject/project.xml | 27 ++++ Lab6.X/strap012_prelab6.zip | Bin 0 -> 803 bytes 16 files changed, 946 insertions(+) create mode 100644 Lab6.X/Makefile create mode 100644 Lab6.X/circBuffer.c create mode 100644 Lab6.X/circBuffer.h create mode 100644 Lab6.X/dist/default/production/memoryfile.xml create mode 100644 Lab6.X/lab6_main.c create mode 100644 Lab6.X/nbproject/Makefile-default.mk create mode 100644 Lab6.X/nbproject/Makefile-genesis.properties create mode 100644 Lab6.X/nbproject/Makefile-impl.mk create mode 100644 Lab6.X/nbproject/Makefile-local-default.mk create mode 100644 Lab6.X/nbproject/Makefile-variables.mk create mode 100644 Lab6.X/nbproject/Package-default.bash create mode 100644 Lab6.X/nbproject/configurations.xml create mode 100644 Lab6.X/nbproject/private/configurations.xml create mode 100644 Lab6.X/nbproject/private/private.xml create mode 100644 Lab6.X/nbproject/project.xml create mode 100644 Lab6.X/strap012_prelab6.zip (limited to 'Lab6.X') diff --git a/Lab6.X/Makefile b/Lab6.X/Makefile new file mode 100644 index 0000000..fca8e2c --- /dev/null +++ b/Lab6.X/Makefile @@ -0,0 +1,113 @@ +# +# 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/Lab6.X/circBuffer.c b/Lab6.X/circBuffer.c new file mode 100644 index 0000000..d4d120f --- /dev/null +++ b/Lab6.X/circBuffer.c @@ -0,0 +1,28 @@ +#include "xc.h" +#include "circBuffer.h" +#define SIZE 1024 + +volatile unsigned int buffer[SIZE]; +int buffSize = 0, write = 0, read = 0; +void initBuffer(){ + int i; + for (i=0; i // include processor files - each processor file is guarded. + + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ +void putVal(int newValue); // add a new value to the buffer +int getAvg(); // average all buffer vals +void initBuffer(); // set all buffer vals to zero + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif + diff --git a/Lab6.X/dist/default/production/memoryfile.xml b/Lab6.X/dist/default/production/memoryfile.xml new file mode 100644 index 0000000..e8d8e00 --- /dev/null +++ b/Lab6.X/dist/default/production/memoryfile.xml @@ -0,0 +1,18 @@ + + + + + + bytes + 8192 + 2176 + 6016 + + + bytes + 65274 + 8088 + 57186 + + + diff --git a/Lab6.X/lab6_main.c b/Lab6.X/lab6_main.c new file mode 100644 index 0000000..e9258c4 --- /dev/null +++ b/Lab6.X/lab6_main.c @@ -0,0 +1,103 @@ +#include "xc.h" +#include "../Lab5.X/lab5_lcd.h" +#include "circBuffer.h" +#include + +#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 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 // Primary Oscillator I/O Function (CLKO/RC15 functions as I/O pin) +#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)) + +void setup(void) { + CLKDIVbits.RCDIV = 0; + AD1PCFG = 0x9fff; //all digital inputs and outputs + initBuffer(); + lcd_init(); + lcd_setCursor(0,0); + + // -- I2C STUFF -- + I2C2BRG = 0x9D; + I2C2CONbits.I2CEN = 1; + _I2CSIDL = 0; + IFS3bits.MI2C2IF=0; + + // -- ADC STUFF -- + AD1CON1 = 0; // set all control to 0. + AD1CON1bits.SSRC = 0b010; //Rollover to conversion + AD1CON1bits.ASAM = 1; // auto-sample + AD1CON1bits.FORM = 0b00; + AD1CON2 = 0; + AD1CON2bits.CSCNA = 0; // no scan + AD1CON2bits.SMPI = 0b0; // every conversion + AD1CON2bits.BUFM = 0; // two 8-word buffers + AD1CON3bits.ADCS = 0b1; + AD1CON3bits.ADRC = 0; + AD1CON3bits.SAMC = 0b1; + AD1CON1bits.ADON = 1; // ton + AD1CHS = 0; + AD1CHSbits.CH0NB = 0; + AD1CHSbits.CH0SB = 0; + AD1CHSbits.CH0NA = 0; + AD1CHSbits.CH0SA = 0; + + // -- TIMER 2 STUFF -- + T2CON = 0; + TMR2 = 0; + T2CONbits.TCKPS = 0b10; + PR2 = 25000; + T2CONbits.TON = 1; + + // -- TIMER 3 STUFF -- + T3CON = 0; + TMR3 = 0; + T3CONbits.TCKPS = 0b10; + PR3 = 1562; + T3CONbits.TON = 1; + + // -- INTERRUPT ENABLES -- + IEC0bits.AD1IE = 1; + IFS0bits.AD1IF = 0; + //ADC Interrupt (Enabled) + IEC0bits.T2IE = 1; + IFS0bits.T2IF = 0; + // T2 Interrupt (Enabled) +} + +volatile unsigned int *ADCpointer = &ADC1BUF0, ADCvalue = 0; +void __attribute__((__interrupt__, __auto_psv__)) _ADC1Interrupt(void) { + IFS0bits.AD1IF = 0; + + +} +volatile unsigned char flag = 0; +void __attribute__((__interrupt__, __auto_psv__)) _T2Interrupt(void) { + //Allow writing to LCD + _T2IF = 0; + TMR2 = 0; + flag = 1; +} + +int main(void) { + setup(); + while (1) { + char adStr[20]; + unsigned long adValue; + if (flag) { + flag = 0; + lcd_setCursor(0,0); + adValue = getAvg(); + sprintf(adStr, "%6.4f V", (3.3/1024)*adValue); + lcd_printStr(adStr); + } + } + return -1; +} diff --git a/Lab6.X/nbproject/Makefile-default.mk b/Lab6.X/nbproject/Makefile-default.mk new file mode 100644 index 0000000..8cfbc47 --- /dev/null +++ b/Lab6.X/nbproject/Makefile-default.mk @@ -0,0 +1,175 @@ +# +# 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}/Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +else +IMAGE_TYPE=production +OUTPUT_SUFFIX=hex +DEBUGGABLE_SUFFIX=elf +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab6.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=lab6_main.c circBuffer.c + +# Object Files Quoted if spaced +OBJECTFILES_QUOTED_IF_SPACED=${OBJECTDIR}/lab6_main.o ${OBJECTDIR}/circBuffer.o +POSSIBLE_DEPFILES=${OBJECTDIR}/lab6_main.o.d ${OBJECTDIR}/circBuffer.o.d + +# Object Files +OBJECTFILES=${OBJECTDIR}/lab6_main.o ${OBJECTDIR}/circBuffer.o + +# Source Files +SOURCEFILES=lab6_main.c circBuffer.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}/Lab6.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}/lab6_main.o: lab6_main.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/lab6_main.o.d + @${RM} ${OBJECTDIR}/lab6_main.o + ${MP_CC} $(MP_EXTRA_CC_PRE) lab6_main.c -o ${OBJECTDIR}/lab6_main.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab6_main.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}/lab6_main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + +${OBJECTDIR}/circBuffer.o: circBuffer.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/circBuffer.o.d + @${RM} ${OBJECTDIR}/circBuffer.o + ${MP_CC} $(MP_EXTRA_CC_PRE) circBuffer.c -o ${OBJECTDIR}/circBuffer.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/circBuffer.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}/circBuffer.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + +else +${OBJECTDIR}/lab6_main.o: lab6_main.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/lab6_main.o.d + @${RM} ${OBJECTDIR}/lab6_main.o + ${MP_CC} $(MP_EXTRA_CC_PRE) lab6_main.c -o ${OBJECTDIR}/lab6_main.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab6_main.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}/lab6_main.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ + +${OBJECTDIR}/circBuffer.o: circBuffer.c nbproject/Makefile-${CND_CONF}.mk + @${MKDIR} "${OBJECTDIR}" + @${RM} ${OBJECTDIR}/circBuffer.o.d + @${RM} ${OBJECTDIR}/circBuffer.o + ${MP_CC} $(MP_EXTRA_CC_PRE) circBuffer.c -o ${OBJECTDIR}/circBuffer.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/circBuffer.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}/circBuffer.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}/Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk ../Lab5.X/lab5_lcd.c ../Lab5.X/lab5_lcd.h + @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} + ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ..\Lab5.X\lab5_lcd.c ..\Lab5.X\lab5_lcd.h -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}/Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk ../Lab5.X/lab5_lcd.c ../Lab5.X/lab5_lcd.h + @${MKDIR} dist/${CND_CONF}/${IMAGE_TYPE} + ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab6.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} ${OBJECTFILES_QUOTED_IF_SPACED} ..\Lab5.X\lab5_lcd.c ..\Lab5.X\lab5_lcd.h -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}/Lab6.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/Lab6.X/nbproject/Makefile-genesis.properties b/Lab6.X/nbproject/Makefile-genesis.properties new file mode 100644 index 0000000..d6d71c3 --- /dev/null +++ b/Lab6.X/nbproject/Makefile-genesis.properties @@ -0,0 +1,10 @@ +# +#Fri Apr 17 20:22:52 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=adb813cd4ce7c3e3b7bbe8664d6b0b98 +com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3 +default.languagetoolchain.version=1.50 +host.platform=windows +conf.ids=default diff --git a/Lab6.X/nbproject/Makefile-impl.mk b/Lab6.X/nbproject/Makefile-impl.mk new file mode 100644 index 0000000..16e9e96 --- /dev/null +++ b/Lab6.X/nbproject/Makefile-impl.mk @@ -0,0 +1,69 @@ +# +# 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=Lab6.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/Lab6.X/nbproject/Makefile-local-default.mk b/Lab6.X/nbproject/Makefile-local-default.mk new file mode 100644 index 0000000..c75d9df --- /dev/null +++ b/Lab6.X/nbproject/Makefile-local-default.mk @@ -0,0 +1,38 @@ +# +# 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/Lab6.X/nbproject/Makefile-variables.mk b/Lab6.X/nbproject/Makefile-variables.mk new file mode 100644 index 0000000..40d1468 --- /dev/null +++ b/Lab6.X/nbproject/Makefile-variables.mk @@ -0,0 +1,13 @@ +# +# Generated - do not edit! +# +# NOCDDL +# +CND_BASEDIR=`pwd` +# default configuration +CND_ARTIFACT_DIR_default=dist/default/production +CND_ARTIFACT_NAME_default=Lab6.X.production.hex +CND_ARTIFACT_PATH_default=dist/default/production/Lab6.X.production.hex +CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package +CND_PACKAGE_NAME_default=lab6.x.tar +CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/lab6.x.tar diff --git a/Lab6.X/nbproject/Package-default.bash b/Lab6.X/nbproject/Package-default.bash new file mode 100644 index 0000000..4c62ae3 --- /dev/null +++ b/Lab6.X/nbproject/Package-default.bash @@ -0,0 +1,73 @@ +#!/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}/Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +OUTPUT_BASENAME=Lab6.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +PACKAGE_TOP_DIR=lab6.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}/lab6.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/lab6.x.tar +cd ${TMPDIR} +tar -vcf ../../../../${CND_DISTDIR}/${CND_CONF}/package/lab6.x.tar * +checkReturnCode + +# Cleanup +cd "${TOP}" +rm -rf ${TMPDIR} diff --git a/Lab6.X/nbproject/configurations.xml b/Lab6.X/nbproject/configurations.xml new file mode 100644 index 0000000..5c9fd0e --- /dev/null +++ b/Lab6.X/nbproject/configurations.xml @@ -0,0 +1,224 @@ + + + + + circBuffer.h + + + + + lab6_main.c + circBuffer.c + + + Makefile + + + Makefile + + + + localhost + PIC24FJ64GA002 + + + PK3OBPlatformTool + XC16 + 1.50 + 3 + + + + + + + + ../Lab5.X/lab5_lcd.c + ../Lab5.X/lab5_lcd.h + + + + + + false + false + + + + + + + false + + false + + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Lab6.X/nbproject/private/configurations.xml b/Lab6.X/nbproject/private/configurations.xml new file mode 100644 index 0000000..099de7b --- /dev/null +++ b/Lab6.X/nbproject/private/configurations.xml @@ -0,0 +1,25 @@ + + + Makefile + 0 + + + :=MPLABComm-USB-Microchip:=<vid>04D8:=<pid>8108:=<rev>0002:=<man>Digilent:=<prod>chipKitProgrammer:=<sn>DA63CA1:=<drv>x:=<xpt>h:=end + C:\Program Files\Microchip\xc16\v1.50\bin + + place holder 1 + place holder 2 + + + + + true + 0 + 0 + 0 + + + + + + diff --git a/Lab6.X/nbproject/private/private.xml b/Lab6.X/nbproject/private/private.xml new file mode 100644 index 0000000..850b906 --- /dev/null +++ b/Lab6.X/nbproject/private/private.xml @@ -0,0 +1,11 @@ + + + + + + file:/C:/Users/Ross/MPLABXProjects/EE2361Projects/Lab6.X/lab6_main.c + file:/C:/Users/Ross/MPLABXProjects/EE2361Projects/Lab6.X/circBuffer.c + file:/C:/Users/Ross/MPLABXProjects/EE2361Projects/Lab6.X/circBuffer.h + + + diff --git a/Lab6.X/nbproject/project.xml b/Lab6.X/nbproject/project.xml new file mode 100644 index 0000000..4cf9e20 --- /dev/null +++ b/Lab6.X/nbproject/project.xml @@ -0,0 +1,27 @@ + + + com.microchip.mplab.nbide.embedded.makeproject + + + Lab6 + b51528bc-1afa-4516-b12e-64bc8ad1cb3e + 0 + c + + h + + ISO-8859-1 + + + + + default + 2 + + + + false + + + + diff --git a/Lab6.X/strap012_prelab6.zip b/Lab6.X/strap012_prelab6.zip new file mode 100644 index 0000000..52eb23f Binary files /dev/null and b/Lab6.X/strap012_prelab6.zip differ -- cgit v1.2.3