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/themadnoodle | |
| parent | 76c23b15abc824f867b48d8d5100dced2417d336 (diff) | |
| download | qmk_firmware-a0fed0ea176d1c986e40fc4981b900509c90d66e.tar.gz qmk_firmware-a0fed0ea176d1c986e40fc4981b900509c90d66e.zip | |
Convert Encoder callbacks to be boolean functions (#12805)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Diffstat (limited to 'keyboards/themadnoodle')
| -rw-r--r-- | keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c | 23 | ||||
| -rw-r--r-- | keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c | 23 |
2 files changed, 24 insertions, 22 deletions
diff --git a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c index 486db5070..15b6df3b1 100644 --- a/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/ncc1701kb/v2/keymaps/default/keymap.c | |||
| @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | [0] = LAYOUT_ortho_3x3( | 15 | [0] = LAYOUT_ortho_3x3( |
| 16 | KC_MPRV, LT(2, KC_MUTE), KC_MNXT, | 16 | KC_MPRV, LT(2, KC_MUTE), KC_MNXT, |
| 17 | KC_MSTP, KC_MPLY, KC_MSEL, | 17 | KC_MSTP, KC_MPLY, KC_MSEL, |
| 18 | KC_CALC, KC_MAIL, LT(1, KC_MYCM) | 18 | KC_CALC, KC_MAIL, LT(1, KC_MYCM) |
| 19 | ), | 19 | ), |
| @@ -28,14 +28,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 28 | * | SAT+ | SAT- | | | 28 | * | SAT+ | SAT- | | |
| 29 | * `-----------------------' | 29 | * `-----------------------' |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | [1] = LAYOUT_ortho_3x3( | 32 | [1] = LAYOUT_ortho_3x3( |
| 33 | RGB_MOD, RGB_TOG, RGB_RMOD, | 33 | RGB_MOD, RGB_TOG, RGB_RMOD, |
| 34 | RGB_SPI, RGB_SPD, RGB_VAI, | 34 | RGB_SPI, RGB_SPD, RGB_VAI, |
| 35 | RGB_SAI, RGB_SAD, KC_TRNS | 35 | RGB_SAI, RGB_SAD, KC_TRNS |
| 36 | ), | 36 | ), |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | /* LAYER 2 (ENCODER) | 39 | /* LAYER 2 (ENCODER) |
| 40 | * ,-----------------------. | 40 | * ,-----------------------. |
| 41 | * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) | 41 | * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) |
| @@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 45 | * | | | | | 45 | * | | | | |
| 46 | * `-----------------------' | 46 | * `-----------------------' |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | [2] = LAYOUT_ortho_3x3( | 49 | [2] = LAYOUT_ortho_3x3( |
| 50 | KC_TRNS, KC_TRNS, KC_TRNS, | 50 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 51 | KC_TRNS, KC_TRNS, KC_TRNS, | 51 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 52 | KC_TRNS, KC_TRNS, KC_TRNS | 52 | KC_TRNS, KC_TRNS, KC_TRNS |
| 53 | ) | 53 | ) |
| 54 | 54 | ||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | void encoder_update_user(uint8_t index, bool clockwise) { | 57 | bool encoder_update_user(uint8_t index, bool clockwise) { |
| 58 | 58 | ||
| 59 | switch (get_highest_layer(layer_state)) { | 59 | switch (get_highest_layer(layer_state)) { |
| 60 | case 1: | 60 | case 1: |
| 61 | if (clockwise) { | 61 | if (clockwise) { |
| @@ -78,6 +78,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
| 78 | tap_code(KC_VOLD); | 78 | tap_code(KC_VOLD); |
| 79 | } | 79 | } |
| 80 | break; | 80 | break; |
| 81 | 81 | ||
| 82 | } | 82 | } |
| 83 | return true; | ||
| 83 | } | 84 | } |
diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c index e487c2726..8fc7e2a27 100644 --- a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c | |||
| @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | [0] = LAYOUT_ortho_3x3( | 15 | [0] = LAYOUT_ortho_3x3( |
| 16 | KC_MPRV, LT(2, KC_MUTE), KC_MNXT, | 16 | KC_MPRV, LT(2, KC_MUTE), KC_MNXT, |
| 17 | KC_MSTP, KC_MPLY, KC_MSEL, | 17 | KC_MSTP, KC_MPLY, KC_MSEL, |
| 18 | KC_CALC, KC_MAIL, LT(1, KC_MYCM) | 18 | KC_CALC, KC_MAIL, LT(1, KC_MYCM) |
| 19 | ), | 19 | ), |
| @@ -28,14 +28,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 28 | * | SAT+ | SAT- | | | 28 | * | SAT+ | SAT- | | |
| 29 | * `-----------------------' | 29 | * `-----------------------' |
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | [1] = LAYOUT_ortho_3x3( | 32 | [1] = LAYOUT_ortho_3x3( |
| 33 | RGB_MOD, RGB_TOG, RGB_RMOD, | 33 | RGB_MOD, RGB_TOG, RGB_RMOD, |
| 34 | RGB_SPI, RGB_SPD, RGB_VAI, | 34 | RGB_SPI, RGB_SPD, RGB_VAI, |
| 35 | RGB_SAI, RGB_SAD, KC_TRNS | 35 | RGB_SAI, RGB_SAD, KC_TRNS |
| 36 | ), | 36 | ), |
| 37 | 37 | ||
| 38 | 38 | ||
| 39 | /* LAYER 2 (ENCODER) | 39 | /* LAYER 2 (ENCODER) |
| 40 | * ,-----------------------. | 40 | * ,-----------------------. |
| 41 | * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) | 41 | * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) |
| @@ -45,17 +45,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 45 | * | | | | | 45 | * | | | | |
| 46 | * `-----------------------' | 46 | * `-----------------------' |
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | [2] = LAYOUT_ortho_3x3( | 49 | [2] = LAYOUT_ortho_3x3( |
| 50 | KC_TRNS, KC_TRNS, KC_TRNS, | 50 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 51 | KC_TRNS, KC_TRNS, KC_TRNS, | 51 | KC_TRNS, KC_TRNS, KC_TRNS, |
| 52 | KC_TRNS, KC_TRNS, KC_TRNS | 52 | KC_TRNS, KC_TRNS, KC_TRNS |
| 53 | ) | 53 | ) |
| 54 | 54 | ||
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | void encoder_update_user(uint8_t index, bool clockwise) { | 57 | bool encoder_update_user(uint8_t index, bool clockwise) { |
| 58 | 58 | ||
| 59 | switch (get_highest_layer(layer_state)) { | 59 | switch (get_highest_layer(layer_state)) { |
| 60 | case 1: | 60 | case 1: |
| 61 | if (clockwise) { | 61 | if (clockwise) { |
| @@ -78,6 +78,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
| 78 | tap_code(KC_VOLD); | 78 | tap_code(KC_VOLD); |
| 79 | } | 79 | } |
| 80 | break; | 80 | break; |
| 81 | 81 | ||
| 82 | } | 82 | } |
| 83 | return true; | ||
| 83 | } | 84 | } |
