Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
1cf040ad19
1 changed files with 2 additions and 2 deletions
|
@ -20,7 +20,7 @@
|
||||||
#if defined(ENCODER_ENABLE)
|
#if defined(ENCODER_ENABLE)
|
||||||
|
|
||||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
if (!encoder_update_kb(index, clockwise)) {
|
if (!encoder_update_user(index, clockwise)) {
|
||||||
return false; /* Don't process further events if user function exists and returns false */
|
return false; /* Don't process further events if user function exists and returns false */
|
||||||
}
|
}
|
||||||
if (index == 0) { /* First encoder */
|
if (index == 0) { /* First encoder */
|
||||||
|
@ -39,4 +39,4 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue