Removed submodules

This commit is contained in:
dave
2024-07-31 11:28:37 -05:00
parent 3873992c7d
commit 113c7a33c7
7 changed files with 118 additions and 50 deletions

9
.gitmodules vendored
View File

@@ -1,9 +0,0 @@
[submodule "qmk_firmware"]
path = qmk_firmware
url = https://github.com/dgvigil/qmk_firmware.git
[submodule "kmk_firmware"]
path = kmk_firmware
url = git@github.com:KMKfw/kmk_firmware.git
[submodule "vial-qmk"]
path = vial-qmk
url = git@github.com:vial-kb/vial-qmk.git

Submodule kmk_firmware deleted from e7b0c0eab3

View File

@@ -0,0 +1,23 @@
#pragma once
/* Don't autoshift numbers or tab */
#define NO_AUTO_SHIFT_NUMERIC
#define NO_AUTO_SHIFT_TAB
#define SPLIT_LAYER_STATE_ENABLE
#define MOUSEKEY_DELAY 20
#define MOUSEKEY_INTERVAL 20
#define MOUSEKEY_MAX_SPEED 5
#define MOUSEKEY_TIME_TO_MAX 40
#define MOUSEKEY_WHEEL_MAX_SPEED 10
// Tapping Term
#define TAPPING_TERM 200
#define TAPPING_TERM_PER_KEY
#define COMBO_TERM 25 // how quickly all combo keys must be pressed in succession to trigger
#define COMBO_MUST_HOLD_MODS // if a combo triggers a modifier, only trigger when the combo is held
#define COMBO_HOLD_TERM 175 // how long at least one of the combo keys must be held to trigger

View File

@@ -1,21 +1,5 @@
/* Copyright 2021 @ Keychron (https://www.keychron.com)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include QMK_KEYBOARD_H
#include "keychron_common.h"
#include "dgvigil.h"
enum combos {
@@ -46,20 +30,13 @@ combo_t key_combos[] = {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = 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_LPAD, __________________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____________________, SPOTLI, __________________BASE_R3____________________, KC_RSFT, KC_UP,
KC_LCTL, KC_LOPT, ___________THUMB_L3________, ___________THUMB_R3________, KC_LEFT, KC_DOWN, KC_RGHT),
[_COLDH] = 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, RGB_TOG,
KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
KC_CAPS, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_QUOT, KC_ENT, KC_HOME,
KC_LSFT, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_GRV, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
KC_LCTL, KC_LOPT, ___________THUMB_L3________, SYM_ENTER, NUM_SPC, FUN_DEL, KC_LEFT, KC_DOWN, KC_RGHT),
[_NAV] = LAYOUT_ansi_69(
QK_BOOT, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, _______, _______, _______, _______, _______, _______, _______, KC_MUTE,
KC_TAB, __________________EMPTY_____________________, __________________NAV_R1____________________, KC_UNDO, KC_RBRC, KC_BSLS, KC_DEL,
@@ -103,20 +80,72 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
};
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_NAV] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
[_SYM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_FUN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_MUS] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_MOUSE] = {ENCODER_CCW_CW(_______, _______)}
};
#endif // ENCODER_MAP_ENABLE
uint8_t mod_state;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static bool isLinux = false;
mod_state = get_mods();
switch (keycode) {
case LINUX:
if (record->event.pressed) {
isLinux = !isLinux;
}
return false;
case COPY:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_C));
} else {
tap_code16(LGUI(KC_C));
}
return false;
}
case PASTE:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_V));
} else {
tap_code16(LGUI(KC_V));
}
return false;
}
case CUT:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_X));
} else {
tap_code16(LGUI(KC_X));
}
return false;
}
case UNDO:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_Z));
} else {
tap_code16(LGUI(KC_Z));
}
return false;
}
case REDO:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_Y));
} else {
tap_code16(LSG(KC_Z));
}
return false;
}
case SALL:
if (record->event.pressed) {
if (isLinux) {
tap_code16(LCTL(KC_A));
} else {
tap_code16(LGUI(KC_A));
}
return false;
}
case M_PASS1:
if (record->event.pressed) {
SEND_STRING("P0plarLake!2023");
@@ -124,9 +153,34 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case M_PASS2:
if (record->event.pressed) {
SEND_STRING("C0pperfield!2023");
SEND_STRING("CindieVerano!2024");
}
return false;
case M_PASS3:
if (record->event.pressed) {
SEND_STRING("1290");
}
return false;
case M_PASS4:
if (record->event.pressed) {
SEND_STRING("Thel0ve0fchrist!");
}
return false;
case SPOTLI:
if (record->event.pressed) {
tap_code16(LGUI(KC_SPACE));
}
return false;
}
return true;
}
}
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_NUM] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
[_NAV] = {ENCODER_CCW_CW(RGB_MOD, RGB_RMOD)},
[_SYM] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_FUN] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_MUS] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
[_MOUSE] = {ENCODER_CCW_CW(_______, _______)}
};

View File

@@ -1,3 +1,6 @@
AUTO_SHIFT_ENABLE = yes
ENCODER_ENABLE = yes
ENCODER_MAP_ENABLE = yes
VPATH += keyboards/keychron/common

Submodule qmk_firmware deleted from afb821077b

Submodule vial-qmk deleted from 3aa7ab3e07