diff options
| author | Xelus22 <17491233+Xelus22@users.noreply.github.com> | 2021-07-20 02:50:55 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-19 09:50:55 -0700 |
| commit | b73a29aaeabe1004423a2ea6180a94a95a1f0d91 (patch) | |
| tree | 41f8708f6d3be543d0d97bc1f73c6c5e69c66ca9 /users | |
| parent | f792aee954c6e5ced81af381775438afa2710c72 (diff) | |
| download | qmk_firmware-b73a29aaeabe1004423a2ea6180a94a95a1f0d91.tar.gz qmk_firmware-b73a29aaeabe1004423a2ea6180a94a95a1f0d91.zip | |
[Bug] Develop - Change uint32_t to layer_state_t (#13596)
* fix sat75
* update uint32_t to layer_state
Diffstat (limited to 'users')
| -rw-r--r-- | users/333fred/333fred.c | 2 | ||||
| -rw-r--r-- | users/bbaserdem/bbaserdem.c | 10 | ||||
| -rw-r--r-- | users/billypython/billypython.c | 2 | ||||
| -rw-r--r-- | users/edvorakjp/edvorakjp.c | 2 | ||||
| -rw-r--r-- | users/edvorakjp/edvorakjp.h | 2 | ||||
| -rw-r--r-- | users/konstantin/konstantin.c | 2 | ||||
| -rw-r--r-- | users/kuchosauronad0/kuchosauronad0.c | 4 | ||||
| -rw-r--r-- | users/mtdjr/mtdjr.c | 2 | ||||
| -rw-r--r-- | users/pvinis/pvinis.c | 2 | ||||
| -rw-r--r-- | users/romus/romus.c | 26 | ||||
| -rw-r--r-- | users/stanrc85/layer_rgb.c | 2 | ||||
| -rw-r--r-- | users/tominabox1/tominabox1.c | 2 | ||||
| -rw-r--r-- | users/turbomech/backupturbomech.c | 2 | ||||
| -rw-r--r-- | users/xulkal/process_records.c | 2 |
14 files changed, 31 insertions, 31 deletions
diff --git a/users/333fred/333fred.c b/users/333fred/333fred.c index 621b9e664..99f4e0168 100644 --- a/users/333fred/333fred.c +++ b/users/333fred/333fred.c | |||
| @@ -117,7 +117,7 @@ void tap_dance_process_keycode(uint16_t keycode) { | |||
| 117 | __attribute__ ((weak)) | 117 | __attribute__ ((weak)) |
| 118 | void layer_state_set_rgb(uint32_t state) {} | 118 | void layer_state_set_rgb(uint32_t state) {} |
| 119 | 119 | ||
| 120 | uint32_t layer_state_set_user(uint32_t state) { | 120 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 121 | layer_state_set_rgb(state); | 121 | layer_state_set_rgb(state); |
| 122 | return state; | 122 | return state; |
| 123 | } | 123 | } |
diff --git a/users/bbaserdem/bbaserdem.c b/users/bbaserdem/bbaserdem.c index ac7b1b62e..cdacda12e 100644 --- a/users/bbaserdem/bbaserdem.c +++ b/users/bbaserdem/bbaserdem.c | |||
| @@ -87,7 +87,7 @@ void rgblight_saveBase(void) { | |||
| 87 | base_sta = false; // If saving, that means base layer is being left | 87 | base_sta = false; // If saving, that means base layer is being left |
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | // Load the base state back | 90 | // Load the base state back |
| 91 | void rgblight_loadBase(void) { | 91 | void rgblight_loadBase(void) { |
| 92 | // Don't do anything if not enabled | 92 | // Don't do anything if not enabled |
| 93 | if ( !base_sta ) { | 93 | if ( !base_sta ) { |
| @@ -248,7 +248,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 248 | } | 248 | } |
| 249 | return false; | 249 | return false; |
| 250 | break; | 250 | break; |
| 251 | #endif | 251 | #endif |
| 252 | 252 | ||
| 253 | // If these keys are pressed, load base layer config, and mark saving | 253 | // If these keys are pressed, load base layer config, and mark saving |
| 254 | #ifdef RGBLIGHT_ENABLE | 254 | #ifdef RGBLIGHT_ENABLE |
| @@ -261,7 +261,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 261 | case RGB_HUI: | 261 | case RGB_HUI: |
| 262 | case RGB_HUD: | 262 | case RGB_HUD: |
| 263 | if ( !base_sta ) { | 263 | if ( !base_sta ) { |
| 264 | rgblight_loadBase(); | 264 | rgblight_loadBase(); |
| 265 | } | 265 | } |
| 266 | return true; | 266 | return true; |
| 267 | break; | 267 | break; |
| @@ -301,7 +301,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 301 | } | 301 | } |
| 302 | return false; | 302 | return false; |
| 303 | break; | 303 | break; |
| 304 | 304 | ||
| 305 | // Layer switches with sound | 305 | // Layer switches with sound |
| 306 | case K_GAMES: | 306 | case K_GAMES: |
| 307 | if (record->event.pressed) { | 307 | if (record->event.pressed) { |
| @@ -622,7 +622,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 622 | |*-----LAYER CHANGE-----*| | 622 | |*-----LAYER CHANGE-----*| |
| 623 | \*----------------------*/ | 623 | \*----------------------*/ |
| 624 | 624 | ||
| 625 | uint32_t layer_state_set_user(uint32_t state) { | 625 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 626 | 626 | ||
| 627 | state = layer_state_set_keymap (state); | 627 | state = layer_state_set_keymap (state); |
| 628 | #ifdef RGBLIGHT_ENABLE | 628 | #ifdef RGBLIGHT_ENABLE |
diff --git a/users/billypython/billypython.c b/users/billypython/billypython.c index 7bdfe33a4..180b478d7 100644 --- a/users/billypython/billypython.c +++ b/users/billypython/billypython.c | |||
| @@ -27,6 +27,6 @@ uint32_t layer_state_set_keymap(uint32_t state) { | |||
| 27 | return state; | 27 | return state; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | uint32_t layer_state_set_user(uint32_t state) { | 30 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 31 | return layer_state_set_keymap(state); | 31 | return layer_state_set_keymap(state); |
| 32 | } | 32 | } |
diff --git a/users/edvorakjp/edvorakjp.c b/users/edvorakjp/edvorakjp.c index d0cd106ff..c44d8bb44 100644 --- a/users/edvorakjp/edvorakjp.c +++ b/users/edvorakjp/edvorakjp.c | |||
| @@ -7,7 +7,7 @@ void matrix_init_user(void) { | |||
| 7 | 7 | ||
| 8 | __attribute__((weak)) void matrix_init_keymap() {} | 8 | __attribute__((weak)) void matrix_init_keymap() {} |
| 9 | 9 | ||
| 10 | uint32_t layer_state_set_user(uint32_t state) { | 10 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 11 | state = update_tri_layer_state(state, L_EDVORAKJP_LOWER, L_EDVORAKJP_RAISE, L_EDVORAKJP_ADJUST); | 11 | state = update_tri_layer_state(state, L_EDVORAKJP_LOWER, L_EDVORAKJP_RAISE, L_EDVORAKJP_ADJUST); |
| 12 | return layer_state_set_keymap(state); | 12 | return layer_state_set_keymap(state); |
| 13 | } | 13 | } |
diff --git a/users/edvorakjp/edvorakjp.h b/users/edvorakjp/edvorakjp.h index 5f20762c6..93cd9851b 100644 --- a/users/edvorakjp/edvorakjp.h +++ b/users/edvorakjp/edvorakjp.h | |||
| @@ -67,7 +67,7 @@ enum tap_dance_code { | |||
| 67 | // base | 67 | // base |
| 68 | void matrix_init_user(void); | 68 | void matrix_init_user(void); |
| 69 | void matrix_init_keymap(void); | 69 | void matrix_init_keymap(void); |
| 70 | uint32_t layer_state_set_user(uint32_t state); | 70 | layer_state_t layer_state_set_user(layer_state_t state); |
| 71 | uint32_t layer_state_set_keymap(uint32_t state); | 71 | uint32_t layer_state_set_keymap(uint32_t state); |
| 72 | bool process_record_user(uint16_t keycode, keyrecord_t *record); | 72 | bool process_record_user(uint16_t keycode, keyrecord_t *record); |
| 73 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record); | 73 | bool process_record_keymap(uint16_t keycode, keyrecord_t *record); |
diff --git a/users/konstantin/konstantin.c b/users/konstantin/konstantin.c index 72aca9fb8..3fdf5a4ca 100644 --- a/users/konstantin/konstantin.c +++ b/users/konstantin/konstantin.c | |||
| @@ -97,7 +97,7 @@ uint32_t layer_state_set_keymap(uint32_t state) { | |||
| 97 | return state; | 97 | return state; |
| 98 | } | 98 | } |
| 99 | 99 | ||
| 100 | uint32_t layer_state_set_user(uint32_t state) { | 100 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 101 | state = layer_state_set_keymap(state); | 101 | state = layer_state_set_keymap(state); |
| 102 | 102 | ||
| 103 | #ifdef LAYER_NUMPAD | 103 | #ifdef LAYER_NUMPAD |
diff --git a/users/kuchosauronad0/kuchosauronad0.c b/users/kuchosauronad0/kuchosauronad0.c index 6c38d0f10..a8f17b08e 100644 --- a/users/kuchosauronad0/kuchosauronad0.c +++ b/users/kuchosauronad0/kuchosauronad0.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | Copyright 2019 Andre Poley <andre.poley@mailbox.org> | 2 | Copyright 2019 Andre Poley <andre.poley@mailbox.org> |
| 3 | 3 | ||
| 4 | This program is free software: you can redistribute it and/or modify | 4 | This program is free software: you can redistribute it and/or modify |
| 5 | it under the terms of the GNU General Public License as published by | 5 | it under the terms of the GNU General Public License as published by |
| @@ -123,7 +123,7 @@ uint32_t layer_state_set_keymap (uint32_t state) { | |||
| 123 | 123 | ||
| 124 | // on layer change, no matter where the change was initiated | 124 | // on layer change, no matter where the change was initiated |
| 125 | // Then runs keymap's layer change check | 125 | // Then runs keymap's layer change check |
| 126 | uint32_t layer_state_set_user(uint32_t state) { | 126 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 127 | state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); | 127 | state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST); |
| 128 | #ifdef RGBLIGHT_ENABLE | 128 | #ifdef RGBLIGHT_ENABLE |
| 129 | state = layer_state_set_rgb(state); | 129 | state = layer_state_set_rgb(state); |
diff --git a/users/mtdjr/mtdjr.c b/users/mtdjr/mtdjr.c index c31b077b4..9c6c26bc8 100644 --- a/users/mtdjr/mtdjr.c +++ b/users/mtdjr/mtdjr.c | |||
| @@ -136,7 +136,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 136 | return true; | 136 | return true; |
| 137 | }; | 137 | }; |
| 138 | 138 | ||
| 139 | uint32_t layer_state_set_user(uint32_t state) { | 139 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 140 | switch (biton32(state)) { | 140 | switch (biton32(state)) { |
| 141 | case _RAISE: | 141 | case _RAISE: |
| 142 | #ifdef RGBLIGHT_ENABLE | 142 | #ifdef RGBLIGHT_ENABLE |
diff --git a/users/pvinis/pvinis.c b/users/pvinis/pvinis.c index 31c3023e8..71f9210ae 100644 --- a/users/pvinis/pvinis.c +++ b/users/pvinis/pvinis.c | |||
| @@ -10,7 +10,7 @@ float song_test[][2] = SONG(QWERTY_SOUND); | |||
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | // SYMBOL + SYSCTL = KBCTL | 12 | // SYMBOL + SYSCTL = KBCTL |
| 13 | uint32_t layer_state_set_user(uint32_t state) { | 13 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 14 | uint32_t intermediate_state = update_tri_layer_state(state, LR_SYMBOL, LR_SYSCTL, LR_KBCTL); | 14 | uint32_t intermediate_state = update_tri_layer_state(state, LR_SYMBOL, LR_SYSCTL, LR_KBCTL); |
| 15 | intermediate_state = layer_state_set_user_keymap(intermediate_state); | 15 | intermediate_state = layer_state_set_user_keymap(intermediate_state); |
| 16 | return intermediate_state; | 16 | return intermediate_state; |
diff --git a/users/romus/romus.c b/users/romus/romus.c index 35b524f94..f707bb884 100644 --- a/users/romus/romus.c +++ b/users/romus/romus.c | |||
| @@ -72,7 +72,7 @@ __attribute__ ((weak)) void led_set_keymap(uint8_t usb_led) { } | |||
| 72 | // Set RGBLIGHT state depending on layer | 72 | // Set RGBLIGHT state depending on layer |
| 73 | void rgblight_change( uint8_t this_layer ) { | 73 | void rgblight_change( uint8_t this_layer ) { |
| 74 | // Enable RGB light; will not work without this | 74 | // Enable RGB light; will not work without this |
| 75 | //rgblight_enable_noeeprom(); | 75 | //rgblight_enable_noeeprom(); |
| 76 | // Change RGB light | 76 | // Change RGB light |
| 77 | switch ( this_layer ) { | 77 | switch ( this_layer ) { |
| 78 | case _DV: | 78 | case _DV: |
| @@ -83,21 +83,21 @@ void rgblight_change( uint8_t this_layer ) { | |||
| 83 | // Do yellow for alternate | 83 | // Do yellow for alternate |
| 84 | rgblight_enable_noeeprom(); | 84 | rgblight_enable_noeeprom(); |
| 85 | rgblight_sethsv_noeeprom( 60,255,255); | 85 | rgblight_sethsv_noeeprom( 60,255,255); |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | break; | 88 | break; |
| 89 | case _GA: | 89 | case _GA: |
| 90 | // Do purple for game | 90 | // Do purple for game |
| 91 | rgblight_enable_noeeprom(); | 91 | rgblight_enable_noeeprom(); |
| 92 | rgblight_sethsv_noeeprom(285,255,255); | 92 | rgblight_sethsv_noeeprom(285,255,255); |
| 93 | 93 | ||
| 94 | 94 | ||
| 95 | break; | 95 | break; |
| 96 | case _NU: | 96 | case _NU: |
| 97 | // Do azure for number | 97 | // Do azure for number |
| 98 | rgblight_enable_noeeprom(); | 98 | rgblight_enable_noeeprom(); |
| 99 | rgblight_sethsv_noeeprom(186,200,255); | 99 | rgblight_sethsv_noeeprom(186,200,255); |
| 100 | 100 | ||
| 101 | 101 | ||
| 102 | break; | 102 | break; |
| 103 | case _SE: | 103 | case _SE: |
| @@ -105,27 +105,27 @@ void rgblight_change( uint8_t this_layer ) { | |||
| 105 | rgblight_enable_noeeprom(); | 105 | rgblight_enable_noeeprom(); |
| 106 | 106 | ||
| 107 | rgblight_sethsv_noeeprom( 16,255,255); | 107 | rgblight_sethsv_noeeprom( 16,255,255); |
| 108 | 108 | ||
| 109 | break; | 109 | break; |
| 110 | case _MO: | 110 | case _MO: |
| 111 | // Do green for mouse | 111 | // Do green for mouse |
| 112 | rgblight_enable_noeeprom(); | 112 | rgblight_enable_noeeprom(); |
| 113 | rgblight_sethsv_noeeprom(120,255,255); | 113 | rgblight_sethsv_noeeprom(120,255,255); |
| 114 | 114 | ||
| 115 | 115 | ||
| 116 | break; | 116 | break; |
| 117 | case _MU: | 117 | case _MU: |
| 118 | // Do orange for music | 118 | // Do orange for music |
| 119 | 119 | ||
| 120 | rgblight_enable_noeeprom(); | 120 | rgblight_enable_noeeprom(); |
| 121 | rgblight_sethsv_noeeprom( 39,255,255); | 121 | rgblight_sethsv_noeeprom( 39,255,255); |
| 122 | 122 | ||
| 123 | break; | 123 | break; |
| 124 | default: | 124 | default: |
| 125 | // Something went wrong | 125 | // Something went wrong |
| 126 | rgblight_enable_noeeprom(); | 126 | rgblight_enable_noeeprom(); |
| 127 | rgblight_sethsv_noeeprom( 0,255,255); | 127 | rgblight_sethsv_noeeprom( 0,255,255); |
| 128 | 128 | ||
| 129 | break; | 129 | break; |
| 130 | } | 130 | } |
| 131 | } | 131 | } |
| @@ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 189 | } | 189 | } |
| 190 | return false; | 190 | return false; |
| 191 | break; | 191 | break; |
| 192 | #endif | 192 | #endif |
| 193 | 193 | ||
| 194 | // Lock functionality: These layers are locked if the LOCKED buttons are | 194 | // Lock functionality: These layers are locked if the LOCKED buttons are |
| 195 | // pressed. Otherwise, they are momentary toggles | 195 | // pressed. Otherwise, they are momentary toggles |
| @@ -225,7 +225,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 225 | } | 225 | } |
| 226 | return false; | 226 | return false; |
| 227 | break; | 227 | break; |
| 228 | 228 | ||
| 229 | // Layer switches with sound | 229 | // Layer switches with sound |
| 230 | case K_GAMES: | 230 | case K_GAMES: |
| 231 | if (record->event.pressed) { | 231 | if (record->event.pressed) { |
| @@ -546,7 +546,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { | |||
| 546 | |*-----LAYER CHANGE-----*| | 546 | |*-----LAYER CHANGE-----*| |
| 547 | \*----------------------*/ | 547 | \*----------------------*/ |
| 548 | 548 | ||
| 549 | uint32_t layer_state_set_user(uint32_t state) { | 549 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 550 | 550 | ||
| 551 | state = layer_state_set_keymap (state); | 551 | state = layer_state_set_keymap (state); |
| 552 | #ifdef RGBLIGHT_ENABLE | 552 | #ifdef RGBLIGHT_ENABLE |
| @@ -554,4 +554,4 @@ uint32_t layer_state_set_user(uint32_t state) { | |||
| 554 | rgblight_change( biton32(state) ); | 554 | rgblight_change( biton32(state) ); |
| 555 | #endif | 555 | #endif |
| 556 | return state; | 556 | return state; |
| 557 | } \ No newline at end of file | 557 | } |
diff --git a/users/stanrc85/layer_rgb.c b/users/stanrc85/layer_rgb.c index 58f17489a..6d57198f3 100644 --- a/users/stanrc85/layer_rgb.c +++ b/users/stanrc85/layer_rgb.c | |||
| @@ -4,7 +4,7 @@ void matrix_init_user(void) { | |||
| 4 | rgblight_setrgb(0xFF, 0x00, 0x00); | 4 | rgblight_setrgb(0xFF, 0x00, 0x00); |
| 5 | }; | 5 | }; |
| 6 | 6 | ||
| 7 | uint32_t layer_state_set_user(uint32_t state) { | 7 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 8 | switch (biton32(state)) { | 8 | switch (biton32(state)) { |
| 9 | case 0: | 9 | case 0: |
| 10 | rgblight_setrgb (0xFF, 0x00, 0x00); | 10 | rgblight_setrgb (0xFF, 0x00, 0x00); |
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c index d2e9e1258..34fe3068a 100644 --- a/users/tominabox1/tominabox1.c +++ b/users/tominabox1/tominabox1.c | |||
| @@ -126,7 +126,7 @@ layer_state_t layer_state_set_keymap (layer_state_t state) { | |||
| 126 | return state; | 126 | return state; |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | uint32_t layer_state_set_user(uint32_t state) { | 129 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 130 | state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 130 | state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 131 | switch (biton32(state)) { | 131 | switch (biton32(state)) { |
| 132 | case _LOWER: | 132 | case _LOWER: |
diff --git a/users/turbomech/backupturbomech.c b/users/turbomech/backupturbomech.c index 2815aa452..aaea05df9 100644 --- a/users/turbomech/backupturbomech.c +++ b/users/turbomech/backupturbomech.c | |||
| @@ -296,7 +296,7 @@ case RGB_MODE_GRADIENT: | |||
| 296 | 296 | ||
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | uint32_t layer_state_set_user(uint32_t state) { | 299 | layer_state_t layer_state_set_user(layer_state_t state) { |
| 300 | #ifdef RGBLIGHT_ENABLE | 300 | #ifdef RGBLIGHT_ENABLE |
| 301 | uint8_t default_layer = eeconfig_read_default_layer(); | 301 | uint8_t default_layer = eeconfig_read_default_layer(); |
| 302 | if (rgb_layer_change) { | 302 | if (rgb_layer_change) { |
diff --git a/users/xulkal/process_records.c b/users/xulkal/process_records.c index b6a4e5cfa..47996110b 100644 --- a/users/xulkal/process_records.c +++ b/users/xulkal/process_records.c | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | #endif | 6 | #endif |
| 7 | 7 | ||
| 8 | #ifdef TRILAYER_ENABLED | 8 | #ifdef TRILAYER_ENABLED |
| 9 | uint32_t layer_state_set_user(uint32_t state) | 9 | layer_state_t layer_state_set_user(layer_state_t state) |
| 10 | { | 10 | { |
| 11 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); | 11 | return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); |
| 12 | } | 12 | } |
