Updating everything to use the new userspace format

This commit is contained in:
2023-11-20 09:48:05 -06:00
parent 3f3579bacc
commit 1b22dc64bb
20 changed files with 258 additions and 286 deletions

View File

@@ -1,30 +1,8 @@
#include QMK_KEYBOARD_H
enum layer_number {
_BASE,
_NAV,
_NUM,
_SYM,
_FUN
};
#include "dgvigil.h"
enum custom_keycodes {
M_PASS1 = SAFE_RANGE,
M_PASS2
};
// Tap Dance declarations
enum {
TD_Q_ESC,
TD_W_GRV,
};
// Tap Dance definitions
tap_dance_action_t tap_dance_actions[] = {
// Tap once for Q, twice for Escape
[TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC),
[TD_W_GRV] = ACTION_TAP_DANCE_DOUBLE(KC_W, KC_GRAVE),
};
#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)
enum combos {
FA_GUI,
@@ -51,18 +29,9 @@ combo_t key_combos[] = {
[JK_CTL] = COMBO(jk_combo, KC_RCTL),
};
// LEFT THUMB KEYS
#define NAV_BKSP LT(_NAV, KC_BSPC)
#define FUN_TAB LT(_FUN, KC_TAB)
// RIGHT THUMB KEYS
#define SYM_ENTER LT(_SYM, KC_ENTER)
#define NUM_SPC LT(_NUM, KC_SPC)
// TAP DANCE
#define Q_ESC TD(TD_Q_ESC)
#define W_GRV TD(TD_W_GRV)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
[_BASE] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________BASE_L1____________________, __________________BASE_R1____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
@@ -74,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └────────┴───────┘ └────────┴────────┘
),
[_NAV] = LAYOUT(
[_NAV] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________NAV_L1____________________, __________________NAV_R1____________________,
_________________BOOT_L1____________________, __________________NAV_R1____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________EMPTY_____________________, __________________NAV_R2____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
@@ -86,11 +55,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └────────┴───────┘ └────────┴────────┘
),
[_NUM] = LAYOUT(
[_NUM] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________NUM_L1____________________, __________________NUM_R1____________________,
__________________NUM_L1____________________, _________________BOOT_R1____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________NUM_L2____________________ __________________EMPTY_____________________,
__________________NUM_L2____________________, __________________EMPTY_____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________NUM_L3____________________, __________________EMPTY_____________________,
// ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘
@@ -98,7 +67,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └────────┴───────┘ └────────┴────────┘
),
[_SYM] = LAYOUT(
[_SYM] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________SYM_L1____________________, __________________EMPTY_____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
@@ -110,13 +79,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └────────┴───────┘ └────────┴────────┘
),
[_FUN] = LAYOUT(
[_FUN] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________EMPTY_____________________, KC_F12, KC_F7, KC_F8, KC_F9, KC_PSCR,
__________________EMPTY_____________________, __________________FUN_L1____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________EMPTY_____________________, KC_F11, KC_F4, KC_F5, KC_F6, _______,
__________________EMPTY_____________________, __________________FUN_L2____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________EMPTY_____________________, KC_F10, KC_F1, KC_F2, KC_F3, _______,
__________________EMPTY_____________________, __________________FUN_L3____________________,
// ├────────┼────────┼────────┼────┬───┴────┬───┴───┐ ┌────┴───┬────────┼────────┼────────┼─────────┘
____THUMB2BLANK_, ____THUMB2BLANK_
// └────────┴───────┘ └────────┴────────┘
@@ -124,19 +93,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case M_PASS1:
if (record->event.pressed) {
SEND_STRING("T3lg3Ranch!2023");
}
return false;
case M_PASS2:
if (record->event.pressed) {
SEND_STRING("P0plarLake!2023");
}
return false;
}
return true;
}