diff options
author | QMK Bot <hello@qmk.fm> | 2021-12-24 00:39:31 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-12-24 00:39:31 +0000 |
commit | 45731efcac7ef68e0844e126b17bc701cb4a6e5d (patch) | |
tree | de593cc29aec2c52e98b8a3f8b4c0c928a953ea0 /keyboards/pearlboards/pandora | |
parent | b7ed91f861c7aa7efd2138e9cca664f94bcffa8e (diff) | |
parent | db149052c3067553fa357d0590ed0f9fc4460f40 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/pearlboards/pandora')
-rw-r--r-- | keyboards/pearlboards/pandora/pandora.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/keyboards/pearlboards/pandora/pandora.c b/keyboards/pearlboards/pandora/pandora.c index 5ce5d22b06..608ee00edf 100644 --- a/keyboards/pearlboards/pandora/pandora.c +++ b/keyboards/pearlboards/pandora/pandora.c @@ -17,7 +17,11 @@ #include "pandora.h" // Encoder rotate function -bool encoder_update_user(uint8_t index, bool clockwise) { +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } /* First encoder */ if (index == 0) { if (clockwise) { @@ -28,8 +32,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) { } return true; } +#endif + // Encoder click function -bool dip_switch_update_user(uint8_t index, bool active) { +#ifdef DIP_SWITCH_ENABLE +bool dip_switch_update_kb(uint8_t index, bool active) { + if (!dip_switch_update_user(index, active)) { return false; } + switch (index) { /* First encoder */ case 0: @@ -40,3 +49,4 @@ bool dip_switch_update_user(uint8_t index, bool active) { } return true; } +#endif |