summaryrefslogtreecommitdiff
path: root/keyboards/ymdk/wings
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ymdk/wings')
-rw-r--r--keyboards/ymdk/wings/config.h21
-rw-r--r--keyboards/ymdk/wings/info.json151
-rw-r--r--keyboards/ymdk/wings/wings.c16
-rw-r--r--keyboards/ymdk/wings/wings.h34
4 files changed, 83 insertions, 139 deletions
diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
index 3b21cea4a6..1998e88011 100644
--- a/keyboards/ymdk/wings/config.h
+++ b/keyboards/ymdk/wings/config.h
@@ -15,25 +15,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 { B0, B1, B2, B3, B7 }
-#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, F7, F6, F5, F4, F1, F0 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION ROW2COL
-
-#define RGB_DI_PIN E2
-#ifdef RGB_DI_PIN
#define RGBLED_NUM 14
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -50,5 +31,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
index 92f019bacb..e669e746df 100644
--- a/keyboards/ymdk/wings/info.json
+++ b/keyboards/ymdk/wings/info.json
@@ -8,10 +8,18 @@
"pid": "0x2975",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"],
+ "rows": ["B0", "B1", "B2", "B3", "B7"]
+ },
+ "diode_direction": "ROW2COL",
"backlight": {
"pin": "B6",
"levels": 5
},
+ "ws2812": {
+ "pin": "E2"
+ },
"indicators": {
"caps_lock": "C7",
"on_state": 0
@@ -21,79 +29,86 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0.75, "y":0.25},
- {"label":"1", "x":1.75, "y":0.25},
- {"label":"2", "x":2.75, "y":0},
- {"label":"3", "x":3.75, "y":0.25},
- {"label":"4", "x":4.75, "y":0.25},
- {"label":"5", "x":5.75, "y":0.25},
- {"label":"6", "x":6.75, "y":0.25},
- {"label":"7", "x":10, "y":0.25},
- {"label":"8", "x":11, "y":0.25},
- {"label":"9", "x":12, "y":0.25},
- {"label":"0", "x":13, "y":0.25},
- {"label":"-", "x":14, "y":0},
- {"label":"=", "x":15, "y":0.25},
- {"label":"|", "x":16, "y":0.25},
- {"label":"Grave", "x":17, "y":0.25},
- {"label":"PgUp", "x":18.75, "y":0},
+ {"matrix": [0, 0], "x": 0.25, "y": 0.25},
+ {"matrix": [0, 1], "x": 1.25, "y": 0.25},
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0.25},
+ {"matrix": [0, 4], "x": 4.25, "y": 0.25},
+ {"matrix": [0, 5], "x": 5.25, "y": 0.25},
+ {"matrix": [0, 6], "x": 6.25, "y": 0.25},
+
+ {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+ {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+ {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+ {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+ {"matrix": [0, 11], "x": 13.5, "y": 0},
+ {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+ {"matrix": [0, 13], "x": 15.5, "y": 0.25},
+ {"matrix": [0, 14], "x": 16.5, "y": 0.25},
+
+ {"matrix": [4, 14], "x": 18.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"matrix": [1, 2], "x": 2.75, "y": 1.25},
+ {"matrix": [1, 3], "x": 3.75, "y": 1.25},
+ {"matrix": [1, 4], "x": 4.75, "y": 1.25},
+ {"matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+ {"matrix": [1, 6], "x": 9, "y": 1.25},
+ {"matrix": [1, 7], "x": 10, "y": 1.25},
+ {"matrix": [1, 8], "x": 11, "y": 1.25},
+ {"matrix": [1, 9], "x": 12, "y": 1.25},
+ {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+ {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+ {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"matrix": [2, 2], "x": 3, "y": 2.25},
+ {"matrix": [2, 3], "x": 4, "y": 2.25},
+ {"matrix": [2, 4], "x": 5, "y": 2.25},
+ {"matrix": [2, 5], "x": 6, "y": 2.25},
+
+ {"matrix": [2, 6], "x": 9.25, "y": 2.25},
+ {"matrix": [2, 7], "x": 10.25, "y": 2.25},
+ {"matrix": [2, 8], "x": 11.25, "y": 2.25},
+ {"matrix": [2, 9], "x": 12.25, "y": 2.25},
+ {"matrix": [2, 10], "x": 13.75, "y": 2.25},
+ {"matrix": [2, 11], "x": 14.75, "y": 2.25},
+ {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 18.75, "y": 2},
-
- {"label":"Tab", "x":0.5, "y":1.25, "w":1.5},
- {"label":"Q", "x":2, "y":1.25},
- {"label":"W", "x":3.25, "y":1.25},
- {"label":"E", "x":4.25, "y":1.25},
- {"label":"R", "x":5.25, "y":1.25},
- {"label":"T", "x":6.25, "y":1.25},
- {"label":"Y", "x":9.5, "y":1.25},
- {"label":"U", "x":10.5, "y":1.25},
- {"label":"I", "x":11.5, "y":1.25},
- {"label":"O", "x":12.5, "y":1.25},
- {"label":"P", "x":13.75, "y":1.25},
- {"label":"{", "x":14.75, "y":1.25},
- {"label":"}", "x":15.75, "y":1.25},
- {"label":"Backspace", "x":16.75, "y":1.25, "w":1.5},
- {"label":"PgDn", "x":19, "y":1},
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.5, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.5, "y": 3.25},
+ {"matrix": [3, 7], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 13.5, "y": 3.25},
+ {"matrix": [3, 11], "x": 14.5, "y": 3.25},
+ {"matrix": [3, 12], "x": 15.5, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 13], "x": 17.5, "y": 3.25},
- {"label":"Caps Lock", "x":0.5, "y":2.25, "w":1.75},
- {"label":"A", "x":2.25, "y":2.25},
- {"label":"S", "x":3.5, "y":2.25},
- {"label":"D", "x":4.5, "y":2.25},
- {"label":"F", "x":5.5, "y":2.25},
- {"label":"G", "x":6.5, "y":2.25},
- {"label":"H", "x":9.75, "y":2.25},
- {"label":"J", "x":10.75, "y":2.25},
- {"label":"K", "x":11.75, "y":2.25},
- {"label":"L", "x":12.75, "y":2.25},
- {"label":":", "x":14.25, "y":2.25},
- {"label":"\"", "x":15.25, "y":2.25},
- {"label":"Enter", "x":16.25, "y":2.25, "w":2.25},
- {"label":"Fn", "x":19.25, "y":2},
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5},
+ {"matrix": [4, 6], "x": 5, "y": 4.25, "w": 2},
+ {"matrix": [4, 8], "x": 7, "y": 4.25},
- {"label":"Shift", "x":0.5, "y":3.25, "w":2.25},
- {"label":"Z", "x":2.75, "y":3.25},
- {"label":"X", "x":4, "y":3.25},
- {"label":"C", "x":5, "y":3.25},
- {"label":"V", "x":6, "y":3.25},
- {"label":"B", "x":7, "y":3.25},
- {"label":"N", "x":10.25, "y":3.25},
- {"label":"M", "x":11.25, "y":3.25},
- {"label":"<", "x":12.25, "y":3.25},
- {"label":">", "x":14, "y":3.25},
- {"label":"?", "x":15, "y":3.25},
- {"label":"Shift", "x":16, "y":3.25, "w":1.75},
- {"label":"Up", "x":18, "y":3.25},
+ {"matrix": [4, 9], "x": 9.75, "y": 4.25, "w": 2.75},
+ {"matrix": [4, 10], "x": 12.5, "y": 4.25, "w": 1.5},
- {"label":"Ctrl", "x":0.5, "y":4.25, "w":1.5},
- {"label":"Alt", "x":4, "y":4.25, "w":1.5},
- {"label":"Space", "x":5.5, "y":4.25, "w":2},
- {"label":"Menu", "x":7.5, "y":4.25},
- {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
- {"label":"Alt", "x":13, "y":4.25, "w":1.5},
- {"label":"Left", "x":17, "y":4.25},
- {"label":"Down", "x":18, "y":4.25},
- {"label":"Right", "x":19, "y":4.25}
+ {"matrix": [4, 11], "x": 16.5, "y": 4.25},
+ {"matrix": [4, 12], "x": 17.5, "y": 4.25},
+ {"matrix": [4, 13], "x": 18.5, "y": 4.25}
]
}
}
diff --git a/keyboards/ymdk/wings/wings.c b/keyboards/ymdk/wings/wings.c
deleted file mode 100644
index 4e696d97b8..0000000000
--- a/keyboards/ymdk/wings/wings.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021 alittlepeace
- *
- * 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 "wings.h"
diff --git a/keyboards/ymdk/wings/wings.h b/keyboards/ymdk/wings/wings.h
deleted file mode 100644
index d9416157f1..0000000000
--- a/keyboards/ymdk/wings/wings.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2021 alittlepeace
- *
- * 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 "quantum.h"
-#pragma once
-
-
-#define XXX KC_NO
-#define LAYOUT_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, k2E, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
- k40, k42, k46, k48, k49, k4A, k4B, k4C, k4D \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E}, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX}, \
- { k40, XXX, k42, XXX, XXX, XXX, k46, XXX, k48, k49, k4A, k4B, k4C, k4D, k4E} \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-01 14:33:13 +0000