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.

Sign up for GitHub

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

Lily58 Add support for RGB MATRIX #8900

Closed
wants to merge 3 commits into from
Closed

Lily58 Add support for RGB MATRIX #8900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2654209
Add support for RGB MATRIX
ShadowProgr Apr 24, 2020
0967993
Add default DRIVER_LED_TOTAL value
ShadowProgr Apr 25, 2020
e103bdb
Resolve conflicts with default keymap
ShadowProgr Apr 25, 2020
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
11 changes: 10 additions & 1 deletion keyboards/lily58/rev1/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* USB Device descriptor parameter */
#define VENDOR_ID 0xFC51
#define PRODUCT_ID 0x0058
#define PRODUCT_ID 0x0058
#define DEVICE_VER 0x0100
#define MANUFACTURER F_YUUCHI
#define PRODUCT Lily58
Expand Down Expand Up @@ -52,7 +52,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

/* ws2812 RGB LED */
#define RGB_DI_PIN D3

#ifdef RGBLIGHT_ENABLE
#define RGBLED_NUM 12 // Number of LEDs
#endif

#ifdef RGB_MATRIX_ENABLE
#define DRIVER_LED_TOTAL 70 // Number of LEDs for Lily58-Glow
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 120 // Sane brightness values so the board has enough power to operate
#define RGB_MATRIX_STARTUP_VAL 120
#endif

/*
* Feature disable options
Expand Down
84 changes: 83 additions & 1 deletion keyboards/lily58/rev1/rev1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,86 @@ void led_set_kb(uint8_t usb_led) {
// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
//led_set_user(usb_led);
}
#endif
#endif

#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
{ 11, 10, 9, 8, 7, 6 },
{ 12, 13, 14, 15, 16, 17 },
{ 23, 22, 21, 20, 19, 18 },
{ 24, 25, 26, 27, 28, 29 },
{ NO_LED, 34, 33, 32, 31, 30 },
{ 46, 45, 44, 43, 42, 41 },
{ 47, 48, 49, 50, 51, 52 },
{ 58, 57, 56, 55, 54, 53 },
{ 59, 60, 61, 62, 63, 64 },
{ NO_LED, 69, 68, 67, 66, 65 }
}, {
{ 89, 55 }, { 54, 52 }, { 19, 42 }, { 19, 13 }, { 54, 9 }, { 89, 12 }, { 89, 4 },
{ 72, 3 }, { 54, 1 }, { 37, 2 }, { 19, 6 }, { 1, 7 }, { 1, 21 }, { 19, 20 },
{ 37, 17 }, { 54, 16 }, { 72, 17 }, { 89, 19 }, { 89, 33 }, { 72, 31 }, { 54, 30 },
{ 37, 31 }, { 19, 35 }, { 1, 36 }, { 1, 50 }, { 19, 49 }, { 37, 46 }, { 54, 44 },
{ 72, 46 }, { 89, 47 }, { 107, 40 }, { 104, 62 }, { 81, 61 }, { 63, 60 }, { 45, 60 },
{ 135, 55 }, { 170, 52 }, { 205, 42 }, { 205, 13 }, { 170, 9 }, { 135, 12 }, { 135, 4 },
{ 152, 3 }, { 170, 1 }, { 187, 2 }, { 205, 6 }, { 223, 7 }, { 223, 21 }, { 205, 20 },
{ 187, 17 }, { 170, 16 }, { 152, 17 }, { 135, 19 }, { 135, 33 }, { 152, 31 }, { 170, 30 },
{ 187, 31 }, { 205, 35 }, { 223, 36 }, { 223, 50 }, { 205, 49 }, { 187, 46 }, { 170, 44 },
{ 152, 46 }, { 135, 47 }, { 117, 40 }, { 120, 62 }, { 143, 61 }, { 161, 60 }, { 179, 60 }
}, {
2, 2, 2, 2, 2, 2, 4,
4, 4, 4, 4, 1, 1, 4,
4, 4, 4, 4, 4, 4, 4,
4, 4, 1, 1, 4, 4, 4,
4, 4, 4, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 4,
4, 4, 4, 4, 1, 1, 4,
4, 4, 4, 4, 4, 4, 4,
4, 4, 1, 1, 4, 4, 4,
4, 4, 4, 1, 1, 1, 1
} };
#endif

__attribute__((weak))
void matrix_init_user(void) {}

void matrix_init_kb(void) {
#ifdef RGB_MATRIX_ENABLE
if (!isLeftHand) {
g_led_config = (led_config_t) { {
{ 46, 45, 44, 43, 42, 41 },
{ 47, 48, 49, 50, 51, 52 },
{ 58, 57, 56, 55, 54, 53 },
{ 59, 60, 61, 62, 63, 64 },
{ NO_LED, 69, 68, 67, 66, 65 },
{ 11, 10, 9, 8, 7, 6 },
{ 12, 13, 14, 15, 16, 17 },
{ 23, 22, 21, 20, 19, 18 },
{ 24, 25, 26, 27, 28, 29 },
{ NO_LED, 34, 33, 32, 31, 30 }
}, {
{ 135, 55 }, { 170, 52 }, { 205, 42 }, { 205, 13 }, { 170, 9 }, { 135, 12 }, { 135, 4 },
{ 152, 3 }, { 170, 1 }, { 187, 2 }, { 205, 6 }, { 223, 7 }, { 223, 21 }, { 205, 20 },
{ 187, 17 }, { 170, 16 }, { 152, 17 }, { 135, 19 }, { 135, 33 }, { 152, 31 }, { 170, 30 },
{ 187, 31 }, { 205, 35 }, { 223, 36 }, { 223, 50 }, { 205, 49 }, { 187, 46 }, { 170, 44 },
{ 152, 46 }, { 135, 47 }, { 117, 40 }, { 120, 62 }, { 143, 61 }, { 161, 60 }, { 179, 60 },
{ 89, 55 }, { 54, 52 }, { 19, 42 }, { 19, 13 }, { 54, 9 }, { 89, 12 }, { 89, 4 },
{ 72, 3 }, { 54, 1 }, { 37, 2 }, { 19, 6 }, { 1, 7 }, { 1, 21 }, { 19, 20 },
{ 37, 17 }, { 54, 16 }, { 72, 17 }, { 89, 19 }, { 89, 33 }, { 72, 31 }, { 54, 30 },
{ 37, 31 }, { 19, 35 }, { 1, 36 }, { 1, 50 }, { 19, 49 }, { 37, 46 }, { 54, 44 },
{ 72, 46 }, { 89, 47 }, { 107, 40 }, { 104, 62 }, { 81, 61 }, { 63, 60 }, { 45, 60 }
}, {
2, 2, 2, 2, 2, 2, 4,
4, 4, 4, 4, 1, 1, 4,
4, 4, 4, 4, 4, 4, 4,
4, 4, 1, 1, 4, 4, 4,
4, 4, 4, 1, 1, 1, 1,
2, 2, 2, 2, 2, 2, 4,
4, 4, 4, 4, 1, 1, 4,
4, 4, 4, 4, 4, 4, 4,
4, 4, 1, 1, 4, 4, 4,
4, 4, 4, 1, 1, 1, 1
} };
}
#endif
matrix_init_user();
}
1 change: 1 addition & 0 deletions keyboards/lily58/rev1/rev1.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "lily58.h"

#include "quantum.h"
#include "split_util.h"

#ifdef RGBLIGHT_ENABLE
//rgb led driver
Expand Down