Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		| @@ -15,3 +15,23 @@ | ||||
|  */ | ||||
|  | ||||
| #include "bear_65.h" | ||||
|  | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| led_config_t g_led_config = { { | ||||
| 	// Key Matrix to LED Index | ||||
| 	{ NO_LED, 4     , 4     , 4     , 4     , 3     , 3     , 3     , 3     , 2     , 2     , 2     , 2     , 1     , NO_LED}, | ||||
| 	{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6     }, | ||||
| 	{ 6     , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 6     , 0     , 6     }, | ||||
| 	{ 7     , 5     , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 11    }, | ||||
| 	{ 7     , NO_LED, NO_LED, 8     , NO_LED, 8     , 9     , NO_LED, 9     , 7     , 10    , 11    , 11    , 11    , 1     }, | ||||
| }, { | ||||
| 	// LED Index to Physical Position | ||||
| 	{224, 32}, {224, 10}, {192, 10}, {128, 25}, | ||||
|     {70, 10}, {16, 10}, {16, 32}, {16, 64}, | ||||
|     {64, 64}, {112, 64}, {176, 64}, {224, 64} | ||||
| }, { | ||||
| 	// LED Index to Flag | ||||
| 	LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, | ||||
| 	LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL | ||||
| } }; | ||||
| #endif | ||||
|   | ||||
| @@ -73,3 +73,11 @@ | ||||
| //     #define RGBLIGHT_EFFECT_RGB_TEST | ||||
| //     #define RGBLIGHT_EFFECT_ALTERNATING | ||||
| #endif | ||||
|  | ||||
| /* RGB matrix support */ | ||||
| #ifdef RGB_MATRIX_ENABLE | ||||
| #define RGB_MATRIX_KEYPRESSES | ||||
| #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 220 | ||||
| #define RGB_MATRIX_FRAMEBUFFER_EFFECTS | ||||
| #define DRIVER_LED_TOTAL 12 // Number of LEDs | ||||
| #endif | ||||
|   | ||||
| @@ -22,3 +22,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth | ||||
| AUDIO_ENABLE = no           # Audio output | ||||
|  | ||||
| LTO_ENABLE = yes            # Use LTO flags to reduce firmware size | ||||
|  | ||||
| RGB_MATRIX_ENABLE = no		# Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) | ||||
| RGB_MATRIX_DRIVER = WS2812	# RGB matrix driver support | ||||
|   | ||||
		Reference in New Issue
	
	Block a user