summaryrefslogtreecommitdiff
path: root/keyboards/jiran
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/jiran')
-rw-r--r--keyboards/jiran/config.h9
-rw-r--r--keyboards/jiran/info.json69
-rw-r--r--keyboards/jiran/jiran.c1
-rw-r--r--keyboards/jiran/jiran.h11
-rw-r--r--keyboards/jiran/rev1/info.json71
-rw-r--r--keyboards/jiran/rev1/rev1.c1
-rw-r--r--keyboards/jiran/rev1/rev1.h26
-rw-r--r--keyboards/jiran/rev2/config.h1
-rw-r--r--keyboards/jiran/rev2/info.json76
-rw-r--r--keyboards/jiran/rev2/rev2.c1
-rw-r--r--keyboards/jiran/rev2/rev2.h24
11 files changed, 153 insertions, 137 deletions
diff --git a/keyboards/jiran/config.h b/keyboards/jiran/config.h
index 39ed4bb0c7..16a45b256b 100644
--- a/keyboards/jiran/config.h
+++ b/keyboards/jiran/config.h
@@ -17,13 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { B4, B5, F4, F5, F6 }
-#define MATRIX_COL_PINS { D3, D2, D4, C6, D7, E6 }
-
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define MASTER_LEFT
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index 9f04243278..143eaaa557 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -8,71 +8,14 @@
"pid": "0x3735",
"device_version": "3.0.0"
},
+ "matrix_pins": {
+ "cols": ["D3", "D2", "D4", "C6", "D7", "E6"],
+ "rows": ["B4", "B5", "F4", "F5", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D1"
},
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label":"Esc", "x":1, "y":0.88},
- {"label":"1", "x":2, "y":0.75},
- {"label":"2", "x":3, "y":0.38},
- {"label":"3", "x":4, "y":0.13},
- {"label":"4", "x":5, "y":0.38},
- {"label":"5", "x":6, "y":0.5},
- {"label":"6", "x":11.75, "y":0.5},
- {"label":"7", "x":12.75, "y":0.38},
- {"label":"8", "x":13.75, "y":0.13},
- {"label":"9", "x":14.75, "y":0.38},
- {"label":"0", "x":15.75, "y":0.75},
- {"label":"_", "x":16.75, "y":0.88},
- {"label":"Win", "x":0, "y":2.63},
- {"label":"Tab", "x":1, "y":1.88},
- {"label":"Q", "x":2, "y":1.75},
- {"label":"W", "x":3, "y":1.38},
- {"label":"E", "x":4, "y":1.13},
- {"label":"R", "x":5, "y":1.38},
- {"label":"T", "x":6, "y":1.5},
- {"label":"Y", "x":11.75, "y":1.5},
- {"label":"U", "x":12.75, "y":1.38},
- {"label":"I", "x":13.75, "y":1.13},
- {"label":"O", "x":14.75, "y":1.38},
- {"label":"P", "x":15.75, "y":1.75},
- {"label":"{", "x":16.75, "y":1.88},
- {"label":"}", "x":17.75, "y":2.63},
- {"label":"Shift", "x":1, "y":2.88},
- {"label":"A", "x":2, "y":2.75},
- {"label":"S", "x":3, "y":2.38},
- {"label":"D", "x":4, "y":2.13},
- {"label":"F", "x":5, "y":2.38},
- {"label":"G", "x":6, "y":2.5},
- {"label":"H", "x":11.75, "y":2.5},
- {"label":"J", "x":12.75, "y":2.38},
- {"label":"K", "x":13.75, "y":2.13},
- {"label":"L", "x":14.75, "y":2.38},
- {"label":":", "x":15.75, "y":2.75},
- {"label":"\"", "x":16.75, "y":2.88},
- {"label":"Ctrl", "x":1, "y":3.88},
- {"label":"Z", "x":2, "y":3.75},
- {"label":"X", "x":3, "y":3.38},
- {"label":"C", "x":4, "y":3.13},
- {"label":"V", "x":5, "y":3.38},
- {"label":"B", "x":6, "y":3.5},
- {"label":"N", "x":11.75, "y":3.5},
- {"label":"M", "x":12.75, "y":3.38},
- {"label":"<", "x":13.75, "y":3.13},
- {"label":">", "x":14.75, "y":3.38},
- {"label":"?", "x":15.75, "y":3.75},
- {"label":"|", "x":16.75, "y":3.88},
- {"label":"Fn", "x":5, "y":4.38},
- {"label":"Space", "x":6, "y":4.5},
- {"label":"Alt", "x":7, "y":4.63},
- {"label":"Enter", "x":10.75, "y":4.63},
- {"label":"Back", "x":11.75, "y":4.5},
- {"label":"Fn", "x":12.75, "y":4.38}
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/jiran/jiran.c b/keyboards/jiran/jiran.c
deleted file mode 100644
index 71a8504c5b..0000000000
--- a/keyboards/jiran/jiran.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "jiran.h"
diff --git a/keyboards/jiran/jiran.h b/keyboards/jiran/jiran.h
deleted file mode 100644
index c8ae32b135..0000000000
--- a/keyboards/jiran/jiran.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_jiran_rev1
- #include "rev1.h"
-#endif
-
-#ifdef KEYBOARD_jiran_rev2
-#include "rev2.h"
-#endif
diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json
index 830440f4f6..b9a6d56fe6 100644
--- a/keyboards/jiran/rev1/info.json
+++ b/keyboards/jiran/rev1/info.json
@@ -2,5 +2,76 @@
"backlight": {
"pin": "B6",
"levels": 5
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0.75},
+ {"matrix": [0, 1], "x": 2, "y": 0.62},
+ {"matrix": [0, 2], "x": 3, "y": 0.25},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+ {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+ {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+ {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 0},
+ {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+ {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+ {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 0], "x": 1, "y": 1.75},
+ {"matrix": [1, 1], "x": 2, "y": 1.62},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+ {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+ {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.75, "y": 1},
+ {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+ {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+ {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+ {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+ {"matrix": [2, 0], "x": 1, "y": 2.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.62},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+ {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+ {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 13.75, "y": 2},
+ {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+ {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 1, "y": 3.75},
+ {"matrix": [3, 1], "x": 2, "y": 3.62},
+ {"matrix": [3, 2], "x": 3, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+ {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+ {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 13.75, "y": 3},
+ {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+ {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+ {"matrix": [4, 3], "x": 5, "y": 4.25},
+ {"matrix": [4, 4], "x": 6, "y": 4.37},
+ {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+ {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+ {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+ ]
+ }
}
}
diff --git a/keyboards/jiran/rev1/rev1.c b/keyboards/jiran/rev1/rev1.c
deleted file mode 100644
index 9aedcc130a..0000000000
--- a/keyboards/jiran/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h" \ No newline at end of file
diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h
deleted file mode 100644
index 6d5ea99dac..0000000000
--- a/keyboards/jiran/rev1/rev1.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "jiran.h"
-#include "quantum.h"
-
-
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L40, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R45, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L43, L44, L45, R40, R41, R42 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, KC_NO, KC_NO, L43, L44, L45, }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 }, \
- { R45, KC_NO, KC_NO, R42, R41, R40 } \
- }
diff --git a/keyboards/jiran/rev2/config.h b/keyboards/jiran/rev2/config.h
index 0dd0f63195..d810f3e395 100644
--- a/keyboards/jiran/rev2/config.h
+++ b/keyboards/jiran/rev2/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGB_DI_PIN B6
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json
new file mode 100644
index 0000000000..8539b47652
--- /dev/null
+++ b/keyboards/jiran/rev2/info.json
@@ -0,0 +1,76 @@
+{
+ "ws2812": {
+ "pin": "B6"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 1, "y": 0.75},
+ {"matrix": [0, 1], "x": 2, "y": 0.62},
+ {"matrix": [0, 2], "x": 3, "y": 0.25},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0.25},
+ {"matrix": [0, 5], "x": 6, "y": 0.37},
+
+ {"matrix": [5, 5], "x": 11.75, "y": 0.37},
+ {"matrix": [5, 4], "x": 12.75, "y": 0.25},
+ {"matrix": [5, 3], "x": 13.75, "y": 0},
+ {"matrix": [5, 2], "x": 14.75, "y": 0.25},
+ {"matrix": [5, 1], "x": 15.75, "y": 0.62},
+ {"matrix": [5, 0], "x": 16.75, "y": 0.75},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5},
+ {"matrix": [1, 0], "x": 1, "y": 1.75},
+ {"matrix": [1, 1], "x": 2, "y": 1.62},
+ {"matrix": [1, 2], "x": 3, "y": 1.25},
+ {"matrix": [1, 3], "x": 4, "y": 1},
+ {"matrix": [1, 4], "x": 5, "y": 1.25},
+ {"matrix": [1, 5], "x": 6, "y": 1.37},
+
+ {"matrix": [6, 5], "x": 11.75, "y": 1.37},
+ {"matrix": [6, 4], "x": 12.75, "y": 1.25},
+ {"matrix": [6, 3], "x": 13.75, "y": 1},
+ {"matrix": [6, 2], "x": 14.75, "y": 1.25},
+ {"matrix": [6, 1], "x": 15.75, "y": 1.62},
+ {"matrix": [6, 0], "x": 16.75, "y": 1.75},
+ {"matrix": [9, 0], "x": 17.75, "y": 2.5},
+
+ {"matrix": [2, 0], "x": 1, "y": 2.75},
+ {"matrix": [2, 1], "x": 2, "y": 2.62},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.37},
+
+ {"matrix": [7, 5], "x": 11.75, "y": 2.37},
+ {"matrix": [7, 4], "x": 12.75, "y": 2.25},
+ {"matrix": [7, 3], "x": 13.75, "y": 2},
+ {"matrix": [7, 2], "x": 14.75, "y": 2.25},
+ {"matrix": [7, 1], "x": 15.75, "y": 2.62},
+ {"matrix": [7, 0], "x": 16.75, "y": 2.75},
+
+ {"matrix": [3, 0], "x": 1, "y": 3.75},
+ {"matrix": [3, 1], "x": 2, "y": 3.62},
+ {"matrix": [3, 2], "x": 3, "y": 3.25},
+ {"matrix": [3, 3], "x": 4, "y": 3},
+ {"matrix": [3, 4], "x": 5, "y": 3.25},
+ {"matrix": [3, 5], "x": 6, "y": 3.37},
+
+ {"matrix": [8, 5], "x": 11.75, "y": 3.37},
+ {"matrix": [8, 4], "x": 12.75, "y": 3.25},
+ {"matrix": [8, 3], "x": 13.75, "y": 3},
+ {"matrix": [8, 2], "x": 14.75, "y": 3.25},
+ {"matrix": [8, 1], "x": 15.75, "y": 3.62},
+ {"matrix": [8, 0], "x": 16.75, "y": 3.75},
+
+ {"matrix": [4, 3], "x": 5, "y": 4.25},
+ {"matrix": [4, 4], "x": 6, "y": 4.37},
+ {"matrix": [4, 5], "x": 7, "y": 4.5},
+
+ {"matrix": [9, 5], "x": 10.75, "y": 4.5},
+ {"matrix": [9, 4], "x": 11.75, "y": 4.37},
+ {"matrix": [9, 3], "x": 12.75, "y": 4.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/jiran/rev2/rev2.c b/keyboards/jiran/rev2/rev2.c
deleted file mode 100644
index b1af81707d..0000000000
--- a/keyboards/jiran/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev2.h"
diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h
deleted file mode 100644
index 616497b3ca..0000000000
--- a/keyboards/jiran/rev2/rev2.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "jiran.h"
-#include "quantum.h"
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
- L40, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R45, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \
- L43, L44, L45, R40, R41, R42 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05 }, \
- { L10, L11, L12, L13, L14, L15 }, \
- { L20, L21, L22, L23, L24, L25 }, \
- { L30, L31, L32, L33, L34, L35 }, \
- { L40, KC_NO, KC_NO, L43, L44, L45, }, \
- { R05, R04, R03, R02, R01, R00 }, \
- { R15, R14, R13, R12, R11, R10 }, \
- { R25, R24, R23, R22, R21, R20 }, \
- { R35, R34, R33, R32, R31, R30 }, \
- { R45, KC_NO, KC_NO, R42, R41, R40 } \
- }
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-03 08:36:03 +0000