dave/dgvigil-keebs
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: dave:2024-03-22
Branches Tags
dave:main dave:again-with-colemakdh dave:restore-colemakdh
dave:2024-07-31 dave:2024-07-29 dave:2024-06-24 dave:2024-06-20 dave:2024-06-17 dave:2024-06-10 dave:2024-06-04 dave:2024-06-03 dave:2024-05-20 dave:2024-05-17 dave:2024-05-16 dave:2024-05-03 dave:2024-03-22 dave:2024-03-05 dave:2024-03-04 dave:2024-02-21 dave:2023-12-16
...
compare: dave:2024-06-20
Branches Tags
dave:again-with-colemakdh dave:restore-colemakdh dave:main
dave:2024-07-31 dave:2024-07-29 dave:2024-06-24 dave:2024-06-20 dave:2024-06-17 dave:2024-06-10 dave:2024-06-04 dave:2024-06-03 dave:2024-05-20 dave:2024-05-17 dave:2024-05-16 dave:2024-05-03 dave:2024-03-22 dave:2024-03-05 dave:2024-03-04 dave:2024-02-21 dave:2023-12-16

23 Commits
2024-03-22 ... 2024-06-20

Author SHA1 Message Date
Dave G Vigil Sr
8edc57504e Update lint_and_compile.yml 2024-06-20 16:39:24 -05:00
Dave G Vigil Sr
1141cb56b3 Update keymap.c 2024-06-20 16:24:41 -05:00
Dave G Vigil Sr
61eaf52e8e Update keymap.c 2024-06-20 16:13:36 -05:00
Dave G Vigil Sr
efcd882784 Update keycodes.h 2024-06-17 16:17:24 -05:00
Dave G Vigil Sr
e5cb15e11c Update keymap_blocks.h 2024-06-17 16:16:58 -05:00
Dave G Vigil Sr
d95104a672 Update keycodes.h 2024-06-17 16:16:02 -05:00
Dave G Vigil Sr
e58afed32c Update keycodes.h 2024-06-17 16:15:18 -05:00
Dave G Vigil Sr
29b2cb26e9 Update keymap.c 2024-06-17 16:03:35 -05:00
Dave G Vigil Sr
e0af1fa5dd Update keymap.c 2024-06-17 16:02:33 -05:00
Dave G Vigil Sr
f22b4c579c Update keycodes.h 2024-06-10 14:00:51 -05:00
Dave G Vigil Sr
ce98807d44 Update keymap_blocks.h 2024-06-10 13:19:14 -05:00
Dave G Vigil Sr
c7e860e597 Update keymap.c 2024-06-10 12:55:53 -05:00
Dave G Vigil Sr
290b549f66 Update keymap_blocks.h 2024-06-04 13:44:00 -05:00
Dave G Vigil Sr
9be7641b41 Update keymap.c 2024-06-03 07:27:58 -05:00
Dave G Vigil Sr
51241369e3 Update keycodes.h 2024-05-20 15:13:51 -05:00
Dave G Vigil Sr
71886d6d74 Update keymap.c 2024-05-16 22:38:00 -05:00
Dave G Vigil Sr
498e57efaa Update keymap.c 2024-05-16 17:03:46 -05:00
Dave G Vigil Sr
7953fd664c Update keymap_blocks.h 2024-05-16 16:19:31 -05:00
Dave G Vigil Sr
50a0c6456b Update keymap.c 2024-05-16 16:15:12 -05:00
Dave G Vigil Sr
81ca318fa7 Update keymap.c 2024-05-16 15:44:30 -05:00
Dave G Vigil Sr
71255baf54 Update keymap.c by adding SPOTLI shortcut 2024-05-02 21:05:59 -05:00
Dave G Vigil Sr
f489152126 Update keycodes.h 2024-05-02 21:03:20 -05:00
Dave G Vigil Sr
824ea2a75b Update keycodes.h for qwerty and colmak 2024-05-02 20:52:40 -05:00
5 changed files with 85 additions and 56 deletions
Expand all files Collapse all files

1
.github/workflows/lint_and_compile.yml vendored
View File

