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

1 files changed, 63 insertions, 0 deletions

diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
new file mode 100644
index 0000000000..a1374aa9a3
--- /dev/null
+++ b/keyboards/merge/um70/config.h
@@ -0,0 +1,63 @@
+/* Copyright 2021 duoshock 
+ * 
+ * This program is free software: you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License as published by 
+ * the Free Software Foundation, either version 2 of the License, or 
+ * (at your option) any later version. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config_common.h"
+
+#define VENDOR_ID       0x4D65
+#define PRODUCT_ID      0x3222
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Merge
+#define PRODUCT         UM-70
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 8
+
+#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define SOFT_SERIAL_PIN D2
+#define SPLIT_USB_DETECT
+#define MASTER_LEFT
+#define SPLIT_MODS_ENABLE
+
+#define RGB_DI_PIN D3
+#define RGBLIGHT_SPLIT
+#define RGBLED_NUM 83
+#define RGBLED_SPLIT { 39, 44 }
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_SPLIT RGBLED_SPLIT
+#endif
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_LIMIT_VAL 150
+
+#define DEBOUNCE 5
+
+#define B6_AUDIO
+
+#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