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
This commit is contained in:
James Young 2022-08-27 23:13:44 -07:00 committed by GitHub
parent 0a3f7e4869
commit efdd4f4d50
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 142 additions and 101 deletions

View file

@ -4,12 +4,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -1,10 +1,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST,
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,
@ -39,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
), ),
[_RAISE] = LAYOUT( [_RAISE] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, _______, _______, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
_______, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______, _______, KC_4, KC_5, KC_6, KC_PLUS, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, _______,
KC_ENT, KC_7, KC_8, KC_9, KC_MINS, _______, _______, _______, _______, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS, KC_ENT, KC_7, KC_8, KC_9, KC_MINS, _______, _______, _______, _______, KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
_______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY _______, KC_COMM, KC_0, KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
), ),
[_ADJUST] = LAYOUT( [_ADJUST] = LAYOUT(

View file

@ -4,13 +4,15 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _MOVEMENT 5 _RAISE,
#define _ADJUST 16 _MOVEMENT,
_ADJUST,
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -4,12 +4,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -5,12 +5,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -5,12 +5,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -1,10 +1,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
#define LOWER MO(_LOWER) #define LOWER MO(_LOWER)
#define RAISE MO(_RAISE) #define RAISE MO(_RAISE)

View file

@ -5,10 +5,12 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -5,12 +5,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -4,12 +4,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -6,9 +6,10 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
_QWERTY,
#define _FUNC 15 _FUNC
};
// Defines for task manager and such // Defines for task manager and such
#define CALTDEL LCTL(LALT(KC_DEL)) #define CALTDEL LCTL(LALT(KC_DEL))

View file

@ -7,9 +7,11 @@ extern keymap_config_t keymap_config;
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _RGB 1 _QWERTY,
#define _FUNC 15 _RGB,
_FUNC
};
// Defines for task manager and such // Defines for task manager and such
#define CALTDEL LCTL(LALT(KC_DEL)) #define CALTDEL LCTL(LALT(KC_DEL))

View file

@ -5,10 +5,12 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -16,10 +16,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Defines the keycodes used by our macros in process_record_user // Defines the keycodes used by our macros in process_record_user
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -16,10 +16,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
// Defines the keycodes used by our macros in process_record_user // Defines the keycodes used by our macros in process_record_user
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -1,10 +1,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -1,10 +1,12 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
#define _QWERTY 0 enum layer_names {
#define _LOWER 1 _QWERTY,
#define _RAISE 2 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -25,12 +25,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -22,12 +22,14 @@
// The underscores don't mean anything - you can have a layer called STUFF or any other name. // The underscores don't mean anything - you can have a layer called STUFF or any other name.
// Layer names don't all need to be of the same length, obviously, and you can also skip them // Layer names don't all need to be of the same length, obviously, and you can also skip them
// entirely and just use numbers. // entirely and just use numbers.
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -20,12 +20,14 @@
extern rgblight_config_t rgblight_config; extern rgblight_config_t rgblight_config;
#endif #endif
#define _QWERTY 0 enum layer_names {
#define _COLEMAK 1 _QWERTY,
#define _DVORAK 2 _COLEMAK,
#define _LOWER 3 _DVORAK,
#define _RAISE 4 _LOWER,
#define _ADJUST 16 _RAISE,
_ADJUST
};
enum custom_keycodes { enum custom_keycodes {
QWERTY = SAFE_RANGE, QWERTY = SAFE_RANGE,

View file

@ -17,6 +17,8 @@ uint8_t keymap_layer_count(void) {
return NUM_KEYMAP_LAYERS; return NUM_KEYMAP_LAYERS;
} }
_Static_assert(NUM_KEYMAP_LAYERS <= MAX_LAYER, "Number of keymap layers exceeds maximum set by LAYER_STATE_(8|16|32)BIT");
#if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE) #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
# define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t)))) # define NUM_ENCODERMAP_LAYERS ((uint8_t)(sizeof(encoder_map) / ((NUM_ENCODERS) * (2) * sizeof(uint16_t))))