Skip to content

Commit efdd4f4

Browse files
noroadsleftnoroadsleft
authored
Clean-up of #define _ADJUST 16 instances (#18182)
* enum layer_names: 40percentclub/nori default keymap * enum layer_names: ergotravel default keymap * enum layer_names: handwired/atreus50 default keymap * enum layer_names: handwired/ortho5x13 default keymap * enum layer_names: keebio/levinson default keymap * enum layer_names: keebio/nyquist default keymap * enum layer_names: keebio/rorschach default keymap * enum layer_names: keebio/viterbi default keymap * enum layer_names: keebio/wavelet default keymap * enum layer_names: lets_split default keymap * enum layer_names: maple_computing/launchpad reference keymaps Update `default` and `default_rgb` keymaps. * enum layer_names: maple_computing/minidox default keymap * enum layer_names: miniaxe reference keymaps Update `default` and `underglow` keymaps. * enum layer_names: omkbd/ergodash/mini default keymap * enum layer_names: omkbd/ergodash/rev1 default keymap * enum layer_names: orthodox default keymap * enum layer_names: unikeyboard/divergetm2 default keymap * enum layer_names: woodkeys/scarletbandana default keymap * add _Static_assert to keymap_introspection.c
1 parent 0a3f7e4 commit efdd4f4

File tree

21 files changed

+142
-101
lines changed

21 files changed

+142
-101
lines changed

‎keyboards/40percentclub/nori/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
55
// Layer names don't all need to be of the same length, obviously, and you can also skip them
66
// entirely and just use numbers.
7-
#define _QWERTY 0
8-
#define _COLEMAK 1
9-
#define _DVORAK 2
10-
#define _LOWER 3
11-
#define _RAISE 4
12-
#define _ADJUST 16
7+
enum layer_names {
8+
_QWERTY,
9+
_COLEMAK,
10+
_DVORAK,
11+
_LOWER,
12+
_RAISE,
13+
_ADJUST
14+
};
1315

