diff options
| author | Drashna Jaelre <drashna@live.com> | 2021-05-21 23:17:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-21 23:17:32 -0700 |
| commit | a0fed0ea176d1c986e40fc4981b900509c90d66e (patch) | |
| tree | ee12f5943046015ea0dce8e2a30a68bc8eb99dbe /keyboards/mixi | |
| parent | 76c23b15abc824f867b48d8d5100dced2417d336 (diff) | |
Convert Encoder callbacks to be boolean functions (#12805)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/mixi')
| -rw-r--r-- | keyboards/mixi/keymaps/default/keymap.c | 11 | ||||
| -rw-r--r-- | keyboards/mixi/keymaps/via/keymap.c | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/keyboards/mixi/keymaps/default/keymap.c b/keyboards/mixi/keymaps/default/keymap.c index 21c3c669a0..916bd5e3d0 100644 --- a/keyboards/mixi/keymaps/default/keymap.c +++ b/keyboards/mixi/keymaps/default/keymap.c | |||
| @@ -17,8 +17,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 17 | */ | 17 | */ |
| 18 | [0] = | 18 | [0] = |
| 19 | LAYOUT( | 19 | LAYOUT( |
| 20 | KC_MUTE, KC_MPLY, MO(2) , | 20 | KC_MUTE, KC_MPLY, MO(2) , |
| 21 | KC_MPRV, KC_UP , KC_MNXT, | 21 | KC_MPRV, KC_UP , KC_MNXT, |
| 22 | KC_LEFT, KC_DOWN , KC_RGHT | 22 | KC_LEFT, KC_DOWN , KC_RGHT |
| 23 | ), | 23 | ), |
| 24 | 24 | ||
| @@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 51 | */ | 51 | */ |
| 52 | [2] = | 52 | [2] = |
| 53 | LAYOUT( | 53 | LAYOUT( |
| 54 | KC_NO , KC_NO, KC_TRNS, | 54 | KC_NO , KC_NO, KC_TRNS, |
| 55 | EEP_RST, RESET, DEBUG , | 55 | EEP_RST, RESET, DEBUG , |
| 56 | KC_NO , KC_NO, KC_NO | 56 | KC_NO , KC_NO, KC_NO |
| 57 | ) | 57 | ) |
| 58 | 58 | ||
| @@ -96,7 +96,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | uint8_t selected_layer = 0; | 98 | uint8_t selected_layer = 0; |
| 99 | void encoder_update_user(uint8_t index, bool clockwise) { | 99 | bool encoder_update_user(uint8_t index, bool clockwise) { |
| 100 | if (index == 0) { | 100 | if (index == 0) { |
| 101 | if (layer_state_is(2)) { | 101 | if (layer_state_is(2)) { |
| 102 | if (clockwise) { | 102 | if (clockwise) { |
| @@ -114,4 +114,5 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
| 114 | } | 114 | } |
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | return true; | ||
| 117 | } | 118 | } |
diff --git a/keyboards/mixi/keymaps/via/keymap.c b/keyboards/mixi/keymaps/via/keymap.c index 4ffaf111dc..5eb9e12365 100644 --- a/keyboards/mixi/keymaps/via/keymap.c +++ b/keyboards/mixi/keymaps/via/keymap.c | |||
| @@ -17,8 +17,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 17 | */ | 17 | */ |
| 18 | [0] = | 18 | [0] = |
| 19 | LAYOUT( | 19 | LAYOUT( |
| 20 | KC_MUTE, KC_MPLY, MO(2) , | 20 | KC_MUTE, KC_MPLY, MO(2) , |
| 21 | KC_MPRV, KC_UP , KC_MNXT, | 21 | KC_MPRV, KC_UP , KC_MNXT, |
| 22 | KC_LEFT, KC_DOWN , KC_RGHT | 22 | KC_LEFT, KC_DOWN , KC_RGHT |
| 23 | ), | 23 | ), |
| 24 | 24 | ||
| @@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 51 | */ | 51 | */ |
| 52 | [2] = | 52 | [2] = |
| 53 | LAYOUT( | 53 | LAYOUT( |
| 54 | KC_NO , KC_NO, KC_TRNS, | 54 | KC_NO , KC_NO, KC_TRNS, |
| 55 | EEP_RST, RESET, DEBUG , | 55 | EEP_RST, RESET, DEBUG , |
| 56 | KC_NO , KC_NO, KC_NO | 56 | KC_NO , KC_NO, KC_NO |
| 57 | ), | 57 | ), |
| 58 | 58 | ||
| @@ -113,7 +113,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { | |||
| 113 | } | 113 | } |
| 114 | 114 | ||
| 115 | uint8_t selected_layer = 0; | 115 | uint8_t selected_layer = 0; |
| 116 | void encoder_update_user(uint8_t index, bool clockwise) { | 116 | bool encoder_update_user(uint8_t index, bool clockwise) { |
| 117 | if (index == 0) { | 117 | if (index == 0) { |
| 118 | if (layer_state_is(2)) { | 118 | if (layer_state_is(2)) { |
| 119 | if (clockwise) { | 119 | if (clockwise) { |
| @@ -131,4 +131,5 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
| 131 | } | 131 | } |
| 132 | } | 132 | } |
| 133 | } | 133 | } |
| 134 | return true; | ||
| 134 | } | 135 | } |
