Skip to content

Commit dbab2f5

Browse files
t4corunt4corun
committed
Pushing changes so far
1 parent f0786c5 commit dbab2f5

5 files changed

Lines changed: 52 additions & 90 deletions

File tree

‎users/t4corun/features/oled/oled.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#include "t4corun.h"
44

55
#define OLED_RENDER_DEFAULT_LAYER1 "Qwrty"
6-
#define OLED_RENDER_DEFAULT_LAYER2 "Clmak"
7-
#define OLED_RENDER_DEFAULT_LAYER3 "Game "
6+
#define OLED_RENDER_DEFAULT_LAYER2 "Graph"
87
#define OLED_RENDER_LAYER_2 " Nav "
98
#define OLED_RENDER_LAYER_3 " Num "
109
#define OLED_RENDER_LAYER_4 " Sym "

‎users/t4corun/features/oled/oled_128x64.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
#include "t4corun.h"
44

55
#define OLED_RENDER_DEFAULT_LAYER1 "QWERTY :"
6-
#define OLED_RENDER_DEFAULT_LAYER2 "COLEMAK DH:"
7-
#define OLED_RENDER_DEFAULT_LAYER3 "GAME :"
6+
#define OLED_RENDER_DEFAULT_LAYER2 "GRAPHITE :"
87
#define OLED_RENDER_LAYER_2 "Navigation"
98
#define OLED_RENDER_LAYER_3 "Number "
109
#define OLED_RENDER_LAYER_4 "Symbol "

‎users/t4corun/features/taphold.c‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,23 +52,11 @@ bool process_record_user_taphold(uint16_t keycode, keyrecord_t *record) {
5252
return process_tap_hold(record, KC_DQUO, KC_DQUO, HOLD_BRACKETS);
5353
case BK_SQUO:
5454
return process_tap_hold(record, KC_QUOT, KC_QUOT, HOLD_BRACKETS);
55-
// double tap
56-
case DT_BSLS:
57-
return process_tap_hold(record, KC_BSLS, KC_BSLS, HOLD_DOUBLETP);
58-
case DT_SLSH:
59-
return process_tap_hold(record, KC_SLSH, KC_SLSH, HOLD_DOUBLETP);
60-
case DT_PIPE:
61-
return process_tap_hold(record, KC_PIPE, KC_PIPE, HOLD_DOUBLETP);
6255
// Custom override without holding shift
6356
case OR_COMM:
6457
return process_tap_hold(record, KC_COMM, KC_LPRN, HOLD_SINGLETP);
6558
case OR_DOT:
6659
return process_tap_hold(record, KC_DOT, KC_RPRN, HOLD_SINGLETP);
67-
// auto shift
68-
case AS_MINS:
69-
return process_tap_hold(record, KC_MINS, KC_UNDS, HOLD_SINGLETP);
70-
case AS_QUOT:
71-
return process_tap_hold(record, KC_QUOT, KC_DQUO, HOLD_SINGLETP);
7260
}
7361
return true;
7462
}

