added the extra rgb effect support to all keyboards that support rgb matrix

This commit is contained in:
Sadek Baroudi 2023-02-24 19:26:18 -08:00
parent 04c069149f
commit 5fbba11e06
15 changed files with 159 additions and 94 deletions

View File

@ -26,10 +26,18 @@ led_config_t g_led_config = { {
{120,64}, {136,56}, {160,48}, {128,48}, {120,24}, {112,16}, {128,8}, {136,6}, {144,32}, {168,32},
{160,24}, {152,8}, {144,0}, {164,0}, {172,8}, {180,16}, {188,32}, {200,24}, {192,16}, {184,8}
}, {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4
4, 12, 4, // col 1 - top down
4, 4, 12, 4, // col 2 - bottom up
4, 12, 4, 4, // col 3 - top down
4, 12, 4, // col 4 - bottom up
4, 4, 4, // col 5 - top down
1, 9, 1, // thumb left - left right
1, 9, 1, // thumb right - left right
4, 4, 4, // col 6 - bottom up
4, 12, 4, // col 7 - top down
4, 4, 12, 4, // col 8 - bottom up
4, 12, 4, 4, // col 9 - top down
4, 12, 4 // col 10 - bottom up
} };
#endif

View File

@ -27,10 +27,18 @@ led_config_t g_led_config = { {
{120,64}, {136,56}, {160,48}, {128,48}, {120,24}, {112,16}, {128,8}, {136,6}, {144,32}, {168,32},
{160,24}, {152,8}, {144,0}, {164,0}, {172,8}, {180,16}, {188,32}, {200,24}, {192,16}, {184,8}
}, {
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 1, 1, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4
4, 12, 4, // col 1 - top down
4, 4, 12, 4, // col 2 - bottom up
4, 12, 4, 4, // col 3 - top down
4, 12, 4, // col 4 - bottom up
4, 4, 4, // col 5 - top down
1, 9, 1, // thumb left - left right
1, 9, 1, // thumb right - left right
4, 4, 4, // col 6 - bottom up
4, 12, 4, // col 7 - top down
4, 4, 12, 4, // col 8 - bottom up
4, 12, 4, 4, // col 9 - top down
4, 12, 4 // col 10 - bottom up
} };
#endif

View File

@ -32,12 +32,20 @@ led_config_t g_led_config = { {
{175, 20}, {167, 11}, {160, 1}, {178, 0}, {186, 9}, {194, 18}, {201, 28}, {209, 38}, {223, 30}, {215, 20},
{208, 11}, {200, 1}
}, {
4, 4, 4, 4, 1, 4, 4, 4, 4, 4,
4, 4, 4, 1, 4, 4, 4, 4, 4, 4,
4, 4, 1, 1, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 1, 4,
4, 4, 4, 4, 4, 4, 4, 1, 4, 4,
4, 4
4, 4, 12, 4, // col 1 - top to bottom
1, 4, 12, 4, 4, // col 2 - bottom to top
4, 4, 12, 4, 1, // col 3 - top to bottom
4, 12, 4, 4, // col 4 - bottom to top
4, 4, 4, 4, // col 5 - top to bottom
1, 9, 1, // left thumb cluster - left to right
1, // upper left thumb
1, // upper right thumb
1, 9, 1, // right thumb cluster - left to right
4, 4, 4, 4, // col 6 - bottom to top
4, 4, 12, 4, // col 7 - top to bottom
1, 4, 12, 4, 4, // col 8 - bottom to top
4, 4, 12, 4, 1, // col 9 - top to bottom
4, 12, 4, 4 // col 10 - bottom to top
} };
#endif

View File

@ -28,10 +28,20 @@ led_config_t g_led_config = { {
{141,38},{137,25},{133,12},{148,6},{152,20},{156,33},{170,26},{166,12},{162,0},{179,0},{183,12},{187,26},
{205,31},{201,18},{197,4},{215,5},{219,19},{223,32}
}, {
1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 1, 1, 1
1, 1, 1, // col 1 - bottom to top
4, 12, 4, // col 2 - top to bottom
4, 12, 4, // col 3 - bottom to top
4, 12, 4, // col 4 - top to bottom
4, 12, 4, // col 5 - bottom to top
4, 4, 4, // col 6 - top to bottom
1, 9, 1, // left thumbs - left to right
1, 9, 1, // right thumbs - left to right
4, 4, 4, // col 7 - bottom to top
4, 12, 4, // col 8 - top to bottom
4, 12, 4, // col 9 - bottom to top
4, 12, 4, // col 10 - top to bottom
4, 12, 4, // col 11 - bottom to top
1, 1, 1 // col 12 - top to bottom
} };

View File

