diff options
author | QMK Bot <hello@qmk.fm> | 2021-02-07 17:27:11 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-02-07 17:27:11 +0000 |
commit | 7122adc4b8635784576ccc73c23159e38e89bf2c (patch) | |
tree | 0ec0014419ba3d9ec141875d14fce91036aab68b | |
parent | ffd768dfbcb784e7aa5bb92054f0e7fccab37a50 (diff) | |
parent | 65db45c475c95b8454d83ebb7e47832c450e4980 (diff) | |
download | qmk_firmware-7122adc4b8635784576ccc73c23159e38e89bf2c.tar.gz qmk_firmware-7122adc4b8635784576ccc73c23159e38e89bf2c.zip |
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r-- | keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c | 100 | ||||
-rw-r--r-- | keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk | 1 | ||||
-rw-r--r-- | users/stanrc85/config.h | 4 | ||||
-rw-r--r-- | users/stanrc85/rules.mk | 4 |
4 files changed, 109 insertions, 0 deletions
diff --git a/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c new file mode 100644 index 000000000..bf75a284f --- /dev/null +++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c | |||
@@ -0,0 +1,100 @@ | |||
1 | /* Copyright 2020 Stanrc85 | ||
2 | * | ||
3 | * This program is free software: you can redistribute it and/or modify | ||
4 | * it under the terms of the GNU General Public License as published by | ||
5 | * the Free Software Foundation, either version 2 of the License, or | ||
6 | * (at your option) any later version. | ||
7 | * | ||
8 | * This program is distributed in the hope that it will be useful, | ||
9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
11 | * GNU General Public License for more details. | ||
12 | * | ||
13 | * You should have received a copy of the GNU General Public License | ||
14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
15 | */ | ||
16 | #include QMK_KEYBOARD_H | ||
17 | #include "stanrc85.h" | ||
18 | |||
19 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
20 | /* Base */ | ||
21 | [_QWERTY] = LAYOUT_all( | ||
22 | KC_ESC, 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_BSPC, KC_MPLY, | ||
23 | 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, CA_SCLN, | ||
24 | KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, | ||
25 | KC_LSFT, 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, | ||
26 | KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT | ||
27 | ), | ||
28 | [_DEFAULT] = LAYOUT_all( | ||
29 | KC_ESC, 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_BSPC, KC_MPLY, | ||
30 | 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, CA_SCLN, | ||
31 | KC_CTLE, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, CA_QUOT, | ||
32 | KC_LSFT, 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, | ||
33 | KC_LCTL, KC_LGUI, KC_LALT, LT_SPCF, LT_SPCF, LT_SPCF, TD_TWIN, MO(_FN2_60), KC_GRV, KC_LEFT, KC_DOWN, KC_RGHT | ||
34 | ), | ||
35 | [_FN1_60] = LAYOUT_all( | ||
36 | KC_TILD, 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, KC_DEL, _______, | ||
37 | _______, _______, CA_QUOT, KC_VOLU, CA_SCLN, _______, _______, KC_HOME, KC_UP, KC_END, KC_PSCR, _______, _______, KC_INS, _______, | ||
38 | KC_CAPS, _______, KC_MUTE, KC_VOLD, KC_MPLY, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, | ||
39 | _______, _______, KC_RDP, _______, _______, _______, _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______, | ||
40 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
41 | ), | ||
42 | [_FN2_60] = LAYOUT_all( | ||
43 | RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
44 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, | ||
45 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MAKE, _______, | ||
46 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
47 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, TG(_DEFAULT) | ||
48 | ) | ||
49 | |||
50 | }; | ||
51 | |||
52 | |||
53 | void rgb_matrix_indicators_user(void) { | ||
54 | uint8_t layer = get_highest_layer(layer_state); | ||
55 | switch (layer) { | ||
56 | case _QWERTY: | ||
57 | rgb_matrix_set_color(10, 0, 0, 0); | ||
58 | break; | ||
59 | case _FN1_60: | ||
60 | rgb_matrix_set_color(10, 0, 0, 255); | ||
61 | break; | ||
62 | case _FN2_60: | ||
63 | rgb_matrix_set_color(10, 255, 255, 255); | ||
64 | break; | ||
65 | case _DEFAULT: | ||
66 | rgb_matrix_set_color(10, 0, 255, 0); | ||
67 | break; | ||
68 | default: | ||
69 | break; | ||
70 | } | ||
71 | if (host_keyboard_led_state().caps_lock) { | ||
72 | rgb_matrix_set_color(10, 255, 0, 0); | ||
73 | } | ||
74 | } | ||
75 | |||
76 | void matrix_init_kb(void){ | ||
77 | |||
78 | #ifdef RGB_MATRIX_ENABLE | ||
79 | |||
80 | g_led_config = (led_config_t){ { | ||
81 | // Key Matrix to LED Index | ||
82 | { 10 , 10 , 9 , 9 , 8 , 7 , 7 , 6 , 5 , 5 , 4 , 3 , 3 , 2 , 1 , 1 }, | ||
83 | { NO_LED, 11 , 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 , 1 }, | ||
84 | { NO_LED, 12 , NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 23 , 1 }, | ||
85 | { NO_LED, 13 , 14 , NO_LED, 15 , 16 , NO_LED, 17 , 18 , NO_LED, 19 , 20 , NO_LED, 21 , 22 , NO_LED }, | ||
86 | { 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 }, | ||
87 | }, { | ||
88 | // LED Index to Physical Position | ||
89 | {224, 42}, {224, 21}, {209, 21}, {179, 21}, {164, 21}, {134, 21}, {119, 21}, {89, 21}, {74, 21}, {45, 21}, {30, 21}, {30, 42}, | ||
90 | {30, 64}, {30, 85}, {45, 85}, {74, 85}, {89, 85}, {119, 85}, {134, 85}, {164, 85}, {179, 85}, {209, 85}, {224, 85}, {224, 64} | ||
91 | }, { | ||
92 | // LED Index to Flag | ||
93 | LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, | ||
94 | LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, | ||
95 | LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL | ||
96 | } }; | ||
97 | |||
98 | #endif | ||
99 | matrix_init_user(); | ||
100 | } | ||
diff --git a/keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk b/keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk | |||
@@ -0,0 +1 @@ | |||
VIA_ENABLE = yes | |||
diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h index ae0a66ae6..a45f9c861 100644 --- a/users/stanrc85/config.h +++ b/users/stanrc85/config.h | |||
@@ -13,3 +13,7 @@ | |||
13 | #define INDICATOR_PIN_1 D6 | 13 | #define INDICATOR_PIN_1 D6 |
14 | #define INDICATOR_PIN_2 D4 | 14 | #define INDICATOR_PIN_2 D4 |
15 | #endif | 15 | #endif |
16 | |||
17 | #ifdef KEYBOARD_boardsource_the_mark | ||
18 | #define RGB_MATRIX_KEYPRESSES | ||
19 | #endif \ No newline at end of file | ||
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk index 0c0a8dd7f..1406c6838 100644 --- a/users/stanrc85/rules.mk +++ b/users/stanrc85/rules.mk | |||
@@ -31,4 +31,8 @@ ifeq ($(strip $(KEYBOARD)), tkc/osav2) | |||
31 | VIA_ENABLE = yes | 31 | VIA_ENABLE = yes |
32 | LTO_ENABLE = no | 32 | LTO_ENABLE = no |
33 | VELOCIKEY_ENABLE=yes | 33 | VELOCIKEY_ENABLE=yes |
34 | endif | ||
35 | ifeq ($(strip $(KEYBOARD)), boardsource/the_mark) | ||
36 | RGB_MATRIX_ENABLE = yes | ||
37 | RGBLIGHT_ENABLE = no | ||
34 | endif \ No newline at end of file | 38 | endif \ No newline at end of file |