summaryrefslogtreecommitdiff
path: root/keyboards/kagizaraya
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kagizaraya')
-rw-r--r--keyboards/kagizaraya/chidori/chidori.c17
-rw-r--r--keyboards/kagizaraya/chidori/chidori.h57
-rw-r--r--keyboards/kagizaraya/chidori/config.h21
-rw-r--r--keyboards/kagizaraya/chidori/info.json149
-rw-r--r--keyboards/kagizaraya/halberd/config.h20
-rw-r--r--keyboards/kagizaraya/halberd/halberd.c16
-rw-r--r--keyboards/kagizaraya/halberd/halberd.h40
-rw-r--r--keyboards/kagizaraya/halberd/info.json60
-rw-r--r--keyboards/kagizaraya/scythe/config.h20
-rw-r--r--keyboards/kagizaraya/scythe/info.json91
-rw-r--r--keyboards/kagizaraya/scythe/scythe.c16
-rw-r--r--keyboards/kagizaraya/scythe/scythe.h51
12 files changed, 283 insertions, 275 deletions
diff --git a/keyboards/kagizaraya/chidori/chidori.c b/keyboards/kagizaraya/chidori/chidori.c
deleted file mode 100644
index 229982724e..0000000000
--- a/keyboards/kagizaraya/chidori/chidori.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 "chidori.h"
diff --git a/keyboards/kagizaraya/chidori/chidori.h b/keyboards/kagizaraya/chidori/chidori.h
deleted file mode 100644
index d82b9217fb..0000000000
--- a/keyboards/kagizaraya/chidori/chidori.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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"
-
-// clang-format off
-#define LAYOUT( \
- L01, L02, L03, L04, L05, L06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-
-#define LAYOUT_extended( \
- L01, L02, L03, L04, L05, L06, M01, M02, M03, M04, M05, M06, R01, R02, R03, R04, R05, R06, \
- L07, L08, L09, L10, L11, L12, M07, M08, M09, M10, M11, M12, R07, R08, R09, R10, R11, R12, \
- L13, L14, L15, L16, L17, L18, M13, M14, M15, M16, M17, M18, R13, R14, R15, R16, R17, R18, \
- L19, L20, L21, L22, L23, L24, M19, M20, M21, M22, M23, M24, R19, R20, R21, R22, R23, R24 \
-) { \
- { L01, L02, L03, L04, L05, L06 }, \
- { L07, L08, L09, L10, L11, L12 }, \
- { L13, L14, L15, L16, L17, L18 }, \
- { L19, L20, L21, L22, L23, L24 }, \
- { M01, M02, M03, M04, M05, M06 }, \
- { M07, M08, M09, M10, M11, M12 }, \
- { M13, M14, M15, M16, M17, M18 }, \
- { M19, M20, M21, M22, M23, M24 }, \
- { R01, R02, R03, R04, R05, R06 }, \
- { R07, R08, R09, R10, R11, R12 }, \
- { R13, R14, R15, R16, R17, R18 }, \
- { R19, R20, R21, R22, R23, R24 } \
-}
-// clang-format on
diff --git a/keyboards/kagizaraya/chidori/config.h b/keyboards/kagizaraya/chidori/config.h
index 4a90a41d9d..eb719e9504 100644
--- a/keyboards/kagizaraya/chidori/config.h
+++ b/keyboards/kagizaraya/chidori/config.h
@@ -22,26 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROWS 12
#define MATRIX_COLS 6
-/*
- * 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 \
- { D0, D5 }
-#define MATRIX_COL_PINS \
- { F1, F0, B0 }
-*/
-
-/* 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 */
@@ -68,7 +48,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
/* USB config */
-#define USB_MAX_POWER_CONSUMPTION 100
#define USB_COUNT_SOF 0
#define USB_INTR_CFG_SET (1 << ISC01)
#define USB_INTR_ENABLE_BIT INT0
diff --git a/keyboards/kagizaraya/chidori/info.json b/keyboards/kagizaraya/chidori/info.json
index 8cafe4cc7e..6603f54b03 100644
--- a/keyboards/kagizaraya/chidori/info.json
+++ b/keyboards/kagizaraya/chidori/info.json
@@ -6,25 +6,156 @@
"usb": {
"vid": "0xFEED",
"pid": "0x3942",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "max_power": 100
},
"processor": "atmega328p",
"bootloader": "usbasploader",
"layouts": {
"LAYOUT": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "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":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "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": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "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": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3}
]
},
"LAYOUT_extended": {
"layout": [
- {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":19, "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":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":19, "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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":19, "y":2},
- {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [4, 0], "x": 7, "y": 0},
+ {"matrix": [4, 1], "x": 8, "y": 0},
+ {"matrix": [4, 2], "x": 9, "y": 0},
+ {"matrix": [4, 3], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 5], "x": 12, "y": 0},
+
+ {"matrix": [8, 0], "x": 14, "y": 0},
+ {"matrix": [8, 1], "x": 15, "y": 0},
+ {"matrix": [8, 2], "x": 16, "y": 0},
+ {"matrix": [8, 3], "x": 17, "y": 0},
+ {"matrix": [8, 4], "x": 18, "y": 0},
+ {"matrix": [8, 5], "x": 19, "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": [5, 0], "x": 7, "y": 1},
+ {"matrix": [5, 1], "x": 8, "y": 1},
+ {"matrix": [5, 2], "x": 9, "y": 1},
+ {"matrix": [5, 3], "x": 10, "y": 1},
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 5], "x": 12, "y": 1},
+
+ {"matrix": [9, 0], "x": 14, "y": 1},
+ {"matrix": [9, 1], "x": 15, "y": 1},
+ {"matrix": [9, 2], "x": 16, "y": 1},
+ {"matrix": [9, 3], "x": 17, "y": 1},
+ {"matrix": [9, 4], "x": 18, "y": 1},
+ {"matrix": [9, 5], "x": 19, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+
+ {"matrix": [6, 0], "x": 7, "y": 2},
+ {"matrix": [6, 1], "x": 8, "y": 2},
+ {"matrix": [6, 2], "x": 9, "y": 2},
+ {"matrix": [6, 3], "x": 10, "y": 2},
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 5], "x": 12, "y": 2},
+
+ {"matrix": [10, 0], "x": 14, "y": 2},
+ {"matrix": [10, 1], "x": 15, "y": 2},
+ {"matrix": [10, 2], "x": 16, "y": 2},
+ {"matrix": [10, 3], "x": 17, "y": 2},
+ {"matrix": [10, 4], "x": 18, "y": 2},
+ {"matrix": [10, 5], "x": 19, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+
+ {"matrix": [7, 0], "x": 7, "y": 3},
+ {"matrix": [7, 1], "x": 8, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3},
+ {"matrix": [7, 3], "x": 10, "y": 3},
+ {"matrix": [7, 4], "x": 11, "y": 3},
+ {"matrix": [7, 5], "x": 12, "y": 3},
+
+ {"matrix": [11, 0], "x": 14, "y": 3},
+ {"matrix": [11, 1], "x": 15, "y": 3},
+ {"matrix": [11, 2], "x": 16, "y": 3},
+ {"matrix": [11, 3], "x": 17, "y": 3},
+ {"matrix": [11, 4], "x": 18, "y": 3},
+ {"matrix": [11, 5], "x": 19, "y": 3}
]
}
}
diff --git a/keyboards/kagizaraya/halberd/config.h b/keyboards/kagizaraya/halberd/config.h
index 9b0ba0a609..9b42731f84 100644
--- a/keyboards/kagizaraya/halberd/config.h
+++ b/keyboards/kagizaraya/halberd/config.h
@@ -16,25 +16,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 { D6, D4, D5, E6 }
-#define MATRIX_COL_PINS { D7, B4, C7, C6, B6, B5, F7, F6, F5, F4, F1 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -49,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/halberd/halberd.c b/keyboards/kagizaraya/halberd/halberd.c
deleted file mode 100644
index 8ce55ca3e5..0000000000
--- a/keyboards/kagizaraya/halberd/halberd.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 "halberd.h"
diff --git a/keyboards/kagizaraya/halberd/halberd.h b/keyboards/kagizaraya/halberd/halberd.h
deleted file mode 100644
index d2adb4a15c..0000000000
--- a/keyboards/kagizaraya/halberd/halberd.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 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( \
- K00, 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 \
-) \
-{ \
- { K00, 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 }, \
- { KC_NO, KC_NO, K33, K34, K35, K36, K37, K38, K39, KC_NO, KC_NO } \
-}
-
diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json
index 43ab1df6e9..790db40f6d 100644
--- a/keyboards/kagizaraya/halberd/info.json
+++ b/keyboards/kagizaraya/halberd/info.json
@@ -1,18 +1,70 @@
{
- "keyboard_name": "Halberd",
+ "keyboard_name": "Halberd",
"manufacturer": "Kagizaraya",
- "url": "",
- "maintainer": "ka2hiro",
+ "url": "",
+ "maintainer": "ka2hiro",
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "F0"
+ },
+ "matrix_pins": {
+ "cols": ["D7", "B4", "C7", "C6", "B6", "B5", "F7", "F6", "F5", "F4", "F1"],
+ "rows": ["D6", "D4", "D5", "E6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"!", "x":0, "y":0}, {"label":"@", "x":1, "y":0}, {"label":"#", "x":2, "y":0}, {"label":"$", "x":3, "y":0}, {"label":"%", "x":4, "y":0}, {"label":"Tab", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"_", "x":1, "y":1}, {"label":"+", "x":2, "y":1}, {"label":"|", "x":3, "y":1}, {"label":"~", "x":4, "y":1}, {"label":"BkSp", "x":5, "y":1}, {"label":":", "x":6, "y":1}, {"label":"\"", "x":7, "y":1}, {"label":">", "x":8, "y":1}, {"label":"{", "x":9, "y":1}, {"label":"}", "x":10, "y":1}, {"label":"Caps", "x":0, "y":2}, {"label":"-", "x":1, "y":2}, {"label":"=", "x":2, "y":2}, {"label":"\\", "x":3, "y":2}, {"label":"`", "x":4, "y":2}, {"label":"Enter", "x":5, "y":2}, {"label":";", "x":6, "y":2}, {"label":"'", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":"[", "x":9, "y":2}, {"label":"]", "x":10, "y":2}, {"label":"GUI", "x":2, "y":3}, {"label":"Lower", "x":3, "y":3}, {"label":"Esc", "x":4, "y":3}, {"x":5, "y":3}, {"label":"Shift", "x":6, "y":3}, {"label":"Raise", "x":7, "y":3}, {"label":"Alt", "x":8, "y":3}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "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": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3}
+ ]
}
}
}
diff --git a/keyboards/kagizaraya/scythe/config.h b/keyboards/kagizaraya/scythe/config.h
index 481d3400dd..96e9669046 100644
--- a/keyboards/kagizaraya/scythe/config.h
+++ b/keyboards/kagizaraya/scythe/config.h
@@ -16,26 +16,7 @@ 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 { F7, F6, F5, F4, D5 }
-#define MATRIX_COL_PINS { D6, D7, B4, B5, B6, C6, C7 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define RGBLIGHT_SPLIT 1
-#define RGB_DI_PIN F0
-#ifdef RGB_DI_PIN
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -50,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json
index acab68f80b..8198cd0017 100644
--- a/keyboards/kagizaraya/scythe/info.json
+++ b/keyboards/kagizaraya/scythe/info.json
@@ -1,24 +1,107 @@
{
- "keyboard_name": "Scythe",
+ "keyboard_name": "Scythe",
"manufacturer": "Kagizaraya",
- "url": "",
- "maintainer": "ka2hiro",
+ "url": "",
+ "maintainer": "ka2hiro",
"usb": {
"vid": "0xFEED",
"pid": "0x3941",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D6", "D7", "B4", "B5", "B6", "C6", "C7"],
+ "rows": ["F7", "F6", "F5", "F4", "D5"]
+ },
+ "diode_direction": "COL2ROW",
"backlight": {
"pin": "B7"
},
"split": {
"soft_serial_pin": "D0"
},
+ "ws2812": {
+ "pin": "F0"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
- "layout": [{"label":"Esc", "x":2, "y":0}, {"label":"1", "x":3, "y":0}, {"label":"2", "x":4, "y":0}, {"label":"3", "x":5, "y":0}, {"label":"4", "x":6, "y":0}, {"label":"5", "x":7, "y":0}, {"label":"_", "x":8, "y":0}, {"label":"+", "x":9.5, "y":0}, {"label":"6", "x":10.5, "y":0}, {"label":"7", "x":11.5, "y":0}, {"label":"8", "x":12.5, "y":0}, {"label":"9", "x":13.5, "y":0}, {"label":"0", "x":14.5, "y":0}, {"label":"\\", "x":15.5, "y":0}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"{", "x":7.75, "y":1}, {"label":"}", "x":9.75, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"Backace", "x":15.75, "y":1, "w":1.5}, {"label":"Control", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"~", "x":7.5, "y":2}, {"label":"\"", "x":10, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"Return", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"Caps", "x":7.25, "y":3}, {"label":"Del", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":1.75}, {"label":"Fn", "x":18, "y":3}, {"label":"", "x":2.75, "y":4, "w":1.25}, {"label":"", "x":4, "y":4, "w":1.25}, {"label":"Fn", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2}, {"x":10, "y":4, "w":2}, {"label":"Fn", "x":12, "y":4, "w":1.25}, {"label":"", "x":13.25, "y":4, "w":1.25}, {"label":"", "x":14.5, "y":4, "w":1.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 2, "y": 0},
+ {"matrix": [0, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [0, 3], "x": 5, "y": 0},
+ {"matrix": [0, 4], "x": 6, "y": 0},
+ {"matrix": [0, 5], "x": 7, "y": 0},
+ {"matrix": [0, 6], "x": 8, "y": 0},
+
+ {"matrix": [5, 0], "x": 9.5, "y": 0},
+ {"matrix": [5, 1], "x": 10.5, "y": 0},
+ {"matrix": [5, 2], "x": 11.5, "y": 0},
+ {"matrix": [5, 3], "x": 12.5, "y": 0},
+ {"matrix": [5, 4], "x": 13.5, "y": 0},
+ {"matrix": [5, 5], "x": 14.5, "y": 0},
+ {"matrix": [5, 6], "x": 15.5, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 2.75, "y": 1},
+ {"matrix": [1, 2], "x": 3.75, "y": 1},
+ {"matrix": [1, 3], "x": 4.75, "y": 1},
+ {"matrix": [1, 4], "x": 5.75, "y": 1},
+ {"matrix": [1, 5], "x": 6.75, "y": 1},
+ {"matrix": [1, 6], "x": 7.75, "y": 1},
+
+ {"matrix": [6, 0], "x": 9.75, "y": 1},
+ {"matrix": [6, 1], "x": 10.75, "y": 1},
+ {"matrix": [6, 2], "x": 11.75, "y": 1},
+ {"matrix": [6, 3], "x": 12.75, "y": 1},
+ {"matrix": [6, 4], "x": 13.75, "y": 1},
+ {"matrix": [6, 5], "x": 14.75, "y": 1},
+ {"matrix": [6, 6], "x": 15.75, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 2.5, "y": 2},
+ {"matrix": [2, 2], "x": 3.5, "y": 2},
+ {"matrix": [2, 3], "x": 4.5, "y": 2},
+ {"matrix": [2, 4], "x": 5.5, "y": 2},
+ {"matrix": [2, 5], "x": 6.5, "y": 2},
+ {"matrix": [2, 6], "x": 7.5, "y": 2},
+
+ {"matrix": [7, 0], "x": 10, "y": 2},
+ {"matrix": [7, 1], "x": 11, "y": 2},
+ {"matrix": [7, 2], "x": 12, "y": 2},
+ {"matrix": [7, 3], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 5], "x": 15, "y": 2},
+ {"matrix": [7, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+ {"matrix": [3, 6], "x": 7.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 10.25, "y": 3},
+ {"matrix": [8, 1], "x": 11.25, "y": 3},
+ {"matrix": [8, 2], "x": 12.25, "y": 3},
+ {"matrix": [8, 3], "x": 13.25, "y": 3},
+ {"matrix": [8, 4], "x": 14.25, "y": 3},
+ {"matrix": [8, 5], "x": 15.25, "y": 3},
+ {"matrix": [8, 6], "x": 16.25, "y": 3, "w": 1.75},
+ {"matrix": [9, 6], "x": 18, "y": 3},
+
+ {"matrix": [4, 0], "x": 2.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 4, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 5.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 4, "w": 2},
+
+ {"matrix": [9, 0], "x": 10, "y": 4, "w": 2},
+ {"matrix": [9, 1], "x": 12, "y": 4, "w": 1.25},
+ {"matrix": [9, 2], "x": 13.25, "y": 4, "w": 1.25},
+ {"matrix": [9, 3], "x": 14.5, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/kagizaraya/scythe/scythe.c b/keyboards/kagizaraya/scythe/scythe.c
deleted file mode 100644
index c1f95e2f70..0000000000
--- a/keyboards/kagizaraya/scythe/scythe.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 "scythe.h"
diff --git a/keyboards/kagizaraya/scythe/scythe.h b/keyboards/kagizaraya/scythe/scythe.h
deleted file mode 100644
index c13c63fdd0..0000000000
--- a/keyboards/kagizaraya/scythe/scythe.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright 2019 ENDO Katsuhiro <ka2hiro@kagizaraya.jp>
- *
- * 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 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.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT( \
- L01, L02, L03, L04, L05, L06, L07, R01, R02, R03, R04, R05, R06, R07, \
- L08, L09, L10, L11, L12, L13, L14, R08, R09, R10, R11, R12, R13, R14, \
- L15, L16, L17, L18, L19, L20, L21, R15, R16, R17, R18, R19, R20, R21, \
- L22, L23, L24, L25, L26, L27, L28, R22, R23, R24, R25, R26, R27, R28, R33, \
- L29, L30, L31, L32, R29, R30, R31, R32 \
- ) \
- { \
- { L01, L02, L03, L04, L05, L06, L07 }, \
- { L08, L09, L10, L11, L12, L13, L14 }, \
- { L15, L16, L17, L18, L19, L20, L21 }, \
- { L22, L23, L24, L25, L26, L27, L28 }, \
- { L29, L30, L31, L32, ___, ___, ___ }, \
- { R01, R02, R03, R04, R05, R06, R07 }, \
- { R08, R09, R10, R11, R12, R13, R14 }, \
- { R15, R16, R17, R18, R19, R20, R21 }, \
- { R22, R23, R24, R25, R26, R27, R28 }, \
- { R29, R30, R31, R32, ___, ___, R33 } \
- }
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 10:50:36 +0000