summaryrefslogtreecommitdiff
path: root/keyboards/kakunpc
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kakunpc')
-rw-r--r--keyboards/kakunpc/angel17/alpha/alpha.c16
-rw-r--r--keyboards/kakunpc/angel17/alpha/alpha.h40
-rw-r--r--keyboards/kakunpc/angel17/alpha/config.h17
-rw-r--r--keyboards/kakunpc/angel17/alpha/info.json34
-rw-r--r--keyboards/kakunpc/angel17/info.json29
-rw-r--r--keyboards/kakunpc/angel17/rev1/config.h20
-rw-r--r--keyboards/kakunpc/angel17/rev1/info.json37
-rw-r--r--keyboards/kakunpc/angel17/rev1/rev1.c16
-rw-r--r--keyboards/kakunpc/angel17/rev1/rev1.h40
-rw-r--r--keyboards/kakunpc/angel64/alpha/alpha.c16
-rw-r--r--keyboards/kakunpc/angel64/alpha/alpha.h48
-rw-r--r--keyboards/kakunpc/angel64/alpha/config.h3
-rw-r--r--keyboards/kakunpc/angel64/alpha/info.json74
-rw-r--r--keyboards/kakunpc/angel64/rev1/config.h3
-rw-r--r--keyboards/kakunpc/angel64/rev1/info.json3
-rw-r--r--keyboards/kakunpc/angel64/rev1/rev1.c16
-rw-r--r--keyboards/kakunpc/business_card/alpha/alpha.c16
-rw-r--r--keyboards/kakunpc/business_card/alpha/alpha.h35
-rw-r--r--keyboards/kakunpc/business_card/alpha/config.h20
-rw-r--r--keyboards/kakunpc/business_card/alpha/info.json21
-rw-r--r--keyboards/kakunpc/business_card/alpha/keymaps/default/config.h3
-rw-r--r--keyboards/kakunpc/business_card/beta/beta.c16
-rw-r--r--keyboards/kakunpc/business_card/beta/beta.h37
-rw-r--r--keyboards/kakunpc/business_card/beta/config.h20
-rw-r--r--keyboards/kakunpc/business_card/beta/info.json22
-rw-r--r--keyboards/kakunpc/business_card/beta/keymaps/default/config.h4
-rw-r--r--keyboards/kakunpc/business_card/business_card.c16
-rw-r--r--keyboards/kakunpc/business_card/business_card.h25
-rw-r--r--keyboards/kakunpc/choc_taro/choc_taro.c17
-rw-r--r--keyboards/kakunpc/rabbit_capture_plan/config.h20
-rw-r--r--keyboards/kakunpc/rabbit_capture_plan/info.json370
-rw-r--r--keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c17
-rw-r--r--keyboards/kakunpc/suihankey/alpha/alpha.c16
-rw-r--r--keyboards/kakunpc/suihankey/alpha/alpha.h39
-rw-r--r--keyboards/kakunpc/suihankey/alpha/config.h20
-rw-r--r--keyboards/kakunpc/suihankey/alpha/info.json44
-rw-r--r--keyboards/kakunpc/suihankey/rev1/config.h20
-rw-r--r--keyboards/kakunpc/suihankey/rev1/info.json44
-rw-r--r--keyboards/kakunpc/suihankey/rev1/rev1.c16
-rw-r--r--keyboards/kakunpc/suihankey/rev1/rev1.h40
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/alpha.c16
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/alpha.h45
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/config.h19
-rw-r--r--keyboards/kakunpc/suihankey/split/alpha/info.json62
-rw-r--r--keyboards/kakunpc/suihankey/split/info.json51
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/config.h19
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/info.json62
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/rev1.c16
-rw-r--r--keyboards/kakunpc/suihankey/split/rev1/rev1.h47
-rw-r--r--keyboards/kakunpc/thedogkeyboard/config.h3
-rw-r--r--keyboards/kakunpc/thedogkeyboard/info.json3
-rw-r--r--keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c16
52 files changed, 436 insertions, 1233 deletions
diff --git a/keyboards/kakunpc/angel17/alpha/alpha.c b/keyboards/kakunpc/angel17/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/angel17/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "alpha.h"
diff --git a/keyboards/kakunpc/angel17/alpha/alpha.h b/keyboards/kakunpc/angel17/alpha/alpha.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/alpha/alpha.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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_numpad_5x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, \
- k20, k21, k22, k13, \
- k30, k31, k32, \
- k40, k41, k33 \
-) \
-{ \
- { k00, k10, k20, k31, k41 }, \
- { k02, k12, k22, k33, KC_NO }, \
- { k01, k11, k21, k32, KC_NO }, \
- { k03, k13, k30, k40, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/angel17/alpha/config.h b/keyboards/kakunpc/angel17/alpha/config.h
index abe10572df..f79d812475 100644
--- a/keyboards/kakunpc/angel17/alpha/config.h
+++ b/keyboards/kakunpc/angel17/alpha/config.h
@@ -17,23 +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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* 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/kakunpc/angel17/alpha/info.json b/keyboards/kakunpc/angel17/alpha/info.json
new file mode 100644
index 0000000000..8e0df61513
--- /dev/null
+++ b/keyboards/kakunpc/angel17/alpha/info.json
@@ -0,0 +1,34 @@
+{
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+ {"matrix": [1, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+
+ {"matrix": [0, 2], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [0, 3], "x": 1, "y": 3},
+ {"matrix": [2, 3], "x": 2, "y": 3},
+
+ {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [0, 4], "x": 2, "y": 4},
+ {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json
index da7b1d688e..a8a4f2c148 100644
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@@ -10,32 +10,5 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
- "community_layouts": ["numpad_5x4"],
- "layouts": {
- "LAYOUT_numpad_5x4": {
- "layout": [
- {"label":"Num Lock", "x":0, "y":0},
- {"label":"/", "x":1, "y":0},
- {"label":"*", "x":2, "y":0},
- {"label":"-", "x":3, "y":0},
-
- {"label":"7", "x":0, "y":1},
- {"label":"8", "x":1, "y":1},
- {"label":"9", "x":2, "y":1},
-
- {"label":"4", "x":0, "y":2},
- {"label":"5", "x":1, "y":2},
- {"label":"6", "x":2, "y":2},
- {"label":"+", "x":3, "y":1, "h":2},
-
- {"label":"1", "x":0, "y":3},
- {"label":"2", "x":1, "y":3},
- {"label":"3", "x":2, "y":3},
-
- {"label":"0", "x":0, "y":4, "w":2},
- {"label":".", "x":2, "y":4},
- {"label":"Enter", "x":3, "y":3, "h":2}
- ]
- }
- }
+ "community_layouts": ["numpad_5x4"]
}
diff --git a/keyboards/kakunpc/angel17/rev1/config.h b/keyboards/kakunpc/angel17/rev1/config.h
index 0c2a432d5f..f3471e71e4 100644
--- a/keyboards/kakunpc/angel17/rev1/config.h
+++ b/keyboards/kakunpc/angel17/rev1/config.h
@@ -17,32 +17,12 @@ 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 { D4, C6, D7, E6 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 17
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/angel17/rev1/info.json b/keyboards/kakunpc/angel17/rev1/info.json
new file mode 100644
index 0000000000..9454cc5ffd
--- /dev/null
+++ b/keyboards/kakunpc/angel17/rev1/info.json
@@ -0,0 +1,37 @@
+{
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1"],
+ "rows": ["D4", "C6", "D7", "E6"]
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT_numpad_5x4": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+ {"matrix": [1, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+
+ {"matrix": [0, 1], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1, "y": 1},
+ {"matrix": [1, 1], "x": 2, "y": 1},
+
+ {"matrix": [0, 2], "x": 0, "y": 2},
+ {"matrix": [2, 2], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 1, "h": 2},
+
+ {"matrix": [3, 2], "x": 0, "y": 3},
+ {"matrix": [0, 3], "x": 1, "y": 3},
+ {"matrix": [2, 3], "x": 2, "y": 3},
+
+ {"matrix": [3, 3], "x": 0, "y": 4, "w": 2},
+ {"matrix": [0, 4], "x": 2, "y": 4},
+ {"matrix": [1, 3], "x": 3, "y": 3, "h": 2}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kakunpc/angel17/rev1/rev1.c b/keyboards/kakunpc/angel17/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/angel17/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "rev1.h"
diff --git a/keyboards/kakunpc/angel17/rev1/rev1.h b/keyboards/kakunpc/angel17/rev1/rev1.h
deleted file mode 100644
index 5b8600a206..0000000000
--- a/keyboards/kakunpc/angel17/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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_numpad_5x4( \
- k00, k01, k02, k03, \
- k10, k11, k12, \
- k20, k21, k22, k13, \
- k30, k31, k32, \
- k40, k41, k33 \
-) \
-{ \
- { k00, k10, k20, k31, k41 }, \
- { k02, k12, k22, k33, KC_NO }, \
- { k01, k11, k21, k32, KC_NO }, \
- { k03, k13, k30, k40, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/angel64/alpha/alpha.c b/keyboards/kakunpc/angel64/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/angel64/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "alpha.h"
diff --git a/keyboards/kakunpc/angel64/alpha/alpha.h b/keyboards/kakunpc/angel64/alpha/alpha.h
deleted file mode 100644
index 6c0898a56a..0000000000
--- a/keyboards/kakunpc/angel64/alpha/alpha.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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( \
- 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, k46, k47, k48, k49, k50, k51, k52, k53, \
- k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64\
-) \
-{ \
- { k01, k13, k25, k37, k49, k61 }, \
- { k02, k14, k26, k38, k50, k62 }, \
- { k03, k15, k27, k39, k51, k63 }, \
- { k04, k16, k28, k40, k52, k64 }, \
- { k05, k17, k29, k41, k53, KC_NO }, \
- { k06, k18, k30, k42, k54, KC_NO }, \
- { k07, k19, k31, k43, k55, KC_NO }, \
- { k08, k20, k32, k44, k56, KC_NO }, \
- { k09, k21, k33, k45, k57, KC_NO }, \
- { k10, k22, k34, k46, k58, KC_NO }, \
- { k11, k23, k35, k47, k59, KC_NO }, \
- { k12, k24, k36, k48, k60, KC_NO } \
-}
diff --git a/keyboards/kakunpc/angel64/alpha/config.h b/keyboards/kakunpc/angel64/alpha/config.h
index 39d8fcf0cd..b4d1467a6b 100644
--- a/keyboards/kakunpc/angel64/alpha/config.h
+++ b/keyboards/kakunpc/angel64/alpha/config.h
@@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -47,7 +45,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/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json
index 0fe4f0f5ab..3429799a75 100644
--- a/keyboards/kakunpc/angel64/alpha/info.json
+++ b/keyboards/kakunpc/angel64/alpha/info.json
@@ -8,11 +8,83 @@
"pid": "0x0A64",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"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":"%", "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":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"back", "x":13, "y":0}, {"label":"Q", "x":0, "y":1, "w":1.5}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"[", "x":10.5, "y":1}, {"label":"]", "x":11.5, "y":1}, {"label":"|", "x":12.5, "y":1, "w":1.5}, {"label":"Ctrl", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";:", "x":10, "y":2}, {"label":"`", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":">", "x":9.5, "y":3}, {"label":"?", "x":10.5, "y":3}, {"label":"\u2191", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3, "w":1.5}, {"label":"Caps", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Start", "x":2, "y":4, "w":1.5}, {"label":"Ctrl", "x":3.5, "y":4, "w":1.5}, {"label":"Space", "x":5, "y":4, "w":2}, {"label":"Ctrl", "x":7, "y":4, "w":1.5}, {"label":"Alt", "x":8.5, "y":4, "w":1.5}, {"label":"\u2190", "x":10, "y":4}, {"label":"\u2193", "x":11, "y":4}, {"label":"\u2192", "x":12, "y":4}, {"label":"Alt", "x":13, "y":4}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [1, 0], "x": 1, "y": 0},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0},
+ {"matrix": [4, 0], "x": 4, "y": 0},
+ {"matrix": [5, 0], "x": 5, "y": 0},
+ {"matrix": [6, 0], "x": 6, "y": 0},
+ {"matrix": [7, 0], "x": 7, "y": 0},
+ {"matrix": [8, 0], "x": 8, "y": 0},
+ {"matrix": [9, 0], "x": 9, "y": 0},
+ {"matrix": [10, 0], "x": 10, "y": 0},
+ {"matrix": [11, 0], "x": 11, "y": 0},
+ {"matrix": [0, 1], "x": 12, "y": 0},
+ {"matrix": [1, 1], "x": 13, "y": 0},
+
+ {"matrix": [2, 1], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 1},
+ {"matrix": [4, 1], "x": 2.5, "y": 1},
+ {"matrix": [5, 1], "x": 3.5, "y": 1},
+ {"matrix": [6, 1], "x": 4.5, "y": 1},
+ {"matrix": [7, 1], "x": 5.5, "y": 1},
+ {"matrix": [8, 1], "x": 6.5, "y": 1},
+ {"matrix": [9, 1], "x": 7.5, "y": 1},
+ {"matrix": [10, 1], "x": 8.5, "y": 1},
+ {"matrix": [11, 1], "x": 9.5, "y": 1},
+ {"matrix": [0, 2], "x": 10.5, "y": 1},
+ {"matrix": [1, 2], "x": 11.5, "y": 1},
+ {"matrix": [2, 2], "x": 12.5, "y": 1, "w": 1.5},
+
+ {"matrix": [3, 2], "x": 0, "y": 2},
+ {"matrix": [4, 2], "x": 1, "y": 2},
+ {"matrix": [5, 2], "x": 2, "y": 2},
+ {"matrix": [6, 2], "x": 3, "y": 2},
+ {"matrix": [7, 2], "x": 4, "y": 2},
+ {"matrix": [8, 2], "x": 5, "y": 2},
+ {"matrix": [9, 2], "x": 6, "y": 2},
+ {"matrix": [10, 2], "x": 7, "y": 2},
+ {"matrix": [11, 2], "x": 8, "y": 2},
+ {"matrix": [0, 3], "x": 9, "y": 2},
+ {"matrix": [1, 3], "x": 10, "y": 2},
+ {"matrix": [2, 3], "x": 11, "y": 2},
+ {"matrix": [3, 3], "x": 12, "y": 2, "w": 2},
+
+ {"matrix": [4, 3], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 3], "x": 1.5, "y": 3},
+ {"matrix": [6, 3], "x": 2.5, "y": 3},
+ {"matrix": [7, 3], "x": 3.5, "y": 3},
+ {"matrix": [8, 3], "x": 4.5, "y": 3},
+ {"matrix": [9, 3], "x": 5.5, "y": 3},
+ {"matrix": [10, 3], "x": 6.5, "y": 3},
+ {"matrix": [11, 3], "x": 7.5, "y": 3},
+ {"matrix": [0, 4], "x": 8.5, "y": 3},
+ {"matrix": [1, 4], "x": 9.5, "y": 3},
+ {"matrix": [2, 4], "x": 10.5, "y": 3},
+ {"matrix": [3, 4], "x": 11.5, "y": 3},
+ {"matrix": [4, 4], "x": 12.5, "y": 3, "w": 1.5},
+
+ {"matrix": [5, 4], "x": 0, "y": 4},
+ {"matrix": [6, 4], "x": 1, "y": 4},
+ {"matrix": [7, 4], "x": 2, "y": 4, "w": 1.5},
+ {"matrix": [8, 4], "x": 3.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 4], "x": 5, "y": 4, "w": 2},
+ {"matrix": [10, 4], "x": 7, "y": 4, "w": 1.5},
+ {"matrix": [11, 4], "x": 8.5, "y": 4, "w": 1.5},
+ {"matrix": [0, 5], "x": 10, "y": 4},
+ {"matrix": [1, 5], "x": 11, "y": 4},
+ {"matrix": [2, 5], "x": 12, "y": 4},
+ {"matrix": [3, 5], "x": 13, "y": 4}
+ ]
}
}
}
diff --git a/keyboards/kakunpc/angel64/rev1/config.h b/keyboards/kakunpc/angel64/rev1/config.h
index 39d8fcf0cd..b4d1467a6b 100644
--- a/keyboards/kakunpc/angel64/rev1/config.h
+++ b/keyboards/kakunpc/angel64/rev1/config.h
@@ -29,8 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 64
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -47,7 +45,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/kakunpc/angel64/rev1/info.json b/keyboards/kakunpc/angel64/rev1/info.json
index 77d034baeb..c30614b640 100644
--- a/keyboards/kakunpc/angel64/rev1/info.json
+++ b/keyboards/kakunpc/angel64/rev1/info.json
@@ -8,6 +8,9 @@
"pid": "0x0A64",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/kakunpc/angel64/rev1/rev1.c b/keyboards/kakunpc/angel64/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/angel64/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "rev1.h"
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.c b/keyboards/kakunpc/business_card/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "alpha.h"
diff --git a/keyboards/kakunpc/business_card/alpha/alpha.h b/keyboards/kakunpc/business_card/alpha/alpha.h
deleted file mode 100644
index 9807576899..0000000000
--- a/keyboards/kakunpc/business_card/alpha/alpha.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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, \
- k10, k11, k12 \
-) \
-{ \
- { k00, k01, k02 }, \
- { k10, k11, k12 }, \
-}
diff --git a/keyboards/kakunpc/business_card/alpha/config.h b/keyboards/kakunpc/business_card/alpha/config.h
index 93130b4f99..719781fad5 100644
--- a/keyboards/kakunpc/business_card/alpha/config.h
+++ b/keyboards/kakunpc/business_card/alpha/config.h
@@ -17,32 +17,12 @@ 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 { B2, B6 }
-#define MATRIX_COL_PINS { E6, B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/alpha/info.json b/keyboards/kakunpc/business_card/alpha/info.json
index 3cbeeef196..17fda49030 100644
--- a/keyboards/kakunpc/business_card/alpha/info.json
+++ b/keyboards/kakunpc/business_card/alpha/info.json
@@ -8,17 +8,26 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["E6", "B4", "B5"],
+ "rows": ["B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"1", "x":0, "y":0},
- {"label":"2", "x":1, "y":0},
- {"label":"3", "x":2, "y":0},
- {"label":"4", "x":0, "y":1},
- {"label":"5", "x":1, "y":1},
- {"label":"6", "x":2, "y":1}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1}
]
}
}
diff --git a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
index ff2381020a..dec4c0dd7b 100644
--- a/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/alpha/keymaps/default/config.h
@@ -16,8 +16,6 @@
#pragma once
-// place overrides here
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -28,4 +26,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/business_card/beta/beta.c b/keyboards/kakunpc/business_card/beta/beta.c
deleted file mode 100644
index 7a9aa1b9bd..0000000000
--- a/keyboards/kakunpc/business_card/beta/beta.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "beta.h"
diff --git a/keyboards/kakunpc/business_card/beta/beta.h b/keyboards/kakunpc/business_card/beta/beta.h
deleted file mode 100644
index 21a334e8a9..0000000000
--- a/keyboards/kakunpc/business_card/beta/beta.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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, \
- k10, k11, \
- k20, k21 \
-) \
-{ \
- { k21, k20 }, \
- { k11, k10 }, \
- { k01, k00 }, \
-}
diff --git a/keyboards/kakunpc/business_card/beta/config.h b/keyboards/kakunpc/business_card/beta/config.h
index 405e4daefb..719781fad5 100644
--- a/keyboards/kakunpc/business_card/beta/config.h
+++ b/keyboards/kakunpc/business_card/beta/config.h
@@ -17,32 +17,12 @@ 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 { B3, B2, B6 }
-#define MATRIX_COL_PINS { B4, B5 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 6
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/business_card/beta/info.json b/keyboards/kakunpc/business_card/beta/info.json
index 1dab5c4d3a..9886b2aa6c 100644
--- a/keyboards/kakunpc/business_card/beta/info.json
+++ b/keyboards/kakunpc/business_card/beta/info.json
@@ -8,17 +8,27 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["B4", "B5"],
+ "rows": ["B3", "B2", "B6"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"1", "x":0, "y":0},
- {"label":"2", "x":1, "y":0},
- {"label":"3", "x":0, "y":1},
- {"label":"4", "x":1, "y":1},
- {"label":"5", "x":0, "y":2},
- {"label":"6", "x":1, "y":2}
+ {"matrix": [2, 1], "x": 0, "y": 0},
+ {"matrix": [2, 0], "x": 1, "y": 0},
+
+ {"matrix": [1, 1], "x": 0, "y": 1},
+ {"matrix": [1, 0], "x": 1, "y": 1},
+
+ {"matrix": [0, 1], "x": 0, "y": 2},
+ {"matrix": [0, 0], "x": 1, "y": 2}
]
}
}
diff --git a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
index fb0c1ab3a3..dec4c0dd7b 100644
--- a/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
+++ b/keyboards/kakunpc/business_card/beta/keymaps/default/config.h
@@ -16,9 +16,6 @@
#pragma once
-// place overrides here
-
-#ifdef RGB_DI_PIN
# define RGBLIGHT_EFFECT_BREATHING
# define RGBLIGHT_EFFECT_RAINBOW_MOOD
# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
@@ -29,4 +26,3 @@
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE
-#endif
diff --git a/keyboards/kakunpc/business_card/business_card.c b/keyboards/kakunpc/business_card/business_card.c
deleted file mode 100644
index 01beb28220..0000000000
--- a/keyboards/kakunpc/business_card/business_card.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "business_card.h"
diff --git a/keyboards/kakunpc/business_card/business_card.h b/keyboards/kakunpc/business_card/business_card.h
deleted file mode 100644
index 125c3080d6..0000000000
--- a/keyboards/kakunpc/business_card/business_card.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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
-
-#ifdef KEYBOARD_kakunpc_business_card_alpha
- #include "alpha.h"
-#endif
-#ifdef KEYBOARD_kakunpc_business_card_beta
- #include "beta.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kakunpc/choc_taro/choc_taro.c b/keyboards/kakunpc/choc_taro/choc_taro.c
deleted file mode 100644
index 2a835b2bd8..0000000000
--- a/keyboards/kakunpc/choc_taro/choc_taro.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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 "choc_taro.h"
diff --git a/keyboards/kakunpc/rabbit_capture_plan/config.h b/keyboards/kakunpc/rabbit_capture_plan/config.h
index efc247b38b..3cdc282329 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/config.h
+++ b/keyboards/kakunpc/rabbit_capture_plan/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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_SPLIT {32, 37}
# define RGBLED_NUM 69
# define RGBLIGHT_HUE_STEP 8
@@ -53,7 +34,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/kakunpc/rabbit_capture_plan/info.json b/keyboards/kakunpc/rabbit_capture_plan/info.json
index 7c7157bdf4..02ac7d54b7 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/info.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/info.json
@@ -8,6 +8,14 @@
"pid": "0xEB59",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
@@ -16,303 +24,79 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {
- "x": 0.66,
- "y": 0
- },
- {
- "x": 1.6600000000000001,
- "y": 0
- },
- {
- "x": 2.97,
- "y": 0
- },
- {
- "x": 3.97,
- "y": 0
- },
- {
- "x": 4.97,
- "y": 0
- },
- {
- "x": 5.97,
- "y": 0
- },
- {
- "x": 6.97,
- "y": 0
- },
- {
- "x": 9.87,
- "y": 0
- },
- {
- "x": 10.87,
- "y": 0
- },
- {
- "x": 11.87,
- "y": 0
- },
- {
- "x": 12.87,
- "y": 0
- },
- {
- "x": 14.32,
- "y": 0
- },
- {
- "x": 15.32,
- "y": 0
- },
- {
- "x": 16.32,
- "y": 0
- },
- {
- "x": 17.32,
- "y": 0
- },
-
-
-
- {
- "x": 0.53,
- "y": 1,
- "w": 1.5
- },
- {
- "x": 2.03,
- "y": 1
- },
- {
- "x": 3.47,
- "y": 1
- },
- {
- "x": 4.47,
- "y": 1
- },
- {
- "x": 5.47,
- "y": 1
- },
- {
- "x": 6.47,
- "y": 1
- },
- {
- "x": 7.47,
- "y": 1
- },
- {
- "x": 9.37,
- "y": 1
- },
- {
- "x": 10.37,
- "y": 1
- },
- {
- "x": 11.37,
- "y": 1
- },
- {
- "x": 12.37,
- "y": 1
- },
- {
- "x": 13.97,
- "y": 1
- },
- {
- "x": 14.97,
- "y": 1
- },
- {
- "x": 15.97,
- "y": 1
- },
- {
- "x": 16.97,
- "y": 1,
- "w": 1.5
- },
-
-
-
- {
- "x": 0.39,
- "y": 2,
- "w": 1.75
- },
- {
- "x": 2.14,
- "y": 2
- },
- {
- "x": 3.72,
- "y": 2
- },
- {
- "x": 4.72,
- "y": 2
- },
- {
- "x": 5.72,
- "y": 2
- },
- {
- "x": 6.72,
- "y": 2
- },
- {
- "x": 7.72,
- "y": 2
- },
- {
- "x": 9.62,
- "y": 2
- },
- {
- "x": 10.62,
- "y": 2
- },
- {
- "x": 11.62,
- "y": 2
- },
- {
- "x": 12.62,
- "y": 2
- },
- {
- "x": 14.34,
- "y": 2
- },
- {
- "x": 15.34,
- "y": 2
- },
- {
- "x": 16.34,
- "y": 2,
- "w": 2.25
- },
-
-
+ {"x": 0.41, "y": 0},
+ {"x": 1.41, "y": 0},
+ {"x": 2.72, "y": 0},
+ {"x": 3.72, "y": 0},
+ {"x": 4.72, "y": 0},
+ {"x": 5.72, "y": 0},
+ {"x": 6.72, "y": 0},
+ {"x": 9.62, "y": 0},
+ {"x": 10.62, "y": 0},
+ {"x": 11.62, "y": 0},
+ {"x": 12.62, "y": 0},
+ {"x": 14.07, "y": 0},
+ {"x": 15.07, "y": 0},
+ {"x": 16.07, "y": 0},
+ {"x": 17.07, "y": 0},
- {
- "x": 0.25,
- "y": 3,
- "w": 2.25
- },
- {
- "x": 2.5,
- "y": 3
- },
- {
- "x": 4.22,
- "y": 3
- },
- {
- "x": 5.22,
- "y": 3
- },
- {
- "x": 6.22,
- "y": 3
- },
- {
- "x": 7.22,
- "y": 3
- },
- {
- "x": 9.12,
- "y": 3
- },
- {
- "x": 10.12,
- "y": 3
- },
- {
- "x": 11.12,
- "y": 3
- },
- {
- "x": 12.12,
- "y": 3
- },
- {
- "x": 13.97,
- "y": 3
- },
- {
- "x": 14.97,
- "y": 3
- },
- {
- "x": 15.97,
- "y": 3
- },
- {
- "x": 16.97,
- "y": 3
- },
- {
- "x": 18.25,
- "y": 3.25
- },
+ {"x": 0.28, "y": 1, "w": 1.5},
+ {"x": 1.78, "y": 1},
+ {"x": 3.22, "y": 1},
+ {"x": 4.22, "y": 1},
+ {"x": 5.22, "y": 1},
+ {"x": 6.22, "y": 1},
+ {"x": 7.22, "y": 1},
+ {"x": 9.12, "y": 1},
+ {"x": 10.12, "y": 1},
+ {"x": 11.12, "y": 1},
+ {"x": 12.12, "y": 1},
+ {"x": 13.72, "y": 1},
+ {"x": 14.72, "y": 1},
+ {"x": 15.72, "y": 1},
+ {"x": 16.72, "y": 1, "w": 1.5},
+ {"x": 0.14, "y": 2, "w": 1.75},
+ {"x": 1.89, "y": 2},
+ {"x": 3.47, "y": 2},
+ {"x": 4.47, "y": 2},
+ {"x": 5.47, "y": 2},
+ {"x": 6.47, "y": 2},
+ {"x": 7.47, "y": 2},
+ {"x": 9.37, "y": 2},
+ {"x": 10.37, "y": 2},
+ {"x": 11.37, "y": 2},
+ {"x": 12.37, "y": 2},
+ {"x": 14.09, "y": 2},
+ {"x": 15.09, "y": 2},
+ {"x": 16.09, "y": 2, "w": 2.25},
+ {"x": 0, "y": 3, "w": 2.25},
+ {"x": 2.25, "y": 3},
+ {"x": 3.97, "y": 3},
+ {"x": 4.97, "y": 3},
+ {"x": 5.97, "y": 3},
+ {"x": 6.97, "y": 3},
+ {"x": 8.87, "y": 3},
+ {"x": 9.87, "y": 3},
+ {"x": 10.87, "y": 3},
+ {"x": 11.87, "y": 3},
+ {"x": 13.72, "y": 3},
+ {"x": 14.72, "y": 3},
+ {"x": 15.72, "y": 3},
+ {"x": 16.72, "y": 3},
+ {"x": 18, "y": 3.25},
- {
- "x": 0.5,
- "y": 4,
- "w": 1.25
- },
- {
- "x": 1.75,
- "y": 4,
- "w": 1.25
- },
- {
- "x": 4.72,
- "y": 4
- },
- {
- "x": 5.72,
- "y": 4,
- "w": 2
- },
- {
- "x": 7.72,
- "y": 4
- },
- {
- "x": 9.6,
- "y": 4,
- "w": 2.75
- },
- {
- "x": 12.35,
- "y": 4
- },
- {
- "x": 17.25,
- "y": 4.25
- },
- {
- "x": 18.25,
- "y": 4.25
- },
- {
- "x": 19.25,
- "y": 4.25
- }
+ {"x": 0.25, "y": 4, "w": 1.25},
+ {"x": 1.5, "y": 4, "w": 1.25},
+ {"x": 4.47, "y": 4},
+ {"x": 5.47, "y": 4, "w": 2},
+ {"x": 7.47, "y": 4},
+ {"x": 9.35, "y": 4, "w": 2.75},
+ {"x": 12.1, "y": 4},
+ {"x": 17, "y": 4.25},
+ {"x": 18, "y": 4.25},
+ {"x": 19, "y": 4.25}
]
}
}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c b/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
deleted file mode 100644
index 7a45e61f35..0000000000
--- a/keyboards/kakunpc/rabbit_capture_plan/rabbit_capture_plan.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 kakunpc
- *
- * 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 "rabbit_capture_plan.h"
diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.c b/keyboards/kakunpc/suihankey/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/suihankey/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "alpha.h"
diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h
deleted file mode 100644
index 02bba47104..0000000000
--- a/keyboards/kakunpc/suihankey/alpha/alpha.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, \
- L10, L11, L12, L13, L14, \
- L20, L21, L22, L23, L24, \
- L30, L31, L32 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { L30, L31, L32 }, \
-}
diff --git a/keyboards/kakunpc/suihankey/alpha/config.h b/keyboards/kakunpc/suihankey/alpha/config.h
index a2fcf4c628..09038071c2 100644
--- a/keyboards/kakunpc/suihankey/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/alpha/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 { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#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/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json
index 76c31631ff..b48aab8422 100644
--- a/keyboards/kakunpc/suihankey/alpha/info.json
+++ b/keyboards/kakunpc/suihankey/alpha/info.json
@@ -8,32 +8,40 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.125},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.125},
- {"x": 4, "y": 0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.125},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.125},
- {"x": 4, "y": 1.25},
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.125},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.125},
- {"x": 4, "y": 2.25},
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
- {"x": 3.4, "y": 3.25},
- {"x": 4.4, "y": 3.55},
- {"x": 5.4, "y": 3.85}
+ {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+ {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+ {"matrix": [3, 2], "x": 5.4, "y": 3.85}
]
}
}
diff --git a/keyboards/kakunpc/suihankey/rev1/config.h b/keyboards/kakunpc/suihankey/rev1/config.h
index 9c2bb19be8..09038071c2 100644
--- a/keyboards/kakunpc/suihankey/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/rev1/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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#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/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json
index 76c31631ff..4f5caa6c63 100644
--- a/keyboards/kakunpc/suihankey/rev1/info.json
+++ b/keyboards/kakunpc/suihankey/rev1/info.json
@@ -8,32 +8,40 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.125},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.125},
- {"x": 4, "y": 0.25},
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [1, 0], "x": 1, "y": 0.125},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0.125},
+ {"matrix": [4, 0], "x": 4, "y": 0.25},
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.125},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.125},
- {"x": 4, "y": 1.25},
+ {"matrix": [0, 1], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1.125},
+ {"matrix": [4, 1], "x": 4, "y": 1.25},
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.125},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.125},
- {"x": 4, "y": 2.25},
+ {"matrix": [0, 2], "x": 0, "y": 2.375},
+ {"matrix": [1, 2], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2.125},
+ {"matrix": [4, 2], "x": 4, "y": 2.25},
- {"x": 3.4, "y": 3.25},
- {"x": 4.4, "y": 3.55},
- {"x": 5.4, "y": 3.85}
+ {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+ {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+ {"matrix": [2, 3], "x": 5.4, "y": 3.85}
]
}
}
diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.c b/keyboards/kakunpc/suihankey/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/suihankey/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "rev1.h"
diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h
deleted file mode 100644
index cbc877abd5..0000000000
--- a/keyboards/kakunpc/suihankey/rev1/rev1.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- L00, L01, L02, L03, L04, \
- L10, L11, L12, L13, L14, \
- L20, L21, L22, L23, L24, \
- L30, L31, L32 \
-) \
-{ \
- { L00, L10, L20, L30 }, \
- { L01, L11, L21, L31 }, \
- { L02, L12, L22, L32 }, \
- { L03, L13, L23, KC_NO }, \
- { L04, L14, L24, KC_NO }, \
-}
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.c b/keyboards/kakunpc/suihankey/split/alpha/alpha.c
deleted file mode 100644
index 1c2936e157..0000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/alpha.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "alpha.h"
diff --git a/keyboards/kakunpc/suihankey/split/alpha/alpha.h b/keyboards/kakunpc/suihankey/split/alpha/alpha.h
deleted file mode 100644
index ba93405ecc..0000000000
--- a/keyboards/kakunpc/suihankey/split/alpha/alpha.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30 \
-) \
-{ \
- { L00, L01, L02, L03, L04 }, \
- { L10, L11, L12, L13, L14 }, \
- { L20, L21, L22, L23, L24 }, \
- { L30, L31, L32 }, \
- { R00, R01, R02, R03, R04 }, \
- { R10, R11, R12, R13, R14 }, \
- { R20, R21, R22, R23, R24 }, \
- { R30, R31, R32 }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/kakunpc/suihankey/split/alpha/config.h b/keyboards/kakunpc/suihankey/split/alpha/config.h
index f8fd8a6b5f..09befa3a58 100644
--- a/keyboards/kakunpc/suihankey/split/alpha/config.h
+++ b/keyboards/kakunpc/suihankey/split/alpha/config.h
@@ -17,35 +17,16 @@ 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 { F4, F5, F6, F7 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 }
#define USE_I2C
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN D2
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/suihankey/split/alpha/info.json b/keyboards/kakunpc/suihankey/split/alpha/info.json
new file mode 100644
index 0000000000..72aaf72967
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/alpha/info.json
@@ -0,0 +1,62 @@
+{
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4"],
+ "rows": ["F4", "F5", "F6", "F7"]
+ },
+ "diode_direction": "COL2ROW",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [0, 1], "x": 1, "y": 0.125},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.125},
+ {"matrix": [0, 4], "x": 4, "y": 0.25},
+
+ {"matrix": [4, 4], "x": 8.2, "y": 0.25},
+ {"matrix": [4, 3], "x": 9.2, "y": 0.125},
+ {"matrix": [4, 2], "x": 10.2, "y": 0},
+ {"matrix": [4, 1], "x": 11.2, "y": 0.125},
+ {"matrix": [4, 0], "x": 12.2, "y": 0.375},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.125},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+ {"matrix": [5, 4], "x": 8.2, "y": 1.25},
+ {"matrix": [5, 3], "x": 9.2, "y": 1.125},
+ {"matrix": [5, 2], "x": 10.2, "y": 1},
+ {"matrix": [5, 1], "x": 11.2, "y": 1.125},
+ {"matrix": [5, 0], "x": 12.2, "y": 1.375},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.375},
+ {"matrix": [2, 1], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.125},
+ {"matrix": [2, 4], "x": 4, "y": 2.25},
+
+ {"matrix": [6, 4], "x": 8.2, "y": 2.25},
+ {"matrix": [6, 3], "x": 9.2, "y": 2.125},
+ {"matrix": [6, 2], "x": 10.2, "y": 2},
+ {"matrix": [6, 1], "x": 11.2, "y": 2.125},
+ {"matrix": [6, 0], "x": 12.2, "y": 2.375},
+
+ {"matrix": [3, 0], "x": 3.4, "y": 3.25},
+ {"matrix": [3, 1], "x": 4.4, "y": 3.55},
+ {"matrix": [3, 2], "x": 5.4, "y": 3.85},
+
+ {"matrix": [7, 2], "x": 6.8, "y": 3.85},
+ {"matrix": [7, 1], "x": 7.8, "y": 3.55},
+ {"matrix": [7, 0], "x": 8.8, "y": 3.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kakunpc/suihankey/split/info.json b/keyboards/kakunpc/suihankey/split/info.json
index 4cab8c48f2..8f624aeb6c 100644
--- a/keyboards/kakunpc/suihankey/split/info.json
+++ b/keyboards/kakunpc/suihankey/split/info.json
@@ -13,54 +13,5 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "community_layouts": ["split_3x5_3"],
- "layouts": {
- "LAYOUT_split_3x5_3": {
- "layout": [
- {"x": 0, "y": 0.375},
- {"x": 1, "y": 0.125},
- {"x": 2, "y": 0},
- {"x": 3, "y": 0.125},
- {"x": 4, "y": 0.25},
-
- {"x": 8.2, "y": 0.25},
- {"x": 9.2, "y": 0.125},
- {"x": 10.2, "y": 0},
- {"x": 11.2, "y": 0.125},
- {"x": 12.2, "y": 0.375},
-
- {"x": 0, "y": 1.375},
- {"x": 1, "y": 1.125},
- {"x": 2, "y": 1},
- {"x": 3, "y": 1.125},
- {"x": 4, "y": 1.25},
-
- {"x": 8.2, "y": 1.25},
- {"x": 9.2, "y": 1.125},
- {"x": 10.2, "y": 1},
- {"x": 11.2, "y": 1.125},
- {"x": 12.2, "y": 1.375},
-
- {"x": 0, "y": 2.375},
- {"x": 1, "y": 2.125},
- {"x": 2, "y": 2},
- {"x": 3, "y": 2.125},
- {"x": 4, "y": 2.25},
-
- {"x": 8.2, "y": 2.25},
- {"x": 9.2, "y": 2.125},
- {"x": 10.2, "y": 2},
- {"x": 11.2, "y": 2.125},
- {"x": 12.2, "y": 2.375},
-
- {"x": 3.4, "y": 3.25},
- {"x": 4.4, "y": 3.55},
- {"x": 5.4, "y": 3.85},
-
- {"x": 6.8, "y": 3.85},
- {"x": 7.8, "y": 3.55},
- {"x": 8.8, "y": 3.25}
- ]
- }
- }
+ "community_layouts": ["split_3x5_3"]
}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/config.h b/keyboards/kakunpc/suihankey/split/rev1/config.h
index c05fe6d365..1398e13f82 100644
--- a/keyboards/kakunpc/suihankey/split/rev1/config.h
+++ b/keyboards/kakunpc/suihankey/split/rev1/config.h
@@ -17,28 +17,10 @@ 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 { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7 }
#define USE_I2C
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN D2
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -55,7 +37,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/kakunpc/suihankey/split/rev1/info.json b/keyboards/kakunpc/suihankey/split/rev1/info.json
new file mode 100644
index 0000000000..2c414b3116
--- /dev/null
+++ b/keyboards/kakunpc/suihankey/split/rev1/info.json
@@ -0,0 +1,62 @@
+{
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_split_3x5_3"
+ },
+ "layouts": {
+ "LAYOUT_split_3x5_3": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0.375},
+ {"matrix": [1, 0], "x": 1, "y": 0.125},
+ {"matrix": [2, 0], "x": 2, "y": 0},
+ {"matrix": [3, 0], "x": 3, "y": 0.125},
+ {"matrix": [4, 0], "x": 4, "y": 0.25},
+
+ {"matrix": [9, 0], "x": 8.2, "y": 0.25},
+ {"matrix": [8, 0], "x": 9.2, "y": 0.125},
+ {"matrix": [7, 0], "x": 10.2, "y": 0},
+ {"matrix": [6, 0], "x": 11.2, "y": 0.125},
+ {"matrix": [5, 0], "x": 12.2, "y": 0.375},
+
+ {"matrix": [0, 1], "x": 0, "y": 1.375},
+ {"matrix": [1, 1], "x": 1, "y": 1.125},
+ {"matrix": [2, 1], "x": 2, "y": 1},
+ {"matrix": [3, 1], "x": 3, "y": 1.125},
+ {"matrix": [4, 1], "x": 4, "y": 1.25},
+
+ {"matrix": [9, 1], "x": 8.2, "y": 1.25},
+ {"matrix": [8, 1], "x": 9.2, "y": 1.125},
+ {"matrix": [7, 1], "x": 10.2, "y": 1},
+ {"matrix": [6, 1], "x": 11.2, "y": 1.125},
+ {"matrix": [5, 1], "x": 12.2, "y": 1.375},
+
+ {"matrix": [0, 2], "x": 0, "y": 2.375},
+ {"matrix": [1, 2], "x": 1, "y": 2.125},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [3, 2], "x": 3, "y": 2.125},
+ {"matrix": [4, 2], "x": 4, "y": 2.25},
+
+ {"matrix": [9, 2], "x": 8.2, "y": 2.25},
+ {"matrix": [8, 2], "x": 9.2, "y": 2.125},
+ {"matrix": [7, 2], "x": 10.2, "y": 2},
+ {"matrix": [6, 2], "x": 11.2, "y": 2.125},
+ {"matrix": [5, 2], "x": 12.2, "y": 2.375},
+
+ {"matrix": [0, 3], "x": 3.4, "y": 3.25},
+ {"matrix": [1, 3], "x": 4.4, "y": 3.55},
+ {"matrix": [2, 3], "x": 5.4, "y": 3.85},
+
+ {"matrix": [7, 3], "x": 6.8, "y": 3.85},
+ {"matrix": [6, 3], "x": 7.8, "y": 3.55},
+ {"matrix": [5, 3], "x": 8.8, "y": 3.25}
+ ]
+ }
+ }
+}
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.c b/keyboards/kakunpc/suihankey/split/rev1/rev1.c
deleted file mode 100644
index 40ff30e620..0000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "rev1.h"
diff --git a/keyboards/kakunpc/suihankey/split/rev1/rev1.h b/keyboards/kakunpc/suihankey/split/rev1/rev1.h
deleted file mode 100644
index 98618ba712..0000000000
--- a/keyboards/kakunpc/suihankey/split/rev1/rev1.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 Leys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT_split_3x5_3( \
- L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
- L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
- L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
- L30, L31, L32, R32, R31, R30 \
-) \
-{ \
- { L00, L10, L20, L30 }, \
- { L01, L11, L21, L31 }, \
- { L02, L12, L22, L32 }, \
- { L03, L13, L23, KC_NO }, \
- { L04, L14, L24, KC_NO }, \
- { R00, R10, R20, R30 }, \
- { R01, R11, R21, R31 }, \
- { R02, R12, R22, R32 }, \
- { R03, R13, R23, KC_NO }, \
- { R04, R14, R24, KC_NO }, \
-}
-
-#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/kakunpc/thedogkeyboard/config.h b/keyboards/kakunpc/thedogkeyboard/config.h
index fe05231b6f..6b9c95516d 100644
--- a/keyboards/kakunpc/thedogkeyboard/config.h
+++ b/keyboards/kakunpc/thedogkeyboard/config.h
@@ -35,15 +35,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B4, B5 }
#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6 }
-#define RGB_DI_PIN D3
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 111
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 50 /* The maximum brightness level */
#define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/kakunpc/thedogkeyboard/info.json b/keyboards/kakunpc/thedogkeyboard/info.json
index 26b320083c..f511fbc77e 100644
--- a/keyboards/kakunpc/thedogkeyboard/info.json
+++ b/keyboards/kakunpc/thedogkeyboard/info.json
@@ -8,6 +8,9 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
diff --git a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c b/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
deleted file mode 100644
index a1808324c8..0000000000
--- a/keyboards/kakunpc/thedogkeyboard/thedogkeyboard.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 kakunpc
- *
- * 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 "thedogkeyboard.h"