summaryrefslogtreecommitdiff
path: root/keyboards/qwertyydox
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/qwertyydox')
-rw-r--r--keyboards/qwertyydox/config.h21
-rw-r--r--keyboards/qwertyydox/info.json121
-rw-r--r--keyboards/qwertyydox/qwertyydox.c1
-rw-r--r--keyboards/qwertyydox/qwertyydox.h7
-rw-r--r--keyboards/qwertyydox/rev1/rev1.c1
-rw-r--r--keyboards/qwertyydox/rev1/rev1.h28
6 files changed, 68 insertions, 111 deletions
diff --git a/keyboards/qwertyydox/config.h b/keyboards/qwertyydox/config.h
index 5ea65094f9..d47dcae187 100644
--- a/keyboards/qwertyydox/config.h
+++ b/keyboards/qwertyydox/config.h
@@ -17,26 +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)
- *
-*/
-// wiring of each half
-#define MATRIX_ROW_PINS { B6, B2, B3, B1 }
-#define MATRIX_COL_PINS { F7, F6, F5, C6, D7, D4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D6
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 12
#define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8
@@ -53,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/qwertyydox/info.json b/keyboards/qwertyydox/info.json
index df34cd9fa7..fcc14084b0 100644
--- a/keyboards/qwertyydox/info.json
+++ b/keyboards/qwertyydox/info.json
@@ -9,6 +9,14 @@
"pid": "0x1256",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["F7", "F6", "F5", "C6", "D7", "D4", "D1"],
+ "rows": ["B6", "B2", "B3", "B1"]
+ },
+ "ws2812": {
+ "pin": "D6"
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D0"
},
@@ -17,59 +25,66 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Tab", "x":0, "y":0},
- {"label":"Q", "x":1, "y":0},
- {"label":"W", "x":2, "y":0},
- {"label":"E", "x":3, "y":0},
- {"label":"R", "x":4, "y":0},
- {"label":"T", "x":5, "y":0},
- {"label":"Y", "x":6, "y":0},
- {"label":"Y", "x":9, "y":0},
- {"label":"U", "x":10, "y":0},
- {"label":"I", "x":11, "y":0},
- {"label":"O", "x":12, "y":0},
- {"label":"P", "x":13, "y":0},
- {"label":"{", "x":14, "y":0},
- {"label":"}", "x":15, "y":0},
- {"label":"Caps Lock", "x":0.25, "y":1},
- {"label":"A", "x":1.25, "y":1},
- {"label":"S", "x":2.25, "y":1},
- {"label":"D", "x":3.25, "y":1},
- {"label":"F", "x":4.25, "y":1},
- {"label":"G", "x":5.25, "y":1},
- {"label":"H", "x":9.25, "y":1},
- {"label":"J", "x":10.25, "y":1},
- {"label":"K", "x":11.25, "y":1},
- {"label":"L", "x":12.25, "y":1},
- {"label":":", "x":13.25, "y":1},
- {"label":"\"", "x":14.25, "y":1},
- {"label":"|", "x":15.25, "y":1},
- {"label":"Shift", "x":0.75, "y":2},
- {"label":"Z", "x":1.75, "y":2},
- {"label":"X", "x":2.75, "y":2},
- {"label":"C", "x":3.75, "y":2},
- {"label":"V", "x":4.75, "y":2},
- {"label":"B", "x":5.75, "y":2},
- {"label":"N", "x":9.75, "y":2},
- {"label":"M", "x":10.75, "y":2},
- {"label":"<", "x":11.75, "y":2},
- {"label":">", "x":12.75, "y":2},
- {"label":"?", "x":13.75, "y":2},
- {"label":"Shift", "x":14.75, "y":2},
- {"label":"Ctrl", "x":0.75, "y":3},
- {"label":"GUI", "x":1.75, "y":3},
- {"label":"Alt", "x":2.75, "y":3},
- {"label":"\"-QWERTY\"", "x":3.75, "y":3},
- {"label":"Enter", "x":4.75, "y":3.33},
- {"label":"Delete", "x":5.75, "y":3.67},
- {"label":"TO(_NUM)", "x":6.75, "y":4},
- {"label":"TO(_NAV)", "x":8.75, "y":4},
- {"label":"Space", "x":9.75, "y":3.67},
- {"label":"Back Space", "x":10.75, "y":3.33},
- {"label":"Left", "x":11.75, "y":3},
- {"label":"Alt", "x":12.75, "y":3},
- {"label":"GUI", "x":13.75, "y":3},
- {"label":"Ctrl", "x":14.75, "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": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [4, 6], "x": 9, "y": 0},
+ {"matrix": [4, 5], "x": 10, "y": 0},
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0.25, "y": 1},
+ {"matrix": [1, 1], "x": 1.25, "y": 1},
+ {"matrix": [1, 2], "x": 2.25, "y": 1},
+ {"matrix": [1, 3], "x": 3.25, "y": 1},
+ {"matrix": [1, 4], "x": 4.25, "y": 1},
+ {"matrix": [1, 5], "x": 5.25, "y": 1},
+
+ {"matrix": [5, 6], "x": 9.25, "y": 1},
+ {"matrix": [5, 5], "x": 10.25, "y": 1},
+ {"matrix": [5, 4], "x": 11.25, "y": 1},
+ {"matrix": [5, 3], "x": 12.25, "y": 1},
+ {"matrix": [5, 2], "x": 13.25, "y": 1},
+ {"matrix": [5, 1], "x": 14.25, "y": 1},
+ {"matrix": [5, 0], "x": 15.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0.75, "y": 2},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [6, 5], "x": 9.75, "y": 2},
+ {"matrix": [6, 4], "x": 10.75, "y": 2},
+ {"matrix": [6, 3], "x": 11.75, "y": 2},
+ {"matrix": [6, 2], "x": 12.75, "y": 2},
+ {"matrix": [6, 1], "x": 13.75, "y": 2},
+ {"matrix": [6, 0], "x": 14.75, "y": 2},
+
+ {"matrix": [3, 0], "x": 0.75, "y": 3},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.33},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.67},
+ {"matrix": [3, 6], "x": 6.75, "y": 4},
+
+ {"matrix": [7, 6], "x": 8.75, "y": 4},
+ {"matrix": [7, 5], "x": 9.75, "y": 3.67},
+ {"matrix": [7, 4], "x": 10.75, "y": 3.33},
+ {"matrix": [7, 3], "x": 11.75, "y": 3},
+ {"matrix": [7, 2], "x": 12.75, "y": 3},
+ {"matrix": [7, 1], "x": 13.75, "y": 3},
+ {"matrix": [7, 0], "x": 14.75, "y": 3}
]
}
}
diff --git a/keyboards/qwertyydox/qwertyydox.c b/keyboards/qwertyydox/qwertyydox.c
deleted file mode 100644
index 53c3eca648..0000000000
--- a/keyboards/qwertyydox/qwertyydox.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "qwertyydox.h"
diff --git a/keyboards/qwertyydox/qwertyydox.h b/keyboards/qwertyydox/qwertyydox.h
deleted file mode 100644
index 9eb4073dfe..0000000000
--- a/keyboards/qwertyydox/qwertyydox.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_qwertyydox_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/qwertyydox/rev1/rev1.c b/keyboards/qwertyydox/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/qwertyydox/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h
deleted file mode 100644
index a7b30b648f..0000000000
--- a/keyboards/qwertyydox/rev1/rev1.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "qwertyydox.h"
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
- #include <avr/io.h>
- #include <avr/interrupt.h>
-#endif
-#endif
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \
- L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, L06 }, \
- { L10, L11, L12, L13, L14, L15, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, L36 }, \
- { R06, R05, R04, R03, R02, R01, R00 }, \
- { R16, R15, R14, R13, R12, R11, R10 }, \
- { R26, R25, R24, R23, R22, R21, KC_NO, }, \
- { R36, R35, R34, R33, R32, R31, R30 } \
- }