@@ -38,6 +38,7 @@ jobs:
# qmk compile -kb ferris/sweep -km dgvigil
echo "Building QMK for keebio/iris/rev8"
qmk compile -kb keebio/iris/rev8 -km dgvigil
qmk compile -kb keebio/iris/rev8 -km via
# echo "Building QMK for bluebell/swoop"
# qmk compile -kb bluebell/swoop -km dgvigil -e CONVERT_TO=promicro_rp2040
find -maxdepth 1 -name "*.hex"

7
dgvigil/definitions/keycodes.h
View File

@@ -22,7 +22,9 @@ enum {
enum {
CUSTOM_KEYCODE_START = SAFE_RANGE,
WINDOWS,
QWERTY,
COLEMAK,
LINUX,
COPY,
PASTE,
CUT,
@@ -49,9 +51,6 @@ enum {
#define NUM_SPC LT(_NUM, KC_SPC)
#define FUN_DEL LT(_FUN, KC_DEL)
#define QWERTY DF(_QWERTY)
#define COLEMAK DF(_COLEMAK_DH)
// 2 LEFT THUMB KEYS
#define FUN_TAB LT(_FUN, KC_TAB)
// 2 RIGHT THUMB KEYS

8
dgvigil/definitions/keymap_blocks.h
View File

@@ -17,8 +17,8 @@
// EMPTY ROW
#define __________________EMPTY_____________________ _______, _______, _______, _______, _______
// BOOTLOADER
#define _________________BOOT_R1____________________ _______, _______, _______, _______, QK_BOOTLOADER
#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,_______,_______,_______
#define _________________BOOT_R1____________________ _______, _______, QWERTY, _______, QK_BOOTLOADER
#define _________________BOOT_L1____________________ QK_BOOTLOADER,_______,COLEMAK,_______,_______
// _BASE
@@ -69,8 +69,8 @@
// MOUSE
#define __________________MOU_R1____________________ _______, KC_PSTE, KC_COPY, KC_CUT, KC_UNDO
#define __________________MOU_R2____________________ KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
#define __________________MOU_R3____________________ KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R
#define __________________MOU_R2____________________ KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______
#define __________________MOU_R3____________________ KC_BTN2, KC_BTN1, KC_WH_D, KC_WH_U, KC_BTN2
// COLEMAK-DH
#define __________________COLEML1____________________ Q_ESC, KC_W, KC_F, KC_P, KC_B

52
draculad/keymap.c
View File

@@ -44,6 +44,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
__________________BASE_L3____________________, __________________BASE_R3____________________,
// └────────┴────────┴────────┴────────┼────────┤ ├────────┼────────┴────────┴────────┴────────┘
_______, _______,
// ┌────────┬────────┼────────┼ ┼────────┼────────┬────────┐
___________THUMB_L3________, ___________THUMB_R3________
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
[_COLEMAK_DH] = LAYOUT_wrapper(
// ┌────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┐
__________________COLEML1____________________, __________________COLEMR1____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________COLEML2____________________, __________________COLEMR2____________________,
// ├────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┤
__________________COLEML3____________________, __________________COLEMR3____________________,
// └────────┴────────┴────────┴────────┼────────┤ ├────────┼────────┴────────┴────────┴────────┘
_______, _______,
// ┌────────┬────────┼────────┼ ┼────────┼────────┬────────┐
___________THUMB_L3________, ___________THUMB_R3________
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
@@ -293,17 +306,27 @@ bool oled_task_user(void) {
uint8_t mod_state;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static bool isWindows = false;
static bool isLinux = false;
mod_state = get_mods();
switch (keycode) {
case WINDOWS:
case QWERTY:
if (record->event.pressed) {
isWindows = !isWindows;
set_single_persistent_default_layer(_QWERTY);
}
return false;
case COLEMAK:
if (record->event.pressed) {
set_single_persistent_default_layer(_COLEMAK_DH);
}
return false;
case LINUX:
if (record->event.pressed) {
isLinux = !isLinux;
}
return false;
case COPY:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_C));
} else {
tap_code16(LGUI(KC_C));
@@ -312,7 +335,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case PASTE:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_V));
} else {
tap_code16(LGUI(KC_V));
@@ -321,7 +344,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case CUT:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_X));
} else {
tap_code16(LGUI(KC_X));
@@ -330,7 +353,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case UNDO:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_Z));
} else {
tap_code16(LGUI(KC_Z));
@@ -339,7 +362,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case REDO:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_Y));
} else {
tap_code16(LSG(KC_Z));
@@ -348,7 +371,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case SALL:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_A));
} else {
tap_code16(LGUI(KC_A));
@@ -362,17 +385,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case M_PASS2:
if (record->event.pressed) {
SEND_STRING("ThisisThel0ve0fchrist!");
SEND_STRING("CindieVerano!2024");
}
return false;
case M_PASS3:
if (record->event.pressed) {
SEND_STRING("1029");
SEND_STRING("1290");
}
return false;
case M_PASS4:
if (record->event.pressed) {
SEND_STRING("10242677");
SEND_STRING("Thel0ve0fchrist!");
}
return false;
case SPOTLI:
if (record->event.pressed) {
tap_code16(LGUI(KC_SPACE));
}
return false;
}

