diff options
author | RossTheRoss <msattr@gmail.com> | 2020-04-08 11:17:47 -0500 |
---|---|---|
committer | RossTheRoss <msattr@gmail.com> | 2020-04-08 11:17:47 -0500 |
commit | f7dddf06297f415413760f3bedf00f7297e60cf7 (patch) | |
tree | 2a3008d3efcf7b140593b120ca925e1757e1d83c /Lab2B.X | |
parent | e (diff) | |
download | ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar.gz ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar.bz2 ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar.lz ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar.xz ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.tar.zst ee2361-f7dddf06297f415413760f3bedf00f7297e60cf7.zip |
Forget to add a bunch of things
oops
Diffstat (limited to '')
-rw-r--r-- | Lab2B.X/Makefile (renamed from Lab 2.X/Makefile) | 0 | ||||
-rw-r--r-- | Lab2B.X/dist/default/debug/memoryfile.xml (renamed from HW3.X/dist/default/production/memoryfile.xml) | 36 | ||||
-rw-r--r-- | Lab2B.X/dist/default/production/memoryfile.xml | 18 | ||||
-rw-r--r-- | Lab2B.X/lab2b_asm.s (renamed from Lab_2B.X/lab2b_asm.s) | 78 | ||||
-rw-r--r-- | Lab2B.X/lab2b_c.c | 153 | ||||
-rw-r--r-- | Lab2B.X/lab2b_header.h | 15 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Makefile-default.mk (renamed from Lab_2B.X/nbproject/Makefile-default.mk) | 24 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Makefile-genesis.properties | 10 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Makefile-impl.mk (renamed from Lab_2B.X/nbproject/Makefile-impl.mk) | 2 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Makefile-local-default.mk (renamed from Lab_2B.X/nbproject/Makefile-local-default.mk) | 25 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Makefile-variables.mk (renamed from Lab_2B.X/nbproject/Makefile-variables.mk) | 4 | ||||
-rw-r--r-- | Lab2B.X/nbproject/Package-default.bash (renamed from Lab_2B.X/nbproject/Package-default.bash) | 4 | ||||
-rw-r--r-- | Lab2B.X/nbproject/configurations.xml | 198 | ||||
-rw-r--r-- | Lab2B.X/nbproject/private/configurations.xml | 25 | ||||
-rw-r--r-- | Lab2B.X/nbproject/private/private.xml (renamed from HW3.X/nbproject/private/private.xml) | 16 | ||||
-rw-r--r-- | Lab2B.X/nbproject/project.xml | 32 |
16 files changed, 544 insertions, 96 deletions
diff --git a/Lab 2.X/Makefile b/Lab2B.X/Makefile index fca8e2c..fca8e2c 100644 --- a/Lab 2.X/Makefile +++ b/Lab2B.X/Makefile diff --git a/HW3.X/dist/default/production/memoryfile.xml b/Lab2B.X/dist/default/debug/memoryfile.xml index 22401db..76b7a05 100644 --- a/HW3.X/dist/default/production/memoryfile.xml +++ b/Lab2B.X/dist/default/debug/memoryfile.xml @@ -1,18 +1,18 @@ -<?xml version="1.0" encoding="UTF-8"?>
-
-<project>
- <executable name="dist/default/production/HW3.X.production.elf">
- <memory name="data">
- <units>bytes</units>
- <length>8192</length>
- <used>4</used>
- <free>8188</free>
- </memory>
- <memory name="program">
- <units>bytes</units>
- <length>65274</length>
- <used>453</used>
- <free>64821</free>
- </memory>
- </executable>
-</project>
+<?xml version="1.0" encoding="UTF-8"?> + +<project> + <executable name="dist/default/debug/Lab_2B.X.debug.elf"> + <memory name="data"> + <units>bytes</units> + <length>8192</length> + <used>80</used> + <free>8112</free> + </memory> + <memory name="program"> + <units>bytes</units> + <length>65274</length> + <used>1056</used> + <free>64218</free> + </memory> + </executable> +</project> diff --git a/Lab2B.X/dist/default/production/memoryfile.xml b/Lab2B.X/dist/default/production/memoryfile.xml new file mode 100644 index 0000000..386e890 --- /dev/null +++ b/Lab2B.X/dist/default/production/memoryfile.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project> + <executable name="dist/default/production/Lab_2B.X.production.elf"> + <memory name="data"> + <units>bytes</units> + <length>8192</length> + <used>0</used> + <free>8192</free> + </memory> + <memory name="program"> + <units>bytes</units> + <length>65274</length> + <used>1059</used> + <free>64215</free> + </memory> + </executable> +</project> diff --git a/Lab_2B.X/lab2b_asm.s b/Lab2B.X/lab2b_asm.s index ddee29b..2dfc361 100644 --- a/Lab_2B.X/lab2b_asm.s +++ b/Lab2B.X/lab2b_asm.s @@ -1,40 +1,40 @@ -.include "xc.inc"
-
-.text ;BP (put the following data in ROM(program memory))
-
-; This is a library, thus it can *not* contain a _main function: the C file will
-; define main(). However, we
-; we will need a .global statement to make available ASM functions to C code.
-; All functions utilized outside of this file will need to have a leading
-; underscore (_) and be included in a comment delimited list below.
-.global _write_0, _write_1, _wait_100us, _wait_1ms
-
-_wait_100us:
- repeat #1593
- nop
- return
-
-_wait_1ms:
- repeat #15993
- nop
- return
-
-_write_0: ;2 cycles for function call
- inc LATA ;1
- repeat #2 ;1 for load
- nop ;2+1=3 nop
- clr LATA ;1
- repeat #6 ;1 for load
- nop ;1+6=7 nop
- return ;3 return
-
-
-_write_1: ;2 cycle call
- inc LATA ;1
- repeat #8 ;1 load
- nop ;1+9=10 nop
- clr LATA ;1
- nop ;1
- nop ;1
- return ;3 return
+.include "xc.inc" + +.text ;BP (put the following data in ROM(program memory)) + +; This is a library, thus it can *not* contain a _main function: the C file will +; define main(). However, we +; we will need a .global statement to make available ASM functions to C code. +; All functions utilized outside of this file will need to have a leading +; underscore (_) and be included in a comment delimited list below. +.global _write_0, _write_1, _wait_100us, _wait_1ms + +_wait_100us: + repeat #1593 + nop + return + +_wait_1ms: + repeat #15993 + nop + return + +_write_0: ;2 cycles for function call + inc LATA ;1 + repeat #2 ;1 for load + nop ;2+1=3 nop + clr LATA ;1 + repeat #6 ;1 for load + nop ;1+6=7 nop + return ;3 return + + +_write_1: ;2 cycle call + inc LATA ;1 + repeat #8 ;1 load + nop ;1+9=10 nop + clr LATA ;1 + nop ;1 + nop ;1 + return ;3 return
\ No newline at end of file diff --git a/Lab2B.X/lab2b_c.c b/Lab2B.X/lab2b_c.c new file mode 100644 index 0000000..c8f62b8 --- /dev/null +++ b/Lab2B.X/lab2b_c.c @@ -0,0 +1,153 @@ +#include "xc.h" +#include "lab2b_header.h" +#include "stdint.h" +// 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 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)) +#define PERIOD 30 + +//DEFINTIONS +void writeColor(int r, int g, int b); +void loop(void); +void delay(int delay_in_ms); +uint32_t packColor(unsigned char Red, unsigned char Grn, unsigned char Blu); +unsigned char getR(uint32_t RGBval); +unsigned char getG(uint32_t RGBval); +unsigned char getB(uint32_t RGBval); +void writePacCol(uint32_t PackedColor); +uint32_t Wheel(unsigned char WheelPos); + +void setup(void) { + CLKDIVbits.RCDIV = 0; //Set RCDIV=1:1 (default 2:1) 32MHz or FCY/2=16M + AD1PCFG = 0x9fff; + TRISA = 0b1111111111111110; + TRISB = 0x0000; + wait_1ms(); +} + +int main(void) { + setup(); + wait_100us(); + loop(); + return 0; +} + +void loop(void) { + while (1) { +// LATA = 0x0000; +// wait_100us(); +// +// //RED +// write_1(); +// write_1(); +// write_1(); +// write_1(); +// +// write_1(); +// write_1(); +// write_1(); +// write_1(); +// +// //GREEN +// write_1(); +// write_0(); +// write_0(); +// write_1(); +// +// write_1(); +// write_0(); +// write_1(); +// write_1(); +// +// //BLUE +// write_0(); +// write_0(); +// write_0(); +// write_0(); +// +// write_0(); +// write_0(); +// write_0(); +// write_0(); +/* + writeColor(255, 155, 000); +*/ + int byteFrameNumber = 0; + while (byteFrameNumber <= 255) { +// // COLOR GRADIENT +// writeColor(byteFrameNumber, 0 , 255 - byteFrameNumber); + + //COLOR WHEEL + writePacCol(Wheel(byteFrameNumber)); + delay(PERIOD); + byteFrameNumber++; + } + } +} + +void writeColor(int r, int g, int b) { + write_0(); + wait_100us(); + int i; + for(i = 7; i >= 0; i--) { + r & (1 << i) ? write_1() : write_0(); + } + for(i = 7; i >= 0; i--) { + g & (1 << i) ? write_1() : write_0(); + } + for(i = 7; i >= 0; i--) { + b & (1 << i) ? write_1() : write_0(); + } +} + +void delay(int delay_in_ms) { + int i; + for (i = 0; i < delay_in_ms; i++) { + wait_1ms(); + } +} + +uint32_t packColor(unsigned char Red, unsigned char Grn, unsigned char Blu) { + return ((long) Red << 16) | ((long) Grn << 8) | ((long) Blu); +} + +unsigned char getR(uint32_t RGBval) { + return (unsigned char) (RGBval >> 16); +} +unsigned char getG(uint32_t RGBval) { + return (unsigned char) (RGBval >> 8 ); +} +unsigned char getB(uint32_t RGBval) { + return (unsigned char) (RGBval >> 0 ); +} + +void writePacCol(uint32_t PackedColor) { + writeColor(getR(PackedColor), getG(PackedColor), getB(PackedColor)); +} + +uint32_t Wheel(unsigned char WheelPos) { +// Input a value 0 to 255 to get a color value. +// The colours are a transition r - g - b - back to r. + WheelPos = 255 - WheelPos; + if(WheelPos < 85) { + return packColor(255 - WheelPos * 3, 0, WheelPos * 3); + } + if(WheelPos < 170) { + WheelPos -= 85; + return packColor(0, WheelPos * 3, 255 - WheelPos * 3); + } + WheelPos -= 170; + return packColor(WheelPos * 3, 255 - WheelPos * 3, 0); +}
\ No newline at end of file diff --git a/Lab2B.X/lab2b_header.h b/Lab2B.X/lab2b_header.h new file mode 100644 index 0000000..d53f522 --- /dev/null +++ b/Lab2B.X/lab2b_header.h @@ -0,0 +1,15 @@ +#ifndef LAB2B_ASM +#define LAB2B_ASM + +#ifdef __cplusplus +extern "C" { +#endif +void wait_100us(void); +void wait_1ms(void); +void write_0(void); +void write_1(void); +#ifdef __cplusplus +} +#endif + +#endif /* LAB2B_ASM */
\ No newline at end of file diff --git a/Lab_2B.X/nbproject/Makefile-default.mk b/Lab2B.X/nbproject/Makefile-default.mk index 5ab6334..27dc4d4 100644 --- a/Lab_2B.X/nbproject/Makefile-default.mk +++ b/Lab2B.X/nbproject/Makefile-default.mk @@ -30,12 +30,12 @@ ifeq ($(TYPE_IMAGE), DEBUG_RUN) IMAGE_TYPE=debug OUTPUT_SUFFIX=elf DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} else IMAGE_TYPE=production OUTPUT_SUFFIX=hex DEBUGGABLE_SUFFIX=elf -FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +FINAL_IMAGE=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} endif ifeq ($(COMPARE_BUILD), true) @@ -88,7 +88,7 @@ FIXDEPS=fixDeps ifneq ($(INFORMATION_MESSAGE), ) @echo $(INFORMATION_MESSAGE) endif - ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} + ${MAKE} -f nbproject/Makefile-default.mk dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} MP_PROCESSOR_OPTION=24FJ64GA002 MP_LINKER_FILE_OPTION=,--script=p24FJ64GA002.gld @@ -99,7 +99,7 @@ ${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/lab2b_c.o.d @${RM} ${OBJECTDIR}/lab2b_c.o - ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.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 + ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.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 @${FIXDEPS} "${OBJECTDIR}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ else @@ -107,7 +107,7 @@ ${OBJECTDIR}/lab2b_c.o: lab2b_c.c nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/lab2b_c.o.d @${RM} ${OBJECTDIR}/lab2b_c.o - ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.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 + ${MP_CC} $(MP_EXTRA_CC_PRE) lab2b_c.c -o ${OBJECTDIR}/lab2b_c.o -c -mcpu=$(MP_PROCESSOR_OPTION) -MMD -MF "${OBJECTDIR}/lab2b_c.o.d" -g -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc $(COMPARISON_BUILD) -O0 -msmart-io=1 -Wall -msfr-warn=off @${FIXDEPS} "${OBJECTDIR}/lab2b_c.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ endif @@ -119,7 +119,7 @@ ${OBJECTDIR}/lab2b_asm.o: lab2b_asm.s nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/lab2b_asm.o.d @${RM} ${OBJECTDIR}/lab2b_asm.o - ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.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 + ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -D__DEBUG -D__MPLAB_DEBUGGER_PK3=1 -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.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) @${FIXDEPS} "${OBJECTDIR}/lab2b_asm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ else @@ -127,7 +127,7 @@ ${OBJECTDIR}/lab2b_asm.o: lab2b_asm.s nbproject/Makefile-${CND_CONF}.mk @${MKDIR} "${OBJECTDIR}" @${RM} ${OBJECTDIR}/lab2b_asm.o.d @${RM} ${OBJECTDIR}/lab2b_asm.o - ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,-g,--no-relax$(MP_EXTRA_AS_POST) -mdfp=${DFP_DIR}/xc16 + ${MP_CC} $(MP_EXTRA_AS_PRE) lab2b_asm.s -o ${OBJECTDIR}/lab2b_asm.o -c -mcpu=$(MP_PROCESSOR_OPTION) -omf=elf -DXPRJ_default=$(CND_CONF) -legacy-libc -Wa,-MD,"${OBJECTDIR}/lab2b_asm.o.d",--defsym=__MPLAB_BUILD=1,-g,--no-relax$(MP_EXTRA_AS_POST) @${FIXDEPS} "${OBJECTDIR}/lab2b_asm.o.d" $(SILENT) -rsi ${MP_CC_DIR}../ endif @@ -141,15 +141,15 @@ endif # ------------------------------------------------------------------------------------ # Rules for buildStep: link ifeq ($(TYPE_IMAGE), DEBUG_RUN) -dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.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}/Lab_2B.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 + ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.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) else -dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX}: ${OBJECTFILES} nbproject/Makefile-${CND_CONF}.mk +dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.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}/Lab_2B.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}/Lab_2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a -omf=elf -mdfp=${DFP_DIR}/xc16 + ${MP_CC} $(MP_EXTRA_LD_PRE) -o dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.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) + ${MP_CC_DIR}\\xc16-bin2hex dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${DEBUGGABLE_SUFFIX} -a -omf=elf endif diff --git a/Lab2B.X/nbproject/Makefile-genesis.properties b/Lab2B.X/nbproject/Makefile-genesis.properties new file mode 100644 index 0000000..6900e22 --- /dev/null +++ b/Lab2B.X/nbproject/Makefile-genesis.properties @@ -0,0 +1,10 @@ +# +#Wed Apr 08 11:00:01 CDT 2020 +default.Pack.dfplocation= +default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=859fc649e7017fd01769e2187e1537a7 +default.languagetoolchain.dir=C\:\\Program Files\\Microchip\\xc16\\v1.50\\bin +configurations-xml=e601777007ceef34a0de9288bb063c9a +com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=5db0f4d6bbe0ec2a1f1096ccfb9d7ad3 +default.languagetoolchain.version=1.50 +host.platform=windows +conf.ids=default diff --git a/Lab_2B.X/nbproject/Makefile-impl.mk b/Lab2B.X/nbproject/Makefile-impl.mk index d19ad88..58626eb 100644 --- a/Lab_2B.X/nbproject/Makefile-impl.mk +++ b/Lab2B.X/nbproject/Makefile-impl.mk @@ -24,7 +24,7 @@ CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}} # Project Name -PROJECTNAME=Lab_2B.X +PROJECTNAME=Lab2B.X # Active Configuration DEFAULTCONF=default diff --git a/Lab_2B.X/nbproject/Makefile-local-default.mk b/Lab2B.X/nbproject/Makefile-local-default.mk index 214e7fa..bb871de 100644 --- a/Lab_2B.X/nbproject/Makefile-local-default.mk +++ b/Lab2B.X/nbproject/Makefile-local-default.mk @@ -15,24 +15,23 @@ # $ 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" diff --git a/Lab_2B.X/nbproject/Makefile-variables.mk b/Lab2B.X/nbproject/Makefile-variables.mk index 739f16b..aaa6f9f 100644 --- a/Lab_2B.X/nbproject/Makefile-variables.mk +++ b/Lab2B.X/nbproject/Makefile-variables.mk @@ -6,8 +6,8 @@ CND_BASEDIR=`pwd` # default configuration CND_ARTIFACT_DIR_default=dist/default/production -CND_ARTIFACT_NAME_default=Lab_2B.X.production.hex -CND_ARTIFACT_PATH_default=dist/default/production/Lab_2B.X.production.hex +CND_ARTIFACT_NAME_default=Lab2B.X.production.hex +CND_ARTIFACT_PATH_default=dist/default/production/Lab2B.X.production.hex CND_PACKAGE_DIR_default=${CND_DISTDIR}/default/package CND_PACKAGE_NAME_default=lab2b.x.tar CND_PACKAGE_PATH_default=${CND_DISTDIR}/default/package/lab2b.x.tar diff --git a/Lab_2B.X/nbproject/Package-default.bash b/Lab2B.X/nbproject/Package-default.bash index c137317..ab6b25e 100644 --- a/Lab_2B.X/nbproject/Package-default.bash +++ b/Lab2B.X/nbproject/Package-default.bash @@ -10,8 +10,8 @@ CND_CONF=default CND_DISTDIR=dist TMPDIR=build/${CND_CONF}/${IMAGE_TYPE}/tmp-packaging TMPDIRNAME=tmp-packaging -OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} -OUTPUT_BASENAME=Lab_2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +OUTPUT_PATH=dist/${CND_CONF}/${IMAGE_TYPE}/Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} +OUTPUT_BASENAME=Lab2B.X.${IMAGE_TYPE}.${OUTPUT_SUFFIX} PACKAGE_TOP_DIR=lab2b.x/ # Functions diff --git a/Lab2B.X/nbproject/configurations.xml b/Lab2B.X/nbproject/configurations.xml new file mode 100644 index 0000000..5998fec --- /dev/null +++ b/Lab2B.X/nbproject/configurations.xml @@ -0,0 +1,198 @@ +<?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"> + </logicalFolder> + <logicalFolder name="LinkerScript" + displayName="Linker Files" + projectFiles="true"> + </logicalFolder> + <logicalFolder name="SourceFiles" + displayName="Source Files" + projectFiles="true"> + <itemPath>lab2b_asm.s</itemPath> + <itemPath>lab2b_header.h</itemPath> + <itemPath>lab2b_c.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.50</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="firmware.download.all" value="false"/> + </PK3OBPlatformTool> + </conf> + </confs> +</configurationDescriptor> diff --git a/Lab2B.X/nbproject/private/configurations.xml b/Lab2B.X/nbproject/private/configurations.xml new file mode 100644 index 0000000..099de7b --- /dev/null +++ b/Lab2B.X/nbproject/private/configurations.xml @@ -0,0 +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:=<vid>04D8:=<pid>8108:=<rev>0002:=<man>Digilent:=<prod>chipKitProgrammer:=<sn>DA63CA1:=<drv>x:=<xpt>h:=end</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/HW3.X/nbproject/private/private.xml b/Lab2B.X/nbproject/private/private.xml index fc10dfb..6807a2b 100644 --- a/HW3.X/nbproject/private/private.xml +++ b/Lab2B.X/nbproject/private/private.xml @@ -1,9 +1,7 @@ -<?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/Ross/MPLABXProjects/EE2361Projects/HW3.X/int_first_t1.c</file>
- </group>
- </open-files>
-</project-private>
+<?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/> + </open-files> +</project-private> diff --git a/Lab2B.X/nbproject/project.xml b/Lab2B.X/nbproject/project.xml new file mode 100644 index 0000000..254719f --- /dev/null +++ b/Lab2B.X/nbproject/project.xml @@ -0,0 +1,32 @@ +<?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>LAB_2B</name> + <creation-uuid>ad7fe9ed-f02a-439c-9233-24f02477fa64</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> + <spellchecker-wordlist xmlns="http://www.netbeans.org/ns/spellchecker-wordlist/1"> + <word>colours</word> + </spellchecker-wordlist> + </configuration> +</project> |