diff options
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/iso_macro/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/uc1/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um70/config.h | 6 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 6 | ||||
| -rw-r--r-- | keyboards/merge/uma/config.h | 6 |
5 files changed, 0 insertions, 20 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h index f5a82d2df8..310da15eef 100644 --- a/keyboards/merge/iso_macro/config.h +++ b/keyboards/merge/iso_macro/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 3 diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 0359ca2747..0b3cf0c4b5 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 19f3bba97f..2c70420c15 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" #define MATRIX_ROWS 10 #define MATRIX_COLS 8 @@ -41,8 +40,6 @@ #define RGBLIGHT_SLEEP #define RGBLIGHT_LIMIT_VAL 150 -#define DEBOUNCE 5 - #define B6_AUDIO #ifdef AUDIO_ENABLE @@ -51,6 +48,3 @@ #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 diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index b501e372ad..01ba846a4e 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" #define MATRIX_ROWS 12 #define MATRIX_COLS 8 @@ -41,8 +40,6 @@ #define RGBLIGHT_SLEEP #define RGBLIGHT_LIMIT_VAL 120 -#define DEBOUNCE 5 - #define AUDIO_PIN B6 #ifdef AUDIO_ENABLE @@ -51,6 +48,3 @@ #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 diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h index 99343cc152..93c1b82b53 100644 --- a/keyboards/merge/uma/config.h +++ b/keyboards/merge/uma/config.h @@ -14,7 +14,6 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "config_common.h" #define MATRIX_ROWS 10 #define MATRIX_COLS 8 @@ -31,10 +30,5 @@ #define SPLIT_USB_DETECT #define SPLIT_MODS_ENABLE -#define DEBOUNCE 5 - #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 |