Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moonlander: Add RGB LED layout map macro #18745

Merged
merged 1 commit into from
Dec 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keyboards/moonlander/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#define DRIVER_1_LED_TOTAL 36
#define DRIVER_2_LED_TOTAL 36
#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
#define RGB_MATRIX_CENTER { 125, 26 }
#define RGB_MATRIX_CENTER { 120, 36 }
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 175
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_MATRIX_KEYPRESSES
Expand Down
88 changes: 46 additions & 42 deletions keyboards/moonlander/moonlander.c
Original file line number Diff line number Diff line change
Expand Up @@ -264,50 +264,54 @@ const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
};

led_config_t g_led_config = { {
{ 0, 5, 10, 15, 20, 25, 29 },
{ 1, 6, 11, 16, 21, 26, 30 },
{ 2, 7, 12, 17, 22, 27, 31 },
{ 3, 8, 13, 18, 23, 28, NO_LED },
{ 4, 9, 14, 19, 24, NO_LED, NO_LED },
{ 32, 33, 34, 35, NO_LED, NO_LED, NO_LED },
{ 65, 61, 56, 51, 46, 41, 36 },
{ 66, 62, 57, 52, 47, 42, 37 },
{ 67, 63, 58, 53, 48, 43, 38 },
{ NO_LED, 64, 59, 54, 49, 44, 39 },
{ NO_LED, NO_LED, 60, 55, 50, 45, 40 },
{ NO_LED, NO_LED, NO_LED, 71, 70, 69, 68 },
{ 0, 5, 10, 15, 20, 25, 29 },
{ 1, 6, 11, 16, 21, 26, 30 },
{ 2, 7, 12, 17, 22, 27, 31 },
{ 3, 8, 13, 18, 23, 28, NO_LED },
{ 4, 9, 14, 19, 24, NO_LED, NO_LED },
{ 32, 33, 34, 35, NO_LED, NO_LED, NO_LED },
{ 65, 61, 56, 51, 46, 41, 36 },
{ 66, 62, 57, 52, 47, 42, 37 },
{ 67, 63, 58, 53, 48, 43, 38 },
{ NO_LED, 64, 59, 54, 49, 44, 39 },
{ NO_LED, NO_LED, 60, 55, 50, 45, 40 },
{ NO_LED, NO_LED, NO_LED, 71, 70, 69, 68 }
}, {
{ 0, 0 }, { 0, 12 }, { 0, 25 }, { 0, 38 }, { 0, 51 },
{ 17, 0 }, { 17, 12 }, { 17, 25 }, { 17, 38 }, { 17, 51 },
{ 34, 0 }, { 34, 12 }, { 34, 25 }, { 34, 38 }, { 34, 51 },
{ 51, 0 }, { 51, 12 }, { 51, 25 }, { 51, 38 }, { 51, 51 },
{ 68, 0 }, { 68, 12 }, { 68, 25 }, { 68, 38 }, { 68, 51 },
{ 86, 0 }, { 86, 12 }, { 86, 25 }, { 86, 38 },
{ 105, 0 }, { 105, 12 }, { 105, 25 },
{ 90, 55 }, { 105, 68 }, { 116, 86 }, { 116, 59 },

{ 250, 0 }, { 250, 12 }, { 250, 25 }, { 250, 38 }, { 250, 51 },
{ 233, 0 }, { 233, 12 }, { 233, 25 }, { 233, 38 }, { 233, 51 },
{ 216, 0 }, { 216, 12 }, { 216, 25 }, { 216, 38 }, { 216, 51 },
{ 198, 0 }, { 198, 12 }, { 198, 25 }, { 198, 38 }, { 198, 51 },
{ 181, 0 }, { 181, 12 }, { 181, 25 }, { 181, 38 }, { 181, 51 },
{ 163, 0 }, { 163, 12 }, { 163, 25 }, { 163, 38 },
{ 146, 0 }, { 146, 12 }, { 146, 25 },
{ 161, 55 }, { 161, 68 }, { 146, 86 }, { 131, 59 }

{ 0, 4}, { 0, 20}, { 0, 36}, { 0, 52}, { 0, 68},
{ 16, 3}, { 16, 19}, { 16, 35}, { 16, 51}, { 16, 67},
{ 32, 1}, { 32, 17}, { 32, 33}, { 32, 49}, { 32, 65},
{ 48, 0}, { 48, 16}, { 48, 32}, { 48, 48}, { 48, 64},
{ 64, 1}, { 64, 17}, { 64, 33}, { 64, 49}, { 64, 65},
{ 80, 3}, { 80, 19}, { 80, 35}, { 80, 51},
{ 96, 4}, { 96, 20}, { 96, 36},
{ 88, 69}, {100, 80}, {112, 91}, {108, 69},

{240, 4}, {240, 20}, {240, 36}, {240, 52}, {240, 68},
{224, 3}, {224, 19}, {224, 35}, {224, 51}, {224, 67},
{208, 1}, {208, 17}, {208, 33}, {208, 49}, {208, 65},
{192, 0}, {192, 16}, {192, 32}, {192, 48}, {192, 64},
{176, 1}, {176, 17}, {176, 33}, {176, 49}, {176, 65},
{160, 3}, {160, 19}, {160, 35}, {160, 51},
{144, 4}, {144, 20}, {144, 36},
{152, 69}, {140, 80}, {128, 91}, {132, 69}
}, {
1, 1, 1, 1, 1, 4,
4, 4, 4, 1, 4, 4,
4, 4, 1, 4, 4, 4,
4, 1, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4,
4, 4, 1, 1, 1, 1,
1, 1, 1, 1, 1, 4,
4, 4, 4, 1, 4, 4,
4, 4, 1, 4, 4, 4,
4, 1, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4,
4, 4, 1, 1, 1, 1
1, 1, 1, 1, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4,
1, 1, 1,
1, 1, 1, 1,

1, 1, 1, 1, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4, 1,
4, 4, 4, 4,
1, 1, 1,
1, 1, 1, 1
} };
// clang-format on

