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

This commit is contained in:
QMK Bot 2022-06-02 16:18:53 +00:00
commit 8bb2c66c88
2 changed files with 5 additions and 0 deletions

View file

@ -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
*

View file

@ -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