Skip to content

Commit 7180980

Browse files
trankillitytrankillity
committed
Rusty! Time to update.
1 parent 44ba2ec commit 7180980

File tree

4 files changed

+63
-77
lines changed

4 files changed

+63
-77
lines changed

‎.github/workflows/build-firmware.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ jobs:
2121
with:
2222
path: keyboards/fingerpunch/ffkb/byomcu/v3/keymaps/${{ github.actor }}
2323

24-
# - name: Checkout Case Modes
25-
# uses: actions/checkout@v3
26-
# with:
27-
# repository: andrewjrae/kyria-keymap
28-
# path: keyboards/splitkb/kyria/keymaps/andrewjrae
29-
3024
- name: Build firmware
3125
run: make fingerpunch/ffkb/byomcu/v3:${{ github.actor }} FP_TRACKBALL_ENABLE=yes CONVERT_TO=stemcell
3226

‎combos.def‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
KC_3, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_6,
55
*/
66

7+
/* System */
8+
COMB(login, C(A(KC_DEL)), KC_Q, KC_W, KC_Y, KC_QUOT)
9+
COMB(bwfill, C(S(KC_L)), KC_G, KC_M)
10+
COMB(caps, KC_CAPS, KC_B, KC_J)
11+
COMB(boot, QK_BOOT, KC_Z, KC_X, KC_DOT, KC_SLSH)
12+
713
/* Brackets */
814
COMB(lbrk, KC_LBRC, KC_W, KC_F)
915
COMB(rbrk, KC_RBRC, KC_U, KC_Y)
@@ -17,18 +23,13 @@ COMB(mins, KC_MINUS, KC_P, KC_T)
1723
COMB(unds, KC_UNDERSCORE, KC_L, KC_N)
1824
COMB(eqal, KC_EQUAL, KC_F, KC_S)
1925
COMB(excl, KC_EXCLAIM, KC_U, KC_E)
26+
COMB(grav, KC_GRAVE, KC_R, KC_X)
27+
COMB(bsls, KC_BSLASH, KC_S, KC_C)
28+
COMB(fsls, KC_FSLASH, KC_E, KC_COMM)
2029

21-
/* Functions */
22-
//COMB(capw, C_CAPW, KC_G, KC_M)
23-
//COMB(snkc, C_SNKC, KC_B, KC_J)
24-
COMB(caps, KC_CAPS, KC_V, KC_K)
25-
26-
/* System */
27-
COMB(login, C(A(KC_DEL)), KC_Q, KC_QUOT)
28-
COMB(boot, QK_BOOT, KC_Z, KC_X, KC_DOT, KC_SLSH)
2930

3031
/* Mouse */
31-
COMB(mouse1, KC_MS_BTN1, KC_R, KC_T)
32-
COMB(mouse2, KC_MS_BTN2, KC_W, KC_P)
33-
COMB(mouse3, KC_MS_BTN3, KC_X, KC_D)
34-
COMB(scroll, FP_SCROLL_MOMENT, KC_A, KC_T)
32+
// COMB(mouse1, KC_MS_BTN1, KC_R, KC_T)
33+
// COMB(mouse2, KC_MS_BTN2, KC_W, KC_P)
34+
// COMB(mouse3, KC_MS_BTN3, KC_X, KC_D)
35+
// COMB(scroll, FP_SCROLL_MOMENT, KC_A, KC_T)

‎keymap.c‎

Lines changed: 48 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,42 +7,24 @@
77
// Defines names for use in layer keycodes and the keymap
88
enum layer_names {
99
_BASE,
10-
_NUMB,
1110
_NAVI,
12-
// _MOUS,
11+
_MOUS,
12+
_NUMB,
13+
_FUNC,
1314
_SYST,
1415
_COMB
1516
};
1617

17-
// enum custom_keycodes {
18-
// C_DBLC = SAFE_RANGE,
19-
// C_MLTG,
20-
// // C_SCRL,
21-
// // C_ZOOM,
22-
// C_CAPW,
23-
// C_SNKC,
24-
// C_KEBC,
25-
// C_XCSE
26-
// };
27-
28-
2918
#define COMBO_ONLY_FROM_LAYER _COMB
3019

