summaryrefslogtreecommitdiff
path: root/keyboards/majistic
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/majistic')
-rw-r--r--keyboards/majistic/config.h9
-rw-r--r--keyboards/majistic/info.json154
-rw-r--r--keyboards/majistic/majistic.c17
-rw-r--r--keyboards/majistic/majistic.h47
4 files changed, 87 insertions, 140 deletions
diff --git a/keyboards/majistic/config.h b/keyboards/majistic/config.h
index 2ff78e2bed..c896b12478 100644
--- a/keyboards/majistic/config.h
+++ b/keyboards/majistic/config.h
@@ -18,15 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, F4, F5 } // F4, F5 is dummy
-#define MATRIX_ROW_PINS_RIGHT { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS_RIGHT { B6, B2, B3, B1, F7, F6, F5, F4 }
-
-/* 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/majistic/info.json b/keyboards/majistic/info.json
index be3a1cafdd..632f34617f 100644
--- a/keyboards/majistic/info.json
+++ b/keyboards/majistic/info.json
@@ -8,80 +8,100 @@
"pid": "0x6E55",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
+ "rows": ["F6", "F7", "B1", "B3", "B2"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
- "soft_serial_pin": "D2"
+ "soft_serial_pin": "D2",
+ "matrix_pins": {
+ "right": {
+ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ }
+ },
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"1", "x":0, "y":0, "w":1.5},
- {"label":"2", "x":1.5, "y":0},
- {"label":"3", "x":2.5, "y":0},
- {"label":"4", "x":3.5, "y":0},
- {"label":"5", "x":4.5, "y":0},
- {"label":"6", "x":5.5, "y":0},
- {"label":"7", "x":7.5, "y":0},
- {"label":"8", "x":8.5, "y":0},
- {"label":"9", "x":9.5, "y":0},
- {"label":"0", "x":10.5, "y":0},
- {"label":"-", "x":11.5, "y":0},
- {"label":"^", "x":12.5, "y":0},
- {"label":"\\", "x":13.5, "y":0},
- {"label":"BS", "x":14.5, "y":0},
- {"label":"Tab", "x":0, "y":1},
- {"label":"Q", "x":1, "y":1},
- {"label":"W", "x":2, "y":1},
- {"label":"E", "x":3, "y":1},
- {"label":"R", "x":4, "y":1},
- {"label":"T", "x":5, "y":1},
- {"label":"Y", "x":7, "y":1},
- {"label":"U", "x":8, "y":1},
- {"label":"I", "x":9, "y":1},
- {"label":"O", "x":10, "y":1},
- {"label":"P", "x":11, "y":1},
- {"label":"@", "x":12, "y":1},
- {"label":"[", "x":13, "y":1},
- {"label":"Caps Lock", "x":0, "y":2, "w":1.25},
- {"label":"A", "x":1.25, "y":2},
- {"label":"S", "x":2.25, "y":2},
- {"label":"D", "x":3.25, "y":2},
- {"label":"F", "x":4.25, "y":2},
- {"label":"G", "x":5.25, "y":2},
- {"label":"H", "x":7.25, "y":2},
- {"label":"J", "x":8.25, "y":2},
- {"label":"K", "x":9.25, "y":2},
- {"label":"L", "x":10.25, "y":2},
- {"label":";", "x":11.25, "y":2},
- {"label":":", "x":12.25, "y":2},
- {"label":"]", "x":13.25, "y":2},
- {"label":"Enter", "x":14.25, "y":1, "w":1.25, "h":2},
- {"label":"Shift", "x":0, "y":3, "w":1.75},
- {"label":"Z", "x":1.75, "y":3},
- {"label":"X", "x":2.75, "y":3},
- {"label":"C", "x":3.75, "y":3},
- {"label":"V", "x":4.75, "y":3},
- {"label":"B", "x":5.75, "y":3},
- {"label":"N", "x":7.75, "y":3},
- {"label":"M", "x":8.75, "y":3},
- {"label":",", "x":9.75, "y":3},
- {"label":".", "x":10.75, "y":3},
- {"label":"/", "x":11.75, "y":3},
- {"label":"up", "x":12.75, "y":3},
- {"label":"Shift", "x":13.75, "y":3, "w":1.75},
- {"label":"Ctrl", "x":0, "y":4},
- {"label":"Alt", "x":1, "y":4},
- {"label":"command", "x":2, "y":4, "w":1.25},
- {"label":"EISU", "x":3.25, "y":4, "w":1.25},
- {"label":"", "x":4.5, "y":4, "w":1.75},
- {"label":"", "x":7.25, "y":4, "w":1.5},
- {"label":"KANA", "x":8.75, "y":4, "w":1.5},
- {"label":"command", "x":10.25, "y":4, "w":1.5},
- {"label":"left", "x":11.75, "y":4},
- {"label":"down", "x":12.75, "y":4},
- {"label":"right", "x":13.75, "y":4}
- ]
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7.5, "y": 0},
+ {"matrix": [5, 1], "x": 8.5, "y": 0},
+ {"matrix": [5, 2], "x": 9.5, "y": 0},
+ {"matrix": [5, 3], "x": 10.5, "y": 0},
+ {"matrix": [5, 4], "x": 11.5, "y": 0},
+ {"matrix": [5, 5], "x": 12.5, "y": 0},
+ {"matrix": [5, 6], "x": 13.5, "y": 0},
+ {"matrix": [5, 7], "x": 14.5, "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": [6, 0], "x": 7, "y": 1},
+ {"matrix": [6, 1], "x": 8, "y": 1},
+ {"matrix": [6, 2], "x": 9, "y": 1},
+ {"matrix": [6, 3], "x": 10, "y": 1},
+ {"matrix": [6, 4], "x": 11, "y": 1},
+ {"matrix": [6, 5], "x": 12, "y": 1},
+ {"matrix": [6, 6], "x": 13, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [2, 1], "x": 1.25, "y": 2},
+ {"matrix": [2, 2], "x": 2.25, "y": 2},
+ {"matrix": [2, 3], "x": 3.25, "y": 2},
+ {"matrix": [2, 4], "x": 4.25, "y": 2},
+ {"matrix": [2, 5], "x": 5.25, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.25, "y": 2},
+ {"matrix": [7, 1], "x": 8.25, "y": 2},
+ {"matrix": [7, 2], "x": 9.25, "y": 2},
+ {"matrix": [7, 3], "x": 10.25, "y": 2},
+ {"matrix": [7, 4], "x": 11.25, "y": 2},
+ {"matrix": [7, 5], "x": 12.25, "y": 2},
+ {"matrix": [7, 6], "x": 13.25, "y": 2},
+ {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+
+ {"matrix": [8, 0], "x": 7.75, "y": 3},
+ {"matrix": [8, 1], "x": 8.75, "y": 3},
+ {"matrix": [8, 2], "x": 9.75, "y": 3},
+ {"matrix": [8, 3], "x": 10.75, "y": 3},
+ {"matrix": [8, 4], "x": 11.75, "y": 3},
+ {"matrix": [8, 5], "x": 12.75, "y": 3},
+ {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+ {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75},
+
+ {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5},
+ {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5},
+ {"matrix": [9, 3], "x": 11.75, "y": 4},
+ {"matrix": [9, 4], "x": 12.75, "y": 4},
+ {"matrix": [9, 5], "x": 13.75, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/majistic/majistic.c b/keyboards/majistic/majistic.c
deleted file mode 100644
index 7ceba7cf28..0000000000
--- a/keyboards/majistic/majistic.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 yossiyossy
- *
- * 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 "majistic.h"
diff --git a/keyboards/majistic/majistic.h b/keyboards/majistic/majistic.h
deleted file mode 100644
index 77c4a49121..0000000000
--- a/keyboards/majistic/majistic.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2020 yossiyossy
- *
- * 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(\
- l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, \
- l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, \
- l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r17, \
- l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, \
- l40, l41, l42, l43, l44, r40, r41, r42, r43, r44, r45 \
-) {\
- { l00, l01, l02, l03, l04, l05, KC_NO, KC_NO }, \
- { l10, l11, l12, l13, l14, l15, KC_NO, KC_NO }, \
- { l20, l21, l22, l23, l24, l25, KC_NO, KC_NO}, \
- { l30, l31, l32, l33, l34, l35, KC_NO, KC_NO}, \
- { l40, l41, l42, l43, l44, KC_NO, KC_NO, KC_NO}, \
- { r00, r01, r02, r03, r04, r05, r06, r07 }, \
- { r10, r11, r12, r13, r14, r15, r16, r17 }, \
- { r20, r21, r22, r23, r24, r25, r26, KC_NO }, \
- { r30, r31, r32, r33, r34, r35, r36, KC_NO }, \
- { r40, r41, r42, r43, r44, r45, KC_NO, KC_NO } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-05 06:56:29 +0000