summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-06-02 16:18:53 +0000
committerQMK Bot <hello@qmk.fm>2022-06-02 16:18:53 +0000
commit8bb2c66c88cc50f2e992a81d14df97902f7867a6 (patch)
tree1f0bd0cab7cd76a35a01a7e55ac5917adab6ee30
parent73bd3dff8c74f3bcd27955887034f8f7bf603d05 (diff)
parent7ff666340ca4de2447141b5327f758d52b4417cd (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/acheron/shark/alpha/config.h4
-rw-r--r--keyboards/acheron/shark/alpha/rules.mk1
2 files changed, 5 insertions, 0 deletions
diff --git a/keyboards/acheron/shark/alpha/config.h b/keyboards/acheron/shark/alpha/config.h
index cd2d88129c..493d267b51 100644
--- a/keyboards/acheron/shark/alpha/config.h
+++ b/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
*
diff --git a/keyboards/acheron/shark/alpha/rules.mk b/keyboards/acheron/shark/alpha/rules.mk
index 507f362b26..a5b2141884 100644
--- a/keyboards/acheron/shark/alpha/rules.mk
+++ b/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