소스 검색

LED config fixes (#18973)

Ryan 2 년 전
부모
커밋
20ed138236

+ 1 - 1
keyboards/handwired/hnah108/config.h

@@ -47,7 +47,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BACKLIGHT_LEVELS 4
 
 #define RGB_DI_PIN E2
-#define RGB_MATRIX_LED_COUNT 31
+#define RGB_MATRIX_LED_COUNT 30
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects

+ 4 - 4
keyboards/handwired/hnah108/hnah108.c

@@ -32,10 +32,10 @@ led_config_t g_led_config = {
         { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      2 }
     }, {
         // LED Index to Physical Position
-        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 },
-        {   0,  25 },                                                                                                                                             { 205,  25 },
-        {   0,  51 },                                                                                                                                             { 205,  51 },
-        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }
+        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 }, { 224,   0 },
+        {   0,  25 },                                                                                                                                                           { 224,  25 },
+        {   0,  51 },                                                                                                                                                           { 224,  51 },
+        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }, { 224,  63 }
     }, {
         // LED Index to Flag
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+ 2 - 2
keyboards/kbdfans/odin/rgb/config.h

@@ -24,8 +24,8 @@
 #define DIODE_DIRECTION COL2ROW
 
 #define DEBOUNCE 5
-#define RGBLED_NUM 110
-#define RGB_MATRIX_LED_COUNT 110
+#define RGBLED_NUM 104
+#define RGB_MATRIX_LED_COUNT 104
 #define RGB_DI_PIN B15
 
 #ifdef RGB_MATRIX_ENABLE

+ 23 - 29
keyboards/kbdfans/odin/rgb/rgb.c

@@ -17,35 +17,29 @@
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {
-{
-    { 0,  NO_LED, 1,   2,      3,      4,      NO_LED,  5,      6,      7,      8,  9,  10,     11, 12,     13,     14, 15, 16, 17 },
-    { 36, 35,     34,  33,     32,     31,     30,      29,     28,     27,     26, 25, 24,     23, NO_LED, 22,     21, 20, 19, 18 },
-    { 37, 38,     39,  40,     41,     42,     43,      44,     45,     46,     47, 48, 49,     50, NO_LED, 51,     52, 53, 54, 55 },
-    { 75, 74,     73,  72,     71,     70,     69,      68,     67,     66,     65,  64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
-    { 76, NO_LED, 77,  78,     79,     80,     81,      82,     83,     84,     85,  86, NO_LED, 87, NO_LED, 88,     89, 90, 91, 92 },
-    { 103,102,    101, NO_LED, NO_LED, NO_LED, 100,     NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED,     98, 97,     96,     95, 94, 93, NO_LED }
-},
-{
-    {   12*0,  0 }, {  12*2,  0 }, {  12*3,  0 }, {  12*4,  0 }, {  12*5,  0 }, { 12*7,  0 }, { 12*8,  0 }, { 12*9,  0 }, { 12*10,  0 }, { 12*11,  0 },    { 12*12,  0 }, { 12*13,  0 }, { 12*14,  0 }, { 12*15,  0 }, { 12*16,  0 }, { 12*17,  0 }, { 12*18,  0 }, { 224,  0 },
-
-    { 224,  14 }, { 12*18,  14 },  { 12*17,  14 }, { 12*16,  14 },{ 12*15,  14 },{ 12*13,  14 },  { 12*12,  14 },  { 12*11,  14 },  { 12*10,  14 }, { 12*9,  14 },{ 12*8, 14},{ 12*7,  14},  {  12*6, 14 },  {  12*5,  14 }, {  12*4,  14 },{  12*3,  14 },{  12*2,  14 }, {12,  14},  {   12*0,  14 },
-
-    {   12*0,  26.8 }, {12,  26.8}, {  12*2,  26.8 }, {  12*3,  26.8 }, {  12*4,  26.8 }, {  12*5,  26.8 }, {  12*6, 26.8 }, { 12*7,  26.8}, { 12*8, 26.8}, { 12*9,  26.8 }, { 12*10,  26.8 }, { 12*11,  26.8 },    { 12*12,  26.8 }, { 12*13,  26.8 },  { 12*15,  26.8 }, { 12*16,  26.8 }, { 12*17,  26.8 }, { 12*18,  26.8 }, { 224,  33.2 },
-
- { 12*18,  39.6 }, { 12*17,  39.6 },{ 12*16,  39.6 }, {224,0},{0,0},{0,64},{224,64 },   { 12*13,  39.6 }, { 12*11,  39.6 }, { 12*10,  39.6 }, { 12*9,  39.6 },{ 12*8, 39.6},  { 12*7,  39.6},  {  12*6, 39.6 },  {  12*5,  39.6 },{  12*4,  39.6 },{  12*3,  39.6 },  {  12*2,  39.6 }, {12,  39.6},  {   12*0,  39.6 },
-
-    {   12*0,  52 },{  12*2,  52 }, {  12*3,  52 }, {  12*4,  52 }, {  12*5,  52 }, {  12*6, 52 }, { 12*7,  52}, { 12*8, 52}, { 12*9,  52 }, { 12*10,  52 }, { 12*11,  52 },   { 12*13,  52 },  { 12*15,  52 }, { 12*16,  52 }, { 12*17,  52 }, { 12*18,  52 }, { 224,  58 },
-
- { 12*18,  64 },  { 12*17,  64 },  { 12*16,  64 },  { 12*15,  64 },{ 12*14,  64 }, { 12*13,  64 },  { 12*11,  64 },   {  12*6, 64 }, {  12*2,  64 }, {12,  64},    {   12*0,  64 }
-},
-{
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
-4,4,4,4,4,4,4,4,4,4,4,4
-}};
+    {
+        { 0,   NO_LED,   1,      2,      3,      4, NO_LED,      5,      6,      7,      8,  9,     10, 11,     12,     13, 14, 15, 16,     17 },
+        { 36,      35,  34,     33,     32,     31,     30,     29,     28,     27,     26, 25,     24, 23, NO_LED,     22, 21, 20, 19,     18 },
+        { 37,      38,  39,     40,     41,     42,     43,     44,     45,     46,     47, 48,     49, 50, NO_LED,     51, 52, 53, 54,     55 },
+        { 75,      74,  73,     72,     71,     70,     69,     68,     67,     66,     65, 64, NO_LED, 63, NO_LED, NO_LED, 58, 57, 56, NO_LED },
+        { 76,  NO_LED,  77,     78,     79,     80,     81,     82,     83,     84,     85, 86, NO_LED, 87, NO_LED,     88, 89, 90, 91,     92 },
+        { 103,    102, 101, NO_LED, NO_LED, NO_LED,    100, NO_LED, NO_LED, NO_LED, NO_LED, 99, NO_LED, 98,     97,     96, 95, 94, 93, NO_LED }
+    }, {
+        {   0,  0 }, {  24,  0 }, {  36,  0 }, {  48,  0 }, {  60,  0 }, {  84,  0 }, {  96,  0 }, { 108,  0 }, { 120,  0 }, { 132,  0 }, { 144,  0 }, { 156,  0 }, { 168,  0 }, { 180,  0 }, { 192,  0 }, { 204,  0 }, { 216,  0 }, { 224,  0 },
+        { 224, 14 }, { 216, 14 }, { 204, 14 }, { 192, 14 }, { 180, 14 }, { 156, 14 }, { 144, 14 }, { 132, 14 }, { 120, 14 }, { 108, 14 }, { 96,  14 }, {  84, 14 }, {  72, 14 }, {  60, 14 }, {  48, 14 }, {  36, 14 }, {  24, 14 }, { 12,  14 }, {   0, 14 },
+        {   0, 27 }, {  12, 27 }, {  24, 27 }, {  36, 27 }, {  48, 27 }, {  60, 27 }, {  72, 27 }, {  84, 27 }, {  96, 27 }, { 108, 27 }, { 120, 27 }, { 132, 27 }, { 144, 27 }, { 156, 27 }, { 180, 27 }, { 192, 27 }, { 204, 27 }, { 216, 27 }, { 224, 33 },
+        { 216, 40 }, { 204, 40 }, { 192, 40 }, { 224,  0 }, {   0,  0 }, {   0, 64 }, { 224, 64 }, { 156, 40 }, { 132, 40 }, { 120, 40 }, { 108, 40 }, {  96, 40 }, {  84, 40 }, {  72, 40 }, {  60, 40 }, {  48, 40 }, {  36, 40 }, {  24, 40 }, {  12, 40 }, {   0, 40 },
+        {   0, 52 }, {  24, 52 }, {  36, 52 }, {  48, 52 }, {  60, 52 }, {  72, 52 }, { 84,  52 }, {  96, 52 }, { 108, 52 }, { 120, 52 }, { 132, 52 }, { 156, 52 }, { 180, 52 }, { 192, 52 }, { 204, 52 }, { 216, 52 }, { 224, 58 },
+        { 216, 64 }, { 204, 64 }, { 192, 64 }, { 180, 64 }, { 168, 64 }, { 156, 64 }, { 132, 64 }, {  72, 64 }, {  24, 64 }, { 12,  64 }, {   0, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+    }
+};
 
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {

+ 1 - 1
keyboards/keybee/keybee65/config.h

@@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B0
 // The number of LEDs connected
-#define RGB_MATRIX_LED_COUNT 80
+#define RGB_MATRIX_LED_COUNT 68
 // Limit the Brithness of the LEDs
 #define RGBLIGHT_LIMIT_VAL 96
 #define RGB_VAL_STEP 12

+ 24 - 24
keyboards/keybee/keybee65/keybee65.c

@@ -13,27 +13,27 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 */
 #include "keybee65.h"
 
-led_config_t g_led_config  = { {
-  // Key Matrix to LED Index
-  {  0,       1,      2,      3,      4,      5,  6,      7,      8,      9, 10, 11, 12, NO_LED, 13, 14  },
-  {  29, NO_LED,     28,     27,     26,     25, 24,     23,     22,     21, 20, 19, 18,     17, 16, 15  },
-  {  30, NO_LED,     31,     32,     33,     34, 35,     36,     37,     38, 39, 40, 41, NO_LED, 42, 43  },
-  {  57, NO_LED,     56,     55,     54,     53, 52,     51,     50,     49, 48, 47, 46, NO_LED, 45, 44  },
-  {  58,     59,     60, NO_LED, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64,     65, 66, 67  }
-}, {
-  // LED Index to Physical Position
-    {6,  2}, {20, 2},  {35, 11}, {49, 11}, {64, 11}, {78, 11}, {92, 11}, {107, 11}, {120, 11}, {135, 11}, {148, 11}, {164, 11}, {177, 11},            {198, 11}, {220, 11},
-    {9, 24},           {26, 24}, {42, 24}, {56, 24}, {70, 24}, {85, 24}, {100, 24}, {113, 24}, {128, 24}, {143, 24}, {156, 24}, {170, 24}, {184, 24}, {202, 24}, {220, 24},
-    {11, 38},          {29, 38}, {46, 38}, {60, 38}, {74, 38}, {88, 38}, {103, 38}, {118, 38}, {132, 38}, {146, 38}, {160, 38}, {174, 38},            {198, 38}, {220, 38},
-    {16, 53},          {37, 53}, {52, 53}, {66, 53}, {80, 53}, {96, 53}, {110, 53}, {125, 53}, {140, 53}, {153, 53}, {168, 53}, {187, 53},            {207, 53}, {220, 53},
-    {6, 68}, {25, 68}, {44, 68}, 
-}, {
-  // LED Index to Flag
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,     
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4, 
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
-    4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 
-
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
-} };
+led_config_t g_led_config  = {
+    {
+        // Key Matrix to LED Index
+        {  0,      1,  2,      3,      4,      5,      6,  7,      8,      9, 10, 11, 12, NO_LED, 13, 14 },
+        { 29, NO_LED, 28,     27,     26,     25,     24, 23,     22,     21, 20, 19, 18,     17, 16, 15 },
+        { 30, NO_LED, 31,     32,     33,     34,     35, 36,     37,     38, 39, 40, 41, NO_LED, 42, 43 },
+        { 57, NO_LED, 56,     55,     54,     53,     52, 51,     50,     49, 48, 47, 46, NO_LED, 45, 44 },
+        { 58,     59, 60, NO_LED, NO_LED, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64,     65, 66, 67 }
+    }, {
+        // LED Index to Physical Position
+        {  6,  2 }, { 20,  2 }, { 35, 11 }, { 49, 11 }, { 64, 11 }, { 78, 11 }, {  92, 11 }, { 107, 11 }, { 120, 11 }, { 135, 11 }, { 148, 11 }, { 164, 11 }, { 177, 11 }, { 198, 11 }, { 220, 11 },
+        {  9, 24 }, { 26, 24 }, { 42, 24 }, { 56, 24 }, { 70, 24 }, { 85, 24 }, { 100, 24 }, { 113, 24 }, { 128, 24 }, { 143, 24 }, { 156, 24 }, { 170, 24 }, { 184, 24 }, { 202, 24 }, { 220, 24 },
+        { 11, 38 }, { 29, 38 }, { 46, 38 }, { 60, 38 }, { 74, 38 }, { 88, 38 }, { 103, 38 }, { 118, 38 }, { 132, 38 }, { 146, 38 }, { 160, 38 }, { 174, 38 },              { 198, 38 }, { 220, 38 },
+        { 16, 53 },             { 37, 53 }, { 52, 53 }, { 66, 53 }, { 80, 53 }, {  96, 53 }, { 110, 53 }, { 125, 53 }, { 140, 53 }, { 153, 53 }, { 168, 53 }, { 187, 53 }, { 207, 53 }, { 220, 53 },
+        {  6, 68 }, { 25, 68 }, { 44, 68 },                                     {  96, 68 },                           { 148, 68 }, { 164, 68 }, { 180, 68 }, { 192, 68 }, { 207, 68 }, { 220, 68 }
+    }, {
+        // LED Index to Flag
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 4,
+        4,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,          4,       4, 4, 4, 4, 4, 4
+    }
+};

+ 2 - 2
keyboards/linworks/fave84h/config.h

@@ -45,8 +45,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 5
 
 /* Define RGB */
-#define RGBLED_NUM 126
-#define RGB_MATRIX_LED_COUNT 126
+#define RGBLED_NUM 86
+#define RGB_MATRIX_LED_COUNT 86
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE

+ 13 - 19
keyboards/linworks/fave84h/fave84h.c

@@ -14,7 +14,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "fave84h.h"
 
 #ifdef RGB_MATRIX_ENABLE
-    led_config_t g_led_config = {
+led_config_t g_led_config = {
     {
         // Key Matrix to LED Index
         { 47, NO_LED, 48,     49,     50, 51,     52,     53,     54,     55, 56,     57,     58,     59,     60,     61,     62 },
@@ -25,26 +25,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         { 72,     71, 70, NO_LED, NO_LED, 69, NO_LED, NO_LED, NO_LED, NO_LED, 68, NO_LED,     67,     66,     65,     64,     63 },
     }, {
         // LED Index to Physical Position
-        {0, 0}, {28, 0}, {42, 0}, {57, 0}, {71, 0}, {92, 0}, {106, 0}, {120, 0}, {134, 0}, {156, 0}, 
-        {170, 0}, {184, 0}, {198, 0}, {216, 0}, {230, 0}, {244, 0}, {0, 15}, {14, 15}, {28, 15}, {42, 15}, 
-        {57, 15}, {71, 15}, {85, 15}, {99, 15}, {113, 15}, {127, 15}, {141, 15}, {156, 15}, {170, 15}, {191, 17}, 
-        {216, 15}, {230, 15}, {244, 15}, {4, 27}, {21, 27}, {35, 27}, {50, 27}, {64, 27}, {78, 27}, {92, 27}, 
-        {106, 27}, {120, 27}, {134, 27}, {149, 27}, {163, 27}, {177, 27}, {194, 27}, {216, 27}, {230, 27}, {244, 27}, 
-        {10, 40}, {25, 40}, {39, 40}, {53, 40}, {67, 40}, {81, 40}, {95, 40}, {110, 40}, {124, 40}, {138, 40}, 
-        {152, 40}, {166, 40}, {189, 40}, {9, 52}, {32, 52}, {46, 52}, {60, 52}, {74, 52}, {88, 52}, {103, 52}, 
-        {117, 52}, {131, 52}, {145, 52}, {159, 52}, {186, 52}, {230, 52}, {4, 64}, {21, 64}, {39, 64}, {99, 64}, 
-        {159, 64}, {177, 64}, {194, 64}, {216, 64}, {230, 64}, {244, 64}
+        {   0,  0 },              {  28,  0 }, {  42,  0 }, {  57,  0 }, {  71,  0 }, {  92,  0 }, { 106,  0 }, { 120,  0 }, { 134,  0 }, { 156,  0 }, { 170,  0 }, { 184,  0 }, { 198,  0 },     { 216,  0 }, { 230,  0 }, { 244,  0 },
+        {   0, 15 }, {  14, 15 }, {  28, 15 }, {  42, 15 }, {  57, 15 }, {  71, 15 }, {  85, 15 }, {  99, 15 }, { 113, 15 }, { 127, 15 }, { 141, 15 }, { 156, 15 }, { 170, 15 }, { 191, 17 },     { 216, 15 }, { 230, 15 }, { 244, 15 },
+        {   4, 27 }, {  21, 27 }, {  35, 27 }, {  50, 27 }, {  64, 27 }, {  78, 27 }, {  92, 27 }, { 106, 27 }, { 120, 27 }, { 134, 27 }, { 149, 27 }, { 163, 27 }, { 177, 27 }, { 194, 27 },     { 216, 27 }, { 230, 27 }, { 244, 27 },
+        {  10, 40 }, {  25, 40 }, {  39, 40 }, {  53, 40 }, {  67, 40 }, {  81, 40 }, {  95, 40 }, { 110, 40 }, { 124, 40 }, { 138, 40 }, { 152, 40 }, { 166, 40 },              { 189, 40 },
+        {   9, 52 },              {  32, 52 }, {  46, 52 }, {  60, 52 }, {  74, 52 }, {  88, 52 }, { 103, 52 }, { 117, 52 }, { 131, 52 }, { 145, 52 }, { 159, 52 },              { 186, 52 },                  { 230, 52 },
+        {   4, 64 }, {  21, 64 }, {  39, 64 },                           {  99, 64 },                                                     { 159, 64 },              { 177, 64 }, { 194, 64 },     { 216, 64 }, { 230, 64 }, { 244, 64 }
     }, {
         // LED Index to Flag
-        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4,    1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1, 
-        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,          1,
-        1, 1, 1,       4,             1,    1, 1,    1, 1, 1,
-
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4,    1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1, 1, 1,
+        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,       1,
+        1, 1, 1,       4,             1,    1, 1,    1, 1, 1
     }
 };
 #endif

+ 2 - 2
keyboards/linworks/fave87h/config.h

@@ -34,8 +34,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #define DEBOUNCE 5
 
 /* Define RGB */
-#define RGBLED_NUM 127
-#define RGB_MATRIX_LED_COUNT 127
+#define RGBLED_NUM 87
+#define RGB_MATRIX_LED_COUNT 87
 #define RGB_DI_PIN D2
 
 #ifdef RGB_MATRIX_ENABLE

+ 15 - 18
keyboards/linworks/fave87h/fave87h.c

@@ -23,29 +23,26 @@ led_config_t g_led_config = {
         { 13,     14, 15,     16,     17, 18,     19,     20,     21, 22, 23,     24,     25,     26,     27,     28,     29 },
         { 12,     11, 10,      9,      8,  7,      6,      5,      4,  3,  2,      1, NO_LED,      0, NO_LED, NO_LED, NO_LED },
         { 74,     75, 76,     77,     78, 79,     80,     81,     82, 83, 84, NO_LED,     85, NO_LED, NO_LED,     86, NO_LED },
-        { 73,     72, 71, NO_LED, NO_LED, 70, NO_LED, NO_LED, NO_LED, 69, 68, NO_LED,     67,     66,     65,     64,     63 },
+        { 73,     72, 71, NO_LED, NO_LED, 70, NO_LED, NO_LED, NO_LED, 69, 68, NO_LED,     67,     66,     65,     64,     63 }
     }, {
         // LED Index to Physical Position
-        {190, 40},  {167, 40},  {153, 40},  {139, 40},  {125, 40},  {111, 40},  {97, 40},   {83, 40},   {69, 40},   {55, 40}, 
-        {40, 40},   {26, 40},   {0, 41},    {5, 27},    {23, 27},   {37, 27},   {51, 27},   {65, 27},   {79, 27},   {93, 27}, 
-        {107, 27},  {121, 27},  {135, 27},  {149, 27},  {163, 27},  {177, 27},  {195, 27},  {216, 27},  {230, 27},  {244, 27}, 
-        {244, 15},  {230, 15},  {216, 15},  {191, 17},  {170, 15},  {156, 15},  {142, 15},  {128, 15},  {114, 15},  {100, 15}, 
-        {86, 15},   {72, 15},   {58, 15},   {44, 15},   {30, 15},   {16, 15},   {2, 15},    {2, 0},     {30, 0},    {44, 0}, 
-        {58, 0},    {72, 0},    {93, 0},    {107, 0},   {121, 0},   {135, 0},   {156, 0},   {170, 0},   {184, 0},   {198, 0}, 
-        {216, 0},   {230, 0},   {244, 0},   {244, 64},  {230, 64},  {216, 64},  {197, 64},  {179, 64},  {162, 64},  {144, 64}, 
-        {91, 64},   {39, 64},   {21, 64},   {4, 64},    {11, 52},   {33, 52},   {47, 52},   {62, 52},   {76, 52},   {90, 52}, 
-        {104, 52},  {118, 52},  {132, 52},  {146, 52},  {160, 52},  {186, 52},  {230, 52}
+        { 190, 40 }, { 167, 40 }, { 153, 40 }, { 139, 40 }, { 125, 40 }, { 111, 40 }, {  97, 40 }, {  83, 40 }, {  69, 40 }, {  55, 40 },
+        {  40, 40 }, {  26, 40 }, {   0, 41 }, {   5, 27 }, {  23, 27 }, {  37, 27 }, {  51, 27 }, {  65, 27 }, {  79, 27 }, {  93, 27 },
+        { 107, 27 }, { 121, 27 }, { 135, 27 }, { 149, 27 }, { 163, 27 }, { 177, 27 }, { 195, 27 }, { 216, 27 }, { 230, 27 }, { 244, 27 },
+        { 244, 15 }, { 230, 15 }, { 216, 15 }, { 191, 17 }, { 170, 15 }, { 156, 15 }, { 142, 15 }, { 128, 15 }, { 114, 15 }, { 100, 15 },
+        {  86, 15 }, {  72, 15 }, {  58, 15 }, {  44, 15 }, {  30, 15 }, {  16, 15 }, {   2, 15 }, {   2,  0 }, {  30,  0 }, {  44,  0 },
+        {  58,  0 }, {  72,  0 }, {  93,  0 }, { 107,  0 }, { 121,  0 }, { 135,  0 }, { 156,  0 }, { 170,  0 }, { 184,  0 }, { 198,  0 },
+        { 216,  0 }, { 230,  0 }, { 244,  0 }, { 244, 64 }, { 230, 64 }, { 216, 64 }, { 197, 64 }, { 179, 64 }, { 162, 64 }, { 144, 64 },
+        {  91, 64 }, {  39, 64 }, {  21, 64 }, {   4, 64 }, {  11, 52 }, {  33, 52 }, {  47, 52 }, {  62, 52 }, {  76, 52 }, {  90, 52 },
+        { 104, 52 }, { 118, 52 }, { 132, 52 }, { 146, 52 }, { 160, 52 }, { 186, 52 }, { 230, 52 }
     }, {
         // LED Index to Flag
-        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 
-        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 
+        1,    4, 4, 4, 4, 1, 1, 1, 1, 4, 4, 4, 4, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
+        9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
         1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,       4,
-        1, 1, 1,       4,          1, 1,    1, 1, 1, 1, 1,
-
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
+        1, 1, 1,       4,          1, 1,    1, 1, 1, 1, 1
     }
 };
 #endif

+ 46 - 32
keyboards/mechlovin/hannah60rgb/rev2/rev2.c

@@ -110,39 +110,53 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, C9_16,  C9_11,  C7_12},//INDICATOR LED-77
 };
 
-led_config_t g_led_config = { {
-  // Key Matrix to LED Index
-  {0,          1,          2,          3,          18,          19,        20,         21,         36,         37,          38,        39,          40,           41},
-  {4,           5,         6,           7,         22,          23,        24,         25,         43,         44,          45,        46,          47,           69},
-  {8,           9,         10,         11,         26,          27,        28,         29,         50,         51,          52,        53,          54,           55},
-  {13,         14,         15,         30,         31,          32,        33,         56,         57,         58,          59,        60,          62,           63},
-  {16,         17,         34,         NO_LED,     NO_LED,      NO_LED,    35,         NO_LED,     NO_LED,     NO_LED,      65,        66,          67,           68},
-    },
+led_config_t g_led_config = {
     {
-  //LED Index to Physical Positon
-  {  0,  0},  { 16,  0},  { 32, 0 },  { 48,  0}, //9-59-68-76
-  {  0, 16},  { 16, 16},  { 32, 16},  { 48, 16}, //10-60-72-77
-  {  0, 32},  { 16, 32},  { 32, 32},  { 48, 32}, //46-61-73-78
-  {  0, 48},  {  0, 48},  { 12, 48},  { 16, 48}, //126-51-63-74
-  {  0, 64},  { 16, 64}, //56-67
-  { 64,  0},  { 80,  0},   { 96, 0},  { 112, 0}, //80-84-89-94
-  { 64, 16},  { 80, 16},   { 96,16},  { 112,16}, //81-85-90-95
-  { 64, 32},  { 80, 32},   { 96,32},  { 112,32}, //82-86-91-96
-  { 32, 48},  { 48, 48},   { 64,48},  {  80,48}, //79-83-87-92
-  { 32, 64},  { 80, 64}, //75-93
-  { 128, 0},  { 144, 0},  { 160, 0},  { 176, 0},    {192,  0},   {220,  0},   {210, 0}, //98-102-106-111-116-121-130
-  { 128,16},   {144,16},   {160,16},  {176, 16},    {192, 16},   {220, 16},   {220,16}, //99-103-107-112-117-129-122
-  { 128,32},  { 144,32},  { 160,32},  { 176,32},    {192, 32},   {220, 32}, //100-104-108-113-118-123
-  {  96,48},   {112,48},  {128, 48},  {144, 48},    {160, 48},   {200, 48},   {220,48},   {220,48}, //97-101-105-109-114-119-128-124
-  {  96,64},   {144,64},   {160,64},   {176,64},    {220, 64}, //127-110-115-120-125
-  { 220, 0},   //140
-}, {
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,           1,           1,
-  1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,          1,            1,
-} };
+        // Key Matrix to LED Index
+        { 0,   1,  2,      3,     18,     19, 20,     21,     36,     37, 38, 39, 40, 41 },
+        { 4,   5,  6,      7,     22,     23, 24,     25,     43,     44, 45, 46, 47, 69 },
+        { 8,   9, 10,     11,     26,     27, 28,     29,     50,     51, 52, 53, 54, 55 },
+        { 13, 14, 15,     30,     31,     32, 33,     56,     57,     58, 59, 60, 62, 63 },
+        { 16, 17, 34, NO_LED, NO_LED, NO_LED, 35, NO_LED, NO_LED, NO_LED, 65, 66, 67, 68 }
+    }, {
+        //LED Index to Physical Positon
+        {   0,  0 }, {  16,  0 }, {  32,  0 }, { 48,  0 }, //9-59-68-76
+        {   0, 16 }, {  16, 16 }, {  32, 16 }, { 48, 16 }, //10-60-72-77
+        {   0, 32 }, {  16, 32 }, {  32, 32 }, { 48, 32 }, //46-61-73-78
+        {   0, 48 }, {   0, 48 }, {  12, 48 }, { 16, 48 }, //126-51-63-74
+        {   0, 64 }, {  16, 64 }, //56-67
+        {  64,  0 }, {  80,  0 }, {  96,  0 }, { 112,  0 }, //80-84-89-94
+        {  64, 16 }, {  80, 16 }, {  96, 16 }, { 112, 16 }, //81-85-90-95
+        {  64, 32 }, {  80, 32 }, {  96, 32 }, { 112, 32 }, //82-86-91-96
+        {  32, 48 }, {  48, 48 }, {  64, 48 }, {  80, 48 }, //79-83-87-92
+        {  32, 64 }, {  80, 64 }, //75-93
+        { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 220,  0 }, { 210,  0 }, //98-102-106-111-116-121-130
+        { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, { 192, 16 }, { 220, 16 }, { 220, 16 }, //99-103-107-112-117-129-122
+        { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 192, 32 }, { 220, 32 }, //100-104-108-113-118-123
+        {  96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 200, 48 }, { 220, 48 }, { 220, 48 }, //97-101-105-109-114-119-128-124
+        {  96, 64 }, { 144, 64 }, { 160, 64 }, { 176, 64 }, { 220, 64 }, //127-110-115-120-125
+        { 220,  0 }, //140
+        {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }, {   0,  0 }
+    }, {
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1,
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1, 1, 1,
+        1, 1,
+        1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1,
+        1,
+        9, 9, 9, 9, 9, 9, 9, 9
+    }
+};
 
 bool rgb_matrix_indicators_kb(void) {
     if (!rgb_matrix_indicators_user()) {

+ 22 - 23
keyboards/melgeek/mj64/rev1/rev1.c

@@ -65,17 +65,17 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
     {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
     {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
-	{0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
+    {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
     {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
-	{0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
-	{0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
+    {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
+    {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
     {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
     {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
     {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
     {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
     {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
     {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
-	{0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
+    {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
     {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
     {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
     {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
@@ -86,26 +86,25 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 };
 
 led_config_t g_led_config = {
-	{
-		/* C0     C1         C2        C3        C4        C5        C6        C7        C8          C9        C10         C11        C12        C13  */
-		{  0,      1,         2,        3,        4,        5,        6,        7,        8,          9,        10,         11,       12,        13     }, /* R0 */
-		{ 27,     26,        25,       24,       23,       22,       21,       20,       19,         18,        17,         16,       15,        14     }, /* R1 */
-		{ 28,     29,        30,       31,       32,       33,       34,       35,       36,         37,        38,         39,       40,        NO_LED }, /* R2 */
-		{ 54,     53,        52,       51,       50,       49,       48,       47,       46,         45,        44,         43,       42,        41     }, /* R3 */
-		{ 62,     61,        60,       NO_LED,   64,       63,       65,       NO_LED,   NO_LED,     59,        58,         57,       56,        55     }, /* R4 */
+    {
+        {  0,  1,  2,      3,      4,  5,      6,      7,      8,  9, 10, 11, 12,     13 },
+        { 27, 26, 25,     24,     23, 22,     21,     20,     19, 18, 17, 16, 15,     14 },
+        { 28, 29, 30,     31,     32, 33,     34,     35,     36, 37, 38, 39, 40, NO_LED },
+        { 54, 53, 52,     51,     50, 49,     48,     47,     46, 45, 44, 43, 42,     41 },
+        { 62, 61, 60, NO_LED, NO_LED, 63, NO_LED, NO_LED, NO_LED, 59, 58, 57, 56,     55 }
     }, {
-        {0, 0},   {16, 0},   {32, 0},  {48, 0},  {64, 0},  {80, 0},  {96, 0},  {112, 0},  {128, 0},  {144, 0},  {160, 0},  {176, 0},  {192, 0},  {208, 0},
-		{0, 16},  {16, 16},  {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
-		{0, 32},  {16, 32},  {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
-		{0, 48},  {16, 48},  {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
-		{0, 64},  {16, 64},  {32, 64},                     {48, 64},                                  {64, 64}, {96, 64},  {112, 64}, {128, 64}, {144, 64}, 
-	}, {
-	       4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4, 
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,
-		   4,      4,         4,        4,        4,        4,        4,        4,         4,         4,         4,          4,        4,        4,
-		   4,      4,         4,                            4,                                        4,         4,          4,        4,        4,
-	}
+        { 0,  0 }, { 16,  0 }, { 32,  0 }, { 48,  0 }, { 64,  0 }, { 80,  0 }, { 96,  0 }, { 112,  0 }, { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 208,  0 },
+        { 0, 16 }, { 16, 16 }, { 32, 16 }, { 48, 16 }, { 64, 16 }, { 80, 16 }, { 96, 16 }, { 112, 16 }, { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, { 192, 16 }, { 208, 16 },
+        { 0, 32 }, { 16, 32 }, { 32, 32 }, { 48, 32 }, { 64, 32 }, { 80, 32 }, { 96, 32 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 },              { 192, 32 },
+        { 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 176, 48 }, { 192, 48 }, { 208, 48 },
+        { 0, 64 }, { 16, 64 }, { 32, 64 },                         { 48, 64 },                                       {  64, 64 }, {  96, 64 }, { 112, 64 }, { 128, 64 }, { 144, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4,       4,          4, 4, 4, 4, 4
+    }
 };
 
 void suspend_power_down_kb(void) {

+ 14 - 13
keyboards/opendeck/32/rev1/rev1.c

@@ -63,27 +63,28 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
     // clang-format on
 };
 
-#define P(x,y) {(x*224 / (MATRIX_COLS - 1)), (y*64 / (MATRIX_ROWS - 1))}
 // clang-format off
 led_config_t g_led_config = {
-    // Key Matrix to LED Index
     {
-        {0,  1,  2,  3,  4,  5,  6,  7},
-        {8,  9,  10, 11, 12, 13, 14, 15},
-        {16, 17, 18, 19, 20, 21, 22, 23},
-        {24, 25, 26, 27, 28, 29, 30, 31}
+        // Key Matrix to LED Index
+        {  0,  1,  2,  3,  4,  5,  6,  7 },
+        {  8,  9, 10, 11, 12, 13, 14, 15 },
+        { 16, 17, 18, 19, 20, 21, 22, 23 },
+        { 24, 25, 26, 27, 28, 29, 30, 31 }
     }, {
         // LED Index to Physical Position
-        P(0, 0), P(1, 0), P(2, 0), P(3, 0), P(4, 0), P(5, 0), P(6, 0), P(7, 0),
-        P(0, 1), P(1, 1), P(2, 1), P(3, 1), P(4, 1), P(5, 1), P(6, 1), P(7, 1),
-        P(0, 2), P(1, 2), P(2, 2), P(3, 2), P(4, 2), P(5, 2), P(6, 2), P(7, 2),
-        P(0, 3), P(1, 3), P(2, 3), P(3, 3), P(4, 3), P(5, 3), P(6, 3), P(7, 3),
+        { 0,  0 }, { 32,  0 }, { 64,  0 }, { 96,  0 }, { 128,  0 }, { 160,  0 }, { 192,  0 }, { 224,  0 },
+        { 0, 21 }, { 32, 21 }, { 64, 21 }, { 96, 21 }, { 128, 21 }, { 160, 21 }, { 192, 21 }, { 224, 21 },
+        { 0, 43 }, { 32, 43 }, { 64, 43 }, { 96, 43 }, { 128, 43 }, { 160, 43 }, { 192, 43 }, { 224, 43 },
+        { 0, 64 }, { 32, 64 }, { 64, 64 }, { 96, 64 }, { 128, 64 }, { 160, 64 }, { 192, 64 }, { 224, 64 }
     }, {
         // LED Index to Flag
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4
     }
 };
-#undef P
 
 // clang-format on
 
@@ -112,7 +113,7 @@ void keyboard_post_init_user() {
 static uint8_t g_key_wrapper_tracker = 0;
 
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    if (!process_record_user(keycode, record) { return false; }
+    if (!process_record_user(keycode, record)) { return false; }
     if (record->event.pressed && keycode != KC_WRAPPER_KEY) {
         register_code(KC_WRAPPER_KEY);
         register_code(keycode);

+ 1 - 1
keyboards/ryanskidmore/rskeys100/config.h

@@ -31,7 +31,7 @@
 /* RGB Data Pin */
 #define RGB_DI_PIN C7
 /* The number of RGB LEDs connected */
-#define RGB_MATRIX_LED_COUNT 118
+#define RGB_MATRIX_LED_COUNT 105
 /* Set the maximum brightness to 110 to avoid going over 500 mA.
  * At full brightness with all three indicator LEDs on, the power draw is about 450 mA. */
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 110

+ 25 - 23
keyboards/ryanskidmore/rskeys100/rskeys100.c

@@ -5,26 +5,28 @@
 
 
 #ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
-         {     0,     1,     2,     3,     4,     5,     6,     7,     8,     9,    10,    11,    12,NO_LED,    14,    15,    16,NO_LED,NO_LED,NO_LED,NO_LED},
-         {    37,    36,    35,    34,    33,    32,    31,    30,    29,    28,    27,    26,    24,    24,    23,    22,    21,    20,    19,    18,    17},
-         {    40,    41,    42,    43,    44,    45,    46,    47,    48,    49,    50,    51,    52,    53,    54,    55,    56,    57,    58,    59,    60},
-         {    78,    77,    76,    75,    74,    73,    72,    71,    70,    69,    68,    67,    66,NO_LED,NO_LED,NO_LED,NO_LED,    64,    63,    62,NO_LED},
-         {    79,    80,    81,    82,    83,    84,    85,    86,    87,    88,    89,    90,    91,NO_LED,NO_LED,    93,NO_LED,    94,    95,    96,    97},
-         {   117,NO_LED,   116,   115,NO_LED,NO_LED,   112,NO_LED,NO_LED,NO_LED,   109,   108,   107,   106,   105,   103,   102,   101,NO_LED,    99,NO_LED}
-     }, {
-         {0, 0}, {21, 0}, {32, 0}, {43, 0}, {53, 0}, {64, 0}, {75, 0}, {85, 0}, {96, 0}, {117, 0}, {128, 0}, {139, 0}, {149, 0}, {160, 0}, {171, 0}, {181, 0},
-         {0, 13}, {11, 13}, {21, 13}, {32, 13}, {42, 13}, {53, 13}, {64, 13}, {75, 13}, {85, 13}, {96, 13}, {107, 13}, {117, 13}, {128, 13}, {139, 13}, {160, 13}, {171, 13}, {181, 13}, {192, 13}, {203, 13}, {213, 13}, {224, 13},
-         {0, 26}, {11, 26}, {21, 26}, {32, 26}, {42, 26}, {53, 26}, {64, 26}, {75, 26}, {85, 26}, {96, 26}, {107, 26}, {117, 26}, {128, 26}, {149, 26}, {160, 26}, {171, 26}, {181, 26}, {192, 26}, {203, 26}, {213, 26}, {224, 26},
-         {0, 38}, {11, 38}, {21, 38}, {32, 38}, {42, 38}, {53, 38}, {64, 38}, {75, 38}, {85, 38}, {96, 38}, {117, 38}, {128, 38}, {149, 38}, {192, 38}, {203, 38}, {213, 38},
-         {0, 51}, {11, 51}, {21, 51}, {32, 51}, {42, 51}, {53, 51}, {64, 51}, {75, 51}, {85, 51}, {96, 51}, {107, 51}, {117, 51}, {139, 51}, {171, 51}, {192, 51}, {203, 51}, {213, 51}, {224, 51},
-         {0, 64}, {11, 64}, {21, 64}, {64, 64}, {107, 64}, {117, 64}, {128, 64}, {149, 64}, {160, 64}, {171, 64}, {181, 64}, {192, 64}, {213, 64}
-     }, {
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-         4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-     } };
-#endif
+led_config_t g_led_config = {
+    {
+        {   0,      1,   2,   3,      4,      5,   6,      7,      8,      9,  10, 11, 12, NO_LED,     13,     14,     15, NO_LED, NO_LED, NO_LED, NO_LED },
+        {  36,     35,  34,  33,     32,     31,  30,     29,     28,     27,  26, 25, 24,     23,     22,     21,     20,     19,     18,     17,     16 },
+        {  37,     38,  39,  40,     41,     42,  43,     44,     45,     46,  47, 48, 49,     50,     51,     52,     53,     54,     55,     56,     57 },
+        {  73,     72,  71,  70,     69,     68,  67,     66,     65,     64,  63, 62, 61, NO_LED, NO_LED, NO_LED, NO_LED,     60,     59,     58, NO_LED },
+        {  74,     75,  76,  77,     78,     79,  80,     81,     82,     83,  84, 85, 86, NO_LED, NO_LED,     87, NO_LED,     88,     89,     90,     91 },
+        { 104, NO_LED, 103, 102, NO_LED, NO_LED, 101, NO_LED, NO_LED, NO_LED, 100, 99, 98,     97,     96,     95,    94,     93, NO_LED,     92, NO_LED }
+    }, {
+        { 0,  0 }, { 21,  0 }, { 32,  0 }, { 43,  0 }, {  53,  0 }, {  64,  0 }, {  75,  0 }, {  85,  0 }, {  96,  0 }, { 117,  0 }, { 128,  0 }, { 139,  0 }, { 149,  0 }, { 160,  0 }, { 171,  0 }, { 181,  0 },
+        { 0, 13 }, { 11, 13 }, { 21, 13 }, { 32, 13 }, {  42, 13 }, {  53, 13 }, {  64, 13 }, {  75, 13 }, {  85, 13 }, {  96, 13 }, { 107, 13 }, { 117, 13 }, { 128, 13 }, { 139, 13 }, { 160, 13 }, { 171, 13 }, { 181, 13 }, { 192, 13 }, { 203, 13 }, { 213, 13 }, { 224, 13 },
+        { 0, 26 }, { 11, 26 }, { 21, 26 }, { 32, 26 }, {  42, 26 }, {  53, 26 }, {  64, 26 }, {  75, 26 }, {  85, 26 }, {  96, 26 }, { 107, 26 }, { 117, 26 }, { 128, 26 }, { 149, 26 }, { 160, 26 }, { 171, 26 }, { 181, 26 }, { 192, 26 }, { 203, 26 }, { 213, 26 }, { 224, 26 },
+        { 0, 38 }, { 11, 38 }, { 21, 38 }, { 32, 38 }, {  42, 38 }, {  53, 38 }, {  64, 38 }, {  75, 38 }, {  85, 38 }, {  96, 38 }, { 117, 38 }, { 128, 38 }, { 149, 38 }, { 192, 38 }, { 203, 38 }, { 213, 38 },
+        { 0, 51 }, { 11, 51 }, { 21, 51 }, { 32, 51 }, {  42, 51 }, {  53, 51 }, {  64, 51 }, {  75, 51 }, {  85, 51 }, {  96, 51 }, { 107, 51 }, { 117, 51 }, { 139, 51 }, { 171, 51 }, { 192, 51 }, { 203, 51 }, { 213, 51 }, { 224, 51 },
+        { 0, 64 }, { 11, 64 }, { 21, 64 }, { 64, 64 }, { 107, 64 }, { 117, 64 }, { 128, 64 }, { 149, 64 }, { 160, 64 }, { 171, 64 }, { 181, 64 }, { 192, 64 }, { 213, 64 }
+    }, {
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+    }
+};
+#endif

+ 5 - 5
keyboards/xelus/dawn60/rev1_qmk/rev1_qmk.c

@@ -125,11 +125,11 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+16, -1+15, -1+14, -1+13, -1+12, -1+11, -1+10, -1+9 , 15+1 , 15+2 , 15+3 , 15+4 , 15+5 , 15+6 },
-    { -1+7 , -1+6 , -1+5 , -1+4 , -1+3 , -1+2 , -1 +1, 15+9 , 15+10, 15+11, 15+12, 15+13, 15+14, 15+15},
-    { -1+8 , 31+14, 31+13, 31+12, 31+11, 31+10, 31+9 , 47+1 , 47+2 , 47+3 , 47+4 , 47+5 , 15+8 , 15+7 },
-    { 31+15, 31+5 , 31+4 , 31+3 , 31+2 , 31+1 , 47+9 , 47+10, 47+11, 47+12, NO_LED  ,47+6 , 47+7 , 15+16},
-    { 31+16, 31+8 , 31+7 , NO_LED, NO_LED  , 31+6 , NO_LED  , NO_LED  , NO_LED  , 47+13, 47+14, 47+15, 47+16, 47+8 }
+    { 15, 14, 13,     12,     11, 10,      9,      8,     16, 17,     18, 19, 20, 21 },
+    {  6,  5,  4,      3,      2,  1,      0,     24,     25, 26,     27, 28, 29, 30 },
+    {  7, 45, 44,     43,     42, 41,     40,     48,     49, 50,     51, 52, 23, 22 },
+    { 46, 36, 35,     34,     33, 32,     56,     57,     58, 59, NO_LED, 53, 54, 31 },
+    { 47, 39, 38, NO_LED, NO_LED, 37, NO_LED, NO_LED, NO_LED, 60,     61, 62, 63, 55 }
 }, {
     // LA1..LA16
     {104, 16}, {88 , 16}, {72 , 16}, {56 , 16}, {40 , 16}, {24 , 16}, {4  , 16}, {6  , 32},

+ 6 - 6
keyboards/xelus/pachi/rgb/rev1/rev1.c

@@ -158,12 +158,12 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+00+3 , NO_LED,   -1+26+3 , -1+39+3 , -1+52+3 , -1+65+3 , -1+78+3 , -1+91+3 , -1+104+3 , -1+00+1 , -1+13+1 , -1+26+1 , -1+39+1 , -1+52+1 , -1+65+1 , -1+78+1 , -1+91+1 },
-    { -1+00+4 , -1+13+4 , -1+26+4 , -1+39+4 , -1+52+4 , -1+65+4 , -1+78+4 , -1+91+4 , -1+104+4 , -1+00+2 , -1+13+2 , -1+26+2 , -1+39+2 , -1+52+2 , -1+65+2 , -1+78+2 , -1+91+2 },
-    { -1+00+6 , -1+13+6 , -1+26+6 , -1+39+6 , -1+52+6 , -1+65+6 , -1+78+6 , -1+91+6 , -1+104+6 , -1+00+5 , -1+13+5 , -1+26+5 , -1+39+5 , -1+52+5 , -1+65+5 , -1+78+5 , -1+91+6 },
-    { -1+00+8 , -1+13+8 , -1+26+8 , -1+39+8 , -1+52+8 , -1+65+8 , -1+78+8 , -1+91+8 , -1+104+8 , -1+00+7 , -1+13+7 , -1+26+7 , NO_LED  , -1+52+7 , NO_LED  , NO_LED  , NO_LED  },
-    { -1+00+11, -1+13+11, -1+26+11, -1+39+11, -1+52+11, -1+65+11, -1+78+11, -1+91+11, -1+104+11, -1+00+10, -1+13+10, NO_LED  , -1+52+10, NO_LED  , NO_LED  , -1+78+10, NO_LED  },
-    { -1+00+9 , -1+13+9 , -1+26+9 , NO_LED  , NO_LED  , -1+65+9 , NO_LED  , NO_LED  , NO_LED   , NO_LED  , -1+13+12, NO_LED  , -1+39+12, -1+52+12, -1+65+12, -1+78+12, -1+91+12}
+    {  2, NO_LED, 28,     41,     54, 67,     80,     93,    106,      0, 13,     26,     39,     52,     65,     78,     91 },
+    {  3,     16, 29,     42,     55, 68,     81,     94,    107,      1, 14,     27,     40,     53,     66,     79,     92 },
+    {  5,     18, 31,     44,     57, 70,     83,     96,    109,      4, 17,     30,     43,     56,     69,     82,     96 },
+    {  7,     20, 33,     46,     59, 72,     85,     98,    111,      6, 19,     32, NO_LED,     58, NO_LED, NO_LED, NO_LED },
+    { 10,     23, 36,     49,     62, 75,     88,    101,    114,      9, 22, NO_LED,     61, NO_LED, NO_LED,     87, NO_LED },
+    {  8,     21, 34, NO_LED, NO_LED, 73, NO_LED, NO_LED, NO_LED, NO_LED, 24, NO_LED,     50,     63,     76,     89,    102 }
 }, {
     {123,  0}, {117, 15}, {0  ,  0}, {0  , 15}, {123, 27}, {3  , 27}, {127, 40}, {5  , 40}, {2  , 64}, {133, 52}, {8  , 52}, {131, 64}, {255,255},
     {143,  0}, {130, 15}, {255,255}, {13 , 15}, {136, 27}, {19 , 27}, {140, 40}, {23 , 40}, {18 , 64}, {146, 52}, {29 , 52}, {148, 64}, {255,255},

+ 12 - 12
keyboards/xelus/pachi/rgb/rev2/rev2.c

@@ -158,18 +158,18 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
 
 __attribute__ ((weak))
 led_config_t g_led_config = { {
-    { -1+00+3 , -1+26+3 , -1+52+3 , -1+78+3 , -1+104+3, -1+13+1 , -1+39+1 , -1+65+1 , -1+91+1  },
-    { NO_LED  , -1+39+3 , -1+65+3 , -1+91+3 , -1+00+1 , -1+26+1 , -1+52+1 , -1+78+1 , NO_LED   },
-    { -1+00+4 , -1+26+4 , -1+52+4 , -1+78+4 , -1+104+4, -1+13+2 , -1+39+2 , -1+65+2 , -1+91+2  },
-    { -1+13+4 , -1+39+4 , -1+65+4 , -1+91+4 , -1+00+2 , -1+26+2 , -1+52+2 , -1+78+2 , NO_LED   },
-    { -1+00+6 , -1+26+6 , -1+52+6 , -1+78+6 , -1+104+6, -1+13+5 , -1+39+5 , -1+65+5 , -1+91+5  },
-    { -1+13+6 , -1+39+6 , -1+65+6 , -1+91+6 , -1+00+5 , -1+26+5 , -1+52+5 , -1+78+5 , NO_LED   },
-    { -1+00+8 , -1+26+8 , -1+52+8 , -1+78+8 , -1+104+8, -1+13+7 , NO_LED  , NO_LED  , NO_LED   },
-    { -1+13+8 , -1+39+8 , -1+65+8 , -1+91+8 , -1+00+7 , -1+26+7 , -1+52+7 , NO_LED  , NO_LED   },
-    { -1+00+11, -1+26+11, -1+52+11, -1+78+11,-1+104+11, -1+13+10, -1+52+10, NO_LED  , NO_LED   },
-    { -1+13+11, -1+39+11, -1+65+11, -1+91+11, -1+00+10, NO_LED  , NO_LED  , -1+78+10, NO_LED   },
-    { -1+00+9 , -1+26+9 , NO_LED  , NO_LED  , NO_LED  , -1+13+12, -1+39+12, -1+65+12, -1+91+12 },
-    { -1+13+9 , NO_LED  , -1+65+9 , NO_LED  , NO_LED  , NO_LED  , -1+52+12, -1+78+12, NO_LED   }
+    {      2,     28,     54,     80,    106,     13,     39,     65,     91 },
+    { NO_LED,     41,     67,     93,      0,     26,     52,     78, NO_LED },
+    {      3,     29,     55,     81,    107,     14,     40,     66,     92 },
+    {     16,     42,     68,     94,      1,     27,     53,     79, NO_LED },
+    {      5,     31,     57,     83,    109,     17,     43,     69,     95 },
+    {     18,     44,     70,     96,      4,     31,     56,     82, NO_LED },
+    {      7,     33,     59,     85,    111,     19, NO_LED, NO_LED, NO_LED },
+    {     20,     46,     72,     98,      6,     32,     58, NO_LED, NO_LED },
+    {     10,     36,     62,     88,    114,     22,     61, NO_LED, NO_LED },
+    {     23,     49,     75,    101,      9, NO_LED, NO_LED,     87, NO_LED },
+    {      8,     34, NO_LED, NO_LED, NO_LED,     24,     50,     76,    102 },
+    {     21, NO_LED,     73, NO_LED, NO_LED, NO_LED,     63,     89, NO_LED }
 }, {
     {123,  0}, {117, 15}, {0  ,  0}, {0  , 15}, {123, 27}, {3  , 27}, {127, 40}, {5  , 40}, {2  , 64}, {133, 52}, {8  , 52}, {131, 64}, {255,255},
     {143,  0}, {130, 15}, {255,255}, {13 , 15}, {136, 27}, {19 , 27}, {140, 40}, {23 , 40}, {18 , 64}, {146, 52}, {29 , 52}, {148, 64}, {255,255},