Skip to content

Commit 97609fc

Browse files
Francis-GurrFrancis-Gurr
committed
update number and function layers
1 parent 6732805 commit 97609fc

File tree

3 files changed

+55
-87
lines changed

3 files changed

+55
-87
lines changed

‎keyboards/boardsource/unicorne/keymaps/francis/keymap.c‎

Lines changed: 24 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@
44
// KEYCODES
55

66
// Layer shortcuts
7-
#define TG_QWRTY TG(_QWERTY) // Toggle qwerty layer
8-
#define TG_MOUSE TG(_MOUSE) // Mouse layer on hold (momentary) or double tap (toggle)
9-
#define TT_FUN TT(_FUN) // Function layer on hold (momentary) or double tap (toggle)
107
#define DF_ALPHA DF(_ALPHABET)
11-
#define DF_GAME1 DF(_GAME1)
12-
#define MO_GAME2 MO(_GAME2)
13-
#define MO_FUN MO(_FUNCTION)
148

159
// Layer tap keys
1610
// #define R_MACRO LT(_MACROS, KC_R) // Macros layer on hold, r on tap
@@ -43,8 +37,6 @@ enum layers {
4337
_NAVIGATION,
4438
_MOUSE,
4539
_FUNCTION,
46-
_GAME1,
47-
_GAME2,
4840
};
4941

5042

@@ -55,20 +47,29 @@ enum layers {
5547
const key_override_t volume_down_override = ko_make_basic(MOD_MASK_SHIFT, KC_VOLD, KC_BRID); // Shift + volume down = brightness down
5648
const key_override_t volume_up_override = ko_make_basic(MOD_MASK_SHIFT, KC_VOLU, KC_BRIU); // Shift + volume up = brightness up
5749

58-
// on colemak layer only
59-
const key_override_t comma_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_COMM, KC_SCLN, 1 << 0); // Shift + , = ;
60-
const key_override_t dot_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_DOT, KC_COLN, 1 << 0); // Shift + . = :
61-
const key_override_t question_mark_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_QUES, KC_EXLM, 1 << 0); // Shift + ? = !
50+
// on alphabet layer only
51+
const key_override_t alpha_comma_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_COMM, KC_SCLN, 1 << 0); // Shift , is ;
52+
const key_override_t alpha_dot_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_DOT, KC_COLN, 1 << 0); // Shift . is :
53+
const key_override_t alpha_question_mark_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_QUES, KC_EXLM, 1 << 0); // Shift ? is !
54+
55+
// on number layer only
56+
const key_override_t num_equals_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_EQUAL, KC_DLR, 1 << 2); // Shift = is $
57+
const key_override_t num_minus_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_MINUS, KC_BSLS, 1 << 2); // Shift - is /
58+
const key_override_t num_plus_override = ko_make_with_layers(MOD_MASK_SHIFT, KC_PLUS, KC_ASTR, 1 << 2); // Shift + is *
6259

6360
// This globally defines all key overrides to be used
6461
const key_override_t *key_overrides[] = {
6562
&volume_down_override,
6663
&volume_up_override,
67-
&comma_override,
68-
&dot_override,
69-
&question_mark_override,
64+
&alpha_comma_override,
65+
&alpha_dot_override,
66+
&alpha_question_mark_override,
67+
&num_equals_override,
68+
&num_minus_override,
69+
&num_plus_override,
7070
};
7171

72+
7273
// ----------------------------------------------------------------------------------------------------
7374
// KEYMAP
7475

@@ -100,13 +101,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
100101

