Skip to content

Commit 09df2a0

Browse files
authored
Fixed build errors in Tidbit firmware due to mismatched return type in keymaps (#9)
* Fixed encoder_update return type mismatch in VIA keymap * Fixed encoder_update return type mismatch in OLED keycap * Fixed encoder_update return type mismatch in DEFAULT keycap * Fixed encoder_update return type mismatch in 4ROTARY keymap * Fixed encoder_update return type mismatch in 19KEYPAD keymap
1 parent e891938 commit 09df2a0

5 files changed

Lines changed: 17 additions & 12 deletions

File tree

keymaps/19keypad/keymap.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
7272
return true;
7373
}
7474

75-
void encoder_update_user(uint8_t index, bool clockwise) {
75+
bool encoder_update_user(uint8_t index, bool clockwise) {
7676
if (clockwise) {
7777
tap_code(KC_VOLU);
7878
} else {
7979
tap_code(KC_VOLD);
8080
}
81+
return true;
8182
}
8283

8384
layer_state_t layer_state_set_user(layer_state_t state) {
@@ -97,4 +98,4 @@ void led_set_kb(uint8_t usb_led) {
9798
set_bitc_LED(LED_ON);
9899
else
99100
set_bitc_LED(LED_DIM);
100-
}
101+
}

keymaps/4rotary/keymap.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
8787
return true;
8888
}
8989

90-
void encoder_update_user(uint8_t index, bool clockwise) {
90+
bool encoder_update_user(uint8_t index, bool clockwise) {
9191
/* With an if statement we can check which encoder was turned. */
9292
if (index == 0) { /* First encoder */
9393
if (clockwise) {
@@ -114,6 +114,7 @@ void encoder_update_user(uint8_t index, bool clockwise) {
114114
tap_code(KC_VOLD);
115115
}
116116
}
117+
return true;
117118
}
118119

119120
layer_state_t layer_state_set_user(layer_state_t state) {

keymaps/default/keymap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
8282
return true;
8383
}
8484

85-
void encoder_update_user(uint8_t index, bool clockwise) {
85+
bool encoder_update_user(uint8_t index, bool clockwise) {
8686
if (clockwise) {
8787
tap_code(KC_VOLU);
8888
} else {
8989
tap_code(KC_VOLD);
90-
}
90+
}
91+
return true;
9192
}
9293

9394
layer_state_t layer_state_set_user(layer_state_t state) {
@@ -107,4 +108,4 @@ void led_set_kb(uint8_t usb_led) {
107108
set_bitc_LED(LED_DIM);
108109
else
109110
set_bitc_LED(LED_OFF);
110-
}
111+
}

keymaps/oled/keymap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
129129
return true;
130130
}
131131

132-
void encoder_update_user(uint8_t index, bool clockwise) {
132+
bool encoder_update_user(uint8_t index, bool clockwise) {
133133
if (clockwise) {
134134
tap_code(KC_VOLU);
135135
} else {
136136
tap_code(KC_VOLD);
137-
}
137+
}
138+
return true;
138139
}
139140

140141
layer_state_t layer_state_set_user(layer_state_t state) {
@@ -154,4 +155,4 @@ void led_set_kb(uint8_t usb_led) {
154155
set_bitc_LED(LED_DIM);
155156
else
156157
set_bitc_LED(LED_OFF);
157-
}
158+
}

keymaps/via/keymap.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,18 @@ void matrix_scan_user(void) {
7171
matrix_scan_remote_kb();
7272
}
7373

74-
void encoder_update_user(uint8_t index, bool clockwise) {
74+
bool encoder_update_user(uint8_t index, bool clockwise) {
7575
if (clockwise) {
7676
tap_code(KC_VOLU);
7777
} else {
7878
tap_code(KC_VOLD);
79-
}
79+
}
80+
return true;
8081
}
8182

8283
void led_set_kb(uint8_t usb_led) {
8384
if (usb_led & (1<<USB_LED_NUM_LOCK))
8485
set_bitc_LED(LED_DIM);
8586
else
8687
set_bitc_LED(LED_OFF);
87-
}
88+
}

0 commit comments

Comments
 (0)