summaryrefslogtreecommitdiff
path: root/keyboards/sidderskb/majbritt
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/sidderskb/majbritt')
-rw-r--r--keyboards/sidderskb/majbritt/rev1/config.h38
-rw-r--r--keyboards/sidderskb/majbritt/rev1/info.json153
-rw-r--r--keyboards/sidderskb/majbritt/rev1/rev1.c21
-rw-r--r--keyboards/sidderskb/majbritt/rev1/rev1.h35
-rw-r--r--keyboards/sidderskb/majbritt/rev2/config.h8
-rw-r--r--keyboards/sidderskb/majbritt/rev2/info.json155
-rw-r--r--keyboards/sidderskb/majbritt/rev2/rev2.c17
-rw-r--r--keyboards/sidderskb/majbritt/rev2/rev2.h41
8 files changed, 171 insertions, 297 deletions
diff --git a/keyboards/sidderskb/majbritt/rev1/config.h b/keyboards/sidderskb/majbritt/rev1/config.h
deleted file mode 100644
index 9a8b654abf..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright 2020 MechMerlin
-
-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
-
-
-/*
- * 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 { D0, D1, D2, D3, D5 }
-#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B0, B7, B5, B4, D7, D6, B3 }
-
-#define DIODE_DIRECTION COL2ROW
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json
index 890bb5a5cb..bcbac9b10c 100644
--- a/keyboards/sidderskb/majbritt/rev1/info.json
+++ b/keyboards/sidderskb/majbritt/rev1/info.json
@@ -8,78 +8,97 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B0", "B7", "B5", "B4", "D7", "D6", "B3"],
+ "rows": ["D0", "D1", "D2", "D3", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"K00 (D0,F0)", "x":0.75, "y":0.25},
- {"label":"K01 (D0,F1)", "x":1.75, "y":0.25},
- {"label":"K02 (D0,E6)", "x":2.75, "y":0.25},
- {"label":"K03 (D0,C7)", "x":4, "y":0.25},
- {"label":"K04 (D0,C6)", "x":5, "y":0.25},
- {"label":"K05 (D0,B6)", "x":6, "y":0.25},
- {"label":"K06 (D0,D4)", "x":7, "y":0.25},
- {"label":"K07 (D0,B1)", "x":8.75, "y":0.25},
- {"label":"K08 (D0,B0)", "x":9.75, "y":0.25},
- {"label":"K09 (D0,B7)", "x":10.75, "y":0.25},
- {"label":"K0A (D0,B5)", "x":11.75, "y":0.25},
- {"label":"K0B (D0,B4)", "x":13, "y":0.25},
- {"label":"K0C (D0,D7)", "x":14, "y":0.25},
- {"label":"K0D (D0,D6)", "x":15, "y":0.25, "w":2},
- {"label":"K1E (D1,B3)", "x":17.25, "y":0},
- {"label":"K10 (D1,F0)", "x":0.5, "y":1.25, "w":1.5},
- {"label":"K11 (D1,F1)", "x":2, "y":1.25},
- {"label":"K12 (D1,E6)", "x":3.25, "y":1.25},
- {"label":"K13 (D1,C7)", "x":4.25, "y":1.25},
- {"label":"K14 (D1,C6)", "x":5.25, "y":1.25},
- {"label":"K15 (D1,B6)", "x":6.25, "y":1.25},
- {"label":"K16 (D1,D4)", "x":8.5, "y":1.25},
- {"label":"K17 (D1,B1)", "x":9.5, "y":1.25},
- {"label":"K18 (D1,B0)", "x":10.5, "y":1.25},
- {"label":"K19 (D1,B7)", "x":11.5, "y":1.25},
- {"label":"K1A (D1,B5)", "x":12.5, "y":1.25},
- {"label":"K1B (D1,B4)", "x":13.75, "y":1.25},
- {"label":"K1C (D1,D7)", "x":14.75, "y":1.25},
- {"label":"K1D (D1,D6)", "x":16, "y":1.25, "w":1.25, "h":2},
- {"label":"K2E (D2,B3)", "x":17.5, "y":1},
- {"label":"K20 (D2,F0)", "x":0.25, "y":2.25, "w":1.75},
- {"label":"K21 (D2,F1)", "x":2, "y":2.25},
- {"label":"K22 (D2,E6)", "x":3.5, "y":2.25},
- {"label":"K23 (D2,C7)", "x":4.5, "y":2.25},
- {"label":"K24 (D2,C6)", "x":5.5, "y":2.25},
- {"label":"K25 (D2,B6)", "x":6.5, "y":2.25},
- {"label":"K26 (D2,D4)", "x":8.75, "y":2.25},
- {"label":"K27 (D2,B1)", "x":9.75, "y":2.25},
- {"label":"K28 (D2,B0)", "x":10.75, "y":2.25},
- {"label":"K29 (D2,B7)", "x":11.75, "y":2.25},
- {"label":"K2A (D2,B5)", "x":13, "y":2.25},
- {"label":"K2B (D2,B4)", "x":14, "y":2.25},
- {"label":"K2C (D2,D7)", "x":15, "y":2.25},
- {"label":"K3E (D3,B3)", "x":17.75, "y":2},
- {"label":"K30 (D3,F0)", "x":0, "y":3.25, "w":1.25},
- {"label":"K41 (D5,F1)", "x":1.25, "y":3.25},
- {"label":"K31 (D3,F1)", "x":2.25, "y":3.25},
- {"label":"K32 (D3,E6)", "x":3.75, "y":3.25},
- {"label":"K33 (D3,C7)", "x":4.75, "y":3.25},
- {"label":"K34 (D3,C6)", "x":5.75, "y":3.25},
- {"label":"K35 (D3,B6)", "x":6.75, "y":3.25},
- {"label":"K36 (D3,D4)", "x":9, "y":3.25},
- {"label":"K37 (D3,B1)", "x":10, "y":3.25},
- {"label":"K38 (D3,B0)", "x":11, "y":3.25},
- {"label":"K39 (D3,B7)", "x":12, "y":3.25},
- {"label":"K3A (D3,B5)", "x":13.5, "y":3.25},
- {"label":"K3B (D3,B4)", "x":14.5, "y":3.25, "w":1.75},
- {"label":"K3D (D3,D6)", "x":16.5, "y":3.5},
- {"label":"K40 (D5,F0)", "x":0, "y":4.25, "w":1.5},
- {"label":"K42 (D5,E6)", "x":3.75, "y":4.25, "w":1.5},
- {"label":"K44 (D5,C6)", "x":5.25, "y":4.25, "w":2},
- {"label":"K45 (D5,B6)", "x":7.25, "y":4.25},
- {"label":"K47 (D5,B1)", "x":8.5, "y":4.25, "w":2.75},
- {"label":"K49 (D5,B7)", "x":11.25, "y":4.25, "w":1.5},
- {"label":"K4C (D5,D7)", "x":15.5, "y":4.5},
- {"label":"K4D (D5,D6)", "x":16.5, "y":4.5},
- {"label":"K4E (D5,B3)", "x":17.5, "y":4.5}
+ {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+ {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+ {"matrix": [0, 2], "x": 2.75, "y": 0.25},
+ {"matrix": [0, 3], "x": 4, "y": 0.25},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+ {"matrix": [0, 5], "x": 6, "y": 0.25},
+ {"matrix": [0, 6], "x": 7, "y": 0.25},
+
+ {"matrix": [0, 7], "x": 8.75, "y": 0.25},
+ {"matrix": [0, 8], "x": 9.75, "y": 0.25},
+ {"matrix": [0, 9], "x": 10.75, "y": 0.25},
+ {"matrix": [0, 10], "x": 11.75, "y": 0.25},
+ {"matrix": [0, 11], "x": 13, "y": 0.25},
+ {"matrix": [0, 12], "x": 14, "y": 0.25},
+ {"matrix": [0, 13], "x": 15, "y": 0.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1.25},
+ {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+ {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+ {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+ {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 8.5, "y": 1.25},
+ {"matrix": [1, 7], "x": 9.5, "y": 1.25},
+ {"matrix": [1, 8], "x": 10.5, "y": 1.25},
+ {"matrix": [1, 9], "x": 11.5, "y": 1.25},
+ {"matrix": [1, 10], "x": 12.5, "y": 1.25},
+ {"matrix": [1, 11], "x": 13.75, "y": 1.25},
+ {"matrix": [1, 12], "x": 14.75, "y": 1.25},
+ {"matrix": [1, 13], "x": 16, "y": 1.25, "w": 1.25, "h": 2},
+
+ {"matrix": [2, 14], "x": 17.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.25},
+ {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 8.75, "y": 2.25},
+ {"matrix": [2, 7], "x": 9.75, "y": 2.25},
+ {"matrix": [2, 8], "x": 10.75, "y": 2.25},
+ {"matrix": [2, 9], "x": 11.75, "y": 2.25},
+ {"matrix": [2, 10], "x": 13, "y": 2.25},
+ {"matrix": [2, 11], "x": 14, "y": 2.25},
+ {"matrix": [2, 12], "x": 15, "y": 2.25},
+
+ {"matrix": [3, 14], "x": 17.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 3.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 2], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 6.75, "y": 3.25},
+
+ {"matrix": [3, 6], "x": 9, "y": 3.25},
+ {"matrix": [3, 7], "x": 10, "y": 3.25},
+ {"matrix": [3, 8], "x": 11, "y": 3.25},
+ {"matrix": [3, 9], "x": 12, "y": 3.25},
+ {"matrix": [3, 10], "x": 13.5, "y": 3.25},
+ {"matrix": [3, 11], "x": 14.5, "y": 3.25, "w": 1.75},
+
+ {"matrix": [3, 13], "x": 16.5, "y": 3.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2},
+ {"matrix": [4, 5], "x": 7.25, "y": 4.25},
+
+ {"matrix": [4, 7], "x": 8.5, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 9], "x": 11.25, "y": 4.25, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.5, "y": 4.5},
+ {"matrix": [4, 13], "x": 16.5, "y": 4.5},
+ {"matrix": [4, 14], "x": 17.5, "y": 4.5}
]
}
}
diff --git a/keyboards/sidderskb/majbritt/rev1/rev1.c b/keyboards/sidderskb/majbritt/rev1/rev1.c
deleted file mode 100644
index 79b2c9e601..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/rev1.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * 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 "rev1.h"
-
-
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev1/rev1.h b/keyboards/sidderskb/majbritt/rev1/rev1.h
deleted file mode 100644
index 5d49640efc..0000000000
--- a/keyboards/sidderskb/majbritt/rev1/rev1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 MechMerlin
- *
- * 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( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3E,\
- K30, K41, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
- K40, K42, K44, K45, K47, K49, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \
- { K40, K41, K42, KC_NO, K44, K45, KC_NO, K47, KC_NO, K49, KC_NO, KC_NO, K4C, K4D, K4E }, \
-}
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/sidderskb/majbritt/rev2/config.h b/keyboards/sidderskb/majbritt/rev2/config.h
index c0c6902e3b..ced239c833 100644
--- a/keyboards/sidderskb/majbritt/rev2/config.h
+++ b/keyboards/sidderskb/majbritt/rev2/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
- //0 , 1 , 2 , 3 , 4 , 5 , 6 , 7 , 8 , 9 , 10, 11, 12, 13, 14 ,15
-#define MATRIX_ROW_PINS { B0, B1, F7, C6, B5}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, C7, B6, D6, B4, D4, D7, D5 ,D3, D2, D1, D0}
-
-/* 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/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json
index 2ba227e4a8..cced270ff8 100644
--- a/keyboards/sidderskb/majbritt/rev2/info.json
+++ b/keyboards/sidderskb/majbritt/rev2/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.2"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "C7", "B6", "D6", "B4", "D4", "D7", "D5", "D3", "D2", "D1", "D0"],
+ "rows": ["B0", "B1", "F7", "C6", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B7"}
@@ -18,76 +23,86 @@
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Esc", "x": 0.75, "y": 0 },
- { "label": "!", "x": 1.75, "y": 0 },
- { "label": "\"", "x": 2.75, "y": 0 },
- { "label": "\u00a3", "x": 3.75, "y": 0 },
- { "label": "$", "x": 4.75, "y": 0 },
- { "label": "%", "x": 5.75, "y": 0 },
- { "label": "^", "x": 6.75, "y": 0 },
- { "label": "&", "x": 8.5, "y": 0 },
- { "label": "*", "x": 9.5, "y": 0 },
- { "label": "(", "x": 10.5, "y": 0 },
- { "label": ")", "x": 11.5, "y": 0 },
- { "label": "_", "x": 12.5, "y": 0 },
- { "label": "+", "x": 13.5, "y": 0 },
- { "label": "|", "x": 14.5, "y": 0 },
- { "label": "~", "x": 15.5, "y": 0 },
- { "label": "Del", "x": 16.5, "y": 0 },
- { "label": "Tab", "w": 1.5, "x": 0.5, "y": 1 },
- { "label": "Q", "x": 2, "y": 1 },
- { "label": "W", "x": 3, "y": 1 },
- { "label": "E", "x": 4, "y": 1 },
- { "label": "R", "x": 5, "y": 1 },
- { "label": "T", "x": 6, "y": 1 },
- { "label": "Y", "x": 8, "y": 1 },
- { "label": "U", "x": 9, "y": 1 },
- { "label": "I", "x": 10, "y": 1 },
- { "label": "O", "x": 11, "y": 1 },
- { "label": "P", "x": 12, "y": 1 },
- { "label": "{", "x": 13, "y": 1 },
- { "label": "}", "x": 14, "y": 1 },
- { "label": "Enter", "w": 1.5, "x": 15, "y": 1 },
- { "label": "Pgup", "x": 16.5, "y": 1 },
- { "label": "Caps Lock", "w": 1.75, "x": 0.25, "y": 2 },
- { "label": "A", "x": 2, "y": 2 },
- { "label": "S", "x": 3, "y": 2 },
- { "label": "D", "x": 4, "y": 2 },
- { "label": "F", "x": 5, "y": 2 },
- { "label": "G", "x": 6, "y": 2 },
- { "label": "H", "x": 8.25, "y": 2 },
- { "label": "J", "x": 9.25, "y": 2 },
- { "label": "K", "x": 10.25, "y": 2 },
- { "label": "L", "x": 11.25, "y": 2 },
- { "label": ":", "x": 12.25, "y": 2 },
- { "label": "@", "x": 13.25, "y": 2 },
- { "label": "~", "x": 14.25, "y": 2 },
- { "label": "Enter", "w": 1.25, "x": 15.25, "y": 2 },
- { "label": "Pgdn", "x": 16.5, "y": 2 },
- { "label": "Shift", "w": 1.25, "x": 0, "y": 3 },
- { "label": "|", "x": 1.25, "y": 3 },
- { "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": 8.75, "y": 3 },
- { "label": "M", "x": 9.75, "y": 3 },
- { "label": "<", "x": 10.75, "y": 3 },
- { "label": ">", "x": 11.75, "y": 3 },
- { "label": "?", "x": 12.75, "y": 3 },
- { "label": "Shift", "w": 1.75, "x": 13.75, "y": 3 },
- { "label": "Up", "x": 15.5, "y": 3 },
- { "label": "Fn", "x": 16.5, "y": 3 },
- { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 },
- { "label": "Alt", "w": 1.5, "x": 3, "y": 4 },
- { "label": "LSpace", "w": 2.25, "x": 4.5, "y": 4 },
- { "label": "Fn", "x": 6.75, "y": 4 },
- { "label": "RSpace", "w": 2.75, "x": 8.25, "y": 4 },
- { "label": "AltGr", "w": 1.5, "x": 11, "y": 4 },
- { "label": "Left", "x": 14.5, "y": 4 },
- { "label": "Down", "x": 15.5, "y": 4 },
- { "label": "Right", "x": 16.5, "y": 4 }
+ {"matrix": [0, 0], "x": 0.75, "y": 0},
+ {"matrix": [0, 1], "x": 1.75, "y": 0},
+ {"matrix": [0, 2], "x": 2.75, "y": 0},
+ {"matrix": [0, 3], "x": 3.75, "y": 0},
+ {"matrix": [0, 4], "x": 4.75, "y": 0},
+ {"matrix": [0, 5], "x": 5.75, "y": 0},
+ {"matrix": [0, 6], "x": 6.75, "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},
+ {"matrix": [0, 13], "x": 14.5, "y": 0},
+ {"matrix": [0, 14], "x": 15.5, "y": 0},
+ {"matrix": [0, 15], "x": 16.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+ {"matrix": [1, 2], "x": 3, "y": 1},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1},
+ {"matrix": [1, 5], "x": 6, "y": 1},
+
+ {"matrix": [1, 7], "x": 8, "y": 1},
+ {"matrix": [1, 8], "x": 9, "y": 1},
+ {"matrix": [1, 9], "x": 10, "y": 1},
+ {"matrix": [1, 10], "x": 11, "y": 1},
+ {"matrix": [1, 11], "x": 12, "y": 1},
+ {"matrix": [1, 12], "x": 13, "y": 1},
+ {"matrix": [1, 13], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 16.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [2, 2], "x": 3, "y": 2},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "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},
+ {"matrix": [2, 13], "x": 14.25, "y": 2},
+ {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 1.25},
+ {"matrix": [2, 15], "x": 16.5, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 7], "x": 8.75, "y": 3},
+ {"matrix": [3, 8], "x": 9.75, "y": 3},
+ {"matrix": [3, 9], "x": 10.75, "y": 3},
+ {"matrix": [3, 10], "x": 11.75, "y": 3},
+ {"matrix": [3, 11], "x": 12.75, "y": 3},
+ {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.75},
+ {"matrix": [3, 14], "x": 15.5, "y": 3},
+ {"matrix": [3, 15], "x": 16.5, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25},
+ {"matrix": [4, 5], "x": 6.75, "y": 4},
+
+ {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75},
+ {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 13], "x": 14.5, "y": 4},
+ {"matrix": [4, 14], "x": 15.5, "y": 4},
+ {"matrix": [4, 15], "x": 16.5, "y": 4}
]
}
}
diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.c b/keyboards/sidderskb/majbritt/rev2/rev2.c
deleted file mode 100644
index f9120ab2a1..0000000000
--- a/keyboards/sidderskb/majbritt/rev2/rev2.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Sleepdealer
- *
- * 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 "rev2.h"
diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.h b/keyboards/sidderskb/majbritt/rev2/rev2.h
deleted file mode 100644
index a03a2ff105..0000000000
--- a/keyboards/sidderskb/majbritt/rev2/rev2.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Copyright 2021 Sleepdealer
- *
- * 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"
-
-/* 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.
- */
-#define LAYOUT( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
- K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, K315, \
- K400, K403, K404, K405, K408, K410, K413, K414, K415 \
-) {\
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
- { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
- { K200, K201, K202, K203, K204, K205, KC_NO, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \
- { K400, KC_NO, KC_NO, K403, K404, K405, KC_NO, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, K413, K414, K415 } \
-}