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/um80/config.h | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/merge/um80/config.h')
| -rw-r--r-- | keyboards/merge/um80/config.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index b501e372ad..238e5f6d43 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -14,10 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" - -#define MATRIX_ROWS 12 -#define MATRIX_COLS 8 +#pragma once #define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 } @@ -25,7 +22,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define SOFT_SERIAL_PIN D2 #define SPLIT_USB_DETECT #define MASTER_LEFT #define SPLIT_MODS_ENABLE @@ -41,16 +37,8 @@ #define RGBLIGHT_SLEEP #define RGBLIGHT_LIMIT_VAL 120 -#define DEBOUNCE 5 - #define AUDIO_PIN B6 #ifdef AUDIO_ENABLE #define STARTUP_SONG SONG(STARTUP_SOUND) #endif - -#define ENCODERS_PAD_A { B4 } -#define ENCODERS_PAD_B { B5 } - -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0
\ No newline at end of file |