diff options
34 files changed, 44 insertions, 47 deletions
diff --git a/keyboards/40percentclub/nori/keymaps/default/keymap.c b/keyboards/40percentclub/nori/keymaps/default/keymap.c index 3c225a0d9..6ed8567e7 100644 --- a/keyboards/40percentclub/nori/keymaps/default/keymap.c +++ b/keyboards/40percentclub/nori/keymaps/default/keymap.c | |||
| @@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 133 | 133 | ||
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | uint32_t layer_state_set_user(uint32_t state) { | 136 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 137 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 137 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 138 | } | 138 | } |
| 139 | 139 | ||
diff --git a/keyboards/aeboards/ext65/keymaps/default/keymap.c b/keyboards/aeboards/ext65/keymaps/default/keymap.c index efa11cd0f..339fe2c48 100644 --- a/keyboards/aeboards/ext65/keymaps/default/keymap.c +++ b/keyboards/aeboards/ext65/keymaps/default/keymap.c | |||
| @@ -90,8 +90,8 @@ void led_set_user(uint8_t usb_led) { | |||
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | uint32_t layer_state_set_user(uint32_t state) { | 93 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 94 | switch (biton32(state)) { | 94 | switch (get_highest_layer(state)) { |
| 95 | case 1: | 95 | case 1: |
| 96 | writePinHigh(D1); | 96 | writePinHigh(D1); |
| 97 | break; | 97 | break; |
diff --git a/keyboards/ai03/orbit/keymaps/default/keymap.c b/keyboards/ai03/orbit/keymaps/default/keymap.c index 4c8c39fb0..d0c80d928 100644 --- a/keyboards/ai03/orbit/keymaps/default/keymap.c +++ b/keyboards/ai03/orbit/keymaps/default/keymap.c | |||
| @@ -85,7 +85,7 @@ void led_set_user(uint8_t usb_led) { | |||
| 85 | 85 | ||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | uint32_t layer_state_set_user(uint32_t state) { | 88 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 89 | 89 | ||
| 90 | return state; | 90 | return state; |
| 91 | } | 91 | } |
diff --git a/keyboards/boston_meetup/2019/keymaps/default/keymap.c b/keyboards/boston_meetup/2019/keymaps/default/keymap.c index 52d67273e..8e729ca71 100644 --- a/keyboards/boston_meetup/2019/keymaps/default/keymap.c +++ b/keyboards/boston_meetup/2019/keymaps/default/keymap.c | |||
| @@ -108,7 +108,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 108 | 108 | ||
| 109 | }; | 109 | }; |
| 110 | 110 | ||
| 111 | uint32_t layer_state_set_user(uint32_t state) { | 111 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 112 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 112 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 113 | } | 113 | } |
| 114 | 114 | ||
| @@ -163,4 +163,3 @@ void matrix_init_user(void) { | |||
| 163 | 163 | ||
| 164 | void matrix_scan_user(void) { | 164 | void matrix_scan_user(void) { |
| 165 | } | 165 | } |
| 166 | |||
diff --git a/keyboards/comet46/keymaps/default/keymap.c b/keyboards/comet46/keymaps/default/keymap.c index 9ef967646..7a8c29dcb 100644 --- a/keyboards/comet46/keymaps/default/keymap.c +++ b/keyboards/comet46/keymaps/default/keymap.c | |||
| @@ -144,7 +144,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | 146 | ||
| 147 | uint32_t layer_state_set_user(uint32_t state) { | 147 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 148 | return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); | 148 | return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); |
| 149 | } | 149 | } |
| 150 | 150 | ||
diff --git a/keyboards/divergetm2/keymaps/default/keymap.c b/keyboards/divergetm2/keymaps/default/keymap.c index f620cc237..cc098a91a 100644 --- a/keyboards/divergetm2/keymaps/default/keymap.c +++ b/keyboards/divergetm2/keymaps/default/keymap.c | |||
| @@ -194,6 +194,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 194 | return true; | 194 | return true; |
| 195 | } | 195 | } |
| 196 | 196 | ||
| 197 | uint32_t layer_state_set_user(uint32_t state) { | 197 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 198 | return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); | 198 | return update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); |
| 199 | } | 199 | } |
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c index 4936ab42c..20c78bd57 100644 --- a/keyboards/ergodox_ez/keymaps/default/keymap.c +++ b/keyboards/ergodox_ez/keymaps/default/keymap.c | |||
| @@ -174,7 +174,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
| 174 | ergodox_right_led_2_off(); | 174 | ergodox_right_led_2_off(); |
| 175 | ergodox_right_led_3_off(); | 175 | ergodox_right_led_3_off(); |
| 176 | 176 | ||
| 177 | uint8_t layer = biton32(state); | 177 | uint8_t layer = get_highest_layer(state); |
| 178 | switch (layer) { | 178 | switch (layer) { |
| 179 | case 0: | 179 | case 0: |
| 180 | #ifdef RGBLIGHT_COLOR_LAYER_0 | 180 | #ifdef RGBLIGHT_COLOR_LAYER_0 |
diff --git a/keyboards/ergodox_stm32/keymaps/default/keymap.c b/keyboards/ergodox_stm32/keymaps/default/keymap.c index d3d4b5722..dcf8d15b7 100644 --- a/keyboards/ergodox_stm32/keymaps/default/keymap.c +++ b/keyboards/ergodox_stm32/keymaps/default/keymap.c | |||
| @@ -13,9 +13,9 @@ const uint16_t PROGMEM fn_actions[] = { | |||
| 13 | [1] = TT(1) | 13 | [1] = TT(1) |
| 14 | }; | 14 | }; |
| 15 | 15 | ||
| 16 | uint32_t layer_state_set_user(uint32_t state) { | 16 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 17 | 17 | ||
| 18 | uint8_t layer = biton32(state); | 18 | uint8_t layer = get_highest_layer(state); |
| 19 | 19 | ||
| 20 | ergodox_led_all_off(); | 20 | ergodox_led_all_off(); |
| 21 | ergodox_board_led_1_off(); | 21 | ergodox_board_led_1_off(); |
diff --git a/keyboards/fortitude60/keymaps/default/keymap.c b/keyboards/fortitude60/keymaps/default/keymap.c index 1c96424f6..c476fed85 100644 --- a/keyboards/fortitude60/keymaps/default/keymap.c +++ b/keyboards/fortitude60/keymaps/default/keymap.c | |||
| @@ -155,7 +155,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 155 | 155 | ||
| 156 | }; | 156 | }; |
| 157 | 157 | ||
| 158 | uint32_t layer_state_set_user(uint32_t state) { | 158 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 159 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 159 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 160 | } | 160 | } |
| 161 | 161 | ||
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c index 749c385c8..e8082eb71 100644 --- a/keyboards/hadron/ver3/keymaps/default/keymap.c +++ b/keyboards/hadron/ver3/keymaps/default/keymap.c | |||
| @@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 193 | 193 | ||
| 194 | }; | 194 | }; |
| 195 | 195 | ||
| 196 | uint32_t layer_state_set_user(uint32_t state) { | 196 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 197 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 197 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 198 | } | 198 | } |
| 199 | 199 | ||
| @@ -267,4 +267,3 @@ void matrix_init_user(void) { | |||
| 267 | 267 | ||
| 268 | void matrix_scan_user(void) { | 268 | void matrix_scan_user(void) { |
| 269 | } | 269 | } |
| 270 | |||
diff --git a/keyboards/handwired/2x5keypad/keymaps/default/keymap.c b/keyboards/handwired/2x5keypad/keymaps/default/keymap.c index 91a0e28f6..23614a9b7 100644 --- a/keyboards/handwired/2x5keypad/keymaps/default/keymap.c +++ b/keyboards/handwired/2x5keypad/keymaps/default/keymap.c | |||
| @@ -143,7 +143,7 @@ layer_state_t layer_state_set_user(layer_state_t state) | |||
| 143 | { | 143 | { |
| 144 | turn_off_leds(); | 144 | turn_off_leds(); |
| 145 | 145 | ||
| 146 | switch (biton32(state)) | 146 | switch (get_highest_layer(state)) |
| 147 | { | 147 | { |
| 148 | case NORMAL_LAYER: | 148 | case NORMAL_LAYER: |
| 149 | break; | 149 | break; |
diff --git a/keyboards/handwired/bluepill/keymaps/default/keymap.c b/keyboards/handwired/bluepill/keymaps/default/keymap.c index 8a3493039..3d93c24d9 100644 --- a/keyboards/handwired/bluepill/keymaps/default/keymap.c +++ b/keyboards/handwired/bluepill/keymaps/default/keymap.c | |||
| @@ -50,8 +50,8 @@ KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, | |||
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | /* Layer based ilumination, just binary */ | 52 | /* Layer based ilumination, just binary */ |
| 53 | uint32_t layer_state_set_user(uint32_t state) { | 53 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 54 | switch (biton32(state)) { | 54 | switch (get_highest_layer(state)) { |
| 55 | case _FNONE: | 55 | case _FNONE: |
| 56 | palSetPad(GPIOA, 0); //OFF Color A | 56 | palSetPad(GPIOA, 0); //OFF Color A |
| 57 | palClearPad(GPIOA, 1); //ON Color B | 57 | palClearPad(GPIOA, 1); //ON Color B |
diff --git a/keyboards/handwired/jot50/keymaps/default/keymap.c b/keyboards/handwired/jot50/keymaps/default/keymap.c index 7342dcd22..7b674af52 100644 --- a/keyboards/handwired/jot50/keymaps/default/keymap.c +++ b/keyboards/handwired/jot50/keymaps/default/keymap.c | |||
| @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 74 | ), | 74 | ), |
| 75 | }; | 75 | }; |
| 76 | 76 | ||
| 77 | uint32_t layer_state_set_user(uint32_t state) { | 77 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 78 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 78 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 79 | } | 79 | } |
| 80 | 80 | ||
diff --git a/keyboards/handwired/jotanck/keymaps/default/keymap.c b/keyboards/handwired/jotanck/keymaps/default/keymap.c index 2467559a6..3de30d396 100644 --- a/keyboards/handwired/jotanck/keymaps/default/keymap.c +++ b/keyboards/handwired/jotanck/keymaps/default/keymap.c | |||
| @@ -78,9 +78,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 78 | 78 | ||
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | uint32_t layer_state_set_user(uint32_t state) { | 81 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 82 | #ifdef JOTANCK_LEDS | 82 | #ifdef JOTANCK_LEDS |
| 83 | switch (biton32(state)) { | 83 | switch (get_highest_layer(state)) { |
| 84 | case _LOWER: | 84 | case _LOWER: |
| 85 | writePinHigh(JOTANCK_LED1); | 85 | writePinHigh(JOTANCK_LED1); |
| 86 | writePinLow(JOTANCK_LED2); | 86 | writePinLow(JOTANCK_LED2); |
diff --git a/keyboards/handwired/prime_exl/keymaps/default/keymap.c b/keyboards/handwired/prime_exl/keymaps/default/keymap.c index 1dac7825e..7cf919708 100644 --- a/keyboards/handwired/prime_exl/keymaps/default/keymap.c +++ b/keyboards/handwired/prime_exl/keymaps/default/keymap.c | |||
| @@ -132,9 +132,9 @@ void led_set_user(uint8_t usb_led) { | |||
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | //function for layer indicator LED | 134 | //function for layer indicator LED |
| 135 | uint32_t layer_state_set_user(uint32_t state) | 135 | layer_state_t layer_state_set_user(layer_state_t state) |
| 136 | { | 136 | { |
| 137 | if (biton32(state) == 2) { | 137 | if (get_highest_layer(state) == 2) { |
| 138 | writePinHigh(C6); | 138 | writePinHigh(C6); |
| 139 | } else { | 139 | } else { |
| 140 | writePinLow(C6); | 140 | writePinLow(C6); |
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 207984407..14a293bb3 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c | |||
| @@ -986,7 +986,7 @@ void process_doublespace(bool pressed, bool *isactive, bool *otheractive, bool * | |||
| 986 | } | 986 | } |
| 987 | #endif | 987 | #endif |
| 988 | 988 | ||
| 989 | uint32_t layer_state_set_kb(uint32_t state) | 989 | layer_state_t layer_state_set_user(layer_state_t state) |
| 990 | { | 990 | { |
| 991 | // turn on punc layer if both fun & num are on | 991 | // turn on punc layer if both fun & num are on |
| 992 | if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) { | 992 | if ((state & ((1UL<<_NUM) | (1UL<<_FUN))) == ((1UL<<_NUM) | (1UL<<_FUN))) { |
diff --git a/keyboards/handwired/pteron/keymaps/default/keymap.c b/keyboards/handwired/pteron/keymaps/default/keymap.c index 3079cc7af..976fbb6e1 100644 --- a/keyboards/handwired/pteron/keymaps/default/keymap.c +++ b/keyboards/handwired/pteron/keymaps/default/keymap.c | |||
| @@ -99,6 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 99 | 99 | ||
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | uint32_t layer_state_set_user(uint32_t state) { | 102 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 103 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 103 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 104 | } | 104 | } |
diff --git a/keyboards/handwired/wulkan/keymaps/default/keymap.c b/keyboards/handwired/wulkan/keymaps/default/keymap.c index 5134fb000..fec8442ee 100644 --- a/keyboards/handwired/wulkan/keymaps/default/keymap.c +++ b/keyboards/handwired/wulkan/keymaps/default/keymap.c | |||
| @@ -102,7 +102,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 102 | ) | 102 | ) |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | uint32_t layer_state_set_user(uint32_t state) { | 105 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 106 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 106 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 107 | } | 107 | } |
| 108 | 108 | ||
diff --git a/keyboards/handwired/xealous/keymaps/default/keymap.c b/keyboards/handwired/xealous/keymaps/default/keymap.c index ca82445a5..41a3f8c80 100644 --- a/keyboards/handwired/xealous/keymaps/default/keymap.c +++ b/keyboards/handwired/xealous/keymaps/default/keymap.c | |||
| @@ -87,7 +87,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 87 | float tone_qwerty[][2] = TONE_QWERTY; | 87 | float tone_qwerty[][2] = TONE_QWERTY; |
| 88 | float tone_numpad[][2] = TONE_NUMPAD; | 88 | float tone_numpad[][2] = TONE_NUMPAD; |
| 89 | 89 | ||
| 90 | uint32_t default_layer_state_set_kb(uint32_t state) { | 90 | layer_state_t default_layer_state_set_kb(layer_state_t state) { |
| 91 | if (state == 1UL<<_QWERTY) { | 91 | if (state == 1UL<<_QWERTY) { |
| 92 | PLAY_SONG(tone_qwerty); | 92 | PLAY_SONG(tone_qwerty); |
| 93 | } else if (state == 1UL<<_NUMPAD) { | 93 | } else if (state == 1UL<<_NUMPAD) { |
diff --git a/keyboards/hecomi/keymaps/default/keymap.c b/keyboards/hecomi/keymaps/default/keymap.c index 505966fbe..312799f73 100644 --- a/keyboards/hecomi/keymaps/default/keymap.c +++ b/keyboards/hecomi/keymaps/default/keymap.c | |||
| @@ -75,9 +75,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 75 | return true; | 75 | return true; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | uint32_t layer_state_set_user(uint32_t state) | 78 | layer_state_t layer_state_set_user(layer_state_t state) |
| 79 | { | 79 | { |
| 80 | uint8_t layer=biton32(state); | 80 | uint8_t layer=get_highest_layer(state); |
| 81 | switch(layer) | 81 | switch(layer) |
| 82 | { | 82 | { |
| 83 | case DF: | 83 | case DF: |
diff --git a/keyboards/jj40/keymaps/default/keymap.c b/keyboards/jj40/keymaps/default/keymap.c index 47c6bada6..f54eac20a 100644 --- a/keyboards/jj40/keymaps/default/keymap.c +++ b/keyboards/jj40/keymaps/default/keymap.c | |||
| @@ -99,6 +99,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 99 | ) | 99 | ) |
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | uint32_t layer_state_set_user(uint32_t state) { | 102 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 103 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 103 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 104 | } | 104 | } |
diff --git a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c b/keyboards/lazydesigners/dimple/keymaps/default/keymap.c index e5a9c8466..d23c8e8a6 100644 --- a/keyboards/lazydesigners/dimple/keymaps/default/keymap.c +++ b/keyboards/lazydesigners/dimple/keymaps/default/keymap.c | |||
| @@ -116,9 +116,9 @@ if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) { | |||
| 116 | } | 116 | } |
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | uint32_t layer_state_set_user(uint32_t state) { | 119 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 120 | state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 120 | state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 121 | switch (biton32(state)) { | 121 | switch (get_highest_layer(state)) { |
| 122 | case _LOWER: | 122 | case _LOWER: |
| 123 | rgblight_sethsv_noeeprom(HSV_GREEN); | 123 | rgblight_sethsv_noeeprom(HSV_GREEN); |
| 124 | break; | 124 | break; |
diff --git a/keyboards/lets_split/keymaps/default/keymap.c b/keyboards/lets_split/keymaps/default/keymap.c index 05f9bda8d..8b24a4131 100644 --- a/keyboards/lets_split/keymaps/default/keymap.c +++ b/keyboards/lets_split/keymaps/default/keymap.c | |||
| @@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 133 | 133 | ||
| 134 | }; | 134 | }; |
| 135 | 135 | ||
| 136 | uint32_t layer_state_set_user(uint32_t state) { | 136 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 137 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 137 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 138 | } | 138 | } |
| 139 | 139 | ||
diff --git a/keyboards/lets_split_eh/keymaps/default/keymap.c b/keyboards/lets_split_eh/keymaps/default/keymap.c index fe5ca0c8c..366c4ee3c 100644 --- a/keyboards/lets_split_eh/keymaps/default/keymap.c +++ b/keyboards/lets_split_eh/keymaps/default/keymap.c | |||
| @@ -115,6 +115,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 115 | 115 | ||
| 116 | }; | 116 | }; |
| 117 | 117 | ||
| 118 | uint32_t layer_state_set_user(uint32_t state) { | 118 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 119 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 119 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 120 | } | 120 | } |
diff --git a/keyboards/model01/keymaps/default/keymap.c b/keyboards/model01/keymaps/default/keymap.c index a6e5303fe..5ee865972 100644 --- a/keyboards/model01/keymaps/default/keymap.c +++ b/keyboards/model01/keymaps/default/keymap.c | |||
| @@ -110,7 +110,7 @@ void rgb_matrix_indicators_user(void) { | |||
| 110 | } | 110 | } |
| 111 | #else /* no RGB matrix support */ | 111 | #else /* no RGB matrix support */ |
| 112 | 112 | ||
| 113 | uint32_t layer_state_set_user(uint32_t state) { | 113 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 114 | if (state & (1<<NUM)) { | 114 | if (state & (1<<NUM)) { |
| 115 | set_numpad_colours(1, &set_led_to); | 115 | set_numpad_colours(1, &set_led_to); |
| 116 | } else { | 116 | } else { |
diff --git a/keyboards/newgame40/keymaps/default/keymap.c b/keyboards/newgame40/keymaps/default/keymap.c index 41f16a7b7..282a06c10 100644 --- a/keyboards/newgame40/keymaps/default/keymap.c +++ b/keyboards/newgame40/keymaps/default/keymap.c | |||
| @@ -171,7 +171,7 @@ enum layers { | |||
| 171 | 171 | ||
| 172 | }; | 172 | }; |
| 173 | 173 | ||
| 174 | uint32_t layer_state_set_user(uint32_t state) { | 174 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 175 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 175 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 176 | } | 176 | } |
| 177 | 177 | ||
diff --git a/keyboards/orthodox/keymaps/default/keymap.c b/keyboards/orthodox/keymaps/default/keymap.c index b1c86da6c..acbf89ff2 100644 --- a/keyboards/orthodox/keymaps/default/keymap.c +++ b/keyboards/orthodox/keymaps/default/keymap.c | |||
| @@ -83,7 +83,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 83 | 83 | ||
| 84 | }; | 84 | }; |
| 85 | 85 | ||
| 86 | uint32_t layer_state_set_user(uint32_t state) { | 86 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 87 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 87 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 88 | } | 88 | } |
| 89 | 89 | ||
diff --git a/keyboards/plaid/keymaps/default/keymap.c b/keyboards/plaid/keymaps/default/keymap.c index 898284191..6a858a4a7 100644 --- a/keyboards/plaid/keymaps/default/keymap.c +++ b/keyboards/plaid/keymaps/default/keymap.c | |||
| @@ -234,7 +234,7 @@ void eeconfig_init_user(void) { // EEPROM is getting reset! | |||
| 234 | eeconfig_update_user(led_config.raw); | 234 | eeconfig_update_user(led_config.raw); |
| 235 | } | 235 | } |
| 236 | 236 | ||
| 237 | uint32_t layer_state_set_user(uint32_t state) { | 237 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 238 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 238 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 239 | } | 239 | } |
| 240 | 240 | ||
diff --git a/keyboards/primekb/prime_e/keymaps/default/keymap.c b/keyboards/primekb/prime_e/keymaps/default/keymap.c index 5a09cb969..65b2f67a3 100644 --- a/keyboards/primekb/prime_e/keymaps/default/keymap.c +++ b/keyboards/primekb/prime_e/keymaps/default/keymap.c | |||
| @@ -83,9 +83,9 @@ void led_set_user(uint8_t usb_led) { | |||
| 83 | } | 83 | } |
| 84 | 84 | ||
| 85 | //function for layer indicator LED | 85 | //function for layer indicator LED |
| 86 | uint32_t layer_state_set_user(uint32_t state) | 86 | layer_state_t layer_state_set_user(layer_state_t state) |
| 87 | { | 87 | { |
| 88 | if (biton32(state) == 1) { | 88 | if (get_highest_layer(state) == 1) { |
| 89 | writePinHigh(B3); | 89 | writePinHigh(B3); |
| 90 | } else { | 90 | } else { |
| 91 | writePinLow(B3); | 91 | writePinLow(B3); |
diff --git a/keyboards/reviung34/keymaps/default/keymap.c b/keyboards/reviung34/keymaps/default/keymap.c index 4d497a76b..fe373f53b 100755 --- a/keyboards/reviung34/keymaps/default/keymap.c +++ b/keyboards/reviung34/keymaps/default/keymap.c | |||
| @@ -61,7 +61,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 61 | ), | 61 | ), |
| 62 | }; | 62 | }; |
| 63 | 63 | ||
| 64 | uint32_t layer_state_set_user(uint32_t state) { | 64 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 65 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 65 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 66 | } | 66 | } |
| 67 | |||
diff --git a/keyboards/reviung39/keymaps/default/keymap.c b/keyboards/reviung39/keymaps/default/keymap.c index 9f0d0debc..7030be13f 100644 --- a/keyboards/reviung39/keymaps/default/keymap.c +++ b/keyboards/reviung39/keymaps/default/keymap.c | |||
| @@ -56,6 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 56 | ), | 56 | ), |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | uint32_t layer_state_set_user(uint32_t state) { | 59 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 60 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 60 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 61 | } | 61 | } |
diff --git a/keyboards/spacetime/keymaps/default/keymap.c b/keyboards/spacetime/keymaps/default/keymap.c index ac2f5098f..6be5d1d6d 100644 --- a/keyboards/spacetime/keymaps/default/keymap.c +++ b/keyboards/spacetime/keymaps/default/keymap.c | |||
| @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 64 | ) | 64 | ) |
| 65 | }; | 65 | }; |
| 66 | 66 | ||
| 67 | uint32_t layer_state_set_user(uint32_t state) { | 67 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 68 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 68 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 69 | } | 69 | } |
| 70 | 70 | ||
diff --git a/keyboards/staryu/keymaps/default/keymap.c b/keyboards/staryu/keymaps/default/keymap.c index 8c47ff44a..c41c436f9 100755 --- a/keyboards/staryu/keymaps/default/keymap.c +++ b/keyboards/staryu/keymaps/default/keymap.c | |||
| @@ -81,8 +81,8 @@ void keyboard_post_init_user(void) { | |||
| 81 | rgblight_sethsv_noeeprom_white(); | 81 | rgblight_sethsv_noeeprom_white(); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | uint32_t layer_state_set_user(uint32_t state) { | 84 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 85 | switch (biton32(state)) { | 85 | switch (get_highest_layer(state)) { |
| 86 | case _LAYER1: | 86 | case _LAYER1: |
| 87 | rgblight_sethsv_noeeprom_cyan(); | 87 | rgblight_sethsv_noeeprom_cyan(); |
| 88 | break; | 88 | break; |
diff --git a/keyboards/tanuki/keymaps/default/keymap.c b/keyboards/tanuki/keymaps/default/keymap.c index 7c3e11f27..c10a868af 100644 --- a/keyboards/tanuki/keymaps/default/keymap.c +++ b/keyboards/tanuki/keymaps/default/keymap.c | |||
| @@ -59,10 +59,10 @@ void keyboard_post_init_user(void) { | |||
| 59 | } | 59 | } |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | uint32_t layer_state_set_user(uint32_t state) { | 62 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 63 | // This code switches underglow color by active layer, if the user has enabled the feature | 63 | // This code switches underglow color by active layer, if the user has enabled the feature |
| 64 | if(user_config.layer_rgb) { | 64 | if(user_config.layer_rgb) { |
| 65 | switch (biton32(state)) { | 65 | switch (get_highest_layer(state)) { |
| 66 | case _BL: | 66 | case _BL: |
| 67 | rgblight_sethsv_noeeprom(0,10,255); | 67 | rgblight_sethsv_noeeprom(0,10,255); |
| 68 | rgblight_mode_noeeprom(1); | 68 | rgblight_mode_noeeprom(1); |
