diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/merge/uc1/config.h | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/merge/uc1/config.h')
| -rw-r--r-- | keyboards/merge/uc1/config.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 0359ca2747..9dcfb6e074 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -14,11 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" - -/* key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 2 +#pragma once #define MATRIX_ROW_PINS { B1, B2 } #define MATRIX_COL_PINS { B3, B4 } @@ -43,7 +39,3 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define ENCODERS_PAD_A { F5 } -#define ENCODERS_PAD_B { F6 } -#define ENCODER_RESOLUTION 4 |