@ -30,10 +30,20 @@ led_config_t g_led_config = { {
{141,38},{137,25},{133,12},{148,6},{152,20},{156,33},{170,26},{166,12},{162,0},{179,0},{183,12},{187,26},
{205,31},{201,18},{197,4},{215,5},{219,19},{223,32}
}, {
1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 1, 1, 1
1, 1, 1, // col 1 - bottom to top
4, 12, 4, // col 2 - top to bottom
4, 12, 4, // col 3 - bottom to top
4, 12, 4, // col 4 - top to bottom
4, 12, 4, // col 5 - bottom to top
4, 4, 4, // col 6 - top to bottom
1, 9, 1, // left thumbs - left to right
1, 9, 1, // right thumbs - left to right
4, 4, 4, // col 7 - bottom to top
4, 12, 4, // col 8 - top to bottom
4, 12, 4, // col 9 - bottom to top
4, 12, 4, // col 10 - top to bottom
4, 12, 4, // col 11 - bottom to top
1, 1, 1 // col 12 - top to bottom
} };
// 5 column config

View File

@ -30,10 +30,20 @@ led_config_t g_led_config = { {
{141,38},{137,25},{133,12},{148,6},{152,20},{156,33},{170,26},{166,12},{162,0},{179,0},{183,12},{187,26},
{205,31},{201,18},{197,4},{215,5},{219,19},{223,32}
}, {
1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 1, 1, 1
1, 1, 1, // col 1 - bottom to top
4, 12, 4, // col 2 - top to bottom
4, 12, 4, // col 3 - bottom to top
4, 12, 4, // col 4 - top to bottom
4, 12, 4, // col 5 - bottom to top
4, 4, 4, // col 6 - top to bottom
1, 9, 1, // left thumbs - left to right
1, 9, 1, // right thumbs - left to right
4, 4, 4, // col 7 - bottom to top
4, 12, 4, // col 8 - top to bottom
4, 12, 4, // col 9 - bottom to top
4, 12, 4, // col 10 - top to bottom
4, 12, 4, // col 11 - bottom to top
1, 1, 1 // col 12 - top to bottom
} };
// 5 column config

View File

@ -29,10 +29,20 @@ led_config_t g_led_config = { {
{141,38},{137,25},{133,12},{148,6},{152,20},{156,33},{170,26},{166,12},{162,0},{179,0},{183,12},{187,26},
{205,31},{201,18},{197,4},{215,5},{219,19},{223,32}
}, {
1, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 1, 1,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 1, 1, 1
1, 1, 1, // col 1 - bottom to top
4, 12, 4, // col 2 - top to bottom
4, 12, 4, // col 3 - bottom to top
4, 12, 4, // col 4 - top to bottom
4, 12, 4, // col 5 - bottom to top
4, 4, 4, // col 6 - top to bottom
1, 9, 1, // left thumbs - left to right
1, 9, 1, // right thumbs - left to right
4, 4, 4, // col 7 - bottom to top
4, 12, 4, // col 8 - top to bottom
4, 12, 4, // col 9 - bottom to top
4, 12, 4, // col 10 - top to bottom
4, 12, 4, // col 11 - bottom to top
1, 1, 1 // col 12 - top to bottom
} };
#endif

View File

@ -43,9 +43,9 @@ led_config_t g_led_config = { {
4, 4, 4, 4, 4, 1,
1, 12, 12, 12, 12, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1,
1, 1, 9, 1,
1, 1, 1,
1, 1, 1, 1,
1, 9, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 12, 12, 12, 12, 1,
1, 4, 4, 4, 4, 4,

View File

@ -36,15 +36,15 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -37,15 +37,15 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -38,15 +38,15 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -38,15 +38,15 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 12, 12, 12, 12, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 12, 12, 12, 12, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -40,17 +40,17 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 1, 1, // center thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -36,15 +36,15 @@ led_config_t g_led_config = { {
{189,12}, {174,12}, {160,16}, {146,20}, {132,24}, {129,14}, {143,10},
{157,5}, {171,1}, {186,2}, {201,1}, {215,0}
}, {
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1
1, 4, 4, 4, 4, 4, 1, // left half - row 1 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 2 - right to left
1, 12, 12, 12, 12, 4, 1, // left half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // left half - row 4 - right to left
1, 1, 1, 9, 1, // left thumbs - left to right
1, 9, 1, 1, 1, // right thumbs - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 4 - right to left
1, 4, 12, 12, 12, 12, 1, // right half - row 3 - left to right
1, 4, 4, 4, 4, 4, 1, // right half - row 2 - right to left
1, 4, 4, 4, 4, 4, 1 // right half - row 1 - left to right
} };
#endif

View File

@ -31,7 +31,8 @@ static bool alpha_mod_homerow_runner(effect_params_t* params, bool shift) {
for (uint8_t i = led_min; i < led_max; i++) {
RGB_MATRIX_TEST_LED_FLAGS();
if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT) && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_INDICATOR)) {
if ((HAS_FLAGS(g_led_config.flags[i], LED_FLAG_KEYLIGHT) && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_INDICATOR)) ||
(HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER) && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_INDICATOR)) ) {
rgb_matrix_set_color(i, rgb3.r, rgb3.g, rgb3.b);
} else if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
rgb_matrix_set_color(i, rgb2.r, rgb2.g, rgb2.b);