3120
// General Shortcuts
32-
#define C_SELA C(KC_A)
33-
#define C_UNDO C(KC_Z)
34-
#define C_CUT C(KC_X)
35-
#define C_COPY C(KC_C)
36-
#define C_PAST C(KC_V)
37-
#define C_REDO C(KC_Y)
38-
3921
#define C_SNIP G(S(KC_S))
4022
#define C_TABI KC_TAB
4123
#define C_TABD S(KC_TAB)
4224
#define C_STBI FP_SUPER_TAB
4325
#define C_STBD S(FP_SUPER_TAB)
4426
#define C_DSKT G(KC_TAB)
45-
#define C_ACCL FP_ACCEL_TOG
27+
// #define C_ACCL FP_ACCEL_TOG
4628
#define C_CENT C(KC_ENTER)
4729

4830
// Data Grip Shortcuts
@@ -51,23 +33,18 @@ enum layer_names {
5133
#define D_COLS A(S(KC_INS))
5234
#define D_NEWF A(KC_INS)
5335

54-
5536
// Fingerpunch Shortcuts
56-
#define F_DPRS FP_POINT_DPI_RESET
57-
#define F_DPUP FP_POINT_DPI_UP
58-
#define F_DPDN FP_POINT_DPI_DN
59-
#define F_SCRS FP_SCROLL_DPI_RESET
60-
#define F_SCUP FP_SCROLL_DPI_UP
61-
#define F_SCDN FP_SCROLL_DPI_DN
62-
#define F_ACTG FP_ACCEL_TOG
37+
// #define F_DPRS FP_POINT_DPI_RESET
38+
// #define F_DPUP FP_POINT_DPI_UP
39+
// #define F_DPDN FP_POINT_DPI_DN
40+
// #define F_SCRS FP_SCROLL_DPI_RESET
41+
// #define F_SCUP FP_SCROLL_DPI_UP
42+
// #define F_SCDN FP_SCROLL_DPI_DN
43+
// #define F_ACTG FP_ACCEL_TOG
6344

6445
// Oneshots
46+
#define MM(MOD,KEY) MT(MOD_##MOD,KC_##KEY)
6547
#define OSM_SFT OSM(MOD_LSFT)
66-
#define OSM_CTL OSM(MOD_LCTL)
67-
#define OSM_ALT OSM(MOD_LALT)
68-
#define OSM_GUI OSM(MOD_LGUI)
69-
#define OSL_NUM OSL(_NUMB)
70-
#define OSL_NAV OSL(_NAVI)
7148

7249
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
7350
/* Base - Colemak
@@ -85,39 +62,55 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
8562
*/
8663

8764
[_BASE] = LAYOUT_ffkb(
88-
KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, KC_BSLS,
89-
C_TABI, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, C_TABD,
90-
OSM_CTL, KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, C_CENT,
65+
KC_NO, KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, KC_QUOT, KC_NO,
66+
KC_NO, KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, KC_NO,
67+
KC_NO, MM(LGUI,Z), MM(LALT,X), MM(LSFT,C), MM(LCTL,D), KC_V, KC_K, KC_H, KC_COMM, KC_DOT, KC_SLSH, KC_NO,
9168
KC_NO, MO(_NUMB), OSM_SFT, KC_BSPC, KC_ENTER, KC_SPC, MO(_NAVI), KC_NO
9269
),
9370

71+
[_NAVI] = LAYOUT_ffkb(
72+
KC_NO, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_APP, C_STBI, C_STBD, _______, C_DSKT, KC_NO,
73+
KC_NO, C(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_NO,
74+
KC_NO, C(KC_Z), C(KC_X), C(KC_C), C(KC_V), C(KC_Y), KC_VOLD, KC_RSFT, KC_RCTL, KC_LALT, KC_RGUI, KC_NO,
75+
_______, _______, _______, KC_DEL, _______, _______, _______, _______
76+
),
77+
78+
[_MOUS] = LAYOUT_ffkb(
79+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
80+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
81+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
82+
_______, _______, _______, _______, _______, _______, _______, _______
83+
// C_SCRL, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
84+
// C_ZOOM, C_MLTG, KC_BTN3, KC_BTN2, KC_BTN1, C_DBLC, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
85+
// OSM_CTL, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
86+
// _______, C_MLTG, _______, C_MLTG, C_MLTG, C_MLTG, C_MLTG, _______
87+
),
88+
9489
[_NUMB] = LAYOUT_ffkb(
95-
KC_F6, KC_F5, KC_F4, KC_F3, KC_F2, KC_F1, KC_EQL, KC_7, KC_8, KC_9, KC_DOT, KC_COMM,
96-
C_TABI, OSM_GUI, OSM_ALT, OSM_CTL, OSM_SFT, _______, KC_PPLS, KC_4, KC_5, KC_6, KC_PAST, KC_GRV,
97-
KC_F12, KC_F11, KC_F10, KC_F9, KC_F8, KC_F7, KC_MINS, KC_1, KC_2, KC_3, KC_SLSH, KC_UNDS,
90+
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_EQL, KC_7, KC_8, KC_9, KC_DOT, KC_NO,
91+
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PPLS, KC_4, KC_5, KC_6, KC_PAST, KC_NO,
92+
KC_NO, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_NO, KC_MINS, KC_1, KC_2, KC_3, KC_SLSH, KC_NO,
9893
_______, _______, _______, _______, _______, _______, KC_0, _______
9994
),
10095

101-
[_NAVI] = LAYOUT_ffkb(
102-
KC_NO, KC_INS, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_ESC, C_STBI, C_STBD, C_DSKT, _______, TO(_SYST),
103-
C_TABI, C_SELA, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_VOLU, OSM_SFT, OSM_CTL, OSM_ALT, OSM_GUI, C_TABD,
104-
KC_NO, C_UNDO, C_CUT, C_COPY, C_PAST, C_REDO, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MUTE,
105-
_______, _______, _______, KC_DEL, _______, _______, _______, _______
96+
[_FUNC] = LAYOUT_ffkb(
97+
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F7, KC_F8, KC_F9, KC_F12, KC_NO,
98+
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_F4, KC_F5, KC_F6, KC_F11, KC_NO,
99+
KC_NO, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_NO, KC_NO, KC_F1, KC_F2, KC_F3, KC_F10, KC_NO,
100+
_______, _______, _______, _______, _______, _______, _______, _______
106101
),
107102

108103
[_SYST] = LAYOUT_ffkb(
109-
_______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, TO(_BASE), _______, F_DPRS, F_SCRS, _______, _______, TO(_BASE),
110-
_______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, F_ACTG, F_DPUP, F_SCUP, _______, _______, _______,
111-
_______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, F_DPDN, F_SCDN, _______, QK_BOOT, _______,
104+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
105+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
106+
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
112107
_______, _______, _______, _______, _______, _______, _______, _______
108+
// _______, RGB_TOG, RGB_RMOD, RGB_MOD, _______, TO(_BASE), _______, F_DPRS, F_SCRS, _______, _______, _______,
109+
// _______, RGB_SPI, RGB_HUI, RGB_SAI, RGB_VAI, _______, F_ACTG, F_DPUP, F_SCUP, _______, _______, _______,
110+
// _______, RGB_SPD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, F_DPDN, F_SCDN, _______, QK_BOOT, _______,
111+
// _______, _______, _______, _______, _______, _______, _______, _______
113112
),
114113

115-
// [_MOUS] = LAYOUT_ffkb(
116-
// C_SCRL, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
117-
// C_ZOOM, C_MLTG, KC_BTN3, KC_BTN2, KC_BTN1, C_DBLC, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
118-
// OSM_CTL, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_MTOG, C_MLTG, C_MLTG, C_MLTG, C_MLTG, C_ACCL,
119-
// _______, C_MLTG, _______, C_MLTG, C_MLTG, C_MLTG, C_MLTG, _______
120-
// ),
121114

122115
// Combo layer. Never to be activated, just used or combo indexing purposes.
123116
[_COMB] = LAYOUT_ffkb(

‎rules.mk‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# NKRO_ENABLE = yes
21
COMBO_ENABLE = yes
32
KEY_OVERRIDE_ENABLE = yes
3+
TAP_DANCE_ENABLE = yes
44

5-
VPATH += keyboards/gboards
6-
# VPATH += keyboards/splitkb/kyria/keymaps/andrewjrae/features
7-
# SRC += casemodes.c
5+
VPATH += keyboards/gboards

0 commit comments

Comments
 (0)