From 5a01f28cf66a373ab10212cccfb30f71411cfc99 Mon Sep 17 00:00:00 2001 From: Matt Strapp Date: Fri, 28 Feb 2020 11:21:22 -0600 Subject: Fix small things --- Lab_2B.X/dist/default/debug/memoryfile.xml | 36 +-- Lab_2B.X/dist/default/production/memoryfile.xml | 36 +-- Lab_2B.X/lab2b_c.c | 161 +++++----- Lab_2B.X/lab2b_header.h | 18 +- Lab_2B.X/nbproject/Makefile-genesis.properties | 20 +- Lab_2B.X/nbproject/configurations.xml | 393 ++++++++++++------------ Lab_2B.X/nbproject/private/configurations.xml | 50 +-- Lab_2B.X/nbproject/private/private.xml | 14 +- Lab_2B.X/nbproject/project.xml | 61 ++-- 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 @@ - - - - - - bytes - 8192 - 0 - 8192 - - - bytes - 65274 - 618 - 64656 - - - + + + + + + bytes + 8192 + 0 + 8192 + + + bytes + 65274 + 618 + 64656 + + + 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 @@ - - - - - - bytes - 8192 - 0 - 8192 - - - bytes - 65274 - 618 - 64656 - - - + + + + + + bytes + 8192 + 0 + 8192 + + + bytes + 65274 + 618 + 64656 + + + 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 @@ - - - - - - - - - lab2b_asm.s - lab2b_header.h - lab2b_c.c - - - Makefile - - - - . - - Makefile - - - - localhost - PIC24FJ64GA002 - - - PK3OBPlatformTool - XC16 - 1.41 - 3 - - - - - - - - - - - - - false - false - - - - - - - false - - false - - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + lab2b_asm.s + lab2b_header.h + lab2b_c.c + + + Makefile + + + + . + + Makefile + + + + localhost + PIC24FJ64GA002 + + + PK3OBPlatformTool + XC16 + 1.41 + 3 + + + + + + + + + + + + + false + false + + + + + + + false + + false + + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 @@ - - - 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 (x86)\Microchip\xc16\v1.41\bin - - place holder 1 - place holder 2 - - - - - true - 0 - 0 - 0 - - - - - - + + + Makefile + 0 + + + + C:\Program Files (x86)\Microchip\xc16\v1.41\bin + + place holder 1 + place holder 2 + + + + + true + 0 + 0 + 0 + + + + + + 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 @@ - - - - - - - + + + + + + + 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 @@ - - - com.microchip.mplab.nbide.embedded.makeproject - - - LAB_2B - ad7fe9ed-f02a-439c-9233-24f02477fa64 - 0 - c - - h - - ISO-8859-1 - - - . - - - - default - 2 - - - - false - - - - + + + com.microchip.mplab.nbide.embedded.makeproject + + + Lab_2B + d27e1e53-621b-410a-8a6c-a6ea3346788a + 0 + c + + h + + ISO-8859-1 + + + . + + + + default + 2 + + + + false + + + + colours + + + -- cgit v1.2.3