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

keyboards/acheron/shark/alpha/config.h

@@ -30,6 +30,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 12
 
+/* encoder pads */
+#define ENCODERS_PAD_A { B6 }
+#define ENCODERS_PAD_B { B7 }
+
 /*
  * Keyboard Matrix Assignments
  *

keyboards/acheron/shark/alpha/rules.mk

@@ -17,6 +17,7 @@ NKRO_ENABLE = no            # Enable N-Key Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
 
 LAYOUTS = ortho_4x12