Skip to content

Commit

Permalink
use more wrappers
Browse files Browse the repository at this point in the history
  • Loading branch information
@VeyPatch
VeyPatch committed Jan 13, 2025
1 parent 9d4e3be commit 1650117
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 19 deletions.
38 changes: 19 additions & 19 deletions keyboards/splitkb/halcyon/kyria/keymaps/veypatch/keymap.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2024 splitkb.com (support@splitkb.com)
// Copyright 2025 VeyPatch ([email protected].com)
// SPDX-License-Identifier: GPL-2.0-or-later

#include QMK_KEYBOARD_H
Expand Down Expand Up @@ -34,8 +34,8 @@ enum layers {
LAYOUT_wrapper( \
KC_ESC, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, KC_BSPC , \
KC_LSFT, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \
KC_LCTL, K21, K22, K23, K24, K25, KC_F23, KC_CAPS, KC_F22, KC_F24, K26, K27, K28, K29, K2A, KC_PSCR , \
KC_LGUI, KC_DEL, KC_LALT, KC_LSFT, LT(3, KC_ENTER), LT(4, KC_TAB), KC_SPC, KC_BSPC, KC_RGUI, KC_APP \
KC_LCTL, K21, K22, K23, K24, K25, KC_F23, KC_CAPS, KC_F22, KC_F24, K26, K27, K28, K29, K2A, KC_PSCR , \
KC_LGUI, KC_DEL, KC_LALT, KC_LSFT, LT(_NAV, KC_ENTER), LT(_SYM, KC_TAB), KC_SPC, KC_BSPC, KC_RGUI, KC_APP \
)
/* Re-pass though to allow templates to be used */
#define LAYOUT_base_wrapper(...) LAYOUT_kyria_base(__VA_ARGS__)
Expand All @@ -56,29 +56,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
_________________COLEMAK_L3________________, _________________COLEMAK_R3________________
),
[_NAV] = LAYOUT(
_______, LSFT(KC_1), LSFT(KC_2), LSFT(KC_LBRC), LSFT(KC_RBRC), LSFT(KC_BSLS), _______ , _______, _______, KC_BSLS , _______, _______,
_______, LSFT(KC_3), LSFT(KC_4), LSFT(KC_9) , LSFT(KC_0) , KC_GRV , LSFT(KC_EQL), KC_MINS, KC_SLSH, LSFT(KC_8), _______, _______,
_______, LSFT(KC_5), LSFT(KC_6), KC_LBRC , KC_RBRC , LSFT(KC_GRV) , _______, _______, _______, _______, LSFT(KC_7) , KC_EQL , _______, _______ , _______, _______,
_______ , _______ , _______ , _______ , _______, MO(5) , _______, _______, _______ , _______
[_NAV] = LAYOUT_wrapper(
_______, ________________SYMBOLS_L1_________________, ________________SYMBOLS_R1_________________, _______,
_______, ________________SYMBOLS_L2_________________, ________________SYMBOLS_R2_________________, _______,
_______, ________________SYMBOLS_L3_________________, _______, _______, _______, _______, ________________SYMBOLS_R3_________________, _______,
_______, _______, _______, _______, _______, MO(_FUNCTION) , _______, _______, _______, _______

),
[_SYM] = LAYOUT(
_______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______, _______,
_______, _______, _______, _______, KC_MUTE, KC_VOLD, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
_______, MO(6) , _______, _______, MO(5) , _______, _______, _______, _______, _______
_______, ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, _______,
_______, _________________MEDIA_L2__________________, ________________ARROWS_R2__________________, _______,
_______, _________________MEDIA_L3__________________, _______, _______, _______, _______, ________________ARROWS_R3__________________, _______,
_______, MO(_ADJUST), _______, _______, MO(_FUNCTION), _______, _______, _______, _______, _______
),
[_FUNCTION] = LAYOUT(
_______, KC_F1, KC_F2 , KC_F3 , KC_F4 , _______, KC_NUM , KC_P7 , KC_P8, KC_P9, KC_PPLS, KC_PMNS,
_______, KC_F5, KC_F6 , KC_F7 , KC_F8 , _______, _______, KC_P4 , KC_P5, KC_P6, KC_PEQL, KC_PAST,
_______, KC_F9, KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, _______, _______, KC_P1 , KC_P2, KC_P3, KC_PENT, KC_PSLS,
_______, _______, _______, _______, _______, _______, _______, _______, KC_P0 , KC_PDOT
_______, _________________FUNC_L1___________________, __________________NUM_R1___________________, KC_PMNS,
_______, _________________FUNC_L2___________________, __________________NUM_R2___________________, KC_PAST,
_______, _________________FUNC_L3___________________, _______, _______, _______, _______, __________________NUM_R3___________________, KC_PSLS,
_______, _______, _______, _______, _______, _______, _______, _______, __________________NUM_R4___________________
),
[_ADJUST] = LAYOUT(
QK_BOOT, _______, _______, DF(0) , _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, DF(1) , _______, _______, RM_TOGG, RM_SATU, RM_HUEU, RM_VALU, RM_NEXT, RM_SPDU,
_______, _______, _______, DF(2) , _______, _______, _______, _______, _______, _______, _______, RM_SATD, RM_HUED, RM_VALD, RM_PREV, RM_SPDD,
QK_BOOT, __________________DF_L1____________________, ___________________BLANK___________________, _______,
_______, __________________DF_L2____________________, __________________RGB_R1___________________, RM_SPDU,
_______, __________________DF_L3____________________, _______, _______, _______, _______, __________________RGB_R2___________________, RM_SPDD,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
33 changes: 33 additions & 0 deletions users/veypatch/keyrecords/wrappers.h
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Copyright 2025 VeyPatch ([email protected])
// Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <[email protected]>
// Copyright 2020 @jola5
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -254,6 +255,38 @@ NOTE: These are all the same length. If you do a search/replace
#define _________________RAISE_R3__________________ KC_NO , KC_LEFT, KC_DOWN, KC_UP , KC_RGHT


// Veypatch specific
#define ________________SYMBOLS_L1_________________ LSFT(KC_1), LSFT(KC_2), LSFT(KC_LBRC), LSFT(KC_RBRC), LSFT(KC_BSLS)
#define ________________SYMBOLS_L2_________________ LSFT(KC_3), LSFT(KC_4), LSFT(KC_9), LSFT(KC_0), KC_GRV
#define ________________SYMBOLS_L3_________________ LSFT(KC_5), LSFT(KC_6), KC_LBRC, KC_RBRC, LSFT(KC_GRV)

#define ________________SYMBOLS_R1_________________ _______, _______, _______, KC_BSLS, _______
#define ________________SYMBOLS_R2_________________ LSFT(KC_EQL), KC_MINS, KC_SLSH, LSFT(KC_8), _______
#define ________________SYMBOLS_R3_________________ LSFT(KC_7) , KC_EQL , _______, _______ , _______

#define _________________MEDIA_L2__________________ _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLU
#define _________________MEDIA_L3__________________ _______, _______, _______, KC_MUTE, KC_VOLD
#define ________________ARROWS_R2__________________ KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______
#define ________________ARROWS_R3__________________ _______, KC_LEFT, KC_DOWN, KC_RGHT, _______

#define _________________FUNC_L1___________________ KC_F1, KC_F2, KC_F3, KC_F4, _______
#define _________________FUNC_L2___________________ KC_F5, KC_F6, KC_F7, KC_F8, _______
#define _________________FUNC_L3___________________ KC_F9, KC_F10, KC_F11, KC_F12, _______

#define __________________NUM_R1___________________ KC_NUM , KC_P7, KC_P8, KC_P9, KC_PPLS
#define __________________NUM_R2___________________ _______, KC_P4, KC_P5, KC_P6, KC_PEQL
#define __________________NUM_R3___________________ _______, KC_P1, KC_P2, KC_P3, KC_PENT
#define __________________NUM_R4___________________ KC_P0 , KC_PDOT

#define __________________RGB_R1___________________ RM_TOGG, RM_SATU, RM_HUEU, RM_VALU, RM_NEXT
#define __________________RGB_R2___________________ _______, RM_SATD, RM_HUED, RM_VALD, RM_PREV

#define __________________DF_L1____________________ _______, _______, DF(0), _______, _______
#define __________________DF_L2____________________ _______, _______, DF(1), _______, _______
#define __________________DF_L3____________________ _______, _______, DF(2), _______, _______
// Veypatch specific end


#ifdef RGB_MATRIX_ENABLE
# define _________________ADJUST_L1_________________ RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_TOGG
# define _________________ADJUST_L3_________________ RM_PREV, RM_HUED, RM_SATD, RM_VALD, KC_RGB_T
Expand Down

0 comments on commit 1650117

Please sign in to comment.