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.json126
-rw-r--r--keyboards/jiran/jiran.c1
-rw-r--r--keyboards/jiran/jiran.h11
-rw-r--r--keyboards/jiran/rev1/rev1.c1
-rw-r--r--keyboards/jiran/rev1/rev1.h1
-rw-r--r--keyboards/jiran/rev2/rev2.c1
-rw-r--r--keyboards/jiran/rev2/rev2.h1
8 files changed, 70 insertions, 81 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..de64ba20a0 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -8,6 +8,11 @@
"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"
},
@@ -16,62 +21,71 @@
"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}
+ {"x":1, "y":0.75},
+ {"x":2, "y":0.62},
+ {"x":3, "y":0.25},
+ {"x":4, "y":0},
+ {"x":5, "y":0.25},
+ {"x":6, "y":0.37},
+
+ {"x":11.75, "y":0.37},
+ {"x":12.75, "y":0.25},
+ {"x":13.75, "y":0},
+ {"x":14.75, "y":0.25},
+ {"x":15.75, "y":0.62},
+ {"x":16.75, "y":0.75},
+
+ {"x":0, "y":2.5},
+ {"x":1, "y":1.75},
+ {"x":2, "y":1.62},
+ {"x":3, "y":1.25},
+ {"x":4, "y":1},
+ {"x":5, "y":1.25},
+ {"x":6, "y":1.37},
+
+ {"x":11.75, "y":1.37},
+ {"x":12.75, "y":1.25},
+ {"x":13.75, "y":1},
+ {"x":14.75, "y":1.25},
+ {"x":15.75, "y":1.62},
+ {"x":16.75, "y":1.75},
+ {"x":17.75, "y":2.5},
+
+ {"x":1, "y":2.75},
+ {"x":2, "y":2.62},
+ {"x":3, "y":2.25},
+ {"x":4, "y":2},
+ {"x":5, "y":2.25},
+ {"x":6, "y":2.37},
+
+ {"x":11.75, "y":2.37},
+ {"x":12.75, "y":2.25},
+ {"x":13.75, "y":2},
+ {"x":14.75, "y":2.25},
+ {"x":15.75, "y":2.62},
+ {"x":16.75, "y":2.75},
+
+ {"x":1, "y":3.75},
+ {"x":2, "y":3.62},
+ {"x":3, "y":3.25},
+ {"x":4, "y":3},
+ {"x":5, "y":3.25},
+ {"x":6, "y":3.37},
+
+ {"x":11.75, "y":3.37},
+ {"x":12.75, "y":3.25},
+ {"x":13.75, "y":3},
+ {"x":14.75, "y":3.25},
+ {"x":15.75, "y":3.62},
+ {"x":16.75, "y":3.75},
+
+ {"x":5, "y":4.25},
+ {"x":6, "y":4.37},
+ {"x":7, "y":4.5},
+
+ {"x":10.75, "y":4.5},
+ {"x":11.75, "y":4.37},
+ {"x":12.75, "y":4.25}
]
}
}
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/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
index 6d5ea99dac..d243bd366b 100644
--- a/keyboards/jiran/rev1/rev1.h
+++ b/keyboards/jiran/rev1/rev1.h
@@ -1,6 +1,5 @@
#pragma once
-#include "jiran.h"
#include "quantum.h"
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
index 616497b3ca..01ffe1a48e 100644
--- a/keyboards/jiran/rev2/rev2.h
+++ b/keyboards/jiran/rev2/rev2.h
@@ -1,6 +1,5 @@
#pragma once
-#include "jiran.h"
#include "quantum.h"
#define LAYOUT( \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 13:19:37 +0000