Update noroadsleft userspace and keymaps (2021-05-03) (#12796)
* Set Dvorak as the standard base layer * Remove unneeded includes * Remove custom handling for Quake 2 Have now rewritten my in-game configuration to use Dvorak mapping instead of QWERTY, which means I don't need any of this stuff. * Clean up comments in KC60 keymap
This commit is contained in:
James Young
GitHub
parent
25c97e0019
commit
8ed1addd1e
5 changed files with 68 additions and 242 deletions
|
|
@ -15,27 +15,22 @@
|
|||
*/
|
||||
|
||||
#include "noroadsleft.h"
|
||||
#include "sendstring_dvorak.h"
|
||||
//#include "sendstring_colemak.h"
|
||||
#include "print.h"
|
||||
|
||||
|
||||
/**********************
|
||||
** LAYER DEFINITIONS **
|
||||
**********************/
|
||||
// LAYER DEFINITIONS
|
||||
enum layer_names {
|
||||
// BASE LAYERS
|
||||
_QW, // QWERTY
|
||||
_DV, // Dvorak
|
||||
_CM, // Colemak
|
||||
_DV,
|
||||
_QW,
|
||||
_CM,
|
||||
// QUAKE 2 OVERLAY
|
||||
_Q2, // Quake 2
|
||||
_Q2,
|
||||
// FUNCTION LAYER
|
||||
_FN, // Function
|
||||
_FN,
|
||||
// OTHER LAYERS
|
||||
_NP, // Numpad
|
||||
_MA, // Macros
|
||||
_SY, // System
|
||||
_NP,
|
||||
_MA,
|
||||
_SY,
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -44,97 +39,11 @@ enum layer_names {
|
|||
#define CTL_GRV MT(MOD_LCTL, KC_GRV) // Left Control when held, Grave accent when tapped
|
||||
|
||||
|
||||
// MACRO DEFINITIONS
|
||||
enum custom_keycodes {
|
||||
GO_Q2 = KEYMAP_SAFE_RANGE,
|
||||
Q2_ENT
|
||||
};
|
||||
|
||||
|
||||
/*******************
|
||||
** MODIFIER MASKS **
|
||||
*******************/
|
||||
unsigned char q2InputMode = 0;
|
||||
|
||||
|
||||
bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
|
||||
switch(keycode) {
|
||||
// these are our macros!
|
||||
case GO_Q2:
|
||||
if (record->event.pressed) {
|
||||
//default_layer_set(_QW);
|
||||
layer_move(_QW); // TO(_QW);
|
||||
layer_on(_Q2);
|
||||
//layer_off(_SY);
|
||||
};
|
||||
return false;
|
||||
case Q2_ENT:
|
||||
if (record->event.pressed) {
|
||||
if (q2InputMode == 0) {
|
||||
tap_code(KC_ENT);
|
||||
q2InputMode = 1;
|
||||
layer_on(_DV);
|
||||
//layer_on(_Q2);
|
||||
} else if (q2InputMode == 1) {
|
||||
tap_code(KC_ENT);
|
||||
q2InputMode = 0;
|
||||
layer_off(_DV);
|
||||
} else {
|
||||
tap_code(KC_ENT);
|
||||
}
|
||||
};
|
||||
return false;
|
||||
case KC_ESC:
|
||||
if (record->event.pressed) {
|
||||
if (q2InputMode > 0) {
|
||||
tap_code(KC_ESC);
|
||||
q2InputMode = 0;
|
||||
layer_off(_DV);
|
||||
} else {
|
||||
tap_code(KC_ESC);
|
||||
}
|
||||
};
|
||||
return false;
|
||||
case KC_GRV:
|
||||
if (IS_LAYER_ON(_Q2) == true) {
|
||||
if (record->event.pressed) {
|
||||
if (q2InputMode == 0) {
|
||||
tap_code(KC_GRV);
|
||||
q2InputMode = 2;
|
||||
layer_on(_DV);
|
||||
} else if (q2InputMode == 1) {
|
||||
tap_code(KC_GRV);
|
||||
q2InputMode = 2;
|
||||
} else {
|
||||
tap_code(KC_GRV);
|
||||
q2InputMode = 0;
|
||||
layer_off(_DV);
|
||||
}
|
||||
}
|
||||
};
|
||||
return false;
|
||||
} // switch()
|
||||
return true;
|
||||
};
|
||||
|
||||
|
||||
// KEYMAPS
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
/****************
|
||||
** BASE LAYERS **
|
||||
****************/
|
||||
// BASE LAYERS
|
||||
|
||||
/* QWERTY */
|
||||
[_QW] = LAYOUT_60_ansi(
|
||||
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_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,
|
||||
FN_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,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
CTL_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_MA), MO(_FN), KC_RCTL
|
||||
),
|
||||
|
||||
/* Dvorak */
|
||||
[_DV] = LAYOUT_60_ansi(
|
||||
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSPC,
|
||||
KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS,
|
||||
|
|
@ -143,7 +52,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
CTL_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_MA), MO(_FN), KC_RCTL
|
||||
),
|
||||
|
||||
/* Colemak */
|
||||
[_QW] = LAYOUT_60_ansi(
|
||||
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_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,
|
||||
FN_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,
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
CTL_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_MA), MO(_FN), KC_RCTL
|
||||
),
|
||||
|
||||
[_CM] = LAYOUT_60_ansi(
|
||||
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_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,
|
||||
|
|
@ -152,24 +68,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
CTL_GRV, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_MA), MO(_FN), KC_RCTL
|
||||
),
|
||||
|
||||
/*********************
|
||||
** QUAKE 2 OVERLAYS **
|
||||
*********************/
|
||||
// QUAKE 2 OVERLAYS
|
||||
|
||||
/* Quake 2 */
|
||||
[_Q2] = LAYOUT_60_ansi(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, Q2_ENT,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
KC_GRV, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/********************
|
||||
** FUNCTION LAYERS **
|
||||
********************/
|
||||
// FUNCTION LAYER
|
||||
|
||||
/* Fn layer */
|
||||
[_FN] = LAYOUT_60_ansi(
|
||||
KC_GRV, 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_CALC, KC_APP, _______, _______, _______, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_PSCR, KC_SLCK, KC_PAUS,
|
||||
|
|
@ -178,11 +88,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
_______, _______, _______, TG(_NP), _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/*****************
|
||||
** OTHER LAYERS **
|
||||
*****************/
|
||||
// OTHER LAYERS
|
||||
|
||||
/* Numpad layer */
|
||||
[_NP] = LAYOUT_60_ansi(
|
||||
_______, _______, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, _______, _______, _______, _______,
|
||||
_______, _______, _______, _______, KC_E, KC_F, _______, KC_P4, KC_P5, KC_P6, KC_PAST, KC_PSLS, KC_PEQL, _______,
|
||||
|
|
@ -191,7 +98,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
_______, _______, _______, TG(_NP), _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/* Macro layer */
|
||||
[_MA] = LAYOUT_60_ansi(
|
||||
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, DM_REC1, DM_REC2, _______,
|
||||
_______, _______, _______, G_PUSH, _______, _______, _______, _______, _______, _______, _______, DM_PLY1, DM_PLY2, DM_RSTP,
|
||||
|
|
@ -200,9 +106,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
_______, _______, _______, _______, _______, _______, _______, _______
|
||||
),
|
||||
|
||||
/* System layer */
|
||||
[_SY] = LAYOUT_60_ansi(
|
||||
TG(_SY), TO(_QW), TO(_DV), TO(_CM), GO_Q2, XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, DEBUG, XXXXXXX, VRSN, XXXXXXX,
|
||||
TG(_SY), TO(_QW), TO(_DV), TO(_CM), TG(_Q2), XXXXXXX, XXXXXXX, XXXXXXX, RESET, XXXXXXX, DEBUG, XXXXXXX, VRSN, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, M_MDSWP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, BL_DEC, BL_TOGG, BL_INC, BL_BRTG, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue