forked from mirrors/qmk_userspace
Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
This commit is contained in:
parent
cfcd647b2e
commit
0da6562c4d
293 changed files with 1249 additions and 1309 deletions
|
@ -142,7 +142,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case LOWER:
|
||||
if (record->event.pressed) {
|
||||
layer_on(_LOWER);
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
#ifdef BACKLIGHT_BREATHING
|
||||
breathing_enable();
|
||||
|
@ -151,7 +151,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
update_tri_layer(_LOWER, _RAISE, _ADJUST);
|
||||
} else {
|
||||
layer_off(_LOWER);
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
#ifdef BACKLIGHT_BREATHING
|
||||
breathing_self_disable();
|
||||
|
@ -164,7 +164,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
case RAISE:
|
||||
if (record->event.pressed) {
|
||||
layer_on(_RAISE);
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
#ifdef BACKLIGHT_BREATHING
|
||||
breathing_enable();
|
||||
|
@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
update_tri_layer(_LOWER, _RAISE, _ADJUST);
|
||||
} else {
|
||||
layer_off(_RAISE);
|
||||
uint8_t default_layer = biton32(default_layer_state);
|
||||
uint8_t default_layer = get_highest_layer(default_layer_state);
|
||||
if (default_layer == _QWERTY) {
|
||||
#ifdef BACKLIGHT_BREATHING
|
||||
breathing_self_disable();
|
||||
|
|
|
@ -101,7 +101,7 @@ void set_layer_color(int layer) {
|
|||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
if (g_suspend_state || keyboard_config.disable_layer_led) { return; }
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 0:
|
||||
set_layer_color(0);
|
||||
break;
|
||||
|
|
|
@ -231,7 +231,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
bool has_layer_changed = true;
|
||||
|
||||
void matrix_scan_user(void) {
|
||||
uint8_t layer = biton32(layer_state);
|
||||
uint8_t layer = get_highest_layer(layer_state);
|
||||
static uint8_t old_layer = 0;
|
||||
|
||||
if (old_layer != layer) {
|
||||
|
|
|
@ -94,7 +94,7 @@ void rgb_matrix_indicators_user(void) {
|
|||
if (keyboard_config.disable_layer_led) {
|
||||
return;
|
||||
}
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 1:
|
||||
set_layer_color(0);
|
||||
break;
|
||||
|
|
|
@ -502,7 +502,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
|
|||
} else {
|
||||
if (index == 0) { /* First encoder */
|
||||
uint16_t held_keycode_timer = timer_read();
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 0: // Base Layer
|
||||
if ((get_mods() & MOD_MASK_GUI)) { // GUI-ed
|
||||
if (clockwise) {
|
||||
|
|
|
@ -228,7 +228,7 @@ bool music_mask_user(uint16_t keycode) {
|
|||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case _RAISE:
|
||||
for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
|
||||
if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
|
||||
|
|
|
@ -168,7 +168,7 @@ void set_layer_color(int layer) {
|
|||
|
||||
void rgb_matrix_indicators_user(void) {
|
||||
if (g_suspend_state || disable_layer_color) { return; }
|
||||
switch (biton32(layer_state)) {
|
||||
switch (get_highest_layer(layer_state)) {
|
||||
case 0:
|
||||
set_layer_color(0);
|
||||
break;
|
||||
|
@ -276,7 +276,7 @@ bool music_mask_user(uint16_t keycode) {
|
|||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
palClearPad(GPIOB, 8);
|
||||
palClearPad(GPIOB, 9);
|
||||
uint8_t layer = biton32(state);
|
||||
uint8_t layer = get_highest_layer(state);
|
||||
switch (layer) {
|
||||
case _LOWER:
|
||||
palSetPad(GPIOB, 9);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue