summaryrefslogtreecommitdiff
path: root/keyboards/rart/rartand
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/rart/rartand')
-rw-r--r--keyboards/rart/rartand/config.h7
-rw-r--r--keyboards/rart/rartand/info.json109
-rw-r--r--keyboards/rart/rartand/rartand.c15
-rw-r--r--keyboards/rart/rartand/rartand.h34
4 files changed, 57 insertions, 108 deletions
diff --git a/keyboards/rart/rartand/config.h b/keyboards/rart/rartand/config.h
index b134d9e1fc..5ae5dc84a3 100644
--- a/keyboards/rart/rartand/config.h
+++ b/keyboards/rart/rartand/config.h
@@ -15,13 +15,6 @@
#pragma once
-
-#define MATRIX_ROW_PINS { C3, B2, C2, B1, C1, D7, C0, B0 }
-#define MATRIX_COL_PINS { D0, D1, B4, B5, B3, D4, D6 }
-
-/* 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/rart/rartand/info.json b/keyboards/rart/rartand/info.json
index eeb99a3cd4..55bbd49565 100644
--- a/keyboards/rart/rartand/info.json
+++ b/keyboards/rart/rartand/info.json
@@ -8,6 +8,11 @@
"pid": "0x5050",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "B4", "B5", "B3", "D4", "D6"],
+ "rows": ["C3", "B2", "C2", "B1", "C1", "D7", "C0", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "D5",
"on_state": 0
@@ -17,61 +22,61 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- { "x": 0, "y": 0, "w":1.5 },
- { "x": 1.5, "y": 0 },
- { "x": 2.5, "y": 0 },
- { "x": 3.5, "y": 0 },
- { "x": 4.5, "y": 0 },
- { "x": 5.5, "y": 0 },
- { "x": 6.5, "y": 0 },
- { "x": 7.5, "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 },
+ {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5},
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+ {"matrix": [0, 5], "x": 10.5, "y": 0},
+ {"matrix": [1, 5], "x": 11.5, "y": 0},
+ {"matrix": [0, 6], "x": 12.5, "y": 0},
+ {"matrix": [1, 6], "x": 13.5, "y": 0, "w": 1.5},
- {"x": 0, "y": 1, "w":1.75 },
- {"x": 1.75, "y": 1 },
- {"x": 2.75, "y": 1 },
- {"x": 3.75, "y": 1 },
- {"x": 4.75, "y": 1 },
- {"x": 5.75, "y": 1 },
- {"x": 6.75, "y": 1 },
- {"x": 7.75, "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, "w":2.25 },
+ {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.75},
+ {"matrix": [3, 0], "x": 1.75, "y": 1},
+ {"matrix": [2, 1], "x": 2.75, "y": 1},
+ {"matrix": [3, 1], "x": 3.75, "y": 1},
+ {"matrix": [2, 2], "x": 4.75, "y": 1},
+ {"matrix": [3, 2], "x": 5.75, "y": 1},
+ {"matrix": [2, 3], "x": 6.75, "y": 1},
+ {"matrix": [3, 3], "x": 7.75, "y": 1},
+ {"matrix": [2, 4], "x": 8.75, "y": 1},
+ {"matrix": [3, 4], "x": 9.75, "y": 1},
+ {"matrix": [2, 5], "x": 10.75, "y": 1},
+ {"matrix": [3, 5], "x": 11.75, "y": 1},
+ {"matrix": [3, 6], "x": 12.75, "y": 1, "w": 2.25},
- {"x": 0, "y": 2, "w":1.25 },
- {"x": 1.25, "y": 2 },
- {"x": 2.25, "y": 2 },
- {"x": 3.25, "y": 2 },
- {"x": 4.25, "y": 2 },
- {"x": 5.25, "y": 2 },
- {"x": 6.25, "y": 2 },
- {"x": 7.25, "y": 2 },
- {"x": 8.25, "y": 2 },
- {"x": 9.25, "y": 2 },
- {"x": 10.25, "y": 2 },
- {"x": 11.25, "y": 2, "w":1.75 },
- {"x": 13, "y": 2 },
- {"x": 14, "y": 2 },
+ {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.25},
+ {"matrix": [5, 0], "x": 1.25, "y": 2},
+ {"matrix": [4, 1], "x": 2.25, "y": 2},
+ {"matrix": [5, 1], "x": 3.25, "y": 2},
+ {"matrix": [4, 2], "x": 4.25, "y": 2},
+ {"matrix": [5, 2], "x": 5.25, "y": 2},
+ {"matrix": [4, 3], "x": 6.25, "y": 2},
+ {"matrix": [5, 3], "x": 7.25, "y": 2},
+ {"matrix": [4, 4], "x": 8.25, "y": 2},
+ {"matrix": [5, 4], "x": 9.25, "y": 2},
+ {"matrix": [4, 5], "x": 10.25, "y": 2},
+ {"matrix": [5, 5], "x": 11.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 6], "x": 13, "y": 2},
+ {"matrix": [5, 6], "x": 14, "y": 2},
- {"x": 0, "y": 3, "w":1.25 },
- {"x": 1.25, "y": 3, "w":1.25 },
- {"x": 2.5, "y": 3, "w":1.25 },
- {"x": 3.75, "y": 3, "w":2.25 },
- {"x": 6, "y": 3, "w":1.25 },
- {"x": 7.25, "y": 3, "w":2.75 },
- {"x": 10, "y": 3 },
- {"x": 11, "y": 3 },
- {"x": 12, "y": 3 },
- {"x": 13, "y": 3 },
- {"x": 14, "y": 3 }
+ {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [7, 0], "x": 1.25, "y": 3, "w": 1.25},
+ {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+ {"matrix": [6, 2], "x": 3.75, "y": 3, "w": 2.25},
+ {"matrix": [6, 3], "x": 6, "y": 3, "w": 1.25},
+ {"matrix": [6, 4], "x": 7.25, "y": 3, "w": 2.75},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [6, 5], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+ {"matrix": [6, 6], "x": 13, "y": 3},
+ {"matrix": [7, 6], "x": 14, "y": 3}
]
}
}
diff --git a/keyboards/rart/rartand/rartand.c b/keyboards/rart/rartand/rartand.c
deleted file mode 100644
index e9cff88ba5..0000000000
--- a/keyboards/rart/rartand/rartand.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2021 Alabahuy
- * 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 "rartand.h"
diff --git a/keyboards/rart/rartand/rartand.h b/keyboards/rart/rartand/rartand.h
deleted file mode 100644
index c2750822e8..0000000000
--- a/keyboards/rart/rartand/rartand.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 Alabahuy
- * 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_all( \
- K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
- K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K36, \
- K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, \
- K60, K70, K61, K62, K63, K64, K74, K65, K75, K66, K76 \
-) \
-{ \
- { K00, K01, K02, K03, K04, K05, K06 }, \
- { K10, K11, K12, K13, K14, K15, K16 }, \
- { K20, K21, K22, K23, K24, K25, KC_NO }, \
- { K30, K31, K32, K33, K34, K35, K36 }, \
- { K40, K41, K42, K43, K44, K45, K46 }, \
- { K50, K51, K52, K53, K54, K55, K56 }, \
- { K60, K61, K62, K63, K64, K65, K66 }, \
- { K70, KC_NO, KC_NO, KC_NO, K74, K75, K76 }, \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 20:37:10 +0000