diff options
author | QMK Bot <hello@qmk.fm> | 2021-11-01 03:46:23 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-11-01 03:46:23 +0000 |
commit | f7e94f6624cc06a0403ec3b20e12ff558132459d (patch) | |
tree | 69ed582f67f620d8044503324b949e67d1e72a33 | |
parent | 928d9f90ec169f49f50c1566132b06adcaf662d7 (diff) | |
parent | 3c08817e4454ed67fa776148252dc8a3f9ccb20c (diff) | |
download | qmk_firmware-f7e94f6624cc06a0403ec3b20e12ff558132459d.tar.gz qmk_firmware-f7e94f6624cc06a0403ec3b20e12ff558132459d.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/canary/canary60rgb/canary60rgb.c | 126 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/info.json | 2 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/keymaps/default/keymap.c | 11 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/keymaps/via/keymap.c | 4 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/readme.md | 8 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/v1/config.h | 5 | ||||
-rw-r--r-- | keyboards/canary/canary60rgb/v1/rules.mk | 4 |
7 files changed, 83 insertions, 77 deletions
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c index c59a0d321..b01af5f29 100644 --- a/keyboards/canary/canary60rgb/canary60rgb.c +++ b/keyboards/canary/canary60rgb/canary60rgb.c | |||
@@ -17,73 +17,73 @@ | |||
17 | 17 | ||
18 | #ifdef RGB_MATRIX_ENABLE | 18 | #ifdef RGB_MATRIX_ENABLE |
19 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { | 19 | const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = { |
20 | { 0, K_14, J_14, L_14 }, | 20 | { 0, J_14, K_14, L_14 }, |
21 | { 0, K_13, J_13, L_13 }, | 21 | { 0, J_13, K_13, L_13 }, |
22 | { 0, K_12, J_12, L_12 }, | 22 | { 0, J_12, K_12, L_12 }, |
23 | { 0, K_11, J_11, L_11 }, | 23 | { 0, J_11, K_11, L_11 }, |
24 | { 0, K_10, J_10, L_10 }, | 24 | { 0, J_10, K_10, L_10 }, |
25 | { 0, K_9, J_9, L_9 }, | 25 | { 0, J_9, K_9, L_9 }, |
26 | { 0, K_8, J_8, L_8 }, | 26 | { 0, J_8, K_8, L_8 }, |
27 | { 0, K_7, J_7, L_7 }, | 27 | { 0, J_7, K_7, L_7 }, |
28 | { 0, K_6, J_6, L_6 }, | 28 | { 0, J_6, K_6, L_6 }, |
29 | { 0, K_5, J_5, L_5 }, | 29 | { 0, J_5, K_5, L_5 }, |
30 | { 0, K_4, J_4, L_4 }, | 30 | { 0, J_4, K_4, L_4 }, |
31 | { 0, K_3, J_3, L_3 }, | 31 | { 0, J_3, K_3, L_3 }, |
32 | { 0, K_2, J_2, L_2 }, | 32 | { 0, J_2, K_2, L_2 }, |
33 | { 0, K_1, J_1, L_1 }, | 33 | { 0, J_1, K_1, L_1 }, |
34 | 34 | ||
35 | { 0, H_14, G_14, I_14 }, | 35 | { 0, G_14, H_14, I_14 }, |
36 | { 0, H_13, G_13, I_13 }, | 36 | { 0, G_13, H_13, I_13 }, |
37 | { 0, H_12, G_12, I_12 }, | 37 | { 0, G_12, H_12, I_12 }, |
38 | { 0, H_11, G_11, I_11 }, | 38 | { 0, G_11, H_11, I_11 }, |
39 | { 0, H_10, G_10, I_10 }, | 39 | { 0, G_10, H_10, I_10 }, |
40 | { 0, H_9, G_9, I_9 }, | 40 | { 0, G_9, H_9, I_9 }, |
41 | { 0, H_8, G_8, I_8 }, | 41 | { 0, G_8, H_8, I_8 }, |
42 | { 0, H_7, G_7, I_7 }, | 42 | { 0, G_7, H_7, I_7 }, |
43 | { 0, H_6, G_6, I_6 }, | 43 | { 0, G_6, H_6, I_6 }, |
44 | { 0, H_5, G_5, I_5 }, | 44 | { 0, G_5, H_5, I_5 }, |
45 | { 0, H_4, G_4, I_4 }, | 45 | { 0, G_4, H_4, I_4 }, |
46 | { 0, H_3, G_3, I_3 }, | 46 | { 0, G_3, H_3, I_3 }, |
47 | { 0, H_2, G_2, I_2 }, | 47 | { 0, G_2, H_2, I_2 }, |
48 | { 0, H_1, G_1, I_1 }, | 48 | { 0, G_1, H_1, I_1 }, |
49 | 49 | ||
50 | { 0, E_14, D_14, F_14 }, | 50 | { 0, D_14, E_14, F_14 }, |
51 | { 0, E_12, D_12, F_12 }, | 51 | { 0, D_12, E_12, F_12 }, |
52 | { 0, E_11, D_11, F_11 }, | 52 | { 0, D_11, E_11, F_11 }, |
53 | { 0, E_10, D_10, F_10 }, | 53 | { 0, D_10, E_10, F_10 }, |
54 | { 0, E_9, D_9, F_9 }, | 54 | { 0, D_9, E_9, F_9 }, |
55 | { 0, E_8, D_8, F_8 }, | 55 | { 0, D_8, E_8, F_8 }, |
56 | { 0, E_7, D_7, F_7 }, | 56 | { 0, D_7, E_7, F_7 }, |
57 | { 0, E_6, D_6, F_6 }, | 57 | { 0, D_6, E_6, F_6 }, |
58 | { 0, E_5, D_5, F_5 }, | 58 | { 0, D_5, E_5, F_5 }, |
59 | { 0, E_4, D_4, F_4 }, | 59 | { 0, D_4, E_4, F_4 }, |
60 | { 0, E_3, D_3, F_3 }, | 60 | { 0, D_3, E_3, F_3 }, |
61 | { 0, E_2, D_2, F_2 }, | 61 | { 0, D_2, E_2, F_2 }, |
62 | { 0, E_1, D_1, F_1 }, | 62 | { 0, D_1, E_1, F_1 }, |
63 | 63 | ||
64 | { 0, B_14, A_14, C_14 }, | 64 | { 0, A_14, B_14, C_14 }, |
65 | { 0, B_13, A_13, C_13 }, | 65 | { 0, A_13, B_13, C_13 }, |
66 | { 0, B_11, A_11, C_11 }, | 66 | { 0, A_11, B_11, C_11 }, |
67 | { 0, B_10, A_10, C_10 }, | 67 | { 0, A_10, B_10, C_10 }, |
68 | { 0, B_9, A_9, C_9 }, | 68 | { 0, A_9, B_9, C_9 }, |
69 | { 0, B_8, A_8, C_8 }, | 69 | { 0, A_8, B_8, C_8 }, |
70 | { 0, B_7, A_7, C_7 }, | 70 | { 0, A_7, B_7, C_7 }, |
71 | { 0, B_6, A_6, C_6 }, | 71 | { 0, A_6, B_6, C_6 }, |
72 | { 0, B_5, A_5, C_5 }, | 72 | { 0, A_5, B_5, C_5 }, |
73 | { 0, B_4, A_4, C_4 }, | 73 | { 0, A_4, B_4, C_4 }, |
74 | { 0, B_3, A_3, C_3 }, | 74 | { 0, A_3, B_3, C_3 }, |
75 | { 0, B_2, A_2, C_2 }, | 75 | { 0, A_2, B_2, C_2 }, |
76 | { 0, B_1, A_1, C_1 }, | 76 | { 0, A_1, B_1, C_1 }, |
77 | 77 | ||
78 | { 0, B_15, A_15, C_15 }, | 78 | { 0, A_15, B_15, C_15 }, |
79 | { 0, E_13, D_13, F_13 }, | 79 | { 0, D_13, E_13, F_13 }, |
80 | { 0, B_12, A_12, C_12 }, | 80 | { 0, A_12, B_12, C_12 }, |
81 | { 0, E_15, D_15, F_15 }, | 81 | { 0, D_15, E_15, F_15 }, |
82 | { 0, H_15, G_15, I_15 }, | 82 | { 0, G_15, H_15, I_15 }, |
83 | { 0, B_16, A_16, C_16 }, | 83 | { 0, A_16, B_16, C_16 }, |
84 | { 0, E_16, D_16, F_16 }, | 84 | { 0, D_16, E_16, F_16 }, |
85 | { 0, H_16, G_16, I_16 }, | 85 | { 0, G_16, H_16, I_16 }, |
86 | { 0, K_16, J_16, L_16 } | 86 | { 0, J_16, K_16, L_16 } |
87 | }; | 87 | }; |
88 | 88 | ||
89 | led_config_t g_led_config = { | 89 | led_config_t g_led_config = { |
diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index b2526b332..e8cc4c0fe 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json | |||
@@ -1,7 +1,7 @@ | |||
1 | { | 1 | { |
2 | "keyboard_name": "CANARY60RGB", | 2 | "keyboard_name": "CANARY60RGB", |
3 | "url": "", | 3 | "url": "", |
4 | "maintainer": "canary", | 4 | "maintainer": "tuananhnguyen204", |
5 | "layouts": { | 5 | "layouts": { |
6 | "LAYOUT": { | 6 | "LAYOUT": { |
7 | "layout": [ | 7 | "layout": [ |
diff --git a/keyboards/canary/canary60rgb/keymaps/default/keymap.c b/keyboards/canary/canary60rgb/keymaps/default/keymap.c index 62c9971c3..150b18764 100644 --- a/keyboards/canary/canary60rgb/keymaps/default/keymap.c +++ b/keyboards/canary/canary60rgb/keymaps/default/keymap.c | |||
@@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
22 | 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, | 22 | 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, |
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), |
24 | KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
25 | ), | 25 | ), |
26 | [1] = LAYOUT( | 26 | [1] = LAYOUT( |
27 | _______, 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_DEL, | 27 | _______, 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_DEL, |
28 | _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, | 28 | _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, |
29 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, | 29 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, |
30 | _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, | 30 | _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, |
31 | _______, _______, TO(3), TO(4), _______, _______, KC_MPRV, KC_VOLD, KC_MNXT | 31 | _______, _______, TO(3), _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT |
32 | ), | 32 | ), |
33 | [2] = LAYOUT( | 33 | [2] = LAYOUT( |
34 | _______, 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_DEL, | 34 | _______, 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_DEL, |
@@ -43,5 +43,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
43 | _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_PENT, | 43 | _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, KC_PENT, |
44 | _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, | 44 | _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, |
45 | _______, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, _______, _______, _______ | 45 | _______, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, _______, _______, _______ |
46 | ), | ||
47 | [4] = LAYOUT( | ||
48 | KC_GESC, 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, | ||
49 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | ||
50 | CTL_T(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, | ||
51 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), | ||
52 | KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RGHT | ||
46 | ) | 53 | ) |
47 | }; | 54 | }; |
diff --git a/keyboards/canary/canary60rgb/keymaps/via/keymap.c b/keyboards/canary/canary60rgb/keymaps/via/keymap.c index 6ecc731da..6bef543a1 100644 --- a/keyboards/canary/canary60rgb/keymaps/via/keymap.c +++ b/keyboards/canary/canary60rgb/keymaps/via/keymap.c | |||
@@ -21,14 +21,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | 21 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, |
22 | 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, | 22 | 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, |
23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), | 23 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL), |
24 | KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT | 24 | KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT |
25 | ), | 25 | ), |
26 | [1] = LAYOUT( | 26 | [1] = LAYOUT( |
27 | _______, 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_DEL, | 27 | _______, 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_DEL, |
28 | _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, | 28 | _______, _______, KC_UP, _______, _______, _______, KC_CALC, _______, KC_INS, _______, KC_PSCR, KC_SLCK, KC_PAUS, RESET, |
29 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, | 29 | _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, EEP_RST, |
30 | _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, | 30 | _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, KC_END, KC_PGDN, KC_VOLU, KC_MUTE, |
31 | _______, _______, TO(3), TO(4), _______, _______, KC_MPRV, KC_VOLD, KC_MNXT | 31 | _______, _______, TO(3), _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT |
32 | ), | 32 | ), |
33 | [2] = LAYOUT( | 33 | [2] = LAYOUT( |
34 | _______, 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_DEL, | 34 | _______, 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_DEL, |
diff --git a/keyboards/canary/canary60rgb/readme.md b/keyboards/canary/canary60rgb/readme.md index a52745302..7abceb07f 100644 --- a/keyboards/canary/canary60rgb/readme.md +++ b/keyboards/canary/canary60rgb/readme.md | |||
@@ -1,13 +1,13 @@ | |||
1 | # CANARY60RGB | 1 | # Canary60RGB |
2 | 2 | ||
3 |  | 3 |  |
4 |  | 4 |  |
5 | 5 | ||
6 | A hotswap 60% RGB keyboard. | 6 | A hotswap 60% RGB keyboard. |
7 | 7 | ||
8 | * Keyboard Maintainer: [AnthonyNguyen168](https://github.com/AnthonyNguyen168) | 8 | * Keyboard Maintainer: [tuananhnguyen204](https://github.com/AnthonyNguyen168) (tuananhnguyen204@gmail.com) |
9 | * Hardware Supported: CanaryTeam CANARY60RGB V1 | 9 | * Hardware Supported: CanaryTeam Canary60RGB V1 |
10 | * Hardware Availability: [CanaryTeam](https://www.facebook.com/CanaryTeam/) (https://shopee.vn/M%E1%BA%A1ch-b%C3%A0n-ph%C3%ADm-Canary60RGB-PCB-Layout-60--i.196623820.5093520199) | 10 | * Hardware Availability: [CanaryTeam](https://www.facebook.com/CanaryTeam/), [Shopee](https://shopee.vn/search?keyword=canary60rgb) |
11 | * To reset the board into bootloader mode: press Reset hardware button or hold FN + Backslash (layer 1 RESET key) | 11 | * To reset the board into bootloader mode: press Reset hardware button or hold FN + Backslash (layer 1 RESET key) |
12 | 12 | ||
13 | 13 | ||
diff --git a/keyboards/canary/canary60rgb/v1/config.h b/keyboards/canary/canary60rgb/v1/config.h index 5097ea654..303bde7e7 100644 --- a/keyboards/canary/canary60rgb/v1/config.h +++ b/keyboards/canary/canary60rgb/v1/config.h | |||
@@ -55,7 +55,7 @@ | |||
55 | # define RGBLIGHT_EFFECT_RGB_TEST | 55 | # define RGBLIGHT_EFFECT_RGB_TEST |
56 | # define RGBLIGHT_EFFECT_ALTERNATING | 56 | # define RGBLIGHT_EFFECT_ALTERNATING |
57 | # define RGBLIGHT_EFFECT_TWINKLE | 57 | # define RGBLIGHT_EFFECT_TWINKLE |
58 | # define RGBLED_NUM 12 | 58 | # define RGBLED_NUM 20 |
59 | # define RGBLIGHT_HUE_STEP 8 | 59 | # define RGBLIGHT_HUE_STEP 8 |
60 | # define RGBLIGHT_SAT_STEP 8 | 60 | # define RGBLIGHT_SAT_STEP 8 |
61 | # define RGBLIGHT_VAL_STEP 8 | 61 | # define RGBLIGHT_VAL_STEP 8 |
@@ -88,8 +88,7 @@ | |||
88 | # define DISABLE_RGB_MATRIX_MULTISPLASH | 88 | # define DISABLE_RGB_MATRIX_MULTISPLASH |
89 | # define DISABLE_RGB_MATRIX_SOLID_SPLASH | 89 | # define DISABLE_RGB_MATRIX_SOLID_SPLASH |
90 | # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH | 90 | # define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH |
91 | # define DISABLE_RGB_MATRIX_DIGITAL_RAIN | ||
92 | # define DRIVER_ADDR_1 0b1010000 | 91 | # define DRIVER_ADDR_1 0b1010000 |
93 | # define DRIVER_COUNT 1 | 92 | # define DRIVER_COUNT 1 |
94 | # define DRIVER_LED_TOTAL 63 | 93 | # define DRIVER_LED_TOTAL 63 |
95 | #endif | 94 | #endif \ No newline at end of file |
diff --git a/keyboards/canary/canary60rgb/v1/rules.mk b/keyboards/canary/canary60rgb/v1/rules.mk index 24f7f4826..d0b5fab7f 100644 --- a/keyboards/canary/canary60rgb/v1/rules.mk +++ b/keyboards/canary/canary60rgb/v1/rules.mk | |||
@@ -8,7 +8,7 @@ BOOTLOADER = atmel-dfu | |||
8 | # change yes to no to disable | 8 | # change yes to no to disable |
9 | # | 9 | # |
10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite | 10 | BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite |
11 | MOUSEKEY_ENABLE = yes # Mouse keys | 11 | MOUSEKEY_ENABLE = no # Mouse keys |
12 | EXTRAKEY_ENABLE = yes # Audio control and System control | 12 | EXTRAKEY_ENABLE = yes # Audio control and System control |
13 | CONSOLE_ENABLE = no # Console for debug | 13 | CONSOLE_ENABLE = no # Console for debug |
14 | COMMAND_ENABLE = no # Commands for debug and configuration | 14 | COMMAND_ENABLE = no # Commands for debug and configuration |
@@ -17,7 +17,7 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend | |||
17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 17 | # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
18 | NKRO_ENABLE = yes # USB Nkey Rollover | 18 | NKRO_ENABLE = yes # USB Nkey Rollover |
19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
20 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 20 | RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow |
21 | AUDIO_ENABLE = no # Audio output | 21 | AUDIO_ENABLE = no # Audio output |
22 | RGB_MATRIX_ENABLE = yes # Use RGB matrix | 22 | RGB_MATRIX_ENABLE = yes # Use RGB matrix |
23 | RGB_MATRIX_DRIVER = IS31FL3733 | 23 | RGB_MATRIX_DRIVER = IS31FL3733 |