Expand Down
28 changes: 28 additions & 0 deletions keyboards/moonlander/moonlander.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,34 @@ extern bool mcp23018_leds[];
{ KC_NO, KC_NO, ka2, ka3, ka4, ka5, ka6 }, \
{ KC_NO, KC_NO, KC_NO, kb3, kb4, kb5, kb6 } \
}

#define LED_LAYOUT_moonlander( \
l00, l01, l02, l03, l04, l05, l06, l60, l61, l62, l63, l64, l65, l66, \
l10, l11, l12, l13, l14, l15, l16, l70, l71, l72, l73, l74, l75, l76, \
l20, l21, l22, l23, l24, l25, l26, l80, l81, l82, l83, l84, l85, l86, \
l30, l31, l32, l33, l34, l35, l91, l92, l93, l94, l95, l96, \
l40, l41, l42, l43, l44, l53, lb3, la2, la3, la4, la5, la6, \
l50, l51, l52, lb4, lb5, lb6 \
) \
{ \
l00, l10, l20, l30, l40, \
l01, l11, l21, l31, l41, \
l02, l12, l22, l32, l42, \
l03, l13, l23, l33, l43, \
l04, l14, l24, l34, l44, \
l05, l15, l25, l35, \
l06, l16, l26, \
l50, l51, l52, l53, \
\
l66, l76, l86, l96, la6, \
l65, l75, l85, l95, la5, \
l64, l74, l84, l94, la4, \
l63, l73, l83, l93, la3, \
l62, l72, l82, l92, la2, \
l61, l71, l81, l91, \
l60, l70, l80, \
lb6, lb5, lb4, lb3 \
}
// clang-format on

enum planck_ez_keycodes {
Expand Down