From 2a745b59c0c5facfda490b26146c18f4726607bb Mon Sep 17 00:00:00 2001 From: Jacob Alexander Date: Mon, 25 Apr 2016 23:26:27 -0700 Subject: [PATCH] Adding hard-coded underlighting support for KType - Adds 32 channels of RGB leds - Increases buffer pages to 4 - Increases max channels to 576 --- Macro/PixelMap/pixel.c | 43 +++++++++++++++++++++++++++++++++++---- Scan/KType/defaultMap.kll | 24 +++++++++++----------- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/Macro/PixelMap/pixel.c b/Macro/PixelMap/pixel.c index f44bddd..09243ae 100644 --- a/Macro/PixelMap/pixel.c +++ b/Macro/PixelMap/pixel.c @@ -100,17 +100,18 @@ extern LED_Buffer LED_pageBuffer[ ISSI_Chips_define ]; // Buffer list -#define Pixel_BuffersLen 3 -#define Pixel_TotalChannels 432 +#define Pixel_BuffersLen 4 +#define Pixel_TotalChannels 576 PixelBuf Pixel_Buffers[] = { PixelBufElem( LED_BufferLength, 16, 0, LED_pageBuffer[0].buffer ), PixelBufElem( LED_BufferLength, 16, 144, LED_pageBuffer[1].buffer ), PixelBufElem( LED_BufferLength, 16, 288, LED_pageBuffer[2].buffer ), + PixelBufElem( LED_BufferLength, 16, 432, LED_pageBuffer[3].buffer ), }; // Pixel Mapping -#define Pixel_TotalPixels 95 // TODO Generate +#define Pixel_TotalPixels 128 // TODO Generate PixelElement Pixel_Mapping[] = { // Function Row (1-16) Pixel_RGBChannel(0,33,49), // 1 @@ -219,7 +220,40 @@ PixelElement Pixel_Mapping[] = { Pixel_RGBChannel(429,413,397), // 94 Pixel_RGBChannel(430,414,381), // 95 - // Underlighting - TODO + // Underlighting + // TODO Deal with missing channel 96 here + Pixel_RGBChannel(432,465,481), // 97 + Pixel_RGBChannel(433,449,482), // 98 + Pixel_RGBChannel(434,450,466), // 99 + Pixel_RGBChannel(435,451,467), // 100 + Pixel_RGBChannel(436,452,468), // 101 + Pixel_RGBChannel(437,453,469), // 102 + Pixel_RGBChannel(438,454,470), // 103 + Pixel_RGBChannel(439,455,471), // 104 + Pixel_RGBChannel(560,544,528), // 105 + Pixel_RGBChannel(561,545,529), // 106 + Pixel_RGBChannel(562,546,530), // 107 + Pixel_RGBChannel(563,547,531), // 108 + Pixel_RGBChannel(564,548,532), // 109 + Pixel_RGBChannel(565,549,533), // 110 + Pixel_RGBChannel(566,550,517), // 111 + Pixel_RGBChannel(567,534,518), // 112 + Pixel_RGBChannel(440,473,489), // 113 + Pixel_RGBChannel(441,457,490), // 114 + Pixel_RGBChannel(442,458,474), // 115 + Pixel_RGBChannel(443,459,475), // 116 + Pixel_RGBChannel(444,460,476), // 117 + Pixel_RGBChannel(445,461,477), // 118 + Pixel_RGBChannel(446,462,478), // 119 + Pixel_RGBChannel(447,463,479), // 120 + Pixel_RGBChannel(568,552,536), // 121 + Pixel_RGBChannel(569,553,537), // 122 + Pixel_RGBChannel(570,554,538), // 123 + Pixel_RGBChannel(571,555,539), // 124 + Pixel_RGBChannel(572,556,540), // 125 + Pixel_RGBChannel(573,557,541), // 126 + Pixel_RGBChannel(574,558,525), // 127 + Pixel_RGBChannel(575,542,526), // 128 }; // Frame of led changes @@ -2441,6 +2475,7 @@ PixelBuf *Pixel_bufferMap( uint16_t channel ) if ( channel < 144 ) return &Pixel_Buffers[0]; else if ( channel < 288 ) return &Pixel_Buffers[1]; else if ( channel < 432 ) return &Pixel_Buffers[2]; + else if ( channel < 576 ) return &Pixel_Buffers[3]; // Invalid channel, return first channel and display error erro_msg("Invalid channel: "); diff --git a/Scan/KType/defaultMap.kll b/Scan/KType/defaultMap.kll index 8917a50..2f95ca6 100644 --- a/Scan/KType/defaultMap.kll +++ b/Scan/KType/defaultMap.kll @@ -116,7 +116,7 @@ S0x5E : U"Right"; # Available ISSI Chips -ISSI_Chips = 3; # 1 by default +ISSI_Chips = 4; # 1 by default # Default animation speed ISSI_AnimationSpeed = 14; # 20 by default @@ -176,17 +176,17 @@ ISSILedMask4 = " "; # Disabled for now -ISSILedMask4 = " - 0x00, 0x00, /* C1-1 -> C1-16 */ - 0x00, 0x00, /* C2-1 -> C2-16 */ - 0x00, 0x00, /* C3-1 -> C3-16 */ - 0x00, 0x00, /* C4-1 -> C4-16 */ - 0x00, 0x00, /* C5-1 -> C5-16 */ - 0x00, 0x00, /* C6-1 -> C6-16 */ - 0x00, 0x00, /* C7-1 -> C7-16 */ - 0x00, 0x00, /* C8-1 -> C8-16 */ - 0x00, 0x00, /* C9-1 -> C9-16 */ -"; +#ISSILedMask4 = " +# 0x00, 0x00, /* C1-1 -> C1-16 */ +# 0x00, 0x00, /* C2-1 -> C2-16 */ +# 0x00, 0x00, /* C3-1 -> C3-16 */ +# 0x00, 0x00, /* C4-1 -> C4-16 */ +# 0x00, 0x00, /* C5-1 -> C5-16 */ +# 0x00, 0x00, /* C6-1 -> C6-16 */ +# 0x00, 0x00, /* C7-1 -> C7-16 */ +# 0x00, 0x00, /* C8-1 -> C8-16 */ +# 0x00, 0x00, /* C9-1 -> C9-16 */ +#"; ISSILedBrightness1 = " 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, /* C1-1 -> C1-16 */