aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/config.h7
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/keymap.c13
-rw-r--r--keyboards/keebio/quefrency/keymaps/jonavin/readme.md13
-rw-r--r--keyboards/mechwild/mercutio/keymaps/jonavin/config.h30
-rwxr-xr-xkeyboards/mechwild/mercutio/keymaps/jonavin/keymap.c193
-rw-r--r--keyboards/mechwild/mercutio/keymaps/jonavin/readme.md16
-rw-r--r--keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk4
7 files changed, 273 insertions, 3 deletions
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/config.h b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
index 0622cdfad..0e6f66d50 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/config.h
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/config.h
@@ -4,6 +4,7 @@ This is the c configuration file for the keymap
4Copyright 2012 Jun Wako <wakojun@gmail.com> 4Copyright 2012 Jun Wako <wakojun@gmail.com>
5Copyright 2015 Jack Humbert 5Copyright 2015 Jack Humbert
6Copyright 2018 Danny Nguyen <danny@keeb.io> 6Copyright 2018 Danny Nguyen <danny@keeb.io>
7Copyright 2021 Jonavin Eng
7 8
8This program is free software: you can redistribute it and/or modify 9This program is free software: you can redistribute it and/or modify
9it under the terms of the GNU General Public License as published by 10it under the terms of the GNU General Public License as published by
@@ -28,3 +29,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
28 29
29#define TAPPING_TOGGLE 2 30#define TAPPING_TOGGLE 2
30// TT set to two taps 31// TT set to two taps
32
33/* Handle GRAVESC combo keys */
34#define GRAVE_ESC_ALT_OVERRIDE
35 //Always send Escape if Alt is pressed
36#define GRAVE_ESC_CTRL_OVERRIDE
37 //Always send Escape if Control is pressed
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
index 73d0c5af0..c817c9386 100644
--- a/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/keymap.c
@@ -26,6 +26,7 @@ enum custom_layers {
26 _BASE, 26 _BASE,
27 _FN1, 27 _FN1,
28 _MO2, 28 _MO2,
29 _MO3,
29}; 30};
30 31
31 32
@@ -64,11 +65,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
64 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RCTL(KC_PGUP), KC_END, 65 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, RCTL(KC_PGUP), KC_END,
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_APP, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)), 66 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_APP, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)),
66 [_MO2] = LAYOUT_65( 67 [_MO2] = LAYOUT_65(
67 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_PMNS, KC_PPLS, KC_PSLS, KC_NO, KC_NO, KC_TRNS, 68 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_PSLS, KC_PEQL, KC_TRNS,
68 KC_TAB, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_PEQL, KC_TRNS, 69 KC_TAB, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_NO, KC_NO, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS,
69 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_TAB, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, KC_HOME, 70 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_NO, KC_TAB, KC_P1, KC_P2, KC_P3, KC_NO, KC_PAST, KC_PENT, KC_HOME,
70 KC_TRNS, KC_NO, KC_DEL, KC_INS, KC_NO, KC_NO, KC_NLCK, KC_P0, DOUBLEZERO, KC_PDOT, KC_PSLS, KC_TRNS, RCTL(KC_PGUP), KC_END, 71 KC_TRNS, KC_NO, KC_DEL, KC_INS, KC_NO, KC_NO, KC_NLCK, KC_P0, DOUBLEZERO, KC_PDOT, KC_PSLS, KC_TRNS, RCTL(KC_PGUP), KC_END,
71 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)), 72 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCTL(KC_LEFT), RCTL(KC_PGDN), RCTL(KC_RIGHT)),
73 [_MO3] = LAYOUT_65(
74 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
75 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
76 KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
77 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
78 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
72}; 79};
73 80
74void encoder_update_user(uint8_t index, bool clockwise) { 81void encoder_update_user(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/quefrency/keymaps/jonavin/readme.md b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md
new file mode 100644
index 000000000..325ab1af6
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/jonavin/readme.md
@@ -0,0 +1,13 @@
1# jonavin's Quefrency layout - No Macros 65%
2
3- ANSI qwerty layout with split Backspace, 1.25 Left mods, 1u right
4- Left Fn key is Spacebar tap and Fn when held
5- Layer 2 mod on Caps Lock with double-tap to switch to this layer, double tap to switch back
6- Layer 2 provides arrows on WASD and additional nav keys + right hand numpad with 00
7- ESC is set to GRAVESC (Esc when pressed, Shift-Esc is ~ and Win-ESC is `), plus handling for Ctrl-Shift-ESC to bring up Task Manager in Windows
8- Layer 2 left spacebar Backspace
9
10## All layers diagram
11
12![image](https://user-images.githubusercontent.com/71780717/118903429-c52cc800-b8e5-11eb-9c45-3d9815a50123.png)
13
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/config.h b/keyboards/mechwild/mercutio/keymaps/jonavin/config.h
new file mode 100644
index 000000000..7272cd4c3
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/config.h
@@ -0,0 +1,30 @@
1/* Copyright 2021 Kyle McCreery
2 * Copyright 2021 Jonavin Eng
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18#pragma once
19
20/* Define custom font */
21#define OLED_FONT_H "lib/mercutiofont.c"
22
23#define TAPPING_TOGGLE 2
24// TT set to two taps
25
26/* Handle GRAVESC combo keys */
27#define GRAVE_ESC_ALT_OVERRIDE
28 //Always send Escape if Alt is pressed
29#define GRAVE_ESC_CTRL_OVERRIDE
30 //Always send Escape if Control is pressed
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
new file mode 100755
index 000000000..fbbe2660c
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/keymap.c
@@ -0,0 +1,193 @@
1/* Copyright 2021 Kyle McCreery
2 * Copyright 2021 Jonavin Eng
3 *
4 * This program is free software: you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
6 * the Free Software Foundation, either version 2 of the License, or
7 * (at your option) any later version.
8 *
9 * This program is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 * GNU General Public License for more details.
13 *
14 * You should have received a copy of the GNU General Public License
15 * along with this program. If not, see <http://www.gnu.org/licenses/>.
16 */
17
18
19#include QMK_KEYBOARD_H
20#include <stdio.h>
21
22enum custom_layers {
23 _BASE,
24 _FN1,
25 _LOWER,
26 _RAISE,
27};
28
29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30[_BASE] = LAYOUT_all(
31 KC_MUTE,
32 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
33 TT(_RAISE), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
34 KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SFTENT,
35 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, LT(_LOWER,KC_SPC), KC_SPC, KC_RALT, MO(_FN1), KC_RCTL ),
36
37 [_FN1] = LAYOUT_all(
38 KC_TRNS,
39 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_DEL,
40 KC_CAPS, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSCR, KC_SCLN, KC_PAUS, KC_NO, KC_NO,
41 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NLCK, KC_P0, KC_NO, KC_NO, KC_SFTENT,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
43
44 [_LOWER] = LAYOUT_all(
45 KC_TRNS,
46 KC_GRAVE, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
47 KC_TRNS, KC_MINS, KC_EQL, KC_NO, KC_NO, KC_NO, KC_NO, KC_QUES, KC_SLSH, KC_PIPE, KC_BSLS, KC_TILD,
48 KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_NO, KC_NO, KC_NO, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
50
51 [_RAISE] = LAYOUT_all(
52 KC_TRNS,
53 KC_TAB, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PMNS, KC_PPLS, KC_P7, KC_P8, KC_P9, KC_P0, KC_TRNS,
54 TT(_RAISE), KC_LEFT, KC_DOWN, KC_RIGHT,KC_PGDN, KC_PSLS, KC_TAB, KC_P4, KC_P5, KC_P6, KC_PDOT, KC_PEQL,
55 KC_TRNS, KC_TRNS, KC_NO, KC_DEL, KC_INS, KC_NO, KC_PAST, KC_P0, KC_P1, KC_P2, KC_P3, KC_PENT,
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
57};
58
59#ifdef ENCODER_ENABLE // Encoder Functionality
60 uint8_t selected_layer = 0;
61 void encoder_update_user(uint8_t index, bool clockwise) {
62 #ifdef OLED_DRIVER_ENABLE
63 oled_clear();
64 oled_render();
65 #endif
66 switch (index) {
67 case 0: // This is the only encoder right now, keeping for consistency
68 if ( clockwise ) {
69 if ( selected_layer < 3 && keyboard_report->mods & MOD_BIT(KC_LSFT) ) { // If you are holding L shift, encoder changes layers
70 selected_layer ++;
71 layer_move(selected_layer);
72 } else {
73 tap_code(KC_VOLU); // Otherwise it just changes volume
74 }
75 } else if ( !clockwise ) {
76 if ( selected_layer > 0 && keyboard_report->mods & MOD_BIT(KC_LSFT) ){
77 selected_layer --;
78 layer_move(selected_layer);
79 } else {
80 tap_code(KC_VOLD);
81 }
82 }
83 }
84 }
85#endif
86
87#ifdef OLED_DRIVER_ENABLE // OLED Functionality
88 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
89 return OLED_ROTATION_180; // flips the display 180 degrees if offhand
90 }
91
92 bool clear_screen = false; // used to manage singular screen clears to prevent display glitch
93 static void render_name(void) { // Render Mercutio Script Text
94 static const char PROGMEM mercutio_name[] = {
95 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0x95, 0xB5, 0x96, 0xD5, 0xB6, 0xB6,
96 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
97 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
98 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
99 };
100 oled_write_P(mercutio_name, false);
101 }
102
103 static void render_logo(void) { // Render MechWild "MW" Logo
104 static const char PROGMEM logo_1[] = {0x97, 0x98, 0x99, 0x9A,0x00};
105 static const char PROGMEM logo_2[] = {0xB7, 0xB8, 0xB9, 0xBA, 0xBB, 0xBC, 0xBD, 0x00};
106 static const char PROGMEM logo_3[] = {0xD7, 0xD8, 0xD9, 0xDA, 0xDB, 0xDC, 0xDD, 0xB6, 0x00};
107 static const char PROGMEM logo_4[] = {0xB6, 0xB6, 0xB6, 0x9B, 0x9C, 0x9D, 0x9E, 0x00};
108 oled_set_cursor(0,0);
109 oled_write_P(logo_1, false);
110 oled_set_cursor(0,1);
111 oled_write_P(logo_2, false);
112 oled_set_cursor(0,2);
113 oled_write_P(logo_3, false);
114 oled_set_cursor(0,3);
115 oled_write_P(logo_4, false);
116 }
117
118 void oled_task_user(void) {
119
120 if ( IS_HOST_LED_OFF(USB_LED_NUM_LOCK) && IS_HOST_LED_OFF(USB_LED_CAPS_LOCK) && selected_layer == 0 && get_highest_layer(layer_state) == 0 ) {
121 render_name();
122 clear_screen = true;
123 } else {
124 if (clear_screen == true) {
125 oled_clear();
126 oled_render();
127 clear_screen = false;
128 }
129 render_logo();
130 oled_set_cursor(8,2);
131 switch(selected_layer){
132 case 0:
133 oled_write_P(PSTR("BASE"), false);
134 break;
135 case 1:
136 oled_write_P(PSTR("FN"), false);
137 break;
138 case 2:
139 oled_write_P(PSTR("LOWER"), false);
140 break;
141 case 3:
142 oled_write_P(PSTR("RAISE"), false);
143 break;
144 default:
145 oled_write_P(PSTR("Layer ?"), false); // Should never display, here as a catchall
146 }
147 oled_set_cursor(8,3);
148 if (get_highest_layer(layer_state) == selected_layer) {
149 oled_write_P(PSTR(" "), false);
150 } else {
151 switch (get_highest_layer(layer_state)) {
152 case 0:
153 oled_write_P(PSTR("Temp BASE"), false);
154 break;
155 case 1:
156 oled_write_P(PSTR("Temp FN"), false);
157 break;
158 case 2:
159 oled_write_P(PSTR("Temp LOWER"), false);
160 break;
161 case 3:
162 oled_write_P(PSTR("Temp RAISE"), false);
163 break;
164 default:
165 oled_write_P(PSTR("Temp Layer ?"), false); // Should never display, here as a catchall
166 }
167 }
168 led_t led_state = host_keyboard_led_state();
169 oled_set_cursor(8,0);
170 uint8_t wpm_count;
171 char wpm_str[10];
172 wpm_count=get_current_wpm();
173
174 if (wpm_count > 020) { // how wpm when > 20
175 sprintf(wpm_str, " WPM: %03d", wpm_count);
176 oled_write(wpm_str, false);
177 } else {
178 oled_write_P(PSTR(" JONAVIN "), false); // otherwise display keymap name
179 }
180
181 oled_set_cursor(8,1);
182 oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
183 oled_write_P(led_state.caps_lock ? PSTR("CAPS ") : PSTR(" "), false);
184 oled_write_P(led_state.scroll_lock ? PSTR("SCR") : PSTR(" "), false);
185
186 }
187
188 }
189
190 void suspend_power_down_user(void) { // shutdown oled when powered down to prevent OLED from showing Mercutio all the time
191 oled_off();
192 }
193#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md
new file mode 100644
index 000000000..5122f143d
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/readme.md
@@ -0,0 +1,16 @@
1Jonavin's Custom Mercutio Layout
2 - Based on Fancy keymap
3
4Features
5 - Split Enter, shftEnter, Split Backspace
6 - standard shorten home row keys
7 - numpad and nav keys in RAISE LAYER
8 - symbols in LOWER layer
9 - CAPS LOCK 2 taps for RAISE layer toggle
10 - RAISE layer left spacebar Backspace
11 - Shift+Encoder for layer changes (from mercutio/fancy keymap)
12 - MOUSEKEYS is disbled
13 - shutdown oled when powered down to prevent OLED from showing Mercutio all the time
14 - add WPM indicator when wpm is > 20 wpm
15
16![image](https://user-images.githubusercontent.com/71780717/118902752-4aaf7880-b8e4-11eb-82f4-e5047612ffcf.png)
diff --git a/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk b/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk
new file mode 100644
index 000000000..5ae6c7d31
--- /dev/null
+++ b/keyboards/mechwild/mercutio/keymaps/jonavin/rules.mk
@@ -0,0 +1,4 @@
1VIA_ENABLE = yes
2
3MOUSEKEY_ENABLE = yes
4WPM_ENABLE = yes