Merge remote-tracking branch 'origin/master' into develop

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