101102
[_NUMBERS] = LAYOUT_split_3x6_3(
102103
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
103-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_PLUS ,KC_4 ,KC_5 ,KC_6 ,KC_ASTR ,XXXXXXX ,
104+
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_PLUS ,KC_4 ,KC_5 ,KC_6 ,KC_7 ,XXXXXXX ,
104105
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
105106
XXXXXXX ,KC_LGUI ,KC_LALT ,KC_LCTL ,KC_LSFT ,XXXXXXX , KC_EQUAL,KC_0 ,KC_1 ,KC_2 ,KC_3 ,XXXXXXX ,
106107
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
107-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_MINUS,KC_7 ,KC_8 ,KC_9 ,KC_SLASH,XXXXXXX ,
108+
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_MINUS,KC_COMMA,KC_DOT ,KC_QUES ,KC_9 ,XXXXXXX ,
108109
//└────────┴────────┴────────┴────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┴────────┴────────┴────────┴────────┘
109-
_______ ,_______ ,_______ , MO_FUN ,_______ ,_______
110+
_______ ,_______ ,_______ , ______ ,_______ ,_______
110111
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
111112
),
112113

@@ -136,62 +137,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
136137

137138
[_FUNCTION] = LAYOUT_split_3x6_3(
138139
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
139-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F11 ,XXXXXXX ,
140+
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_F4 ,KC_F5 ,KC_F6 ,KC_F7 ,XXXXXXX ,
140141
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
141142
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_F10 ,KC_F1 ,KC_F2 ,KC_F3 ,XXXXXXX ,
142143
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
143-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F12 ,XXXXXXX ,
144+
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,KC_F11 ,KC_F12 ,KC_F8 ,KC_F9 ,XXXXXXX ,
144145
//└────────┴────────┴────────┴────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┴────────┴────────┴────────┴────────┘
145146
_______ ,_______ ,_______ , _______ ,_______ ,_______
146147
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
147-
),
148-
149-
[_GAME1] = LAYOUT_split_3x6_3(
150-
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
151-
XXXXXXX ,KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
152-
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
153-
KC_Z ,KC_CAPS ,KC_A ,KC_S ,KC_D ,KC_F , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
154-
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
155-
KC_LCTL ,KC_LSFT ,KC_X ,KC_C ,KC_V ,KC_T , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
156-
//└────────┴────────┴────────┴────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┴────────┴────────┴────────┴────────┘
157-
MO_GAME2,KC_SPC ,KC_ESC , XXXXXXX ,XXXXXXX ,XXXXXXX
158-
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
159-
),
160-
161-
[_GAME2] = LAYOUT_split_3x6_3(
162-
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
163-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
164-
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
165-
KC_5 ,KC_4 ,KC_3 ,KC_2 ,KC_1 ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
166-
//├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤
167-
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
168-
//└────────┴────────┴────────┴────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┴────────┴────────┴────────┴────────┘
169-
_______ ,_______ ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX
170-
// └────────┴────────┴────────┘ └────────┴────────┴────────┘
171148
),
172149
};
173150

174-
// #include QMK_KEYBOARD_H
175-
// #if __has_include("keymap.h")
176-
// # include "keymap.h"
177-
// #endif
178-
//
179-
//
180-
// /* THIS FILE WAS GENERATED!
181-
// *
182-
// * This file was generated by qmk json2c. You may or may not want to
183-
// * edit it directly.
184-
// */
185-
//
186-
// const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
187-
// [0] = LAYOUT_split_3x6_3(KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC, KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT),
188-
// [1] = LAYOUT_split_3x6_3(_______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
189-
// [2] = LAYOUT_split_3x6_3(QK_BOOT, _______, _______, _______, _______, _______, RM_VALU, RM_HUEU, RM_SATU, RM_NEXT, RM_TOGG, _______, EE_CLR, _______, _______, _______, _______, _______, RM_VALD, RM_HUED, RM_SATD, RM_PREV, CK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
190-
// };
191-
//
192-
//
193-
//
194-
// #ifdef OTHER_KEYMAP_C
195-
// # include OTHER_KEYMAP_C
196-
// #endif // OTHER_KEYMAP_C
197-
//
151+
layer_state_t layer_state_set_user(layer_state_t state) {
152+
return update_tri_layer_state(state, _NUMBERS, _NAVIGATION, _FUNCTION);
153+
}

0 commit comments

Comments
 (0)