1416
enum custom_keycodes {
1517
QWERTY = SAFE_RANGE,

‎keyboards/ergotravel/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#include QMK_KEYBOARD_H
22

33

4-
#define _QWERTY 0
5-
#define _LOWER 1
6-
#define _RAISE 2
7-
#define _ADJUST 16
4+
enum layer_names {
5+
_QWERTY,
6+
_LOWER,
7+
_RAISE,
8+
_ADJUST,
9+
};
810

911
enum custom_keycodes {
1012
QWERTY = SAFE_RANGE,
@@ -39,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
3941
),
4042

4143
[_RAISE] = LAYOUT(
42-
44+
4345
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
4446
_______, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______,
4547
KC_ENT, KC_7, KC_8, KC_9, KC_MINS, _______, _______, _______, _______, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
4648
_______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
47-
49+
4850
),
4951

5052
[_ADJUST] = LAYOUT(

‎keyboards/handwired/atreus50/keymaps/default/keymap.c

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@
44
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
55
// Layer names don't all need to be of the same length, obviously, and you can also skip them
66
// entirely and just use numbers.
7-
#define _QWERTY 0
8-
#define _COLEMAK 1
9-
#define _DVORAK 2
10-
#define _LOWER 3
11-
#define _RAISE 4
12-
#define _MOVEMENT 5
13-
#define _ADJUST 16
7+
enum layer_names {
8+
_QWERTY,
9+
_COLEMAK,
10+
_DVORAK,
11+
_LOWER,
12+
_RAISE,
13+
_MOVEMENT,
14+
_ADJUST,
15+
};
1416

1517
enum custom_keycodes {
1618
QWERTY = SAFE_RANGE,

‎keyboards/handwired/ortho5x13/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
55
// Layer names don't all need to be of the same length, obviously, and you can also skip them
66
// entirely and just use numbers.
7-
#define _QWERTY 0
8-
#define _COLEMAK 1
9-
#define _DVORAK 2
10-
#define _LOWER 3
11-
#define _RAISE 4
12-
#define _ADJUST 16
7+
enum layer_names {
8+
_QWERTY,
9+
_COLEMAK,
10+
_DVORAK,
11+
_LOWER,
12+
_RAISE,
13+
_ADJUST
14+
};
1315

1416
enum custom_keycodes {
1517
QWERTY = SAFE_RANGE,

‎keyboards/keebio/levinson/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
66
// Layer names don't all need to be of the same length, obviously, and you can also skip them
77
// entirely and just use numbers.
8-
#define _QWERTY 0
9-
#define _COLEMAK 1
10-
#define _DVORAK 2
11-
#define _LOWER 3
12-
#define _RAISE 4
13-
#define _ADJUST 16
8+
enum layer_names {
9+
_QWERTY,
10+
_COLEMAK,
11+
_DVORAK,
12+
_LOWER,
13+
_RAISE,
14+
_ADJUST
15+
};
1416

1517
enum custom_keycodes {
1618
QWERTY = SAFE_RANGE,

‎keyboards/keebio/nyquist/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
66
// Layer names don't all need to be of the same length, obviously, and you can also skip them
77
// entirely and just use numbers.
8-
#define _QWERTY 0
9-
#define _COLEMAK 1
10-
#define _DVORAK 2
11-
#define _LOWER 3
12-
#define _RAISE 4
13-
#define _ADJUST 16
8+
enum layer_names {
9+
_QWERTY,
10+
_COLEMAK,
11+
_DVORAK,
12+
_LOWER,
13+
_RAISE,
14+
_ADJUST
15+
};
1416

1517
enum custom_keycodes {
1618
QWERTY = SAFE_RANGE,

‎keyboards/keebio/rorschach/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#include QMK_KEYBOARD_H
22

33

4-
#define _QWERTY 0
5-
#define _LOWER 1
6-
#define _RAISE 2
7-
#define _ADJUST 16
4+
enum layer_names {
5+
_QWERTY,
6+
_LOWER,
7+
_RAISE,
8+
_ADJUST
9+
};
810

911
#define LOWER MO(_LOWER)
1012
#define RAISE MO(_RAISE)

‎keyboards/keebio/viterbi/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
66
// Layer names don't all need to be of the same length, obviously, and you can also skip them
77
// entirely and just use numbers.
8-
#define _QWERTY 0
9-
#define _LOWER 1
10-
#define _RAISE 2
11-
#define _ADJUST 16
8+
enum layer_names {
9+
_QWERTY,
10+
_LOWER,
11+
_RAISE,
12+
_ADJUST
13+
};
1214

1315
enum custom_keycodes {
1416
QWERTY = SAFE_RANGE,

‎keyboards/keebio/wavelet/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
66
// Layer names don't all need to be of the same length, obviously, and you can also skip them
77
// entirely and just use numbers.
8-
#define _QWERTY 0
9-
#define _COLEMAK 1
10-
#define _DVORAK 2
11-
#define _LOWER 3
12-
#define _RAISE 4
13-
#define _ADJUST 16
8+
enum layer_names {
9+
_QWERTY,
10+
_COLEMAK,
11+
_DVORAK,
12+
_LOWER,
13+
_RAISE,
14+
_ADJUST
15+
};
1416

1517
enum custom_keycodes {
1618
QWERTY = SAFE_RANGE,

‎keyboards/lets_split/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
55
// Layer names don't all need to be of the same length, obviously, and you can also skip them
66
// entirely and just use numbers.
7-
#define _QWERTY 0
8-
#define _COLEMAK 1
9-
#define _DVORAK 2
10-
#define _LOWER 3
11-
#define _RAISE 4
12-
#define _ADJUST 16
7+
enum layer_names {
8+
_QWERTY,
9+
_COLEMAK,
10+
_DVORAK,
11+
_LOWER,
12+
_RAISE,
13+
_ADJUST
14+
};
1315

1416
enum custom_keycodes {
1517
QWERTY = SAFE_RANGE,

‎keyboards/maple_computing/launchpad/keymaps/default/keymap.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
77
// Layer names don't all need to be of the same length, obviously, and you can also skip them
88
// entirely and just use numbers.
9-
#define _QWERTY 0
10-
11-
#define _FUNC 15
9+
enum layer_names {
10+
_QWERTY,
11+
_FUNC
12+
};
1213

1314
// Defines for task manager and such
1415
#define CALTDEL LCTL(LALT(KC_DEL))

‎keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c

+5-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@ extern keymap_config_t keymap_config;
77
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
88
// Layer names don't all need to be of the same length, obviously, and you can also skip them
99
// entirely and just use numbers.
10-
#define _QWERTY 0
11-
#define _RGB 1
12-
#define _FUNC 15
10+
enum layer_names {
11+
_QWERTY,
12+
_RGB,
13+
_FUNC
14+
};
1315

1416
// Defines for task manager and such
1517
#define CALTDEL LCTL(LALT(KC_DEL))

‎keyboards/maple_computing/minidox/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
66
// Layer names don't all need to be of the same length, obviously, and you can also skip them
77
// entirely and just use numbers.
8-
#define _QWERTY 0
9-
#define _LOWER 1
10-
#define _RAISE 2
11-
#define _ADJUST 16
8+
enum layer_names {
9+
_QWERTY,
10+
_LOWER,
11+
_RAISE,
12+
_ADJUST
13+
};
1214

1315
enum custom_keycodes {
1416
QWERTY = SAFE_RANGE,

‎keyboards/miniaxe/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
#include QMK_KEYBOARD_H
1717

1818
// Defines the keycodes used by our macros in process_record_user
19-
#define _QWERTY 0
20-
#define _LOWER 1
21-
#define _RAISE 2
22-
#define _ADJUST 16
19+
enum layer_names {
20+
_QWERTY,
21+
_LOWER,
22+
_RAISE,
23+
_ADJUST
24+
};
2325

2426
enum custom_keycodes {
2527
QWERTY = SAFE_RANGE,

‎keyboards/miniaxe/keymaps/underglow/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@
1616
#include QMK_KEYBOARD_H
1717

1818
// Defines the keycodes used by our macros in process_record_user
19-
#define _QWERTY 0
20-
#define _LOWER 1
21-
#define _RAISE 2
22-
#define _ADJUST 16
19+
enum layer_names {
20+
_QWERTY,
21+
_LOWER,
22+
_RAISE,
23+
_ADJUST
24+
};
2325

2426
enum custom_keycodes {
2527
QWERTY = SAFE_RANGE,

‎keyboards/omkbd/ergodash/mini/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#include QMK_KEYBOARD_H
22

33

4-
#define _QWERTY 0
5-
#define _LOWER 1
6-
#define _RAISE 2
7-
#define _ADJUST 16
4+
enum layer_names {
5+
_QWERTY,
6+
_LOWER,
7+
_RAISE,
8+
_ADJUST
9+
};
810

911
enum custom_keycodes {
1012
QWERTY = SAFE_RANGE,

‎keyboards/omkbd/ergodash/rev1/keymaps/default/keymap.c

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#include QMK_KEYBOARD_H
22

33

4-
#define _QWERTY 0
5-
#define _LOWER 1
6-
#define _RAISE 2
7-
#define _ADJUST 16
4+
enum layer_names {
5+
_QWERTY,
6+
_LOWER,
7+
_RAISE,
8+
_ADJUST
9+
};
810

911
enum custom_keycodes {
1012
QWERTY = SAFE_RANGE,

‎keyboards/orthodox/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
2525
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
2626
// Layer names don't all need to be of the same length, obviously, and you can also skip them
2727
// entirely and just use numbers.
28-
#define _QWERTY 0
29-
#define _COLEMAK 1
30-
#define _DVORAK 2
31-
#define _LOWER 3
32-
#define _RAISE 4
33-
#define _ADJUST 16
28+
enum layer_names {
29+
_QWERTY,
30+
_COLEMAK,
31+
_DVORAK,
32+
_LOWER,
33+
_RAISE,
34+
_ADJUST
35+
};
3436

3537
enum custom_keycodes {
3638
QWERTY = SAFE_RANGE,

‎keyboards/unikeyboard/divergetm2/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
2323
// Layer names don't all need to be of the same length, obviously, and you can also skip them
2424
// entirely and just use numbers.
25-
#define _QWERTY 0
26-
#define _COLEMAK 1
27-
#define _DVORAK 2
28-
#define _LOWER 3
29-
#define _RAISE 4
30-
#define _ADJUST 16
25+
enum layer_names {
26+
_QWERTY,
27+
_COLEMAK,
28+
_DVORAK,
29+
_LOWER,
30+
_RAISE,
31+
_ADJUST
32+
};
3133

3234
enum custom_keycodes {
3335
QWERTY = SAFE_RANGE,

‎keyboards/woodkeys/scarletbandana/keymaps/default/keymap.c

+8-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@
2020
extern rgblight_config_t rgblight_config;
2121
#endif
2222

23-
#define _QWERTY 0
24-
#define _COLEMAK 1
25-
#define _DVORAK 2
26-
#define _LOWER 3
27-
#define _RAISE 4
28-
#define _ADJUST 16
23+
enum layer_names {
24+
_QWERTY,
25+
_COLEMAK,
26+
_DVORAK,
27+
_LOWER,
28+
_RAISE,
29+
_ADJUST
30+
};
2931

3032
enum custom_keycodes {
3133
QWERTY = SAFE_RANGE,

0 commit comments

Comments
 (0)