aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Strapp <msattr@gmail.com>2020-02-28 11:21:22 -0600
committerMatt Strapp <msattr@gmail.com>2020-02-28 11:21:22 -0600
commit5a01f28cf66a373ab10212cccfb30f71411cfc99 (patch)
tree16cf571c0dd23b70ddc4dd555d3b02218c4ef9f2
parentFix small things (diff)
downloadee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar.gz
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar.bz2
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar.lz
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar.xz
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.tar.zst
ee2361-5a01f28cf66a373ab10212cccfb30f71411cfc99.zip
Fix small things
-rw-r--r--Lab_2B.X/dist/default/debug/memoryfile.xml36
-rw-r--r--Lab_2B.X/dist/default/production/memoryfile.xml36
-rw-r--r--Lab_2B.X/lab2b_c.c161
-rw-r--r--Lab_2B.X/lab2b_header.h18
-rw-r--r--Lab_2B.X/nbproject/Makefile-genesis.properties20
-rw-r--r--Lab_2B.X/nbproject/configurations.xml393
-rw-r--r--Lab_2B.X/nbproject/private/configurations.xml50
-rw-r--r--Lab_2B.X/nbproject/private/private.xml14
-rw-r--r--Lab_2B.X/nbproject/project.xml61
9 files changed, 395 insertions, 394 deletions
diff --git a/Lab_2B.X/dist/default/debug/memoryfile.xml b/Lab_2B.X/dist/default/debug/memoryfile.xml
index d566b37..daef847 100644
--- a/Lab_2B.X/dist/default/debug/memoryfile.xml
+++ b/Lab_2B.X/dist/default/debug/memoryfile.xml
@@ -1,18 +1,18 @@
-<?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>0</used>
- <free>8192</free>
- </memory>
- <memory name="program">
- <units>bytes</units>
- <length>65274</length>
- <used>618</used>
- <free>64656</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>0</used>
+ <free>8192</free>
+ </memory>
+ <memory name="program">
+ <units>bytes</units>
+ <length>65274</length>
+ <used>618</used>
+ <free>64656</free>
+ </memory>
+ </executable>
+</project>
diff --git a/Lab_2B.X/dist/default/production/memoryfile.xml b/Lab_2B.X/dist/default/production/memoryfile.xml
index 33031ab..31942da 100644
--- a/Lab_2B.X/dist/default/production/memoryfile.xml
+++ b/Lab_2B.X/dist/default/production/memoryfile.xml
@@ -1,18 +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>618</used>
- <free>64656</free>
- </memory>
- </executable>
-</project>
+<?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>618</used>
+ <free>64656</free>
+ </memory>
+ </executable>
+</project>
diff --git a/Lab_2B.X/lab2b_c.c b/Lab_2B.X/lab2b_c.c
index f7150c9..ea7ee20 100644
--- a/Lab_2B.X/lab2b_c.c
+++ b/Lab_2B.X/lab2b_c.c
@@ -14,101 +14,90 @@
#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)
+// 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
+ CLKDIVbits.RCDIV = 0; //Set RCDIV=1:1 (default 2:1) 32MHz or FCY/2=16M
AD1PCFG = 0x9fff;
TRISA = 0b1111111111111110;
- TRISB = 0x0000;
+ TRISB = 0x0000;
wait_1ms();
}
int main(void) {
setup();
- wait_100us();
+ 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++;
- }
- }
+ 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--) {
+ 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--) {
+ g & (1 << i) ? write_1() : write_0();
}
- for(i = 7; i >= 0; i--) {
- b & (1 << i) ? write_1() : write_0();
+ for (i = 7; i >= 0; i--) {
+ b & (1 << i) ? write_1() : write_0();
}
}
@@ -126,11 +115,13 @@ uint32_t packColor(unsigned char Red, unsigned char Grn, unsigned char Blu) {
unsigned char getR(uint32_t RGBval) {
return (unsigned char) (RGBval >> 16);
}
+
unsigned char getG(uint32_t RGBval) {
- return (unsigned char) (RGBval >> 8 );
+ return (unsigned char) (RGBval >> 8);
}
+
unsigned char getB(uint32_t RGBval) {
- return (unsigned char) (RGBval >> 0 );
+ return (unsigned char) (RGBval >> 0);
}
void writePacCol(uint32_t PackedColor) {
@@ -138,16 +129,16 @@ void writePacCol(uint32_t 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);
+ // 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/Lab_2B.X/lab2b_header.h b/Lab_2B.X/lab2b_header.h
index ccf2237..15b6b88 100644
--- a/Lab_2B.X/lab2b_header.h
+++ b/Lab_2B.X/lab2b_header.h
@@ -4,10 +4,20 @@
#ifdef __cplusplus
extern "C" {
#endif
-void wait_100us(void);
-void wait_1ms(void);
-void write_0(void);
-void write_1(void);
+ void wait_100us(void);
+ void wait_1ms(void);
+ void write_0(void);
+ void write_1(void);
+ //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);
#ifdef __cplusplus
}
#endif
diff --git a/Lab_2B.X/nbproject/Makefile-genesis.properties b/Lab_2B.X/nbproject/Makefile-genesis.properties
index b653323..3821297 100644
--- a/Lab_2B.X/nbproject/Makefile-genesis.properties
+++ b/Lab_2B.X/nbproject/Makefile-genesis.properties
@@ -1,10 +1,10 @@
-#
-#Sun Feb 09 12:48:13 CST 2020
-default.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.30\\packs\\Microchip\\PIC24F-GA-GB_DFP\\1.1.74
-default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=3de759bc6af06f5ee7453ec146192402
-default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc16\\v1.41\\bin
-configurations-xml=f8c4c2e15011928baba8ded05860f0e0
-com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76
-default.languagetoolchain.version=1.41
-host.platform=windows
-conf.ids=default
+#
+#Wed Feb 12 11:05:31 CST 2020
+default.Pack.dfplocation=C\:\\Program Files (x86)\\Microchip\\MPLABX\\v5.30\\packs\\Microchip\\PIC24F-GA-GB_DFP\\1.1.74
+default.com-microchip-mplab-nbide-toolchainXC16-XC16LanguageToolchain.md5=3de759bc6af06f5ee7453ec146192402
+default.languagetoolchain.dir=C\:\\Program Files (x86)\\Microchip\\xc16\\v1.41\\bin
+configurations-xml=16ae5683ee36e24fd40e531458e34dc7
+com-microchip-mplab-nbide-embedded-makeproject-MakeProject.md5=7cd2eead2ea6964989cbf02efe721a76
+default.languagetoolchain.version=1.41
+host.platform=windows
+conf.ids=default
diff --git a/Lab_2B.X/nbproject/configurations.xml b/Lab_2B.X/nbproject/configurations.xml
index e5940e9..86777c0 100644
--- a/Lab_2B.X/nbproject/configurations.xml
+++ b/Lab_2B.X/nbproject/configurations.xml
@@ -1,198 +1,195 @@
-<?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.41</languageToolchainVersion>
- <platform>3</platform>
- </toolsSet>
- <packs>
- <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.1.74"/>
- </packs>
- <compileType>
- <linkerTool>
- <linkerLibItems>
- </linkerLibItems>
- </linkerTool>
- <archiverTool>
- </archiverTool>
- <loading>
- <useAlternateLoadableFile>false</useAlternateLoadableFile>
- <parseOnProdLoad>false</parseOnProdLoad>
- <alternateLoadableFile></alternateLoadableFile>
- </loading>
- <subordinates>
- </subordinates>
- </compileType>
- <makeCustomizationType>
- <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
- <makeCustomizationPreStep></makeCustomizationPreStep>
- <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
- <makeCustomizationPostStep></makeCustomizationPostStep>
- <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
- <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
- <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
- </makeCustomizationType>
- <C30>
- <property key="code-model" value="default"/>
- <property key="const-model" value="default"/>
- <property key="data-model" value="default"/>
- <property key="disable-instruction-scheduling" value="false"/>
- <property key="enable-all-warnings" value="true"/>
- <property key="enable-ansi-std" value="false"/>
- <property key="enable-ansi-warnings" value="false"/>
- <property key="enable-fatal-warnings" value="false"/>
- <property key="enable-large-arrays" value="false"/>
- <property key="enable-omit-frame-pointer" value="false"/>
- <property key="enable-procedural-abstraction" value="false"/>
- <property key="enable-short-double" value="false"/>
- <property key="enable-symbols" value="true"/>
- <property key="enable-unroll-loops" value="false"/>
- <property key="extra-include-directories" value=""/>
- <property key="isolate-each-function" value="false"/>
- <property key="keep-inline" value="false"/>
- <property key="oXC16gcc-align-arr" value="false"/>
- <property key="oXC16gcc-cnsts-mauxflash" value="false"/>
- <property key="oXC16gcc-data-sects" value="false"/>
- <property key="oXC16gcc-errata" value=""/>
- <property key="oXC16gcc-fillupper" value=""/>
- <property key="oXC16gcc-large-aggregate" value="false"/>
- <property key="oXC16gcc-mauxflash" value="false"/>
- <property key="oXC16gcc-mpa-lvl" value=""/>
- <property key="oXC16gcc-name-text-sec" value=""/>
- <property key="oXC16gcc-near-chars" value="false"/>
- <property key="oXC16gcc-no-isr-warn" value="false"/>
- <property key="oXC16gcc-sfr-warn" value="false"/>
- <property key="oXC16gcc-smar-io-lvl" value="1"/>
- <property key="oXC16gcc-smart-io-fmt" value=""/>
- <property key="optimization-level" value="0"/>
- <property key="post-instruction-scheduling" value="default"/>
- <property key="pre-instruction-scheduling" value="default"/>
- <property key="preprocessor-macros" value=""/>
- <property key="scalar-model" value="default"/>
- <property key="use-cci" value="false"/>
- <property key="use-iar" value="false"/>
- </C30>
- <C30-AR>
- <property key="additional-options-chop-files" value="false"/>
- </C30-AR>
- <C30-AS>
- <property key="assembler-symbols" value=""/>
- <property key="expand-macros" value="false"/>
- <property key="extra-include-directories-for-assembler" value=""/>
- <property key="extra-include-directories-for-preprocessor" value=""/>
- <property key="false-conditionals" value="false"/>
- <property key="keep-locals" value="false"/>
- <property key="list-assembly" value="false"/>
- <property key="list-section-info" value="false"/>
- <property key="list-source" value="false"/>
- <property key="list-symbols" value="false"/>
- <property key="oXC16asm-extra-opts" value=""/>
- <property key="oXC16asm-list-to-file" value="false"/>
- <property key="omit-debug-dirs" value="false"/>
- <property key="omit-forms" value="false"/>
- <property key="preprocessor-macros" value=""/>
- <property key="relax" value="false"/>
- <property key="warning-level" value="emit-warnings"/>
- </C30-AS>
- <C30-CO>
- <property key="coverage-enable" value=""/>
- </C30-CO>
- <C30-LD>
- <property key="additional-options-use-response-files" value="false"/>
- <property key="boot-eeprom" value="no_eeprom"/>
- <property key="boot-flash" value="no_flash"/>
- <property key="boot-ram" value="no_ram"/>
- <property key="boot-write-protect" value="no_write_protect"/>
- <property key="enable-check-sections" value="false"/>
- <property key="enable-data-init" value="true"/>
- <property key="enable-default-isr" value="true"/>
- <property key="enable-handles" value="true"/>
- <property key="enable-pack-data" value="true"/>
- <property key="extra-lib-directories" value=""/>
- <property key="fill-flash-options-addr" value=""/>
- <property key="fill-flash-options-const" value=""/>
- <property key="fill-flash-options-how" value="0"/>
- <property key="fill-flash-options-inc-const" value="1"/>
- <property key="fill-flash-options-increment" value=""/>
- <property key="fill-flash-options-seq" value=""/>
- <property key="fill-flash-options-what" value="0"/>
- <property key="general-code-protect" value="no_code_protect"/>
- <property key="general-write-protect" value="no_write_protect"/>
- <property key="generate-cross-reference-file" value="false"/>
- <property key="heap-size" value=""/>
- <property key="input-libraries" value=""/>
- <property key="linker-stack" value="true"/>
- <property key="linker-symbols" value=""/>
- <property key="map-file" value="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"/>
- <property key="no-ivt" value="false"/>
- <property key="oXC16ld-extra-opts" value=""/>
- <property key="oXC16ld-fill-upper" value="0"/>
- <property key="oXC16ld-force-link" value="false"/>
- <property key="oXC16ld-no-smart-io" value="false"/>
- <property key="oXC16ld-nostdlib" value="false"/>
- <property key="oXC16ld-stackguard" value="16"/>
- <property key="preprocessor-macros" value=""/>
- <property key="remove-unused-sections" value="false"/>
- <property key="report-memory-usage" value="true"/>
- <property key="secure-eeprom" value="no_eeprom"/>
- <property key="secure-flash" value="no_flash"/>
- <property key="secure-ram" value="no_ram"/>
- <property key="secure-write-protect" value="no_write_protect"/>
- <property key="stack-size" value="16"/>
- <property key="symbol-stripping" value=""/>
- <property key="trace-symbols" value=""/>
- <property key="warn-section-align" value="false"/>
- </C30-LD>
- <C30Global>
- <property key="common-include-directories" value=""/>
- <property key="dual-boot-partition" value="0"/>
- <property key="fast-math" value="false"/>
- <property key="generic-16-bit" value="false"/>
- <property key="legacy-libc" value="true"/>
- <property key="mpreserve-all" value="false"/>
- <property key="oXC16glb-macros" value=""/>
- <property key="output-file-format" value="elf"/>
- <property key="preserve-all" value="false"/>
- <property key="preserve-file" value=""/>
- <property key="relaxed-math" value="false"/>
- <property key="save-temps" value="false"/>
- </C30Global>
- <PK3OBPlatformTool>
- <property key="firmware.download.all" value="false"/>
- </PK3OBPlatformTool>
- </conf>
- </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="65">
+ <logicalFolder name="root" displayName="root" projectFiles="true">
+ <logicalFolder name="HeaderFiles"
+ displayName="Header Files"
+ projectFiles="true">
+ </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.41</languageToolchainVersion>
+ <platform>3</platform>
+ </toolsSet>
+ <packs>
+ <pack name="PIC24F-GA-GB_DFP" vendor="Microchip" version="1.1.74"/>
+ </packs>
+ <compileType>
+ <linkerTool>
+ <linkerLibItems>
+ </linkerLibItems>
+ </linkerTool>
+ <archiverTool>
+ </archiverTool>
+ <loading>
+ <useAlternateLoadableFile>false</useAlternateLoadableFile>
+ <parseOnProdLoad>false</parseOnProdLoad>
+ <alternateLoadableFile></alternateLoadableFile>
+ </loading>
+ <subordinates>
+ </subordinates>
+ </compileType>
+ <makeCustomizationType>
+ <makeCustomizationPreStepEnabled>false</makeCustomizationPreStepEnabled>
+ <makeCustomizationPreStep></makeCustomizationPreStep>
+ <makeCustomizationPostStepEnabled>false</makeCustomizationPostStepEnabled>
+ <makeCustomizationPostStep></makeCustomizationPostStep>
+ <makeCustomizationPutChecksumInUserID>false</makeCustomizationPutChecksumInUserID>
+ <makeCustomizationEnableLongLines>false</makeCustomizationEnableLongLines>
+ <makeCustomizationNormalizeHexFile>false</makeCustomizationNormalizeHexFile>
+ </makeCustomizationType>
+ <C30>
+ <property key="code-model" value="default"/>
+ <property key="const-model" value="default"/>
+ <property key="data-model" value="default"/>
+ <property key="disable-instruction-scheduling" value="false"/>
+ <property key="enable-all-warnings" value="true"/>
+ <property key="enable-ansi-std" value="false"/>
+ <property key="enable-ansi-warnings" value="false"/>
+ <property key="enable-fatal-warnings" value="false"/>
+ <property key="enable-large-arrays" value="false"/>
+ <property key="enable-omit-frame-pointer" value="false"/>
+ <property key="enable-procedural-abstraction" value="false"/>
+ <property key="enable-short-double" value="false"/>
+ <property key="enable-symbols" value="true"/>
+ <property key="enable-unroll-loops" value="false"/>
+ <property key="extra-include-directories" value=""/>
+ <property key="isolate-each-function" value="false"/>
+ <property key="keep-inline" value="false"/>
+ <property key="oXC16gcc-align-arr" value="false"/>
+ <property key="oXC16gcc-cnsts-mauxflash" value="false"/>
+ <property key="oXC16gcc-data-sects" value="false"/>
+ <property key="oXC16gcc-errata" value=""/>
+ <property key="oXC16gcc-fillupper" value=""/>
+ <property key="oXC16gcc-large-aggregate" value="false"/>
+ <property key="oXC16gcc-mauxflash" value="false"/>
+ <property key="oXC16gcc-mpa-lvl" value=""/>
+ <property key="oXC16gcc-name-text-sec" value=""/>
+ <property key="oXC16gcc-near-chars" value="false"/>
+ <property key="oXC16gcc-no-isr-warn" value="false"/>
+ <property key="oXC16gcc-sfr-warn" value="false"/>
+ <property key="oXC16gcc-smar-io-lvl" value="1"/>
+ <property key="oXC16gcc-smart-io-fmt" value=""/>
+ <property key="optimization-level" value="0"/>
+ <property key="post-instruction-scheduling" value="default"/>
+ <property key="pre-instruction-scheduling" value="default"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="scalar-model" value="default"/>
+ <property key="use-cci" value="false"/>
+ <property key="use-iar" value="false"/>
+ </C30>
+ <C30-AR>
+ <property key="additional-options-chop-files" value="false"/>
+ </C30-AR>
+ <C30-AS>
+ <property key="assembler-symbols" value=""/>
+ <property key="expand-macros" value="false"/>
+ <property key="extra-include-directories-for-assembler" value=""/>
+ <property key="extra-include-directories-for-preprocessor" value=""/>
+ <property key="false-conditionals" value="false"/>
+ <property key="keep-locals" value="false"/>
+ <property key="list-assembly" value="false"/>
+ <property key="list-section-info" value="false"/>
+ <property key="list-source" value="false"/>
+ <property key="list-symbols" value="false"/>
+ <property key="oXC16asm-extra-opts" value=""/>
+ <property key="oXC16asm-list-to-file" value="false"/>
+ <property key="omit-debug-dirs" value="false"/>
+ <property key="omit-forms" value="false"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="relax" value="false"/>
+ <property key="warning-level" value="emit-warnings"/>
+ </C30-AS>
+ <C30-CO>
+ <property key="coverage-enable" value=""/>
+ </C30-CO>
+ <C30-LD>
+ <property key="additional-options-use-response-files" value="false"/>
+ <property key="boot-eeprom" value="no_eeprom"/>
+ <property key="boot-flash" value="no_flash"/>
+ <property key="boot-ram" value="no_ram"/>
+ <property key="boot-write-protect" value="no_write_protect"/>
+ <property key="enable-check-sections" value="false"/>
+ <property key="enable-data-init" value="true"/>
+ <property key="enable-default-isr" value="true"/>
+ <property key="enable-handles" value="true"/>
+ <property key="enable-pack-data" value="true"/>
+ <property key="extra-lib-directories" value=""/>
+ <property key="fill-flash-options-addr" value=""/>
+ <property key="fill-flash-options-const" value=""/>
+ <property key="fill-flash-options-how" value="0"/>
+ <property key="fill-flash-options-inc-const" value="1"/>
+ <property key="fill-flash-options-increment" value=""/>
+ <property key="fill-flash-options-seq" value=""/>
+ <property key="fill-flash-options-what" value="0"/>
+ <property key="general-code-protect" value="no_code_protect"/>
+ <property key="general-write-protect" value="no_write_protect"/>
+ <property key="generate-cross-reference-file" value="false"/>
+ <property key="heap-size" value=""/>
+ <property key="input-libraries" value=""/>
+ <property key="linker-stack" value="true"/>
+ <property key="linker-symbols" value=""/>
+ <property key="map-file" value="${DISTDIR}/${PROJECTNAME}.${IMAGE_TYPE}.map"/>
+ <property key="no-ivt" value="false"/>
+ <property key="oXC16ld-extra-opts" value=""/>
+ <property key="oXC16ld-fill-upper" value="0"/>
+ <property key="oXC16ld-force-link" value="false"/>
+ <property key="oXC16ld-no-smart-io" value="false"/>
+ <property key="oXC16ld-nostdlib" value="false"/>
+ <property key="oXC16ld-stackguard" value="16"/>
+ <property key="preprocessor-macros" value=""/>
+ <property key="remove-unused-sections" value="false"/>
+ <property key="report-memory-usage" value="true"/>
+ <property key="secure-eeprom" value="no_eeprom"/>
+ <property key="secure-flash" value="no_flash"/>
+ <property key="secure-ram" value="no_ram"/>
+ <property key="secure-write-protect" value="no_write_protect"/>
+ <property key="stack-size" value="16"/>
+ <property key="symbol-stripping" value=""/>
+ <property key="trace-symbols" value=""/>
+ <property key="warn-section-align" value="false"/>
+ </C30-LD>
+ <C30Global>
+ <property key="common-include-directories" value=""/>
+ <property key="dual-boot-partition" value="0"/>
+ <property key="fast-math" value="false"/>
+ <property key="generic-16-bit" value="false"/>
+ <property key="legacy-libc" value="true"/>
+ <property key="mpreserve-all" value="false"/>
+ <property key="oXC16glb-macros" value=""/>
+ <property key="output-file-format" value="elf"/>
+ <property key="preserve-all" value="false"/>
+ <property key="preserve-file" value=""/>
+ <property key="relaxed-math" value="false"/>
+ <property key="save-temps" value="false"/>
+ </C30Global>
+ </conf>
+ </confs>
+</configurationDescriptor>
diff --git a/Lab_2B.X/nbproject/private/configurations.xml b/Lab_2B.X/nbproject/private/configurations.xml
index dcd118a..6220849 100644
--- a/Lab_2B.X/nbproject/private/configurations.xml
+++ b/Lab_2B.X/nbproject/private/configurations.xml
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="65">
- <projectmakefile>Makefile</projectmakefile>
- <defaultConf>0</defaultConf>
- <confs>
- <conf name="default" type="2">
- <platformToolSN>:=MPLABComm-USB-Microchip:=&lt;vid>04D8:=&lt;pid>8108:=&lt;rev>0002:=&lt;man>Digilent:=&lt;prod>chipKitProgrammer:=&lt;sn>DA63CA1:=&lt;drv>x:=&lt;xpt>h:=end</platformToolSN>
- <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.41\bin</languageToolchainDir>
- <mdbdebugger version="1">
- <placeholder1>place holder 1</placeholder1>
- <placeholder2>place holder 2</placeholder2>
- </mdbdebugger>
- <runprofile version="6">
- <args></args>
- <rundir></rundir>
- <buildfirst>true</buildfirst>
- <console-type>0</console-type>
- <terminal-type>0</terminal-type>
- <remove-instrumentation>0</remove-instrumentation>
- <environment>
- </environment>
- </runprofile>
- </conf>
- </confs>
-</configurationDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<configurationDescriptor version="65">
+ <projectmakefile>Makefile</projectmakefile>
+ <defaultConf>0</defaultConf>
+ <confs>
+ <conf name="default" type="2">
+ <platformToolSN></platformToolSN>
+ <languageToolchainDir>C:\Program Files (x86)\Microchip\xc16\v1.41\bin</languageToolchainDir>
+ <mdbdebugger version="1">
+ <placeholder1>place holder 1</placeholder1>
+ <placeholder2>place holder 2</placeholder2>
+ </mdbdebugger>
+ <runprofile version="6">
+ <args></args>
+ <rundir></rundir>
+ <buildfirst>true</buildfirst>
+ <console-type>0</console-type>
+ <terminal-type>0</terminal-type>
+ <remove-instrumentation>0</remove-instrumentation>
+ <environment>
+ </environment>
+ </runprofile>
+ </conf>
+ </confs>
+</configurationDescriptor>
diff --git a/Lab_2B.X/nbproject/private/private.xml b/Lab_2B.X/nbproject/private/private.xml
index 6807a2b..284eeec 100644
--- a/Lab_2B.X/nbproject/private/private.xml
+++ b/Lab_2B.X/nbproject/private/private.xml
@@ -1,7 +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/>
- </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/Lab_2B.X/nbproject/project.xml b/Lab_2B.X/nbproject/project.xml
index 564eff0..18ad1b3 100644
--- a/Lab_2B.X/nbproject/project.xml
+++ b/Lab_2B.X/nbproject/project.xml
@@ -1,29 +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>
- </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+ <type>com.microchip.mplab.nbide.embedded.makeproject</type>
+ <configuration>
+ <data xmlns="http://www.netbeans.org/ns/make-project/1">
+ <name>Lab_2B</name>
+ <creation-uuid>d27e1e53-621b-410a-8a6c-a6ea3346788a</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>