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

keyboards/ploopyco/trackball_thumb/rev1_001/config.h

@@ -26,5 +26,5 @@
 /* PMW33XX Settings */
 #define PMW33XX_CS_PIN B0
 
-#define ENCODER_A_PINS { F0 }
-#define ENCODER_B_PINS { F4 }
+#define ENCODER_A_PINS { F4 }
+#define ENCODER_B_PINS { F0 }