Another ADHD change
Some checks failed
Compile my Keebs / lint-and-compile (push) Failing after 9s

This commit is contained in:
dave
2024-08-15 07:54:11 -05:00
parent dd4507cfc4
commit d7d125bada
7 changed files with 131 additions and 419 deletions

View File

@@ -16,29 +16,65 @@
#include QMK_KEYBOARD_H
#include "keychron_common.h"
#include "dgvigil.h"
// clang-format off
enum layers{
QWERTY,
COLEDH,
_NAV,
_NUM,
_SYM,
_FUN,
_MUS,
_MOUSE
enum combos {
FA_GUI,
FS_ALT,
FD_CTL,
JQUOT_GUI,
JL_ALT,
JK_CTL,
TA_GUI,
TR_ALT,
TS_CTL,
NO_GUI,
NI_ALT,
NE_CTL
};
const uint16_t PROGMEM fa_combo[] = {KC_F, KC_A, COMBO_END};
const uint16_t PROGMEM fs_combo[] = {KC_F, KC_S, COMBO_END};
const uint16_t PROGMEM fd_combo[] = {KC_F, KC_D, COMBO_END};
const uint16_t PROGMEM jquote_combo[] = {KC_J, KC_QUOT, COMBO_END};
const uint16_t PROGMEM jl_combo[] = {KC_J, KC_L, COMBO_END};
const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
const uint16_t PROGMEM ta_combo[] = {KC_T, KC_A, COMBO_END};
const uint16_t PROGMEM tr_combo[] = {KC_T, KC_R, COMBO_END};
const uint16_t PROGMEM ts_combo[] = {KC_T, KC_S, COMBO_END};
const uint16_t PROGMEM no_combo[] = {KC_N, KC_O, COMBO_END};
const uint16_t PROGMEM ni_combo[] = {KC_N, KC_I, COMBO_END};
const uint16_t PROGMEM ne_combo[] = {KC_N, KC_E, COMBO_END};
combo_t key_combos[] = {
// QWERTY
[FA_GUI] = COMBO(fa_combo, KC_LGUI),
[FS_ALT] = COMBO(fs_combo, KC_LALT),
[FD_CTL] = COMBO(fd_combo, KC_LCTL),
[JQUOT_GUI] = COMBO(jquote_combo, KC_RGUI),
[JL_ALT] = COMBO(jl_combo, KC_RALT),
[JK_CTL] = COMBO(jk_combo, KC_RCTL),
// COLEMAK-DH
[TA_GUI] = COMBO(ta_combo, KC_LGUI),
[TR_ALT] = COMBO(tr_combo, KC_LALT),
[TS_CTL] = COMBO(ts_combo, KC_LCTL),
[NO_GUI] = COMBO(no_combo, KC_RGUI),
[NI_ALT] = COMBO(ni_combo, KC_RALT),
[NE_CTL] = COMBO(ne_combo, KC_RCTL),};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[QWERTY] = LAYOUT_ansi_69(
[_QWERTY] = LAYOUT_ansi_69(
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_MUTE,
KC_TAB, __________________BASE_L1____________________, __________________BASE_R1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, __________________BASE_L2____________________, __________________BASE_R2____________________, KC_QUOT, KC_ENT, KC_HOME,
KC_LSFT, __________________BASE_L3____________________, KC_B, __________________BASE_R3____________________, KC_RSFT, KC_UP,
KC_LCTL, KC_LOPTN, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT),
[COLEDH] = LAYOUT_ansi_69(
[_COLEMAKDH] = LAYOUT_ansi_69(
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_MUTE,
KC_TAB, __________________COLEML1____________________, __________________COLEMR1____________________, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, __________________COLEML2____________________, __________________COLEMR2____________________, KC_QUOT, KC_ENT, KC_HOME,
@@ -90,8 +126,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
[QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[COLEDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_COLEMAKDH] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_NAV] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
[_NUM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_FUN] = {ENCODER_CCW_CW(RGB_HUI, RGB_HUD)},