summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/iso_macro/config.h24
-rw-r--r--keyboards/merge/iso_macro/info.json25
-rw-r--r--keyboards/merge/iso_macro/iso_macro.c17
-rw-r--r--keyboards/merge/iso_macro/iso_macro.h29
-rw-r--r--keyboards/merge/uc1/config.h7
-rw-r--r--keyboards/merge/uc1/info.json19
-rw-r--r--keyboards/merge/uc1/uc1.c17
-rw-r--r--keyboards/merge/uc1/uc1.h27
-rw-r--r--keyboards/merge/um70/config.h7
-rw-r--r--keyboards/merge/um70/info.json8
-rw-r--r--keyboards/merge/um80/config.h7
-rw-r--r--keyboards/merge/um80/info.json8
-rw-r--r--keyboards/merge/uma/config.h6
-rw-r--r--keyboards/merge/uma/info.json5
-rw-r--r--keyboards/merge/uma/uma.h8
15 files changed, 55 insertions, 159 deletions
diff --git a/keyboards/merge/iso_macro/config.h b/keyboards/merge/iso_macro/config.h
deleted file mode 100644
index 7bf2b1b33b..0000000000
--- a/keyboards/merge/iso_macro/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
- /* 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 MATRIX_ROW_PINS { F4, F5, F6}
-#define MATRIX_COL_PINS { B4, B5, B6}
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/iso_macro/info.json b/keyboards/merge/iso_macro/info.json
index bc4269755f..fe20e701ba 100644
--- a/keyboards/merge/iso_macro/info.json
+++ b/keyboards/merge/iso_macro/info.json
@@ -8,6 +8,11 @@
"pid": "0x1200",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "B5", "B6"],
+ "rows": ["F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F0", "pin_b": "F1"},
@@ -22,16 +27,18 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.5, "y":0, "w":1.25, "h":2},
+ {"matrix": [2, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [2, 0], "x": 4.5, "y": 0, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 2], "x": 0, "y": 1},
- {"x":0, "y":1},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1}
+ {"matrix": [1, 0], "x": 1.5, "y": 1},
+ {"matrix": [1, 1], "x": 2.5, "y": 1},
+ {"matrix": [1, 2], "x": 3.5, "y": 1}
]
}
}
diff --git a/keyboards/merge/iso_macro/iso_macro.c b/keyboards/merge/iso_macro/iso_macro.c
deleted file mode 100644
index 6052f9cce9..0000000000
--- a/keyboards/merge/iso_macro/iso_macro.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* 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 "iso_macro.h"
diff --git a/keyboards/merge/iso_macro/iso_macro.h b/keyboards/merge/iso_macro/iso_macro.h
deleted file mode 100644
index dfa9386449..0000000000
--- a/keyboards/merge/iso_macro/iso_macro.h
+++ /dev/null
@@ -1,29 +0,0 @@
- /* 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k21, k00, k01, k02, k20, \
- k22, k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
- { k20, k21, k22 } \
-}
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 9dcfb6e074..7f80333ad3 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -16,10 +16,6 @@
#pragma once
-#define MATRIX_ROW_PINS { B1, B2 }
-#define MATRIX_COL_PINS { B3, B4 }
-
-#define RGB_DI_PIN B5
#define RGBLED_NUM 12
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -36,6 +32,3 @@
#define RGBLIGHT_VAL_STEP 10
#define RGBLIGHT_LIMIT_VAL 255
#define RGBLIGHT_SLEEP
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 55b68a4510..95de5a2e20 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,14 @@
"pid": "0x5543",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "B5"
+ },
+ "matrix_pins": {
+ "cols": ["B3", "B4"],
+ "rows": ["B1", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "F5", "pin_b": "F6"}
@@ -17,11 +25,12 @@
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
- "layout": [
- {"label":"0", "x":0, "y":0},
- {"label":"1", "x":1.25, "y":0},
- {"label":"2", "x":2.25, "y":0},
- {"label":"3", "x":3.25, "y":0}
+ "layout": [
+ {"matrix": [1, 1], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 0], "x": 3.25, "y": 0}
]
}
}
diff --git a/keyboards/merge/uc1/uc1.c b/keyboards/merge/uc1/uc1.c
deleted file mode 100644
index d23e7426d8..0000000000
--- a/keyboards/merge/uc1/uc1.c
+++ /dev/null
@@ -1,17 +0,0 @@
- /* 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 "uc1.h"
diff --git a/keyboards/merge/uc1/uc1.h b/keyboards/merge/uc1/uc1.h
deleted file mode 100644
index 84e655d1b9..0000000000
--- a/keyboards/merge/uc1/uc1.h
+++ /dev/null
@@ -1,27 +0,0 @@
- /* 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
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k11, k00, k01, k10 \
-) \
-{ \
- { k00, k01 }, \
- { k10, k11 } \
-}
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index c249a1816a..57c2dcb6fb 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -16,17 +16,10 @@
#pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#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 }
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index e548d63151..fd566ab395 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -8,6 +8,11 @@
"pid": "0x3222",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}
@@ -16,6 +21,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 238e5f6d43..f267fa3670 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -16,17 +16,10 @@
#pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7, C7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_USB_DETECT
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
-#define RGB_DI_PIN D3
#define RGBLIGHT_SPLIT
#define RGBLED_NUM 100
#define RGBLED_SPLIT { 48, 52 }
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index e3e1359c92..9b7e73b2da 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -8,6 +8,11 @@
"pid": "0x3241",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B7", "C7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}
@@ -16,6 +21,9 @@
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/merge/uma/config.h b/keyboards/merge/uma/config.h
index 6d21adc774..b02c9578cd 100644
--- a/keyboards/merge/uma/config.h
+++ b/keyboards/merge/uma/config.h
@@ -16,11 +16,5 @@
#pragma once
-#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D6, D4 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_USB_DETECT
#define SPLIT_MODS_ENABLE
diff --git a/keyboards/merge/uma/info.json b/keyboards/merge/uma/info.json
index 1363705253..d6a07150f6 100644
--- a/keyboards/merge/uma/info.json
+++ b/keyboards/merge/uma/info.json
@@ -8,6 +8,11 @@
"pid": "0x3232",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D6", "D4"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "C6"
},
diff --git a/keyboards/merge/uma/uma.h b/keyboards/merge/uma/uma.h
index b7fb9a5d61..3e2b5fa264 100644
--- a/keyboards/merge/uma/uma.h
+++ b/keyboards/merge/uma/uma.h
@@ -126,7 +126,7 @@
{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
{ L30, L31, L32, L33, L34, L35, XXX, XXX }, \
- { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+ { L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ R00, R01, R02, R03, R04, R05, R06, R07 }, \
{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
{ R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -145,7 +145,7 @@
{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
{ L30, L31, L32, L33, L34, L35, XXX, XXX }, \
- { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+ { L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ R00, R01, R02, R03, R04, R05, XXX, R07 }, \
{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
{ R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -164,7 +164,7 @@
{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
{ L30, L31, L32, L33, L34, L35, XXX, XXX }, \
- { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+ { L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ R00, R01, R02, R03, R04, R05, XXX, R07 }, \
{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
{ R20, R21, R22, R23, R24, R25, R26, R27 }, \
@@ -183,7 +183,7 @@
{ L10, L11, L12, L13, L14, L15, XXX, XXX }, \
{ L20, L21, L22, L23, L24, L25, XXX, XXX }, \
{ L30, L31, L32, L33, L34, L35, XXX, XXX }, \
- { L40, XXX, L42, L43, L44, L45, L46, L47 }, \
+ { L40, L41, L42, L43, L44, L45, L46, L47 }, \
{ R00, R01, R02, R03, R04, R05, R06, R07 }, \
{ R10, R11, R12, R13, R14, R15, R16, R17 }, \
{ R20, R21, R22, R23, R24, R25, R26, R27 }, \
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-02 21:13:00 +0000