aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorChris Merrill <cmerrill@mit.edu>2020-11-09 16:33:40 -0500
committerGitHub <noreply@github.com>2020-11-09 13:33:40 -0800
commit16fe4b8b77c2eee7fb1598063d2903086bd03ca4 (patch)
tree3d428997fee42cb52015bdb3304d47b9b14a35e9 /keyboards
parent84ca67f1583ec1cc3689bd92a602bd8fdc6ad2a6 (diff)
downloadqmk_firmware-16fe4b8b77c2eee7fb1598063d2903086bd03ca4.tar.gz
qmk_firmware-16fe4b8b77c2eee7fb1598063d2903086bd03ca4.zip
Update massdrop/alt and arm_atsam/led_matrix to fix #10813 (#10818)
* Update massdrop/alt keyboard to fix Caps Lock LED flickering. * Fix Caps-lock LED during underglow-only for massdrop/ctrl * Update keyboards/massdrop/ctrl/keymaps/default/keymap.c
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/massdrop/alt/config_led.c10
-rw-r--r--keyboards/massdrop/alt/keymaps/default/keymap.c4
-rw-r--r--keyboards/massdrop/ctrl/config_led.c4
-rw-r--r--keyboards/massdrop/ctrl/keymaps/default/keymap.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/keyboards/massdrop/alt/config_led.c b/keyboards/massdrop/alt/config_led.c
index 42d4d1474..dfd35a849 100644
--- a/keyboards/massdrop/alt/config_led.c
+++ b/keyboards/massdrop/alt/config_led.c
@@ -37,11 +37,11 @@ led_config_t g_led_config = { {
37 { 224, 13 }, { 224, 25 }, { 224, 38 }, { 224, 50 }, { 222, 62 }, { 191, 64 }, { 179, 64 }, { 167, 64 }, { 153, 64 }, { 139, 64 }, { 125, 64 }, { 112, 64 }, { 98, 64 }, { 84, 64 }, { 70, 64 }, 37 { 224, 13 }, { 224, 25 }, { 224, 38 }, { 224, 50 }, { 222, 62 }, { 191, 64 }, { 179, 64 }, { 167, 64 }, { 153, 64 }, { 139, 64 }, { 125, 64 }, { 112, 64 }, { 98, 64 }, { 84, 64 }, { 70, 64 },
38 { 56, 64 }, { 42, 64 }, { 28, 64 }, { 1, 62 }, { 0, 50 }, { 0, 38 }, { 0, 25 }, { 0, 13 } 38 { 56, 64 }, { 42, 64 }, { 28, 64 }, { 1, 62 }, { 0, 50 }, { 0, 38 }, { 0, 25 }, { 0, 13 }
39}, { 39}, {
40 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 40 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
41 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 41 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
42 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 42 9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
43 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 43 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
44 4, 4, 4, 4, 4, 4, 4, 44 1, 1, 1, 4, 1, 1, 1, 1, 1,
45 // Underglow LEDs 45 // Underglow LEDs
46 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 46 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
47 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 47 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c
index 0d3e7ccb7..df8d40698 100644
--- a/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -87,11 +87,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
87 if (record->event.pressed) { 87 if (record->event.pressed) {
88 switch (rgb_matrix_get_flags()) { 88 switch (rgb_matrix_get_flags()) {
89 case LED_FLAG_ALL: { 89 case LED_FLAG_ALL: {
90 rgb_matrix_set_flags(LED_FLAG_KEYLIGHT); 90 rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
91 rgb_matrix_set_color_all(0, 0, 0); 91 rgb_matrix_set_color_all(0, 0, 0);
92 } 92 }
93 break; 93 break;
94 case LED_FLAG_KEYLIGHT: { 94 case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
95 rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); 95 rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
96 rgb_matrix_set_color_all(0, 0, 0); 96 rgb_matrix_set_color_all(0, 0, 0);
97 } 97 }
diff --git a/keyboards/massdrop/ctrl/config_led.c b/keyboards/massdrop/ctrl/config_led.c
index 448793cf5..0cfe4ee21 100644
--- a/keyboards/massdrop/ctrl/config_led.c
+++ b/keyboards/massdrop/ctrl/config_led.c
@@ -46,7 +46,7 @@ led_config_t g_led_config = { {
46}, { 46}, {
47 // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS 47 // KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS
48 1, 4, 4, 4, 4, 1, 1, 1, 48 1, 4, 4, 4, 4, 1, 1, 1,
49 1, 4, 4, 4, 4, 1, 1, 1, 49 1, 4, 4, 4, 4, 1, 9, 1,
50 // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP 50 // KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP
51 4, 4, 4, 4, 4, 4, 4, 4, 51 4, 4, 4, 4, 4, 4, 4, 4,
52 4, 4, 4, 4, 4, 1, 1, 1, 52 4, 4, 4, 4, 4, 1, 1, 1,
@@ -56,7 +56,7 @@ led_config_t g_led_config = { {
56 4, 4, 4, 4, 4, 4, 1, 1, 56 4, 4, 4, 4, 4, 4, 1, 1,
57 1, 57 1,
58 // KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT 58 // KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT
59 1, 4, 4, 4, 4, 4, 4, 4, 59 9, 4, 4, 4, 4, 4, 4, 4,
60 4, 4, 4, 4, 1, 60 4, 4, 4, 4, 1,
61 // KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP 61 // KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP
62 1, 4, 4, 4, 4, 4, 4, 4, 62 1, 4, 4, 4, 4, 4, 4, 4,
diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 51b7f3931..48fec5ae6 100644
--- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -100,11 +100,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
100 if (record->event.pressed) { 100 if (record->event.pressed) {
101 switch (rgb_matrix_get_flags()) { 101 switch (rgb_matrix_get_flags()) {
102 case LED_FLAG_ALL: { 102 case LED_FLAG_ALL: {
103 rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER); 103 rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
104 rgb_matrix_set_color_all(0, 0, 0); 104 rgb_matrix_set_color_all(0, 0, 0);
105 } 105 }
106 break; 106 break;
107 case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: { 107 case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
108 rgb_matrix_set_flags(LED_FLAG_UNDERGLOW); 108 rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
109 rgb_matrix_set_color_all(0, 0, 0); 109 rgb_matrix_set_color_all(0, 0, 0);
110 } 110 }