67
iris/keymap.c
View File

@@ -50,15 +50,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
[_COLEMAK_DH] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML1____________________, __________________COLEMR1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML2____________________, __________________COLEMR2____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML3____________________, SPOTLI, _______, __________________COLEMR3____________________, _______,
//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
[_NAV] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, RGB_TOG,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, RGB_TOG,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________EMPTY_____________________, __________________NAV_R1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________NAV_L2____________________, __________________NAV_R2____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________NAV_L3____________________, WINDOWS, _______, __________________NAV_R3____________________, _______,
_______, __________________NAV_L3____________________, LINUX, _______, __________________NAV_R3____________________, _______,
//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
___________THUMB_L3________, ___________THUMB_R3________
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
@@ -66,7 +80,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUM] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________NUM_L1____________________, _________________BOOT_R1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -80,7 +94,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_SYM] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________SYM_L1____________________, __________________EMPTY_____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -94,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUN] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________FUN_L1____________________, _________________BOOT_R1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -108,7 +122,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MUS] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, _________________BOOT_L1____________________, __________________EMPTY_____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -122,7 +136,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MOUSE] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, KC_LPAD, SPOTLI, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________EMPTY_____________________, __________________MOU_R1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
@@ -132,36 +146,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
),
[_COLEMAK_DH] = LAYOUT_wrapper(
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______, _______, _______, _______, _______, KC_LPAD, KC_PSCR, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML1____________________, __________________COLEMR1____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML2____________________, __________________COLEMR2____________________, _______,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
_______, __________________COLEML3____________________, _______, _______, __________________COLEMR3____________________, _______,
//└────────┴────────┴────────┴───┬────┴───┬────┴───┬────┴───┬────┘ └───┬────┴───┬────┴───┬────┴───┬────┴────────┴────────┴────────┘
___________THUMB_3__BLANK__, ___________THUMB_3__BLANK__
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
)
};
uint8_t mod_state;
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
static bool isWindows = false;
static bool isLinux = false;
mod_state = get_mods();
switch (keycode) {
case WINDOWS:
case LINUX:
if (record->event.pressed) {
isWindows = !isWindows;
isLinux = !isLinux;
}
return false;
case COPY:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_C));
} else {
tap_code16(LGUI(KC_C));
@@ -170,7 +171,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case PASTE:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_V));
} else {
tap_code16(LGUI(KC_V));
@@ -179,7 +180,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case CUT:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_X));
} else {
tap_code16(LGUI(KC_X));
@@ -188,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case UNDO:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_Z));
} else {
tap_code16(LGUI(KC_Z));
@@ -197,7 +198,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case REDO:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_Y));
} else {
tap_code16(LSG(KC_Z));
@@ -206,7 +207,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
case SALL:
if (record->event.pressed) {
if (isWindows) {
if (isLinux) {
tap_code16(LCTL(KC_A));
} else {
tap_code16(LGUI(KC_A));
@@ -220,17 +221,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return false;
case M_PASS2:
if (record->event.pressed) {
SEND_STRING("ThisisThel0ve0fchrist!");
SEND_STRING("CindieVerano!2024");
}
return false;
case M_PASS3:
if (record->event.pressed) {
SEND_STRING("1029");
SEND_STRING("1290");
}
return false;
case M_PASS4:
if (record->event.pressed) {
SEND_STRING("10242677");
SEND_STRING("Thel0ve0fchrist!");
}
return false;
case SPOTLI: