aboutsummaryrefslogtreecommitdiff
path: root/keyboards/gmmk
diff options
context:
space:
mode:
authorjonavin <71780717+Jonavin@users.noreply.github.com>2021-09-01 23:42:31 -0400
committerGitHub <noreply@github.com>2021-09-01 20:42:31 -0700
commitb6ca21c65c0d32241ed697072292bd5118b64f9a (patch)
tree396968fab42790ca62bdfb054aff9fc88a984aca /keyboards/gmmk
parentcded3b75821547cd69614ab8b4a71417b6fa4bcb (diff)
downloadqmk_firmware-b6ca21c65c0d32241ed697072292bd5118b64f9a.tar.gz
qmk_firmware-b6ca21c65c0d32241ed697072292bd5118b64f9a.zip
[Keymap] Jonavin keymap gmmk pro (#14220)
add rgb nightmode and optional colemak layer Co-authored-by: Jonavin <=>
Diffstat (limited to 'keyboards/gmmk')
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h6
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c22
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md14
-rw-r--r--keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk2
4 files changed, 40 insertions, 4 deletions
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h b/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
index e4ae4c944..ed78f99ec 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
+++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
@@ -31,3 +31,9 @@
31 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR 31 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
32 #define RGB_DISABLE_WHEN_USB_SUSPENDED 32 #define RGB_DISABLE_WHEN_USB_SUSPENDED
33#endif 33#endif
34
35// add fifth layer for colemak -- set "COLEMAK_LAYER_ENABLE = yes" in rules.mk to enable
36#if defined COLEMAK_LAYER_ENABLE
37 #define DYNAMIC_KEYMAP_LAYER_COUNT 5
38 #define _COLEMAK 4
39#endif // COLEMAK_LAYER_ENABLE
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
index edca78cd1..20a786feb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, 44 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG,
45 _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RESET, KC_HOME, 45 _______, _______, RGB_VAI, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______, RESET, KC_HOME,
46 KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END, 46 KC_CAPS, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
47 _______, _______, RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______, _______, RGB_MOD, _______, 47 _______, RGB_NITE,RGB_HUI, _______, _______, _______, KC_NLCK, _______, RGB_TOD, RGB_TOI, _______, _______, RGB_MOD, _______,
48 _______, KC_WINLCK, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI 48 _______, KC_WINLCK, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
49 ), 49 ),
50 50
@@ -66,12 +66,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 66 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
67 ), 67 ),
68 68
69#ifdef COLEMAK_LAYER_ENABLE
70 [_COLEMAK] = LAYOUT(
71 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_INS, KC_MUTE,
72 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_DEL,
73 KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
74 TT(_LOWER), KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_PGDN,
75 KC_LSFTCAPSWIN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
76 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN1),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
77 ),
78#endif // COLEMAK_LAYER_ENABLE
69}; 79};
70 80
71 81
72#ifdef RGB_MATRIX_ENABLE 82#ifdef RGB_MATRIX_ENABLE
73 // Capslock, Scroll lock and Numlock indicator on Left side lights. 83 // Capslock, Scroll lock and Numlock indicator on Left side lights.
74 void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { 84 void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
85 if (get_rgb_nightmode()) rgb_matrix_set_color_all(RGB_OFF);
75 if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) { 86 if (IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)) {
76 rgb_matrix_set_color(LED_L1, RGB_GREEN); 87 rgb_matrix_set_color(LED_L1, RGB_GREEN);
77 rgb_matrix_set_color(LED_L2, RGB_GREEN); 88 rgb_matrix_set_color(LED_L2, RGB_GREEN);
@@ -120,6 +131,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
120 rgb_matrix_set_color(LED_R7, RGB_GREEN); 131 rgb_matrix_set_color(LED_R7, RGB_GREEN);
121 rgb_matrix_set_color(LED_R8, RGB_GREEN); 132 rgb_matrix_set_color(LED_R8, RGB_GREEN);
122 break; 133 break;
134#ifdef COLEMAK_LAYER_ENABLE
135 case _COLEMAK:
136 for (uint8_t i=0; i<ARRAYSIZE(LED_SIDE_RIGHT); i++) {
137 rgb_matrix_set_color(LED_SIDE_RIGHT[i], RGB_BLUE);
138 }
139 break;
140#endif
123 default: 141 default:
124 break; 142 break;
125 } 143 }
@@ -138,6 +156,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
138void keyboard_post_init_keymap(void) { 156void keyboard_post_init_keymap(void) {
139 // keyboard_post_init_user() moved to userspace 157 // keyboard_post_init_user() moved to userspace
140 #ifdef RGB_MATRIX_ENABLE 158 #ifdef RGB_MATRIX_ENABLE
159 rgb_matrix_mode(RGB_MATRIX_SOLID_COLOR);
141 rgb_matrix_set_color_all(RGB_NAUTILUS); // Default startup colour 160 rgb_matrix_set_color_all(RGB_NAUTILUS); // Default startup colour
161 activate_rgb_nightmode(false); // Set to true if you want to startup in nightmode, otherwise use Fn + Z to toggle
142 #endif 162 #endif
143} 163}
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
index dceaa1307..a6482baa5 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
+++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
@@ -20,14 +20,15 @@
20 - Can be changed in FN layer with < and > or encoder 20 - Can be changed in FN layer with < and > or encoder
21 - setting to zero disables timeout 21 - setting to zero disables timeout
22 - indicators in FN layer using RGB in FN and number rows to show the timeout in minutes 22 - indicators in FN layer using RGB in FN and number rows to show the timeout in minutes
23 - LED address location map as enum definition 23 - LED address location map as enum definition in rgb_matrix_map.h
24 - LED group lists for arrows, numpad, F row, num row, left and right side LEDs 24 - LED group lists for arrows, numpad, F row, num row, left and right side LEDs
25 - default startuo in single mode with default colour 25 - default startup in single mode with default colour
26 - Capslock, Scroll Lock, and Num Lock (not set) indicator on left side LED 26 - Capslock, Scroll Lock, and Num Lock (not set) indicator on left side LED
27 - Layer indicator on right side LED 27 - Layer indicator on right side LED
28 - Fn key light up red when Fn layer activate 28 - Fn key light up red when Fn layer activate
29 - Win Key light up red when Win Lock mode enabled 29 - Win Key light up red when Win Lock mode enabled
30 - Layer 2 activation lights up Numpad area 30 - Layer 2 activation lights up Numpad area
31 - Fn + Z to turn off all RGB lights except rgb indicators; press again to toggle
31 32
32rules.mk OPTIONS - Active features from userspace 33rules.mk OPTIONS - Active features from userspace
33STARTUP_NUMLOCK_ON = yes 34STARTUP_NUMLOCK_ON = yes
@@ -42,12 +43,19 @@ TD_LSFT_CAPSLOCK_ENABLE = yes
42IDLE_TIMEOUT_ENABLE = yes 43IDLE_TIMEOUT_ENABLE = yes
43 - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically 44 - Enables Timer functionality; for RGB idle timeouts that can be changed dynamically
44 45
46COLEMAK_LAYER_ENABLE = yes
47 - Enabled optional 5th layer for COLEMAK layout
48 - Use Shift and encoder to enter 5th layer, right led indicator lights up BLUE
49
45## All layers diagram 50## All layers diagram
46Default layer 51Default layer
47![image](https://user-images.githubusercontent.com/71780717/124177658-82324880-da7e-11eb-9421-b69100131062.png) 52![image](https://user-images.githubusercontent.com/71780717/124177658-82324880-da7e-11eb-9421-b69100131062.png)
48 53
49Fn Layer 54Fn Layer
50![image](https://user-images.githubusercontent.com/71780717/126086069-bc539ffc-3ab6-4ebb-9bef-5005f8add294.png) 55![image](https://user-images.githubusercontent.com/71780717/131255937-06c9691b-835f-4c94-93e6-6d1dc3de272b.png)
51 56
52Layer 2 (Caps Lock Mod) 57Layer 2 (Caps Lock Mod)
53![image](https://user-images.githubusercontent.com/71780717/124177683-8b231a00-da7e-11eb-9434-e2475f679a54.png) 58![image](https://user-images.githubusercontent.com/71780717/124177683-8b231a00-da7e-11eb-9434-e2475f679a54.png)
59
60Optional COLEMAK layer
61![image](https://user-images.githubusercontent.com/71780717/131235050-980d2f54-2d23-4ae8-a83f-9fcdbe60d6cb.png)
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
index 6d3574e7f..b06ae1b6a 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
+++ b/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
@@ -7,3 +7,5 @@ TD_LSFT_CAPSLOCK_ENABLE = yes
7IDLE_TIMEOUT_ENABLE = yes 7IDLE_TIMEOUT_ENABLE = yes
8STARTUP_NUMLOCK_ON = yes 8STARTUP_NUMLOCK_ON = yes
9ENCODER_DEFAULTACTIONS_ENABLE = yes 9ENCODER_DEFAULTACTIONS_ENABLE = yes
10
11COLEMAK_LAYER_ENABLE = yes #Enable Colemak layer / set to no to disable