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/kingly_keys | |
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/kingly_keys')
5 files changed, 14 insertions, 9 deletions
diff --git a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c index 2074c7386..8fe6dedcb 100644 --- a/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c | |||
@@ -195,7 +195,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { | |||
195 | } | 195 | } |
196 | 196 | ||
197 | // Encoder Customization: (*Order-of-Keycode Specific) | 197 | // Encoder Customization: (*Order-of-Keycode Specific) |
198 | void encoder_update_user(uint8_t index, bool clockwise) { | 198 | bool encoder_update_user(uint8_t index, bool clockwise) { |
199 | if (index == 0) { | 199 | if (index == 0) { |
200 | if (clockwise) { | 200 | if (clockwise) { |
201 | tap_code(KC_VOLU); | 201 | tap_code(KC_VOLU); |
@@ -203,6 +203,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
203 | tap_code(KC_VOLD); | 203 | tap_code(KC_VOLD); |
204 | } | 204 | } |
205 | } | 205 | } |
206 | return true; | ||
206 | } | 207 | } |
207 | 208 | ||
208 | 209 | ||
diff --git a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c index 8607c8e4e..e36839a58 100644 --- a/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c | |||
@@ -195,7 +195,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { | |||
195 | } | 195 | } |
196 | 196 | ||
197 | // Encoder Customization: (*Order-of-Keycode Specific) | 197 | // Encoder Customization: (*Order-of-Keycode Specific) |
198 | void encoder_update_user(uint8_t index, bool clockwise) { | 198 | bool encoder_update_user(uint8_t index, bool clockwise) { |
199 | if (index == 0) { | 199 | if (index == 0) { |
200 | if (clockwise) { | 200 | if (clockwise) { |
201 | tap_code(KC_VOLU); | 201 | tap_code(KC_VOLU); |
@@ -203,6 +203,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
203 | tap_code(KC_VOLD); | 203 | tap_code(KC_VOLD); |
204 | } | 204 | } |
205 | } | 205 | } |
206 | return true; | ||
206 | } | 207 | } |
207 | 208 | ||
208 | 209 | ||
diff --git a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c index 1bbe1c262..91ecbb421 100644 --- a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c | |||
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
43 | [_BASE] = LAYOUT( | 43 | [_BASE] = LAYOUT( |
44 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, | 44 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
45 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, | 45 | KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, |
46 | KC_NO, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, | 46 | KC_NO, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, |
47 | KC_PGUP, KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 47 | KC_PGUP, KC_LCTRL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
48 | KC_HOME, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, | 48 | KC_HOME, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, |
49 | KC_PGDN, KC_DEL, KC_RCTRL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT | 49 | KC_PGDN, KC_DEL, KC_RCTRL, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT |
@@ -67,14 +67,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
67 | [_LOWER] = LAYOUT( | 67 | [_LOWER] = LAYOUT( |
68 | RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_HUI, RGB_SAI, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, | 68 | RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SAD, RGB_HUD, RGB_HUI, RGB_SAI, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, |
69 | KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQUAL, | 69 | KC_GRAVE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_EQUAL, |
70 | KC_NLCK, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, | 70 | KC_NLCK, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_BSLS, |
71 | KC_HOME, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 71 | KC_HOME, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
72 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | 72 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, |
73 | KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR | 73 | KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR |
74 | ) | 74 | ) |
75 | }; | 75 | }; |
76 | 76 | ||
77 | void encoder_update_user(uint8_t index, bool clockwise) { | 77 | bool encoder_update_user(uint8_t index, bool clockwise) { |
78 | if (index == 0) { | 78 | if (index == 0) { |
79 | if (clockwise) { | 79 | if (clockwise) { |
80 | tap_code(KC_WH_L); | 80 | tap_code(KC_WH_L); |
@@ -82,4 +82,5 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
82 | tap_code(KC_WH_R); | 82 | tap_code(KC_WH_R); |
83 | } | 83 | } |
84 | } | 84 | } |
85 | return true; | ||
85 | } | 86 | } |
diff --git a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c index 0c6db7514..280fe22cc 100644 --- a/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c +++ b/keyboards/kingly_keys/ropro/keymaps/jdayton3/keymap.c | |||
@@ -211,7 +211,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
211 | ) | 211 | ) |
212 | }; | 212 | }; |
213 | 213 | ||
214 | void encoder_update_user(uint8_t index, bool clockwise) { | 214 | bool encoder_update_user(uint8_t index, bool clockwise) { |
215 | if (index == 0) { | 215 | if (index == 0) { |
216 | if (clockwise) { | 216 | if (clockwise) { |
217 | tap_code(KC_WH_L); | 217 | tap_code(KC_WH_L); |
@@ -219,6 +219,7 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
219 | tap_code(KC_WH_R); | 219 | tap_code(KC_WH_R); |
220 | } | 220 | } |
221 | } | 221 | } |
222 | return true; | ||
222 | } | 223 | } |
223 | 224 | ||
224 | 225 | ||
diff --git a/keyboards/kingly_keys/soap/keymaps/default/keymap.c b/keyboards/kingly_keys/soap/keymaps/default/keymap.c index 03966e42b..85f3673ea 100644 --- a/keyboards/kingly_keys/soap/keymaps/default/keymap.c +++ b/keyboards/kingly_keys/soap/keymaps/default/keymap.c | |||
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
31 | * `----------------------------------------' | 31 | * `----------------------------------------' |
32 | */ | 32 | */ |
33 | [BASE] = LAYOUT( | 33 | [BASE] = LAYOUT( |
34 | KC_DEL, KC_UP, KC_ENT, RGB, | 34 | KC_DEL, KC_UP, KC_ENT, RGB, |
35 | KC_LEFT, KC_DOWN, KC_RIGHT, MO(1) | 35 | KC_LEFT, KC_DOWN, KC_RIGHT, MO(1) |
36 | ), | 36 | ), |
37 | 37 | ||
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
43 | * `----------------------------------------' | 43 | * `----------------------------------------' |
44 | */ | 44 | */ |
45 | [FN] = LAYOUT( | 45 | [FN] = LAYOUT( |
46 | RGB_HUI, RGB_VAI, RGB_SAI, KC_TR, | 46 | RGB_HUI, RGB_VAI, RGB_SAI, KC_TR, |
47 | RGB_HUD, RGB_VAD, RGB_SAD, KC_TR | 47 | RGB_HUD, RGB_VAD, RGB_SAD, KC_TR |
48 | ) | 48 | ) |
49 | }; | 49 | }; |
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
51 | /* Rotary Encoder Settings: */ | 51 | /* Rotary Encoder Settings: */ |
52 | /* - Current Value = Horizontal Scrolling */ | 52 | /* - Current Value = Horizontal Scrolling */ |
53 | 53 | ||
54 | void encoder_update_user(uint8_t index, bool clockwise) { | 54 | bool encoder_update_user(uint8_t index, bool clockwise) { |
55 | if (index == 0) { | 55 | if (index == 0) { |
56 | if (clockwise) { | 56 | if (clockwise) { |
57 | tap_code(KC_WH_L); | 57 | tap_code(KC_WH_L); |
@@ -59,4 +59,5 @@ void encoder_update_user(uint8_t index, bool clockwise) { | |||
59 | tap_code(KC_WH_R); | 59 | tap_code(KC_WH_R); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | return true; | ||
62 | } | 63 | } |