Merge remote-tracking branch 'origin/master' into develop

9 files changed, 328 insertions, 0 deletions

diff --git a/keyboards/ymdk/wings/config.h b/keyboards/ymdk/wings/config.h
new file mode 100644
index 0000000000..107fc072f9
--- /dev/null
+++ b/keyboards/ymdk/wings/config.h
@@ -0,0 +1,64 @@
+/* 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/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x594D // "YM"
+#define PRODUCT_ID      0x2975 // "WING"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    YMDK
+#define PRODUCT         WINGS
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * 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 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 14
+#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 */
+
+#define RGBLIGHT_ANIMATIONS
+#endif
+
+
diff --git a/keyboards/ymdk/wings/info.json b/keyboards/ymdk/wings/info.json
new file mode 100644
index 0000000000..b5aaeb9590
--- /dev/null
+++ b/keyboards/ymdk/wings/info.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "YMDK Wings",
+    "url": "http://ymdkey.com/",
+    "maintainer": "qmk",
+    "width": 20.25,
+    "height": 5.25,
+    "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},
+
+               
+                {"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},
+
+
+                {"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":"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":"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}
+            ]
+        }
+    }
+}
diff --git a/keyboards/ymdk/wings/keymaps/default/keymap.c b/keyboards/ymdk/wings/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9b0c070711
--- /dev/null
+++ b/keyboards/ymdk/wings/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* 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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    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_BSLS,  KC_GRV,     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_BSPC,                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),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,                    KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                           KC_LEFT, KC_DOWN, KC_RGHT 
+  ),
+
+  [1] = LAYOUT_all(
+    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+    _______, _______, _______, _______,   RESET, _______, _______, _______, _______, _______, _______, _______, _______,  KC_DEL,           _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                    _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
+    _______, _______,          _______, _______,          _______,          _______,                            _______, _______, _______ 
+  )    
+};
diff --git a/keyboards/ymdk/wings/keymaps/via/keymap.c b/keyboards/ymdk/wings/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6e866902f3
--- /dev/null
+++ b/keyboards/ymdk/wings/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* 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 QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_all(
+    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_BSLS,  KC_GRV, 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_BSPC,          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),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    _______,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,   KC_F11,  KC_F12,  _______, _______, _______,
+    _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,           _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  ),
+
+  [2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  ),
+  [3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______,          _______, _______,          _______,          _______,                   _______, _______, _______
+  )
+};
diff --git a/keyboards/ymdk/wings/keymaps/via/rules.mk b/keyboards/ymdk/wings/keymaps/via/rules.mk
new file mode 100644
index 0000000000..036bd6d1c3
--- /dev/null
+++ b/keyboards/ymdk/wings/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/ymdk/wings/readme.md b/keyboards/ymdk/wings/readme.md
new file mode 100644
index 0000000000..35a7799639
--- /dev/null
+++ b/keyboards/ymdk/wings/readme.md
@@ -0,0 +1,21 @@
+# YMDK Wings
+
+![Wings](https://cdn.shopify.com/s/files/1/0006/5227/9869/products/IMG_8044_2048x2048.jpg)
+
+A keyboard inspired by the Arisu, which is inspired by Lyn's EM7 and TGR Alice
+
+* Keyboard Maintainer: [alittlepeace](https://github.com/alittlepeace)
+* Hardware Supported: YMDK Wings
+* Hardware Availability: [YMDK](https://ymdkey.com/products/ymdk-wings-aluminum-cnc-top-bottom-qmk-pcb-full-assembly-keyboard-jade-navy-cream-switches)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ymdk/wings:default
+
+Flashing example for this keyboard:
+
+    make ymdk/wings:default:flash
+
+To reset the board into bootloader mode, hold the key at the top left of the keyboard while connecting the USB cable (also erases persistent settings).
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/ymdk/wings/rules.mk b/keyboards/ymdk/wings/rules.mk
new file mode 100644
index 0000000000..f49426d513
--- /dev/null
+++ b/keyboards/ymdk/wings/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/ymdk/wings/wings.c b/keyboards/ymdk/wings/wings.c
new file mode 100644
index 0000000000..4e696d97b8
--- /dev/null
+++ b/keyboards/ymdk/wings/wings.c
@@ -0,0 +1,16 @@
+/* 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
new file mode 100644
index 0000000000..d9416157f1
--- /dev/null
+++ b/keyboards/ymdk/wings/wings.h
@@ -0,0 +1,34 @@
+/* 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}  \
+}