‎users/t4corun/features/tapping.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ bool get_chordal_hold(uint16_t tap_hold_keycode, keyrecord_t* tap_hold_record,
1515
case HRM_S: // Qwerty Alt
1616
case HRM_L: // Qwerty Alt
1717
case HRM_QT: // Qwerty GUI
18-
case HRM_R: // ColemakDH Alt
19-
case HRM_I: // ColemakDH Alt
20-
case HRM_O: // ColemakDH GUI
18+
case HRM_N: // Graphite GUI
19+
case HRM_R: // Graphite Alt
20+
case HRM_E: // Graphite Alt
21+
case HRM_I: // Graphite GUI
2122
return false;
2223
default:
2324
break;
@@ -35,9 +36,10 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
3536
case HRM_S: // Qwerty Alt
3637
case HRM_L: // Qwerty Alt
3738
case HRM_QT: // Qwerty GUI
38-
case HRM_R: // ColemakDH Alt
39-
case HRM_I: // ColemakDH Alt
40-
case HRM_O: // ColemakDH GUI
39+
case HRM_N: // Graphite GUI
40+
case HRM_R: // Graphite Alt
41+
case HRM_E: // Graphite Alt
42+
case HRM_I: // Graphite GUI
4143
return TAPPING_TERM + 100;
4244
default:
4345
return TAPPING_TERM;

‎users/t4corun/t4corun.h‎

Lines changed: 42 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ void set_default_layer(bool forward);
2020
enum layers {
2121
_QWERTY = 0,
2222
DEFAULT_LAYER = 0,
23-
_COLEMAK_DH,
24-
_GAME,
23+
_GRAPHITE,
2524
_NAVIGATION,
2625
_NUMBER,
2726
_SYMBOL,
@@ -37,16 +36,9 @@ enum keycodes {
3736
TH_DQUO,
3837
TH_SQUO,
3938

40-
TH_BSLS,
41-
TH_SLSH,
42-
TH_PIPE,
43-
4439
TH_COMM,
4540
TH_DOT,
4641

47-
TH_MINS,
48-
TH_QUOT,
49-
5042
#if defined(ENCODER_ENABLE)
5143
FWD_TAB, // turn encoder for tab and shift tab
5244
REV_TAB, // hold alt or ctrl while turning for window / tab switching
@@ -95,8 +87,7 @@ enum keycodes {
9587

9688
// start at the second layer
9789
#define DEFAULT_LAYER_2 DEFAULT_LAYER + 1
98-
#define DEFAULT_LAYER_3 DEFAULT_LAYER + 2
99-
#define NUM_DEFAULT_LAYERS 3
90+
#define NUM_DEFAULT_LAYERS 2
10091

10192
#define ___x___ KC_NO
10293

@@ -110,11 +101,12 @@ enum keycodes {
110101
#define SCR_TOP LCTL(KC_HOME)
111102

112103
// Windows Shortcuts
113-
#define SC_COPY LCTL(KC_C)
114-
#define SC_CUT LCTL(KC_X)
115104
#define SC_UNDO LCTL(KC_Z)
105+
#define SC_CUT LCTL(KC_X)
106+
#define SC_COPY LCTL(KC_C)
116107
#define SC_PAST LCTL(KC_V)
117108
#define SC_REDO LCTL(KC_Y)
109+
#define W_SNIP LSG(KC_S)
118110

119111
// home row mods QWERTY
120112
#define HRM_A LGUI_T(KC_A)
@@ -126,14 +118,15 @@ enum keycodes {
126118
#define HRM_L RALT_T(KC_L)
127119
#define HRM_QT RGUI_T(KC_QUOT)
128120

129-
// home row mods COLEMAK DH
121+
// home row mods GRAPHITE
122+
#define HRM_N LGUI_T(KC_N)
130123
#define HRM_R LALT_T(KC_R)
131-
#define HRM_SC LCTL_T(KC_S)
132-
#define HRM_T LSFT_T(KC_T)
133-
#define HRM_N RSFT_T(KC_N)
134-
#define HRM_E RCTL_T(KC_E)
135-
#define HRM_I RALT_T(KC_I)
136-
#define HRM_O RGUI_T(KC_O)
124+
#define HRM_T LCTL_T(KC_T)
125+
#define HRM_SG LSFT_T(KC_S)
126+
#define HRM_H RSFT_T(KC_H)
127+
#define HRM_AG RCTL_T(KC_A)
128+
#define HRM_E RALT_T(KC_E)
129+
#define HRM_I RGUI_T(KC_I)
137130

138131
#define HRML(k1, k2, k3, k4) LGUI_T(k1), LALT_T(k2), LCTL_T(k3), LSFT_T(k4)
139132
#define HRMR(k1, k2, k3, k4) RSFT_T(k1), RCTL_T(k2), RALT_T(k3), RGUI_T(k4)
@@ -147,25 +140,16 @@ enum keycodes {
147140
#define BK_DQUO LT(DEFAULT_LAYER, TH_DQUO)
148141
#define BK_SQUO LT(DEFAULT_LAYER, TH_SQUO)
149142

150-
// double tap
151-
#define DT_BSLS LT(DEFAULT_LAYER, TH_BSLS)
152-
#define DT_SLSH LT(DEFAULT_LAYER, TH_SLSH)
153-
#define DT_PIPE LT(DEFAULT_LAYER, TH_PIPE)
154-
155143
// Custom override without holding shift
156144
#define OR_COMM LT(DEFAULT_LAYER, TH_COMM)
157145
#define OR_DOT LT(DEFAULT_LAYER, TH_DOT)
158146

159-
// auto shift
160-
#define AS_MINS LT(DEFAULT_LAYER, TH_MINS)
161-
#define AS_QUOT LT(DEFAULT_LAYER, TH_QUOT)
162-
163147
// pointer specific control
164148
#if defined(KEYBOARD_bastardkb_charybdis_3x5) || defined(KEYBOARD_non_tree_keyball39)
165149
# define MS_SNIP SNIPING //these mouse codes are defined in charybdis.h and keyball.h
166150
# define MS_STOG SNP_TOG
167151
# define MS_DRGS DRGSCRL
168-
# define MS_SDPI S_D_MOD //sniping dpi
152+
# define MS_SDPI S_D_MOD //sniping dlpi
169153
# define MS_PDPI DPI_MOD //pointer dpi
170154
#else
171155
# define MS_SNIP ___x___
@@ -177,70 +161,60 @@ enum keycodes {
177161

178162
#define _NONE_3__________________ ___x___, ___x___, ___x___
179163
#define _NONE_5____________________________________ ___x___, ___x___, ___x___, ___x___, ___x___
180-
#define _GACS_MODS________________________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT
181-
#define _SCAG_MODS________________________ KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI
182-
#define _UCCPR_L___________________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO
164+
#define _MODS_GACS________________________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT
165+
#define _MODS_SCAG________________________ KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI
166+
#define _SHORTCUTS_UCCPR___________________________ SC_UNDO, SC_CUT, SC_COPY, SC_PAST, SC_REDO
183167

184168
#define _BASE_L4_________________ MS_BTN1, NUM, KC_LSFT
185-
#define _BASE_R4________ KC_SPC, NAV
186-
#define _LYR_LTRANS______________ ___x___, _______, ___x___
187-
#define _LYR_RTRANS_____ ___x___, _______
169+
#define _BASE_R4_________________ KC_SPC, NAV, KC_BSPC
170+
#define _LYR_TRANS_______________ ___x___, _______, ___x___
188171

189172
//___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___, ___x___,
190173

191174
#define LAYER_QWERTY \
192175
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \
193176
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \
194-
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, OR_COMM, OR_DOT, AS_MINS, \
195-
_BASE_L4_________________, _BASE_R4________, \
196-
SCR_TOP, KC_MUTE
197-
198-
199-
#define LAYER_COLEMAK_DH \
200-
KC_Q, KC_W, KC_F, KC_P, KC_B, KC_J, KC_L, KC_U, KC_Y, AS_QUOT, \
201-
KC_A, KC_R, KC_S, KC_T, KC_G, KC_M, KC_N, KC_E, KC_I, KC_O, \
202-
KC_Z, KC_X, KC_C, KC_D, KC_V, KC_K, KC_H, OR_COMM, OR_DOT, AS_MINS, \
203-
_BASE_L4_________________, _BASE_R4________, \
177+
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, OR_COMM, OR_DOT, KC_MINS, \
178+
_BASE_L4_________________, _BASE_R4_________________, \
204179
SCR_TOP, KC_MUTE
205180

206181

207-
#define LAYER_GAME \
208-
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_7, KC_8, KC_9, KC_ESC, \
209-
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_4, KC_5, KC_6, KC_GRV, \
210-
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LALT, KC_1, KC_2, KC_3, TOG_CFG, \
211-
KC_ENT, KC_SPC, KC_LSFT, _BASE_R4________, \
182+
#define LAYER_GRAPHITE \
183+
KC_B, KC_L, KC_D, KC_W, KC_Z, KC_QUOT, KC_F, KC_O, KC_U, KC_J, \
184+
KC_N, KC_R, KC_T, KC_S, KC_G, KC_Y, KC_H, KC_A, KC_E, KC_I, \
185+
KC_Q, KC_X, KC_M, KC_C, KC_V, KC_K, KC_P, OR_DOT, KC_MINS, OR_COMM, \
186+
_BASE_L4_________________, _BASE_R4_________________, \
212187
SCR_TOP, KC_MUTE
213188

214189

215190
#define LAYER_NAVIGATION \
216-
___x___, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, KC_APP, MS_BTN2, ___x___, ___x___, \
217-
___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _SCAG_MODS________________________, \
218-
_NONE_5____________________________________, KC_DEL, MS_BTN1, KC_VOLD, KC_VOLU, KC_MUTE, \
219-
KC_TAB, _______, KC_ENT, _LYR_RTRANS_____, \
191+
KC_ESC, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_INS, KC_APP, ___x___, ___x___, ___x___, \
192+
___x___, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_BSPC, _MODS_SCAG________________________, \
193+
_SHORTCUTS_UCCPR___________________________, KC_DEL, ___x___, KC_VOLD, KC_VOLU, ___x___, \
194+
KC_TAB, _______, ___x___, _LYR_TRANS_______________, \
220195
SCR_TOP, ___x___
221196

222197

223198
#define LAYER_NUMBER \
224-
KC_ESC, MS_BTN5, MS_BTN3, MS_BTN4, ___x___, KC_COMM, KC_7, KC_8, KC_9, KC_F5, \
225-
_GACS_MODS________________________, MS_BTN2, KC_DOT, KC_4, KC_5, KC_6, KC_F2, \
226-
___x___, ___x___, MS_PDPI, MS_SDPI, MS_SNIP, KC_MINS, KC_1, KC_2, KC_3, KC_F3, \
227-
FUNC, _______, ___x___, KC_0, _______, \
199+
KC_ESC, MS_BTN5, MS_BTN3, MS_BTN4, W_SNIP, KC_COMM, KC_7, KC_8, KC_9, KC_SLSH, \
200+
_MODS_GACS________________________, MS_BTN2, KC_DOT, KC_4, KC_5, KC_6, KC_ASTR, \
201+
_SHORTCUTS_UCCPR___________________________, KC_MINS, KC_1, KC_2, KC_3, KC_PLUS, \
202+
FUNC, _______, KC_SPC, KC_0, _______, KC_EQL, \
228203
___x___, ___x___
229204

230205

231206
#define LAYER_SYMBOL \
232-
KC_CIRC, KC_AMPR, KC_AT, KC_DLR, KC_GRV, KC_TILD, KC_HASH, KC_ASTR, KC_PLUS, BK_DQUO, \
233-
KC_PERC, BK_LCBR, KC_RCBR, DT_PIPE, KC_SCLN, KC_COLN, KC_EQL, BK_LBRC, KC_RBRC, BK_SQUO, \
234-
___x___, BK_LABK, KC_RABK, DT_BSLS, KC_EXLM, KC_QUES, DT_SLSH, BK_LPRN, KC_RPRN, ___x___, \
235-
_LYR_LTRANS______________, _LYR_RTRANS_____, \
207+
KC_CIRC, KC_AT, BK_LABK, KC_RABK, KC_GRV, KC_PIPE, BK_LCBR, KC_RCBR, KC_DLR, BK_DQUO, \
208+
___x___, KC_ASTR, KC_SLSH, KC_EQL, KC_AMPR, KC_HASH, BK_LPRN, KC_RPRN, KC_SCLN, BK_SQUO, \
209+
KC_TILD, KC_PLUS, BK_LBRC, KC_RBRC, KC_PERC, KC_BSLS, KC_COLN, KC_QUES, KC_EXLM, KC_MINS, \
210+
_LYR_TRANS_______________, _LYR_TRANS_______________, \
236211
___x___, ___x___
237212

238-
239213
#define LAYER_FUNCTION \
240214
QK_BOOT, GU_TOGG, CG_TOGG, KC_BRK, KC_PSCR, TOG_CFG, KC_F7, KC_F8, KC_F9, KC_F10, \
241-
_GACS_MODS________________________, DM_PLY1, FWD_CFG, KC_F4, KC_F5, KC_F6, KC_F11, \
215+
_MODS_GACS________________________, DM_PLY1, FWD_CFG, KC_F4, KC_F5, KC_F6, KC_F11, \
242216
___x___, KC_NUM, KC_CAPS, KC_SCRL, DM_REC1, REV_CFG, KC_F1, KC_F2, KC_F3, KC_F12, \
243-
_______, ___x___, ___x___, DM_PLY2, DM_REC2, \
217+
_______, ___x___, ___x___, DM_PLY2, DM_REC2, ___x___, \
244218
TOG_CFG, TOG_CFG
245219

246220

@@ -249,11 +223,11 @@ enum keycodes {
249223
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
250224
k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
251225
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
252-
k32, k33, k34, k35, k36, \
226+
k32, k33, k34, k35, k36, k37, \
253227
e01, e02 \
254228
) \
255229
k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
256230
HRML(k10, k11, k12, k13), k14, k15, HRMR(k16, k17, k18, k19), \
257231
k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
258-
k32, k33, k34, k35, k36, \
232+
k32, k33, k34, k35, k36, k37, \
259233
e01, e02

0 commit comments

Comments
 (0)