summaryrefslogtreecommitdiff
path: root/keyboards/takashicompany/radialex
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/takashicompany/radialex')
-rw-r--r--keyboards/takashicompany/radialex/config.h20
-rw-r--r--keyboards/takashicompany/radialex/info.json241
-rw-r--r--keyboards/takashicompany/radialex/radialex.c17
-rw-r--r--keyboards/takashicompany/radialex/radialex.h42
4 files changed, 61 insertions, 259 deletions
diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
index 8843ff81f0..39e1d8df5b 100644
--- a/keyboards/takashicompany/radialex/config.h
+++ b/keyboards/takashicompany/radialex/config.h
@@ -17,25 +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 { B6, D4, C6, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 12
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -52,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json
index 1ed37283e7..e3af5b8371 100644
--- a/keyboards/takashicompany/radialex/info.json
+++ b/keyboards/takashicompany/radialex/info.json
@@ -8,191 +8,72 @@
"pid": "0x0019",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {
- "x": 1,
- "y": 0
- },
- {
- "x": 2,
- "y": 0
- },
- {
- "x": 3,
- "y": 0
- },
- {
- "x": 4,
- "y": 0
- },
- {
- "x": 5,
- "y": 0
- },
- {
- "x": 9,
- "y": 0
- },
- {
- "x": 10,
- "y": 0
- },
- {
- "x": 11,
- "y": 0
- },
- {
- "x": 12,
- "y": 0
- },
- {
- "x": 13,
- "y": 0
- },
- {
- "x": 0,
- "y": 1
- },
- {
- "x": 1,
- "y": 1
- },
- {
- "x": 2,
- "y": 1
- },
- {
- "x": 3,
- "y": 1
- },
- {
- "x": 4,
- "y": 1
- },
- {
- "x": 5,
- "y": 1
- },
- {
- "x": 7,
- "y": 1
- },
- {
- "x": 9,
- "y": 1
- },
- {
- "x": 10,
- "y": 1
- },
- {
- "x": 11,
- "y": 1
- },
- {
- "x": 12,
- "y": 1
- },
- {
- "x": 13,
- "y": 1
- },
- {
- "x": 14,
- "y": 1
- },
- {
- "x": 0,
- "y": 2
- },
- {
- "x": 1,
- "y": 2
- },
- {
- "x": 2,
- "y": 2
- },
- {
- "x": 3,
- "y": 2
- },
- {
- "x": 4,
- "y": 2
- },
- {
- "x": 5,
- "y": 2
- },
- {
- "x": 9,
- "y": 2
- },
- {
- "x": 10,
- "y": 2
- },
- {
- "x": 11,
- "y": 2
- },
- {
- "x": 12,
- "y": 2
- },
- {
- "x": 13,
- "y": 2
- },
- {
- "x": 14,
- "y": 2
- },
- {
- "x": 2,
- "y": 3
- },
- {
- "x": 3,
- "y": 3
- },
- {
- "x": 4,
- "y": 3
- },
- {
- "x": 5,
- "y": 3
- },
- {
- "x": 6,
- "y": 3
- },
- {
- "x": 8,
- "y": 3
- },
- {
- "x": 9,
- "y": 3
- },
- {
- "x": 10,
- "y": 3
- },
- {
- "x": 11,
- "y": 3
- },
- {
- "x": 12,
- "y": 3
- }
+ {"matrix": [0, 0], "x": 1, "y": 0},
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 9, "y": 0},
+ {"matrix": [0, 6], "x": 10, "y": 0},
+ {"matrix": [1, 0], "x": 11, "y": 0},
+ {"matrix": [1, 1], "x": 12, "y": 0},
+ {"matrix": [1, 2], "x": 13, "y": 0},
+
+ {"matrix": [5, 5], "x": 0, "y": 1},
+ {"matrix": [1, 3], "x": 1, "y": 1},
+ {"matrix": [1, 4], "x": 2, "y": 1},
+ {"matrix": [1, 5], "x": 3, "y": 1},
+ {"matrix": [1, 6], "x": 4, "y": 1},
+ {"matrix": [2, 0], "x": 5, "y": 1},
+
+ {"matrix": [6, 2], "x": 7, "y": 1},
+
+ {"matrix": [2, 1], "x": 9, "y": 1},
+ {"matrix": [2, 2], "x": 10, "y": 1},
+ {"matrix": [2, 3], "x": 11, "y": 1},
+ {"matrix": [2, 4], "x": 12, "y": 1},
+ {"matrix": [2, 5], "x": 13, "y": 1},
+ {"matrix": [6, 0], "x": 14, "y": 1},
+
+ {"matrix": [5, 6], "x": 0, "y": 2},
+ {"matrix": [2, 6], "x": 1, "y": 2},
+ {"matrix": [3, 0], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [3, 2], "x": 4, "y": 2},
+ {"matrix": [3, 3], "x": 5, "y": 2},
+
+ {"matrix": [3, 4], "x": 9, "y": 2},
+ {"matrix": [3, 5], "x": 10, "y": 2},
+ {"matrix": [3, 6], "x": 11, "y": 2},
+ {"matrix": [4, 0], "x": 12, "y": 2},
+ {"matrix": [4, 1], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+
+ {"matrix": [4, 2], "x": 2, "y": 3},
+ {"matrix": [4, 3], "x": 3, "y": 3},
+ {"matrix": [4, 4], "x": 4, "y": 3},
+ {"matrix": [4, 5], "x": 5, "y": 3},
+ {"matrix": [4, 6], "x": 6, "y": 3},
+
+ {"matrix": [5, 0], "x": 8, "y": 3},
+ {"matrix": [5, 1], "x": 9, "y": 3},
+ {"matrix": [5, 2], "x": 10, "y": 3},
+ {"matrix": [5, 3], "x": 11, "y": 3},
+ {"matrix": [5, 4], "x": 12, "y": 3}
]
}
}
diff --git a/keyboards/takashicompany/radialex/radialex.c b/keyboards/takashicompany/radialex/radialex.c
deleted file mode 100644
index 9146106973..0000000000
--- a/keyboards/takashicompany/radialex/radialex.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * 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 "radialex.h"
diff --git a/keyboards/takashicompany/radialex/radialex.h b/keyboards/takashicompany/radialex/radialex.h
deleted file mode 100644
index 8ad5712201..0000000000
--- a/keyboards/takashicompany/radialex/radialex.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2021 takashicompany
- *
- * 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( \
- k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \
- k41, k11, k12, k13, k14, k15, k45, k16, k17, k18, k19, k20, k43, \
- k42, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k44, \
- k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 \
-) { \
- { 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, KC_NO, KC_NO, KC_NO, KC_NO } \
-}