Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
02dc3b6722
4 changed files with 34 additions and 1 deletions
|
@ -255,7 +255,12 @@ void pointing_device_task(void) {
|
|||
|
||||
if (is_drag_scroll) {
|
||||
mouse_report.h = mouse_report.x;
|
||||
#ifdef PLOOPY_DRAGSCROLL_INVERT
|
||||
// Invert vertical scroll direction
|
||||
mouse_report.v = -mouse_report.y;
|
||||
#else
|
||||
mouse_report.v = mouse_report.y;
|
||||
#endif
|
||||
mouse_report.x = 0;
|
||||
mouse_report.y = 0;
|
||||
}
|
||||
|
|
|
@ -124,6 +124,7 @@
|
|||
#define RGB_DI_PIN A1
|
||||
#define RGBLED_NUM 9
|
||||
#define RGBLIGHT_ANIMATIONS
|
||||
|
||||
// RGB Matrix support
|
||||
#define DRIVER_LED_TOTAL RGBLED_NUM
|
||||
|
||||
#endif
|
||||
|
|
|
@ -15,6 +15,29 @@
|
|||
*/
|
||||
#include "rev3.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
led_config_t g_led_config = { {
|
||||
// Key Matrix to LED Index
|
||||
{ NO_LED, 6, NO_LED, NO_LED, 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, 0 },
|
||||
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
|
||||
{ NO_LED, 4, NO_LED, NO_LED, 3, 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, NO_LED, NO_LED, NO_LED, NO_LED },
|
||||
{ NO_LED, 7, NO_LED, NO_LED, 2, NO_LED },
|
||||
{ NO_LED, 1, NO_LED, NO_LED, 8, NO_LED },
|
||||
}, {
|
||||
// LED Index to Physical Position
|
||||
{112, 39}, {148, 60}, {206, 53}, {206, 3}, {150, 3}, {74, 3}, {18, 3}, {18, 54}, {77, 60}
|
||||
}, {
|
||||
// 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
|
||||
} };
|
||||
#endif
|
||||
|
||||
void matrix_init_kb(void) {
|
||||
matrix_init_user();
|
||||
}
|
||||
|
|
|
@ -25,6 +25,10 @@ API_SYSEX_ENABLE = no
|
|||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||
#SLEEP_LED_ENABLE = yes
|
||||
|
||||
# Do not enable RGB_MATRIX_ENABLE together with RGBLIGHT_ENABLE
|
||||
RGB_MATRIX_ENABLE = no
|
||||
RGB_MATRIX_DRIVER = WS2812
|
||||
|
||||
# SERIAL_LINK_ENABLE = yes
|
||||
ENCODER_ENABLE = yes
|
||||
DIP_SWITCH_ENABLE = yes
|
||||
|
|
Loading…
Reference in a new issue