Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 903bfb6

Browse files
author
filterpaper
committed
Merge branch 'main' of github.com:filterpaper/qmk_userspace into main
2 parents a90c246 + 9dc4175 commit 903bfb6

5 files changed

Lines changed: 44 additions & 5 deletions

File tree

‎combos.def‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ SUBS(vi_quit, ":q!", KC_Q, KC_W)
1818
SUBS(vi_save, ":wq!", KC_Z, KC_X)
1919

2020
// layer toggles
21-
COMB(numb, TG(NUM), RSFT_T(KC_SPC), LT(NUM,KC_BSPC))
22-
COMB(func, TG(FNC), LT(SYM,KC_TAB), RSA_T(KC_ENT))
21+
COMB(func, TG(FNC), LT(SYM,KC_TAB), KC_B)
22+
COMB(numb, TG(NUM), LT(NUM,KC_BSPC), KC_N)
2323

2424
// vimac
2525
COMB(vimacf, C(A(S(G(KC_F)))), HM_D, HM_F)

‎config.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
#define IGNORE_MOD_TAP_INTERRUPT
1616
#define TAP_CODE_DELAY 5
1717
#define TAPPING_TOGGLE 1
18-
#define BOOTMAGIC_LITE_ROW 0
19-
#define BOOTMAGIC_LITE_COLUMN 0
2018
#define GRAVE_ESC_SHIFT_OVERRIDE
2119
#define USB_SUSPEND_WAKEUP_DELAY 200
2220
// Increase polling
@@ -29,7 +27,9 @@
2927
#ifdef SPLIT_KEYBOARD
3028
# define EE_HANDS
3129
# ifdef KEYBOARD_crkbd_rev1
32-
# define BOOTMAGIC_LITE_ROW_RIGHT 4
30+
# define BOOTMAGIC_LITE_ROW 0
31+
# define BOOTMAGIC_LITE_COLUMN 0
32+
# define BOOTMAGIC_LITE_ROW_RIGHT 4
3333
# define BOOTMAGIC_LITE_COLUMN_RIGHT 0
3434
# endif
3535
# if defined(OLED_ENABLE) || defined(RGB_MATRIX_ENABLE)

‎filterpaper.c‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,14 @@ bool process_record_user(uint16_t const keycode, keyrecord_t *record) {
114114

115115
return true; // Continue with unmatched keycodes
116116
}
117+
118+
#ifdef ENCODER_ENABLE
119+
bool encoder_update_user(uint8_t index, bool clockwise) {
120+
if (index == 0) {
121+
clockwise ? tap_code(KC_VOLU) : tap_code(KC_VOLD);
122+
} else if (index == 1) {
123+
clockwise ? tap_code(KC_MNXT) : tap_code(KC_MPRV);
124+
}
125+
return false;
126+
}
127+
#endif

‎keymaps/macro3.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"author": "",
3+
"documentation": "Wrapper based keymap",
4+
"keyboard": "macro3",
5+
"keymap": "filterpaper",
6+
"layout": "MACRO3_wrapper",
7+
"layers": [
8+
[ "MACRO_0" ],
9+
[ "MACRO_1" ],
10+
[ "MACRO_2" ]
11+
],
12+
"notes": "",
13+
"version": 1
14+
}

‎layout.h‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,3 +220,17 @@ KC_DEL, KC_VOLD, KC_VOLU, k37, k38, k39, k40, k41, KC_LEFT, KC_DOWN, KC_UP, KC_R
220220
k200, HRML(k202, k203, k204, k205), k206, k207, HRMR(k208, k209, k210, k211), k212, k213, k215,\
221221
k300, k301, k302, k303, k304, k305, k306, k307, TH4(k308, k309, k310, k311), k313, k314, \
222222
k400, k401, k403, k404, k406, k408, k410, k411, k412, k413, k414, k415
223+
224+
225+
226+
// Macro3
227+
#define MACRO3_wrapper(...) LAYOUT(__VA_ARGS__)
228+
#define MACRO3_0 \
229+
KC_MUTE, KC_MSTP, KC_MRWD, KC_MFFD, \
230+
G(KC_V), G(KC_C), G(KC_X), LT(2,KC_MPLY)
231+
#define MACRO3_1 \
232+
_______, _______, KC_PGDN, KC_PGUP, \
233+
KC_LEFT, KC_DOWN, KC_UP, LT(2,KC_RGHT)
234+
#define MACRO3_2 \
235+
RESET, _______, KC_SLEP, KC_PWR, \
236+
TG(1), KC_END, KC_HOME, _______

0 commit comments

Comments
 (0)