diff options
Diffstat (limited to 'keyboards/merge')
-rw-r--r-- | keyboards/merge/um70/config.h | 27 | ||||
-rw-r--r-- | keyboards/merge/um70/keyboard.json | 4 | ||||
-rw-r--r-- | keyboards/merge/um80/config.h | 27 | ||||
-rw-r--r-- | keyboards/merge/um80/keyboard.json | 4 | ||||
-rw-r--r-- | keyboards/merge/uma/keyboard.json | 4 |
5 files changed, 35 insertions, 31 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 2d9f73d61a..5f999594cf 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -1,23 +1,22 @@ -/* 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 +/* 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/>. */ #pragma once #define SPLIT_USB_DETECT -#define MASTER_LEFT #define SPLIT_MODS_ENABLE #define B6_AUDIO diff --git a/keyboards/merge/um70/keyboard.json b/keyboards/merge/um70/keyboard.json index c349abc788..afb52d3d4f 100644 --- a/keyboards/merge/um70/keyboard.json +++ b/keyboards/merge/um70/keyboard.json @@ -31,7 +31,9 @@ }, "split": { "enabled": true, - "soft_serial_pin": "D2" + "serial": { + "pin": "D2" + } }, "ws2812": { "pin": "D3" diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index d23f9163a7..d8e896c14b 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -1,23 +1,22 @@ -/* 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 +/* 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/>. */ #pragma once #define SPLIT_USB_DETECT -#define MASTER_LEFT #define SPLIT_MODS_ENABLE #define AUDIO_PIN B6 diff --git a/keyboards/merge/um80/keyboard.json b/keyboards/merge/um80/keyboard.json index 1cbac749f7..ea233e8f1c 100644 --- a/keyboards/merge/um80/keyboard.json +++ b/keyboards/merge/um80/keyboard.json @@ -31,7 +31,9 @@ }, "split": { "enabled": true, - "soft_serial_pin": "D2" + "serial": { + "pin": "D2" + } }, "ws2812": { "pin": "D3" diff --git a/keyboards/merge/uma/keyboard.json b/keyboards/merge/uma/keyboard.json index d5fea75fb4..9bd9e54582 100644 --- a/keyboards/merge/uma/keyboard.json +++ b/keyboards/merge/uma/keyboard.json @@ -35,7 +35,9 @@ }, "split": { "enabled": true, - "soft_serial_pin": "D2" + "serial": { + "pin": "D2" + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", |