Browse Source

[Keyboard] Update default keymaps to use `layer_state_t` (#7444)

* Update default keymaps to use `layer_state_t`

* Convert binon32 as get_highest_layer in default keymaps
pull/7446/head
Drashna Jaelre 2 years ago
committed by James Young
parent
commit
6cf574396a
34 changed files with 44 additions and 47 deletions
  1. +1
    -1
      keyboards/40percentclub/nori/keymaps/default/keymap.c
  2. +2
    -2
      keyboards/aeboards/ext65/keymaps/default/keymap.c
  3. +1
    -1
      keyboards/ai03/orbit/keymaps/default/keymap.c
  4. +1
    -2
      keyboards/boston_meetup/2019/keymaps/default/keymap.c
  5. +1
    -1
      keyboards/comet46/keymaps/default/keymap.c
  6. +1
    -1
      keyboards/divergetm2/keymaps/default/keymap.c
  7. +1
    -1
      keyboards/ergodox_ez/keymaps/default/keymap.c
  8. +2
    -2
      keyboards/ergodox_stm32/keymaps/default/keymap.c
  9. +1
    -1
      keyboards/fortitude60/keymaps/default/keymap.c
  10. +1
    -2
      keyboards/hadron/ver3/keymaps/default/keymap.c
  11. +1
    -1
      keyboards/handwired/2x5keypad/keymaps/default/keymap.c
  12. +2
    -2
      keyboards/handwired/bluepill/keymaps/default/keymap.c
  13. +1
    -1
      keyboards/handwired/jot50/keymaps/default/keymap.c
  14. +2
    -2
      keyboards/handwired/jotanck/keymaps/default/keymap.c
  15. +2
    -2
      keyboards/handwired/prime_exl/keymaps/default/keymap.c
  16. +1
    -1
      keyboards/handwired/promethium/keymaps/default/keymap.c
  17. +1
    -1
      keyboards/handwired/pteron/keymaps/default/keymap.c
  18. +1
    -1
      keyboards/handwired/wulkan/keymaps/default/keymap.c
  19. +1
    -1
      keyboards/handwired/xealous/keymaps/default/keymap.c
  20. +2
    -2
      keyboards/hecomi/keymaps/default/keymap.c
  21. +1
    -1
      keyboards/jj40/keymaps/default/keymap.c
  22. +2
    -2
      keyboards/lazydesigners/dimple/keymaps/default/keymap.c
  23. +1
    -1
      keyboards/lets_split/keymaps/default/keymap.c
  24. +1
    -1
      keyboards/lets_split_eh/keymaps/default/keymap.c
  25. +1
    -1
      keyboards/model01/keymaps/default/keymap.c
  26. +1
    -1
      keyboards/newgame40/keymaps/default/keymap.c
  27. +1
    -1
      keyboards/orthodox/keymaps/default/keymap.c
  28. +1
    -1
      keyboards/plaid/keymaps/default/keymap.c
  29. +2
    -2
      keyboards/primekb/prime_e/keymaps/default/keymap.c
  30. +1
    -2
      keyboards/reviung34/keymaps/default/keymap.c
  31. +1
    -1
      keyboards/reviung39/keymaps/default/keymap.c
  32. +1
    -1
      keyboards/spacetime/keymaps/default/keymap.c
  33. +2
    -2
      keyboards/staryu/keymaps/default/keymap.c
  34. +2
    -2
      keyboards/tanuki/keymaps/default/keymap.c

+ 1
- 1
keyboards/40percentclub/nori/keymaps/default/keymap.c View File

@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 2
- 2
keyboards/aeboards/ext65/keymaps/default/keymap.c View File

@ -90,8 +90,8 @@ void led_set_user(uint8_t usb_led) {
}
}
uint32_t layer_state_set_user(uint32_t state) {
switch (biton32(state)) {
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
case 1:
writePinHigh(D1);
break;


+ 1
- 1
keyboards/ai03/orbit/keymaps/default/keymap.c View File

@ -85,7 +85,7 @@ void led_set_user(uint8_t usb_led) {
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return state;
}

+ 1
- 2
keyboards/boston_meetup/2019/keymaps/default/keymap.c View File

@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
@ -163,4 +163,3 @@ void matrix_init_user(void) {
void matrix_scan_user(void) {
}

+ 1
- 1
keyboards/comet46/keymaps/default/keymap.c View File

@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
}


+ 1
- 1
keyboards/divergetm2/keymaps/default/keymap.c View File

@ -194,6 +194,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
}

+ 1
- 1
keyboards/ergodox_ez/keymaps/default/keymap.c View File

@ -174,7 +174,7 @@ layer_state_t layer_state_set_user(layer_state_t state) {
ergodox_right_led_2_off();
ergodox_right_led_3_off();
uint8_t layer = biton32(state);
uint8_t layer = get_highest_layer(state);
switch (layer) {
case 0:
#ifdef RGBLIGHT_COLOR_LAYER_0


+ 2
- 2
keyboards/ergodox_stm32/keymaps/default/keymap.c View File

@ -13,9 +13,9 @@ const uint16_t PROGMEM fn_actions[] = {
[1] = TT(1)
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
uint8_t layer = biton32(state);
uint8_t layer = get_highest_layer(state);
ergodox_led_all_off();
ergodox_board_led_1_off();


+ 1
- 1
keyboards/fortitude60/keymaps/default/keymap.c View File

@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 1
- 2
keyboards/hadron/ver3/keymaps/default/keymap.c View File

@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}
@ -267,4 +267,3 @@ void matrix_init_user(void) {
void matrix_scan_user(void) {
}

+ 1
- 1
keyboards/handwired/2x5keypad/keymaps/default/keymap.c View File

@ -143,7 +143,7 @@ layer_state_t layer_state_set_user(layer_state_t state)
{
turn_off_leds();
switch (biton32(state))
switch (get_highest_layer(state))
{
case NORMAL_LAYER:
break;


+ 2
- 2
keyboards/handwired/bluepill/keymaps/default/keymap.c View File

@ -50,8 +50,8 @@ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
};
/* Layer based ilumination, just binary */
uint32_t layer_state_set_user(uint32_t state) {
switch (biton32(state)) {
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
case _FNONE:
palSetPad(GPIOA, 0); //OFF Color A
palClearPad(GPIOA, 1); //ON Color B


+ 1
- 1
keyboards/handwired/jot50/keymaps/default/keymap.c View File

@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 2
- 2
keyboards/handwired/jotanck/keymaps/default/keymap.c View File

@ -78,9 +78,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
#ifdef JOTANCK_LEDS
switch (biton32(state)) {
switch (get_highest_layer(state)) {
case _LOWER:
writePinHigh(JOTANCK_LED1);
writePinLow(JOTANCK_LED2);


+ 2
- 2
keyboards/handwired/prime_exl/keymaps/default/keymap.c View File

@ -132,9 +132,9 @@ void led_set_user(uint8_t usb_led) {
}
//function for layer indicator LED
uint32_t layer_state_set_user(uint32_t state)
layer_state_t layer_state_set_user(layer_state_t state)
{
if (biton32(state) == 2) {
if (get_highest_layer(state) == 2) {
writePinHigh(C6);
} else {
writePinLow(C6);


+ 1
- 1
keyboards/handwired/promethium/keymaps/default/keymap.c View File

@ -986,7 +986,7 @@ void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool *
}
#endif
uint32_t layer_state_set_kb(uint32_t state)
layer_state_t layer_state_set_user(layer_state_t state)
{
// turn on punc layer if both fun & num are on
if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) {


+ 1
- 1
keyboards/handwired/pteron/keymaps/default/keymap.c View File

@ -99,6 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

+ 1
- 1
keyboards/handwired/wulkan/keymaps/default/keymap.c View File

@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 1
- 1
keyboards/handwired/xealous/keymaps/default/keymap.c View File

@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
float tone_qwerty[][2] = TONE_QWERTY;
float tone_numpad[][2] = TONE_NUMPAD;
uint32_t default_layer_state_set_kb(uint32_t state) {
layer_state_t default_layer_state_set_kb(layer_state_t state) {
if (state == 1UL<<_QWERTY) {
PLAY_SONG(tone_qwerty);
} else if (state == 1UL<<_NUMPAD) {


+ 2
- 2
keyboards/hecomi/keymaps/default/keymap.c View File

@ -75,9 +75,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
uint32_t layer_state_set_user(uint32_t state)
layer_state_t layer_state_set_user(layer_state_t state)
{
uint8_t layer=biton32(state);
uint8_t layer=get_highest_layer(state);
switch(layer)
{
case DF:


+ 1
- 1
keyboards/jj40/keymaps/default/keymap.c View File

@ -99,6 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

+ 2
- 2
keyboards/lazydesigners/dimple/keymaps/default/keymap.c View File

@ -116,9 +116,9 @@ if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
}
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
switch (biton32(state)) {
switch (get_highest_layer(state)) {
case _LOWER:
rgblight_sethsv_noeeprom(HSV_GREEN);
break;


+ 1
- 1
keyboards/lets_split/keymaps/default/keymap.c View File

@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 1
- 1
keyboards/lets_split_eh/keymaps/default/keymap.c View File

@ -115,6 +115,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

+ 1
- 1
keyboards/model01/keymaps/default/keymap.c View File

@ -110,7 +110,7 @@ void rgb_matrix_indicators_user(void) {
}
#else /* no RGB matrix support */
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
if (state & (1<<NUM)) {
set_numpad_colours(1, &set_led_to);
} else {


+ 1
- 1
keyboards/newgame40/keymaps/default/keymap.c View File

@ -171,7 +171,7 @@ enum layers {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 1
- 1
keyboards/orthodox/keymaps/default/keymap.c View File

@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 1
- 1
keyboards/plaid/keymaps/default/keymap.c View File

@ -234,7 +234,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset!
eeconfig_update_user(led_config.raw);
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 2
- 2
keyboards/primekb/prime_e/keymaps/default/keymap.c View File

@ -83,9 +83,9 @@ void led_set_user(uint8_t usb_led) {
}
//function for layer indicator LED
uint32_t layer_state_set_user(uint32_t state)
layer_state_t layer_state_set_user(layer_state_t state)
{
if (biton32(state) == 1) {
if (get_highest_layer(state) == 1) {
writePinHigh(B3);
} else {
writePinLow(B3);


+ 1
- 2
keyboards/reviung34/keymaps/default/keymap.c View File

@ -61,7 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

+ 1
- 1
keyboards/reviung39/keymaps/default/keymap.c View File

@ -56,6 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}

+ 1
- 1
keyboards/spacetime/keymaps/default/keymap.c View File

@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
)
};
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
}


+ 2
- 2
keyboards/staryu/keymaps/default/keymap.c View File

@ -81,8 +81,8 @@ void keyboard_post_init_user(void) {
rgblight_sethsv_noeeprom_white();
}
uint32_t layer_state_set_user(uint32_t state) {
switch (biton32(state)) {
layer_state_t layer_state_set_user(layer_state_t state) {
switch (get_highest_layer(state)) {
case _LAYER1:
rgblight_sethsv_noeeprom_cyan();
break;


+ 2
- 2
keyboards/tanuki/keymaps/default/keymap.c View File

@ -59,10 +59,10 @@ void keyboard_post_init_user(void) {
}
}
uint32_t layer_state_set_user(uint32_t state) {
layer_state_t layer_state_set_user(layer_state_t state) {
// This code switches underglow color by active layer, if the user has enabled the feature
if(user_config.layer_rgb) {
switch (biton32(state)) {
switch (get_highest_layer(state)) {
case _BL:
rgblight_sethsv_noeeprom(0,10,255);
rgblight_mode_noeeprom(1);


Loading…
Cancel
Save