summaryrefslogtreecommitdiff
path: root/keyboards/kudox_game
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/kudox_game')
-rw-r--r--keyboards/kudox_game/info.json34
-rw-r--r--keyboards/kudox_game/kudox_game.c16
-rw-r--r--keyboards/kudox_game/kudox_game.h26
-rw-r--r--keyboards/kudox_game/rev1/config.h12
-rw-r--r--keyboards/kudox_game/rev1/info.json45
-rw-r--r--keyboards/kudox_game/rev1/rev1.c1
-rw-r--r--keyboards/kudox_game/rev1/rev1.h20
-rw-r--r--keyboards/kudox_game/rev2/config.h12
-rw-r--r--keyboards/kudox_game/rev2/info.json45
-rw-r--r--keyboards/kudox_game/rev2/rev2.c1
-rw-r--r--keyboards/kudox_game/rev2/rev2.h20
11 files changed, 91 insertions, 141 deletions
diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json
index e927bb9439..6968b5e427 100644
--- a/keyboards/kudox_game/info.json
+++ b/keyboards/kudox_game/info.json
@@ -8,37 +8,5 @@
"pid": "0x9696"
},
"processor": "atmega32u4",
- "bootloader": "caterina",
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1.5, "y":0},
- {"label":"2", "x":2.5, "y":0},
- {"label":"3", "x":3.5, "y":0},
- {"label":"4", "x":4.5, "y":0},
- {"label":"5", "x":5.5, "y":0},
- {"label":"Q", "x":1.75, "y":1},
- {"label":"W", "x":2.75, "y":1},
- {"label":"E", "x":3.75, "y":1},
- {"label":"R", "x":4.75, "y":1},
- {"label":"T", "x":5.75, "y":1},
- {"label":"Ctrl-C", "x":0, "y":2},
- {"label":"Ctrl-V", "x":1, "y":2},
- {"label":"A", "x":2, "y":2},
- {"label":"S", "x":3, "y":2},
- {"label":"D", "x":4, "y":2},
- {"label":"F", "x":5.25, "y":2},
- {"label":"G", "x":6.25, "y":2},
- {"label":"Shift", "x":0, "y":3, "w":1.5},
- {"label":"Z", "x":1.5, "y":3},
- {"label":"X", "x":3.75, "y":3},
- {"label":"C", "x":4.75, "y":3},
- {"label":"V", "x":5.75, "y":3},
- {"label":"Ctrl", "x":0, "y":4, "w":1.5},
- {"label":"Layer", "x":5.5, "y":4.25, "h":1.5},
- {"x":6.5, "y":4.75, "h":2}
- ]
- }
- }
+ "bootloader": "caterina"
}
diff --git a/keyboards/kudox_game/kudox_game.c b/keyboards/kudox_game/kudox_game.c
deleted file mode 100644
index cf053afd06..0000000000
--- a/keyboards/kudox_game/kudox_game.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * 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 "kudox_game.h"
diff --git a/keyboards/kudox_game/kudox_game.h b/keyboards/kudox_game/kudox_game.h
deleted file mode 100644
index c76f086c87..0000000000
--- a/keyboards/kudox_game/kudox_game.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright 2019 Kumao Kobo <kumaokobo@gmail.com>
- *
- * 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_kudox_game_rev1
- #include "rev1.h"
-#endif
-#ifdef KEYBOARD_kudox_game_rev2
- #include "rev2.h"
-#endif
-
-#include "quantum.h"
diff --git a/keyboards/kudox_game/rev1/config.h b/keyboards/kudox_game/rev1/config.h
index af9cf9a54d..5fddd8102a 100644
--- a/keyboards/kudox_game/rev1/config.h
+++ b/keyboards/kudox_game/rev1/config.h
@@ -17,23 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#undef RGBLED_NUM
#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json
index ad889c2304..7868308ead 100644
--- a/keyboards/kudox_game/rev1/info.json
+++ b/keyboards/kudox_game/rev1/info.json
@@ -1,5 +1,50 @@
{
"usb": {
"device_version": "1.0.0"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "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.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
+ ]
+ }
}
}
diff --git a/keyboards/kudox_game/rev1/rev1.c b/keyboards/kudox_game/rev1/rev1.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h
deleted file mode 100644
index e630a51658..0000000000
--- a/keyboards/kudox_game/rev1/rev1.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "../kudox_game.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, \
- k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, k26, \
- k30, k31, k34, k35, k36, \
- k40, k45, k46 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, KC_NO }, \
- { KC_NO, k11, k12, k13, k14, k15, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k30, k31, KC_NO, KC_NO, k34, k35, k36 }, \
- { k40, KC_NO, KC_NO, KC_NO, KC_NO, k45, k46 } \
-}
diff --git a/keyboards/kudox_game/rev2/config.h b/keyboards/kudox_game/rev2/config.h
index 8591c2fd04..7b6ef67bd9 100644
--- a/keyboards/kudox_game/rev2/config.h
+++ b/keyboards/kudox_game/rev2/config.h
@@ -17,23 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 }
-#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 }
-// #define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5} //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW or 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 */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#undef RGBLED_NUM
#define RGBLED_NUM 7 // Number of LEDs
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json
index 3bdd63ee28..4a441b7385 100644
--- a/keyboards/kudox_game/rev2/info.json
+++ b/keyboards/kudox_game/rev2/info.json
@@ -1,5 +1,50 @@
{
"usb": {
"device_version": "2.0.0"
+ },
+ "ws2812": {
+ "pin": "D3"
+ },
+ "matrix_pins": {
+ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D4", "D7", "E6", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 1.5, "y": 0},
+ {"matrix": [0, 2], "x": 2.5, "y": 0},
+ {"matrix": [0, 3], "x": 3.5, "y": 0},
+ {"matrix": [0, 4], "x": 4.5, "y": 0},
+ {"matrix": [0, 5], "x": 5.5, "y": 0},
+
+ {"matrix": [1, 1], "x": 1.75, "y": 1},
+ {"matrix": [1, 2], "x": 2.75, "y": 1},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "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.25, "y": 2},
+ {"matrix": [2, 6], "x": 6.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [3, 1], "x": 1.5, "y": 3},
+ {"matrix": [3, 4], "x": 3.75, "y": 3},
+ {"matrix": [3, 5], "x": 4.75, "y": 3},
+ {"matrix": [3, 6], "x": 5.75, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5},
+ {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2}
+ ]
+ }
}
}
diff --git a/keyboards/kudox_game/rev2/rev2.c b/keyboards/kudox_game/rev2/rev2.c
deleted file mode 100644
index 32356f8a4a..0000000000
--- a/keyboards/kudox_game/rev2/rev2.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "kudox_game.h"
diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h
deleted file mode 100644
index e630a51658..0000000000
--- a/keyboards/kudox_game/rev2/rev2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include "../kudox_game.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, \
- k11, k12, k13, k14, k15, \
- k20, k21, k22, k23, k24, k25, k26, \
- k30, k31, k34, k35, k36, \
- k40, k45, k46 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, KC_NO }, \
- { KC_NO, k11, k12, k13, k14, k15, KC_NO }, \
- { k20, k21, k22, k23, k24, k25, k26 }, \
- { k30, k31, KC_NO, KC_NO, k34, k35, k36 }, \
- { k40, KC_NO, KC_NO, KC_NO, KC_NO, k45, k46 } \
-}