summaryrefslogtreecommitdiff
path: root/keyboards/dm9records
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/dm9records')
-rw-r--r--keyboards/dm9records/ergoinu/config.h11
-rw-r--r--keyboards/dm9records/ergoinu/ergoinu.c18
-rw-r--r--keyboards/dm9records/ergoinu/ergoinu.h39
-rw-r--r--keyboards/dm9records/ergoinu/info.json136
-rw-r--r--keyboards/dm9records/lain/config.h12
-rw-r--r--keyboards/dm9records/lain/info.json110
-rw-r--r--keyboards/dm9records/lain/lain.h22
-rw-r--r--keyboards/dm9records/plaid/config.h17
-rw-r--r--keyboards/dm9records/plaid/info.json208
-rw-r--r--keyboards/dm9records/plaid/plaid.c16
-rw-r--r--keyboards/dm9records/plaid/plaid.h30
-rw-r--r--keyboards/dm9records/tartan/config.h17
-rw-r--r--keyboards/dm9records/tartan/info.json7
-rw-r--r--keyboards/dm9records/tartan/tartan.c16
14 files changed, 252 insertions, 407 deletions
diff --git a/keyboards/dm9records/ergoinu/config.h b/keyboards/dm9records/ergoinu/config.h
index 43e53608e9..7ca2b8cded 100644
--- a/keyboards/dm9records/ergoinu/config.h
+++ b/keyboards/dm9records/ergoinu/config.h
@@ -24,17 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
// #define EE_HANDS
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { B4, E6, D7, C6, D4, F5, F4 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* ws2812 RGB LED */
-#define RGB_DI_PIN B6
-
#define RGBLED_NUM 7
#ifndef IOS_DEVICE_ENABLE
diff --git a/keyboards/dm9records/ergoinu/ergoinu.c b/keyboards/dm9records/ergoinu/ergoinu.c
deleted file mode 100644
index a01ac0a25c..0000000000
--- a/keyboards/dm9records/ergoinu/ergoinu.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2018 Takuya Urakawa<twitter:@hsgw>
-
-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 "ergoinu.h"
diff --git a/keyboards/dm9records/ergoinu/ergoinu.h b/keyboards/dm9records/ergoinu/ergoinu.h
deleted file mode 100644
index c275d3fa27..0000000000
--- a/keyboards/dm9records/ergoinu/ergoinu.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 Takuya Urakawa<twitter:@hsgw>
-
-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( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, L13, R07, R08, R09, R10, R11, R12, R13, \
- L14, L15, L16, L17, L18, L19, R14, R15, R16, R17, R18, R19, R20, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27,\
- L26, L27, L28, L29, L30, R28, R29, R30, R31, R32 \
- ) { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12, L13 }, \
- { L14, KC_NO, L15, L16, L17, L18, L19 }, \
- { L20, KC_NO, L21, L22, L23, L24, L25 }, \
- { KC_NO, KC_NO, L26, L27, L28, L29, L30}, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R13, R12, R11, R10, R09, R08, R07 }, \
- { R20, R19, R18, R17, R16, R15, R14 }, \
- { R27, R26, R25, R24, R23, R22, R21 }, \
- { KC_NO, KC_NO, R32, R31, R30, R29, R28 } \
- }
diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json
index 38f18f0cc1..1813baa241 100644
--- a/keyboards/dm9records/ergoinu/info.json
+++ b/keyboards/dm9records/ergoinu/info.json
@@ -8,87 +8,95 @@
"pid": "0xEE60",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B4", "E6", "D7", "C6", "D4", "F5", "F4"],
+ "rows": ["F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "B6"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 0, "y": 0.6, "label": "ESC" },
- { "x": 1, "y": 0.4, "label": "1" },
- { "x": 2, "y": 0.4, "label": "2" },
- { "x": 3, "y": 0.25, "label": "3" },
- { "x": 4, "y": 0, "label": "4" },
- { "x": 5, "y": 0.25, "label": "5" },
- { "x": 6, "y": 0.4, "label": "6" },
+ {"matrix": [0, 0], "x": 0, "y": 0.6},
+ {"matrix": [0, 1], "x": 1, "y": 0.4},
+ {"matrix": [0, 2], "x": 2, "y": 0.4},
+ {"matrix": [0, 3], "x": 3, "y": 0.25},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0.25},
+ {"matrix": [0, 6], "x": 6, "y": 0.4},
- { "x": 11, "y": 0.4, "label": "7" },
- { "x": 12, "y": 0.25, "label": "8" },
- { "x": 13, "y": 0, "label": "9" },
- { "x": 14, "y": 0.25, "label": "0" },
- { "x": 15, "y": 0.4, "label": "MINUS" },
- { "x": 16, "y": 0.4, "label": "EQUAL" },
- { "x": 17, "y": 0.6, "label": "BACKSLASH" },
+ {"matrix": [5, 6], "x": 11, "y": 0.4},
+ {"matrix": [5, 5], "x": 12, "y": 0.25},
+ {"matrix": [5, 4], "x": 13, "y": 0},
+ {"matrix": [5, 3], "x": 14, "y": 0.25},
+ {"matrix": [5, 2], "x": 15, "y": 0.4},
+ {"matrix": [5, 1], "x": 16, "y": 0.4},
+ {"matrix": [5, 0], "x": 17, "y": 0.6},
- { "x": 0, "y": 1.6, "label": "DELETE" },
- { "x": 1, "y": 1.4, "label": "TAB" },
- { "x": 2, "y": 1.4, "label": "Q" },
- { "x": 3, "y": 1.25, "label": "W" },
- { "x": 4, "y": 1, "label": "E" },
- { "x": 5, "y": 1.25, "label": "R" },
- { "x": 6, "y": 1.4, "label": "T" },
+ {"matrix": [1, 0], "x": 0, "y": 1.6},
+ {"matrix": [1, 1], "x": 1, "y": 1.4},
+ {"matrix": [1, 2], "x": 2, "y": 1.4},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.4},
- { "x": 11, "y": 1.4, "label": "Y" },
- { "x": 12, "y": 1.25, "label": "U" },
- { "x": 13, "y": 1, "label": "I" },
- { "x": 14, "y": 1.25, "label": "O" },
- { "x": 15, "y": 1.4, "label": "P" },
- { "x": 16, "y": 1.4, "label": "LBRACKET" },
- { "x": 17, "y": 1.6, "label": "RBRACKET" },
+ {"matrix": [6, 6], "x": 11, "y": 1.4},
+ {"matrix": [6, 5], "x": 12, "y": 1.25},
+ {"matrix": [6, 4], "x": 13, "y": 1},
+ {"matrix": [6, 3], "x": 14, "y": 1.25},
+ {"matrix": [6, 2], "x": 15, "y": 1.4},
+ {"matrix": [6, 1], "x": 16, "y": 1.4},
+ {"matrix": [6, 0], "x": 17, "y": 1.6},
- { "x": 0.25, "y": 2.6, "w": 1.75, "label": "LCTRL" },
- { "x": 2, "y": 2.4, "label": "A" },
- { "x": 3, "y": 2.25, "label": "S" },
- { "x": 4, "y": 2, "label": "D" },
- { "x": 5, "y": 2.25, "label": "F" },
- { "x": 6, "y": 2.4, "label": "G" },
+ {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75},
+ {"matrix": [2, 2], "x": 2, "y": 2.4},
+ {"matrix": [2, 3], "x": 3, "y": 2.25},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6, "y": 2.4},
- { "x": 11, "y": 2.4, "label": "H" },
- { "x": 12, "y": 2.25, "label": "J" },
- { "x": 13, "y": 2, "label": "K" },
- { "x": 14, "y": 2.25, "label": "L" },
- { "x": 15, "y": 2.4, "label": "SEMICOLON" },
- { "x": 16, "y": 2.4, "label": "QUOTE" },
- { "x": 17, "y": 2.6, "label": "GRAVE" },
+ {"matrix": [7, 6], "x": 11, "y": 2.4},
+ {"matrix": [7, 5], "x": 12, "y": 2.25},
+ {"matrix": [7, 4], "x": 13, "y": 2},
+ {"matrix": [7, 3], "x": 14, "y": 2.25},
+ {"matrix": [7, 2], "x": 15, "y": 2.4},
+ {"matrix": [7, 1], "x": 16, "y": 2.4},
+ {"matrix": [7, 0], "x": 17, "y": 2.6},
- { "x": 0.25, "y": 3.6, "w": 1.75, "label": "LSHIFT" },
- { "x": 2, "y": 3.4, "label": "Z" },
- { "x": 3, "y": 3.25, "label": "X" },
- { "x": 4, "y": 3, "label": "C" },
- { "x": 5, "y": 3.25, "label": "V" },
- { "x": 6, "y": 3.4, "label": "B" },
+ {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75},
+ {"matrix": [3, 2], "x": 2, "y": 3.4},
+ {"matrix": [3, 3], "x": 3, "y": 3.25},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6, "y": 3.4},
- { "x": 11, "y": 3.4, "label": "N" },
- { "x": 12, "y": 3.25, "label": "M" },
- { "x": 13, "y": 3, "label": "COMMA" },
- { "x": 14, "y": 3.25, "label": "DOT" },
- { "x": 15, "y": 3.4, "label": "SLASH" },
- { "x": 16, "y": 3.4, "label": "RSHIFT" },
- { "x": 17, "y": 3.6, "label": "RSHIFT" },
+ {"matrix": [8, 6], "x": 11, "y": 3.4},
+ {"matrix": [8, 5], "x": 12, "y": 3.25},
+ {"matrix": [8, 4], "x": 13, "y": 3},
+ {"matrix": [8, 3], "x": 14, "y": 3.25},
+ {"matrix": [8, 2], "x": 15, "y": 3.4},
+ {"matrix": [8, 1], "x": 16, "y": 3.4},
+ {"matrix": [8, 0], "x": 17, "y": 3.6},
- { "x": 3, "y": 4.25, "label": "MO(META)" },
- { "x": 4, "y": 4, "label": "LALT" },
- { "x": 5, "y": 4.25, "label": "LGUI" },
- { "x": 6, "y": 4.4, "label": "ENT" },
- { "x": 7, "y": 4.4, "w": 1.5, "label": "SPACE" },
+ {"matrix": [4, 2], "x": 3, "y": 4.25},
+ {"matrix": [4, 3], "x": 4, "y": 4},
+ {"matrix": [4, 4], "x": 5, "y": 4.25},
+ {"matrix": [4, 5], "x": 6, "y": 4.4},
+ {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5},
- { "x": 9.5, "y": 4.4, "w": 1.5, "label": "ENTER" },
- { "x": 11, "y": 4.4, "label": "BACKSPACE" },
- { "x": 12, "y": 4.25, "label": "RGUI" },
- { "x": 13, "y": 4, "label": "RALT" },
- { "x": 14, "y": 4.25, "label": "MO(META)" }
+ {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5},
+ {"matrix": [9, 5], "x": 11, "y": 4.4},
+ {"matrix": [9, 4], "x": 12, "y": 4.25},
+ {"matrix": [9, 3], "x": 13, "y": 4},
+ {"matrix": [9, 2], "x": 14, "y": 4.25}
]
}
}
diff --git a/keyboards/dm9records/lain/config.h b/keyboards/dm9records/lain/config.h
index bf9fce0889..e34b4d34ab 100644
--- a/keyboards/dm9records/lain/config.h
+++ b/keyboards/dm9records/lain/config.h
@@ -3,18 +3,6 @@
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- */
-#define MATRIX_ROW_PINS \
- { C6, D7, D6, D4 }
-#define MATRIX_COL_PINS \
- { C7, F7, F6, F5, F4, F1, F0, B3, B2, B1, D2, D3, D5 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* LED Settings */
#define LED_NUM 3
#define LED_PINS \
diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json
index 6ef0d21391..8ae8a33b44 100644
--- a/keyboards/dm9records/lain/info.json
+++ b/keyboards/dm9records/lain/info.json
@@ -8,60 +8,72 @@
"pid": "0xE8F4",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "D2", "D3", "D5"],
+ "rows": ["C6", "D7", "D6", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "x": 0, "y": 0 },
- { "x": 1, "y": 0 },
- { "x": 2, "y": 0 },
- { "x": 3, "y": 0 },
- { "x": 4, "y": 0 },
- { "x": 5, "y": 0 },
- { "x": 6, "y": 0 },
- { "x": 8.5, "y": 0 },
- { "x": 9.5, "y": 0 },
- { "x": 10.5, "y": 0 },
- { "x": 11.5, "y": 0 },
- { "x": 12.5, "y": 0 },
- { "x": 13.5, "y": 0, "w": 1.5 },
- { "x": 0.25, "y": 1 },
- { "x": 1.25, "y": 1 },
- { "x": 2.25, "y": 1 },
- { "x": 3.25, "y": 1 },
- { "x": 4.25, "y": 1 },
- { "x": 5.25, "y": 1 },
- { "x": 6.25, "y": 1 },
- { "x": 8.75, "y": 1 },
- { "x": 9.75, "y": 1 },
- { "x": 10.75, "y": 1 },
- { "x": 11.75, "y": 1 },
- { "x": 12.75, "y": 1 },
- { "x": 13.75, "y": 1 },
- { "x": 0.5, "y": 2, "w": 1.25 },
- { "x": 1.75, "y": 2 },
- { "x": 2.75, "y": 2 },
- { "x": 3.75, "y": 2 },
- { "x": 4.75, "y": 2 },
- { "x": 5.75, "y": 2 },
- { "x": 8.25, "y": 2 },
- { "x": 9.25, "y": 2 },
- { "x": 10.25, "y": 2 },
- { "x": 11.25, "y": 2 },
- { "x": 12.25, "y": 2 },
- { "x": 13.25, "y": 2, "w": 1.25 },
- { "x": 1, "y": 3, "w": 1.75 },
- { "x": 2.75, "y": 3, "w": 1.25 },
- { "x": 4, "y": 3 },
- { "x": 5, "y": 3, "w": 1.25 },
- { "x": 6.25, "y": 3 },
- { "x": 7.75, "y": 3 },
- { "x": 8.75, "y": 3, "w": 1.25 },
- { "x": 10, "y": 3 },
- { "x": 11, "y": 3 },
- { "x": 12, "y": 3 },
- { "x": 13, "y": 3, "w": 1.25 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+ {"matrix": [0, 9], "x": 10.5, "y": 0},
+ {"matrix": [0, 10], "x": 11.5, "y": 0},
+ {"matrix": [0, 11], "x": 12.5, "y": 0},
+ {"matrix": [0, 12], "x": 13.5, "y": 0, "w": 1.5},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+ {"matrix": [1, 6], "x": 6.25, "y": 1},
+
+ {"matrix": [1, 7], "x": 8.75, "y": 1},
+ {"matrix": [1, 8], "x": 9.75, "y": 1},
+ {"matrix": [1, 9], "x": 10.75, "y": 1},
+ {"matrix": [1, 10], "x": 11.75, "y": 1},
+ {"matrix": [1, 11], "x": 12.75, "y": 1},
+ {"matrix": [1, 12], "x": 13.75, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [2, 7], "x": 8.25, "y": 2},
+ {"matrix": [2, 8], "x": 9.25, "y": 2},
+ {"matrix": [2, 9], "x": 10.25, "y": 2},
+ {"matrix": [2, 10], "x": 11.25, "y": 2},
+ {"matrix": [2, 11], "x": 12.25, "y": 2},
+ {"matrix": [2, 12], "x": 13.25, "y": 2, "w": 1.25},
+
+ {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75},
+ {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25},
+ {"matrix": [3, 9], "x": 10, "y": 3},
+ {"matrix": [3, 10], "x": 11, "y": 3},
+ {"matrix": [3, 11], "x": 12, "y": 3},
+ {"matrix": [3, 12], "x": 13, "y": 3, "w": 1.25}
]
}
}
diff --git a/keyboards/dm9records/lain/lain.h b/keyboards/dm9records/lain/lain.h
index e449416e50..ae0671a943 100644
--- a/keyboards/dm9records/lain/lain.h
+++ b/keyboards/dm9records/lain/lain.h
@@ -17,25 +17,3 @@ extern keyboard_config_t lain_config;
void lain_set_led(uint8_t no, bool flag);
void lain_enable_leds(bool flag);
void lain_enable_leds_toggle(void);
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-// clang-format off
-#define LAYOUT( \
- k01,k02,k03,k04,k05,k06,k07, k08,k09,k10,k11,k12,k13, \
- k14,k15,k16,k17,k18,k19,k20, k21,k22,k23,k24,k25,k26, \
- k27,k28,k29,k30,k31,k32, k33,k34,k35,k36,k37,k38, \
- k39,k40,k41,k42,k43, k44,k45,k46,k47,k48,k49) \
- { \
- {k01, k02, k03,k04,k05,k06,k07, k08,k09,k10,k11,k12,k13}, \
- {k14, k15, k16,k17,k18,k19,k20, k21,k22,k23,k24,k25,k26}, \
- {k27, k28, k29,k30,k31,k32,KC_NO, k33,k34,k35,k36,k37,k38}, \
- {KC_NO,k39, k40,k41,k42,k43,KC_NO, k44,k45,k46,k47,k48,k49} \
- }
-// clang-format on
diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index e808946006..b4b541dbfc 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B3, D4 }
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1, D0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define USB_MAX_POWER_CONSUMPTION 100
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/info.json
index f0e3577e5f..cedf1fae5d 100644
--- a/keyboards/dm9records/plaid/info.json
+++ b/keyboards/dm9records/plaid/info.json
@@ -8,110 +8,128 @@
"pid": "0x27DB",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1", "D0"],
+ "rows": ["B4", "B5", "B3", "D4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega328p",
"bootloader": "usbasploader",
"community_layouts": ["ortho_4x12", "planck_mit"],
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_ortho_4x12",
+ "LAYOUT_plaid_grid": "LAYOUT_ortho_4x12",
+ "LAYOUT_plaid_mit": "LAYOUT_planck_mit"
+ },
"layouts": {
"LAYOUT_planck_mit": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 8, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 8, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 8, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 2, "x": 5, "y": 3 },
- { "w": 1, "x": 7, "y": 3 },
- { "w": 1, "x": 8, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "x": 11, "y": 3 } ]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
},
"LAYOUT_ortho_4x12": {
"layout": [
- { "w": 1, "x": 0, "y": 0 },
- { "w": 1, "x": 1, "y": 0 },
- { "w": 1, "x": 2, "y": 0 },
- { "w": 1, "x": 3, "y": 0 },
- { "w": 1, "x": 4, "y": 0 },
- { "w": 1, "x": 5, "y": 0 },
- { "w": 1, "x": 6, "y": 0 },
- { "w": 1, "x": 7, "y": 0 },
- { "w": 1, "x": 8, "y": 0 },
- { "w": 1, "x": 9, "y": 0 },
- { "w": 1, "x": 10, "y": 0 },
- { "w": 1, "x": 11, "y": 0 },
- { "w": 1, "x": 0, "y": 1 },
- { "w": 1, "x": 1, "y": 1 },
- { "w": 1, "x": 2, "y": 1 },
- { "w": 1, "x": 3, "y": 1 },
- { "w": 1, "x": 4, "y": 1 },
- { "w": 1, "x": 5, "y": 1 },
- { "w": 1, "x": 6, "y": 1 },
- { "w": 1, "x": 7, "y": 1 },
- { "w": 1, "x": 8, "y": 1 },
- { "w": 1, "x": 9, "y": 1 },
- { "w": 1, "x": 10, "y": 1 },
- { "w": 1, "x": 11, "y": 1 },
- { "w": 1, "x": 0, "y": 2 },
- { "w": 1, "x": 1, "y": 2 },
- { "w": 1, "x": 2, "y": 2 },
- { "w": 1, "x": 3, "y": 2 },
- { "w": 1, "x": 4, "y": 2 },
- { "w": 1, "x": 5, "y": 2 },
- { "w": 1, "x": 6, "y": 2 },
- { "w": 1, "x": 7, "y": 2 },
- { "w": 1, "x": 8, "y": 2 },
- { "w": 1, "x": 9, "y": 2 },
- { "w": 1, "x": 10, "y": 2 },
- { "w": 1, "x": 11, "y": 2 },
- { "w": 1, "x": 0, "y": 3 },
- { "w": 1, "x": 1, "y": 3 },
- { "w": 1, "x": 2, "y": 3 },
- { "w": 1, "x": 3, "y": 3 },
- { "w": 1, "x": 4, "y": 3 },
- { "w": 1, "x": 5, "y": 3 },
- { "w": 1, "x": 6, "y": 3 },
- { "w": 1, "x": 7, "y": 3 },
- { "w": 1, "x": 8, "y": 3 },
- { "w": 1, "x": 9, "y": 3 },
- { "w": 1, "x": 10, "y": 3 },
- { "w": 1, "x": 11, "y": 3 } ]
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/dm9records/plaid/plaid.c b/keyboards/dm9records/plaid/plaid.c
deleted file mode 100644
index 50da81950e..0000000000
--- a/keyboards/dm9records/plaid/plaid.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.com)
- *
- * 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 "plaid.h"
diff --git a/keyboards/dm9records/plaid/plaid.h b/keyboards/dm9records/plaid/plaid.h
index 2969967884..6687db5522 100644
--- a/keyboards/dm9records/plaid/plaid.h
+++ b/keyboards/dm9records/plaid/plaid.h
@@ -18,35 +18,5 @@
#include "quantum.h"
-#define LAYOUT_planck_mit( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT_ortho_4x12( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
-}
-
-#define LAYOUT LAYOUT_ortho_4x12
-#define LAYOUT_plaid_grid LAYOUT_ortho_4x12
-#define LAYOUT_plaid_mit LAYOUT_planck_mit
-
#define LED_RED C5
#define LED_GREEN C4
diff --git a/keyboards/dm9records/tartan/config.h b/keyboards/dm9records/tartan/config.h
index 53f1566252..71400c3cf8 100644
--- a/keyboards/dm9records/tartan/config.h
+++ b/keyboards/dm9records/tartan/config.h
@@ -17,23 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B4, B5, B3, B0, C0 }
-#define MATRIX_COL_PINS { D7, D6, D5, D4, B1, B2, C1, C2, C3, C5, D1, D0, C4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/info.json
index 24fad8a9ff..e6425edb3d 100644
--- a/keyboards/dm9records/tartan/info.json
+++ b/keyboards/dm9records/tartan/info.json
@@ -8,6 +8,11 @@
"pid": "0x27DB",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D7", "D6", "D5", "D4", "B1", "B2", "C1", "C2", "C3", "C5", "D1", "D0", "C4"],
+ "rows": ["B4", "B5", "B3", "B0", "C0"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega328p",
"bootloader": "usbasploader",
"community_layouts": ["60_ansi", "60_ansi_split_bs_rshift", "60_iso", "60_iso_split_bs_rshift"],
@@ -16,7 +21,7 @@
"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
},
"LAYOUT_60_ansi_split_bs": {
- "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":1}, {"label":"", "x":14, "y":0, "w":1}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+ "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"label":"", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
},
"LAYOUT_60_ansi_split_bs_rshift": {
"layout": [{"label":"ESC", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"BS", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
diff --git a/keyboards/dm9records/tartan/tartan.c b/keyboards/dm9records/tartan/tartan.c
deleted file mode 100644
index b702633cc9..0000000000
--- a/keyboards/dm9records/tartan/tartan.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Takuya Urakawa (dm9records.com)
- *
- * 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 "tartan.h"