summaryrefslogtreecommitdiffstats
path: root/keyboards/ymdk/wingshs
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/ymdk/wingshs')
-rw-r--r--keyboards/ymdk/wingshs/config.h23
-rw-r--r--keyboards/ymdk/wingshs/info.json157
-rw-r--r--keyboards/ymdk/wingshs/keymaps/default/keymap.c4
-rw-r--r--keyboards/ymdk/wingshs/keymaps/via/keymap.c8
-rw-r--r--keyboards/ymdk/wingshs/matrix_diagram.md16
-rw-r--r--keyboards/ymdk/wingshs/wingshs.c16
-rw-r--r--keyboards/ymdk/wingshs/wingshs.h34
7 files changed, 110 insertions, 148 deletions
diff --git a/keyboards/ymdk/wingshs/config.h b/keyboards/ymdk/wingshs/config.h
index 055c93b327..1679d16b44 100644
--- a/keyboards/ymdk/wingshs/config.h
+++ b/keyboards/ymdk/wingshs/config.h
@@ -13,25 +13,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 80
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
@@ -48,7 +29,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_VAL_STEP 8
#define RGBLIGHT_LIMIT_VAL 160 /* 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/wingshs/info.json b/keyboards/ymdk/wingshs/info.json
index 8e72d4093a..745719a702 100644
--- a/keyboards/ymdk/wingshs/info.json
+++ b/keyboards/ymdk/wingshs/info.json
@@ -2,12 +2,17 @@
"keyboard_name": "WINGS HOTSWAP",
"manufacturer": "YMDK",
"url": "http://ymdkey.com/",
- "maintainer": "qmk",
+ "maintainer": "alittlepeace",
"usb": {
"vid": "0x594D",
"pid": "0x4975",
"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
@@ -16,83 +21,97 @@
"caps_lock": "C7",
"on_state": 0
},
+ "ws2812": {
+ "pin": "E2"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT"
+ },
"layouts": {
- "LAYOUT_all": {
+ "LAYOUT": {
"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":"Backspace", "x":16, "y":0.25, "w":2},
- {"label":"PgUp", "x":18.75, "y":0},
+ {"label": "Esc", "matrix": [0, 0], "x": 0.25, "y": 0.25},
+ {"label": "1", "matrix": [0, 1], "x": 1.25, "y": 0.25},
+ {"label": "2", "matrix": [0, 2], "x": 2.25, "y": 0},
+ {"label": "3", "matrix": [0, 3], "x": 3.25, "y": 0.25},
+ {"label": "4", "matrix": [0, 4], "x": 4.25, "y": 0.25},
+ {"label": "5", "matrix": [0, 5], "x": 5.25, "y": 0.25},
+ {"label": "6", "matrix": [0, 6], "x": 6.25, "y": 0.25},
+
+ {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0.25},
+ {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0.25},
+ {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0.25},
+ {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0.25},
+ {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+ {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0.25},
+ {"label": "Backspace", "matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+
+ {"label": "Page Up", "matrix": [4, 14], "x": 18.25, "y": 0},
+
+ {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+ {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1.25},
+ {"label": "W", "matrix": [1, 2], "x": 2.75, "y": 1.25},
+ {"label": "E", "matrix": [1, 3], "x": 3.75, "y": 1.25},
+ {"label": "R", "matrix": [1, 4], "x": 4.75, "y": 1.25},
+ {"label": "T", "matrix": [1, 5], "x": 5.75, "y": 1.25},
+
+ {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1.25},
+ {"label": "U", "matrix": [1, 7], "x": 10, "y": 1.25},
+ {"label": "I", "matrix": [1, 8], "x": 11, "y": 1.25},
+ {"label": "O", "matrix": [1, 9], "x": 12, "y": 1.25},
+ {"label": "P", "matrix": [1, 10], "x": 13.25, "y": 1.25},
+ {"label": "[", "matrix": [1, 11], "x": 14.25, "y": 1.25},
+ {"label": "]", "matrix": [1, 12], "x": 15.25, "y": 1.25},
+ {"label": "\\", "matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+
+ {"label": "Page Down", "matrix": [1, 14], "x": 18.5, "y": 1},
+
+ {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+ {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2.25},
+ {"label": "S", "matrix": [2, 2], "x": 3, "y": 2.25},
+ {"label": "D", "matrix": [2, 3], "x": 4, "y": 2.25},
+ {"label": "F", "matrix": [2, 4], "x": 5, "y": 2.25},
+ {"label": "G", "matrix": [2, 5], "x": 6, "y": 2.25},
+
+ {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2.25},
+ {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2.25},
+ {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2.25},
+ {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2.25},
+ {"label": ";", "matrix": [2, 10], "x": 13.75, "y": 2.25},
+ {"label": "'", "matrix": [2, 11], "x": 14.75, "y": 2.25},
+ {"label": "Enter", "matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+
+ {"label": "Fn", "matrix": [2, 14], "x": 18.75, "y": 2},
+
+ {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+ {"label": "Z", "matrix": [3, 1], "x": 2.25, "y": 3.25},
+ {"label": "X", "matrix": [3, 2], "x": 3.5, "y": 3.25},
+ {"label": "C", "matrix": [3, 3], "x": 4.5, "y": 3.25},
+ {"label": "V", "matrix": [3, 4], "x": 5.5, "y": 3.25},
+ {"label": "B", "matrix": [3, 5], "x": 6.5, "y": 3.25},
-
- {"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":"|", "x":16.75, "y":1.25, "w":1.5},
- {"label":"PgDn", "x":19, "y":1},
+ {"label": "N", "matrix": [3, 6], "x": 9.75, "y": 3.25},
+ {"label": "M", "matrix": [3, 7], "x": 10.75, "y": 3.25},
+ {"label": ",", "matrix": [3, 8], "x": 11.75, "y": 3.25},
+ {"label": ".", "matrix": [3, 9], "x": 13.5, "y": 3.25},
+ {"label": "/", "matrix": [3, 10], "x": 14.5, "y": 3.25},
+ {"label": "Shift", "matrix": [3, 11], "x": 15.5, "y": 3.25, "w": 1.75},
+ {"label": "\u2191", "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},
+ {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5},
+ {"label": "Alt", "matrix": [4, 2], "x": 3.5, "y": 4.25, "w": 1.5},
+ {"label": "Space", "matrix": [4, 4], "x": 5, "y": 4.25, "w": 2},
+ {"label": "GUI", "matrix": [4, 5], "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},
+ {"label": "Space", "matrix": [4, 6], "x": 9.75, "y": 4.25, "w": 2.75},
+ {"label": "Alt", "matrix": [4, 9], "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}
+ {"label": "\u2190", "matrix": [4, 11], "x": 16.5, "y": 4.25},
+ {"label": "\u2193", "matrix": [4, 12], "x": 17.5, "y": 4.25},
+ {"label": "\u2192", "matrix": [4, 13], "x": 18.5, "y": 4.25}
]
}
}
diff --git a/keyboards/ymdk/wingshs/keymaps/default/keymap.c b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
index 31da48fa69..91926c0747 100644
--- a/keyboards/ymdk/wingshs/keymaps/default/keymap.c
+++ b/keyboards/ymdk/wingshs/keymaps/default/keymap.c
@@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(1),
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT_all(
+ [1] = LAYOUT(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ymdk/wingshs/keymaps/via/keymap.c b/keyboards/ymdk/wingshs/keymaps/via/keymap.c
index f5e1958556..0b9771c749 100644
--- a/keyboards/ymdk/wingshs/keymaps/via/keymap.c
+++ b/keyboards/ymdk/wingshs/keymaps/via/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_all(
+ [0] = LAYOUT(
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_PGUP,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGDN,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, MO(1),
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
),
- [1] = LAYOUT_all(
+ [1] = LAYOUT(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -33,14 +33,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [2] = LAYOUT_all(
+ [2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______
),
- [3] = LAYOUT_all(
+ [3] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/ymdk/wingshs/matrix_diagram.md b/keyboards/ymdk/wingshs/matrix_diagram.md
new file mode 100644
index 0000000000..56f0ed7b49
--- /dev/null
+++ b/keyboards/ymdk/wingshs/matrix_diagram.md
@@ -0,0 +1,16 @@
+# Matrix Diagram for YMDK WINGS HOTSWAP
+
+```
+ ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐┌───┐
+ │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D ││4E │
+┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤└┬──┴┐
+│10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │ │1E │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └┬──┴┐
+│20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2D │ │2E │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ └───┘
+│30 │31 │32 │33 │34 │35 │ │36 │37 │38 │39 │3A │3B │┌───┐
+├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴──────┘│3D │
+│40 │ │42 │44 │45 │ │46 │49 │ ┌───┼───┼───┐
+└─────┘ └─────┴───────┴────┘ └──────────┴─────┘ │4B │4C │4D │
+ └───┴───┴───┘
+```
diff --git a/keyboards/ymdk/wingshs/wingshs.c b/keyboards/ymdk/wingshs/wingshs.c
deleted file mode 100644
index f82fe22197..0000000000
--- a/keyboards/ymdk/wingshs/wingshs.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 "wingshs.h"
diff --git a/keyboards/ymdk/wingshs/wingshs.h b/keyboards/ymdk/wingshs/wingshs.h
deleted file mode 100644
index 3321f48fc1..0000000000
--- a/keyboards/ymdk/wingshs/wingshs.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, 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, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \
- k40, k42, k44, k45, k46, k49, k4B, k4C, k4D \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX}, \
- { 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, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX}, \
- { k40, XXX, k42, XXX, k44, k45, k46, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E} \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 03:48:20 +0000