mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-11-25 04:43:02 +00:00
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:
parent
0a3f7e4869
commit
efdd4f4d50
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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)
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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))
|
||||||
|
@ -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))
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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,
|
||||||
|
@ -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))))
|
||||||
|
Loading…
Reference in New Issue
Block a user