From 55c75da524df1ee00ccbd5b578fb61733906fedf Mon Sep 17 00:00:00 2001
From: yfuku <30647434+yfuku@users.noreply.github.com>
Date: Mon, 27 Dec 2021 12:05:31 +0900
Subject: [PATCH] Add wings42 rev2 (#13702)
* add rev2
* add encoder settings
* add license header
---
keyboards/wings42/rev1/readme.md | 4 +-
keyboards/wings42/rev2/config.h | 152 ++++++++++++
.../wings42/rev2/keymaps/default/keymap.c | 81 +++++++
.../wings42/rev2/keymaps/default/readme.md | 1 +
keyboards/wings42/rev2/keymaps/via/config.h | 20 ++
keyboards/wings42/rev2/keymaps/via/keymap.c | 218 ++++++++++++++++++
keyboards/wings42/rev2/keymaps/via/rules.mk | 2 +
keyboards/wings42/rev2/readme.md | 21 ++
keyboards/wings42/rev2/rev2.c | 17 ++
keyboards/wings42/rev2/rev2.h | 46 ++++
keyboards/wings42/rev2/rules.mk | 0
keyboards/wings42/rules.mk | 2 +-
keyboards/wings42/wings42.h | 4 +
13 files changed, 565 insertions(+), 3 deletions(-)
create mode 100644 keyboards/wings42/rev2/config.h
create mode 100644 keyboards/wings42/rev2/keymaps/default/keymap.c
create mode 100644 keyboards/wings42/rev2/keymaps/default/readme.md
create mode 100644 keyboards/wings42/rev2/keymaps/via/config.h
create mode 100644 keyboards/wings42/rev2/keymaps/via/keymap.c
create mode 100644 keyboards/wings42/rev2/keymaps/via/rules.mk
create mode 100644 keyboards/wings42/rev2/readme.md
create mode 100644 keyboards/wings42/rev2/rev2.c
create mode 100644 keyboards/wings42/rev2/rev2.h
create mode 100644 keyboards/wings42/rev2/rules.mk
diff --git a/keyboards/wings42/rev1/readme.md b/keyboards/wings42/rev1/readme.md
index 158372feb4..4ddfe3e83c 100644
--- a/keyboards/wings42/rev1/readme.md
+++ b/keyboards/wings42/rev1/readme.md
@@ -10,11 +10,11 @@ A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
Make example for this keyboard (after setting up your build environment):
- make wings42:default
+ make wings42/rev1:default
Flashing example for this keyboard:
- make wings42:default:flash
+ make wings42/rev1:default:flash
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/wings42/rev2/config.h b/keyboards/wings42/rev2/config.h
new file mode 100644
index 0000000000..836833718c
--- /dev/null
+++ b/keyboards/wings42/rev2/config.h
@@ -0,0 +1,152 @@
+/*
+Copyright 2021 yfuku
+
+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 .
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x5946 // YF
+#define PRODUCT_ID 0x0005
+#define DEVICE_VER 0x0001
+#define MANUFACTURER yfuku
+#define PRODUCT wings42 rev2
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+/*
+ * 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 { D4, C6, D7, E6, NO_PIN }
+#define MATRIX_COL_PINS { B3, B1, F7, F6, F5, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2 // or D1, D2, D3, E6
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//# define RGBLED_NUM 16
+//# 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 */
+/*== all animations enable ==*/
+//# define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//# define RGBLIGHT_EFFECT_BREATHING
+//# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//# define RGBLIGHT_EFFECT_SNAKE
+//# define RGBLIGHT_EFFECT_KNIGHT
+//# define RGBLIGHT_EFFECT_CHRISTMAS
+//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//# define RGBLIGHT_EFFECT_RGB_TEST
+//# define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7
+//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/wings42/rev2/keymaps/default/keymap.c b/keyboards/wings42/rev2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..df572a6f5a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/default/keymap.c
@@ -0,0 +1,81 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+ _QWERTY = 0,
+ _RAISE,
+ _LOWER,
+ _ADJUST,
+};
+
+#define KC_G_TAB LGUI_T(KC_TAB)
+#define KC_G_BS LGUI_T(KC_BSPC)
+#define KC_L_SPC LT(_LOWER, KC_SPC)
+#define KC_R_ENT LT(_RAISE, KC_ENT)
+#define KC_S_JA LSFT_T(KC_LANG1)
+#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_A_DEL ALT_T(KC_DEL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QWERTY] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
+ KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
+ KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
+ //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
+ KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
+ //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
+ KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
+ // `+--------+--------+--------' `--------+---------+--------+'
+ ),
+
+ [_RAISE] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ _______, _______, _______, _______, _______, RESET
+ // `+--------+--------+--------' `--------+-------+--------+'
+ ),
+
+ [_LOWER] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ RESET , _______, _______, _______, _______, _______
+ // `+--------+--------+--------' `--------+--------+--------+'
+ ),
+
+ [_ADJUST] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ _______, _______, _______, _______, _______, _______
+ // `+--------+--------+--------' `--------+--------+--------+'
+ ),
+};
diff --git a/keyboards/wings42/rev2/keymaps/default/readme.md b/keyboards/wings42/rev2/keymaps/default/readme.md
new file mode 100644
index 0000000000..d99098ad0c
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for wings42
diff --git a/keyboards/wings42/rev2/keymaps/via/config.h b/keyboards/wings42/rev2/keymaps/via/config.h
new file mode 100644
index 0000000000..3e0c8d146a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 .
+ */
+#pragma once
+
+#define ENCODERS_PAD_A { B5, B6 }
+#define ENCODERS_PAD_B { B4, B2 }
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/wings42/rev2/keymaps/via/keymap.c b/keyboards/wings42/rev2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e6b4ef840a
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/keymap.c
@@ -0,0 +1,218 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+ _QWERTY = 0,
+ _RAISE,
+ _LOWER,
+ _ADJUST,
+};
+
+#define KC_G_TAB LGUI_T(KC_TAB)
+#define KC_G_BS LGUI_T(KC_BSPC)
+#define KC_L_SPC LT(_LOWER, KC_SPC)
+#define KC_R_ENT LT(_RAISE, KC_ENT)
+#define KC_S_JA LSFT_T(KC_LANG1)
+#define KC_S_EN LSFT_T(KC_LANG2)
+#define KC_A_DEL ALT_T(KC_DEL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_QWERTY] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+---------+--------+---------+--------+--------.
+ KC_ESC , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
+ KC_G_TAB, KC_A , KC_S , KC_D , KC_F , KC_G , KC_BSPC, KC_BSPC, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_G_BS,
+ //|--------+--------+--------+--------+--------+--------| |--------+---------+--------+---------+--------+--------|
+ KC_LCTL, KC_Z , KC_X , KC_C , KC_V , KC_B , KC_DEL , KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RCTL,
+ //`--------+--------+--------+--------+--------+--------/ \--------+---------+--------+---------+--------+--------'
+ KC_A_DEL,KC_S_EN ,KC_L_SPC, KC_R_ENT, KC_S_JA , KC_A_DEL
+ // `+--------+--------+--------' `--------+---------+--------+'
+ ),
+
+ [_RAISE] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE, KC_AT , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD, _______, _______, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, KC_LCBR, KC_LBRC, _______, _______, KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ _______, _______, _______, _______, _______, RESET
+ // `+--------+--------+--------' `--------+-------+--------+'
+ ),
+
+ [_LOWER] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , _______, _______, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , _______, _______, _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ RESET , _______, _______, _______, _______, _______
+ // `+--------+--------+--------' `--------+--------+--------+'
+ ),
+
+ [_ADJUST] = LAYOUT_split_3x6_3_2(
+ //,--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------.
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ //`--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------'
+ _______, _______, _______, _______, _______, _______
+ // `+--------+--------+--------' `--------+--------+--------+'
+ ),
+};
+
+keyevent_t encoder1_ccw = {
+ .key = (keypos_t){.row = 4, .col = 0},
+ .pressed = false
+};
+
+keyevent_t encoder1_cw = {
+ .key = (keypos_t){.row = 4, .col = 1},
+ .pressed = false
+};
+
+keyevent_t encoder2_ccw = {
+ .key = (keypos_t){.row = 4, .col = 2},
+ .pressed = false
+};
+
+keyevent_t encoder2_cw = {
+ .key = (keypos_t){.row = 4, .col = 3},
+ .pressed = false
+};
+
+keyevent_t encoder3_ccw = {
+ .key = (keypos_t){.row = 9, .col = 1},
+ .pressed = false
+};
+
+keyevent_t encoder3_cw = {
+ .key = (keypos_t){.row = 9, .col = 0},
+ .pressed = false
+};
+
+keyevent_t encoder4_ccw = {
+ .key = (keypos_t){.row = 9, .col = 3},
+ .pressed = false
+};
+
+keyevent_t encoder4_cw = {
+ .key = (keypos_t){.row = 9, .col = 2},
+ .pressed = false
+};
+
+
+void matrix_scan_user(void) {
+ if (IS_PRESSED(encoder1_ccw)) {
+ encoder1_ccw.pressed = false;
+ encoder1_ccw.time = (timer_read() | 1);
+ action_exec(encoder1_ccw);
+ }
+
+ if (IS_PRESSED(encoder1_cw)) {
+ encoder1_cw.pressed = false;
+ encoder1_cw.time = (timer_read() | 1);
+ action_exec(encoder1_cw);
+ }
+
+ if (IS_PRESSED(encoder2_ccw)) {
+ encoder2_ccw.pressed = false;
+ encoder2_ccw.time = (timer_read() | 1);
+ action_exec(encoder2_ccw);
+ }
+
+ if (IS_PRESSED(encoder2_cw)) {
+ encoder2_cw.pressed = false;
+ encoder2_cw.time = (timer_read() | 1);
+ action_exec(encoder2_cw);
+ }
+
+ if (IS_PRESSED(encoder3_ccw)) {
+ encoder3_ccw.pressed = false;
+ encoder3_ccw.time = (timer_read() | 1);
+ action_exec(encoder3_ccw);
+ }
+
+ if (IS_PRESSED(encoder3_cw)) {
+ encoder3_cw.pressed = false;
+ encoder3_cw.time = (timer_read() | 1);
+ action_exec(encoder3_cw);
+ }
+
+ if (IS_PRESSED(encoder4_ccw)) {
+ encoder4_ccw.pressed = false;
+ encoder4_ccw.time = (timer_read() | 1);
+ action_exec(encoder4_ccw);
+ }
+
+ if (IS_PRESSED(encoder4_cw)) {
+ encoder4_cw.pressed = false;
+ encoder4_cw.time = (timer_read() | 1);
+ action_exec(encoder4_cw);
+ }
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) {
+ if (clockwise) {
+ encoder1_cw.pressed = true;
+ encoder1_cw.time = (timer_read() | 1);
+ action_exec(encoder1_cw);
+ } else {
+ encoder1_ccw.pressed = true;
+ encoder1_ccw.time = (timer_read() | 1);
+ action_exec(encoder1_ccw);
+ }
+ } else if (index == 1) {
+ if (clockwise) {
+ encoder2_cw.pressed = true;
+ encoder2_cw.time = (timer_read() | 1);
+ action_exec(encoder2_cw);
+ } else {
+ encoder2_ccw.pressed = true;
+ encoder2_ccw.time = (timer_read() | 1);
+ action_exec(encoder2_ccw);
+ }
+ } else if (index == 2) {
+ if (clockwise) {
+ encoder3_cw.pressed = true;
+ encoder3_cw.time = (timer_read() | 1);
+ action_exec(encoder3_cw);
+ } else {
+ encoder3_ccw.pressed = true;
+ encoder3_ccw.time = (timer_read() | 1);
+ action_exec(encoder3_ccw);
+ }
+ } else if (index == 3) {
+ if (clockwise) {
+ encoder4_cw.pressed = true;
+ encoder4_cw.time = (timer_read() | 1);
+ action_exec(encoder4_cw);
+ } else {
+ encoder4_ccw.pressed = true;
+ encoder4_ccw.time = (timer_read() | 1);
+ action_exec(encoder4_ccw);
+ }
+ }
+
+ return true;
+}
diff --git a/keyboards/wings42/rev2/keymaps/via/rules.mk b/keyboards/wings42/rev2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..eea5e1e2a2
--- /dev/null
+++ b/keyboards/wings42/rev2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/wings42/rev2/readme.md b/keyboards/wings42/rev2/readme.md
new file mode 100644
index 0000000000..158372feb4
--- /dev/null
+++ b/keyboards/wings42/rev2/readme.md
@@ -0,0 +1,21 @@
+# wings42
+
+
+
+A split keyboard with 3x6 vertically staggered keys and 3 thumb keys.
+
+* Keyboard Maintainer: [yfuku](https://github.com/yfuku)
+* Hardware Supported: wings42 PCB, Pro Micro
+* Hardware Availability: https://yfuku.booth.pm/
+
+Make example for this keyboard (after setting up your build environment):
+
+ make wings42:default
+
+Flashing example for this keyboard:
+
+ make wings42:default:flash
+
+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).
+
+A build guide for this keyboard can be found here: [wings42 build guide](https://yfuku.com/wings42/buildguide/)
diff --git a/keyboards/wings42/rev2/rev2.c b/keyboards/wings42/rev2/rev2.c
new file mode 100644
index 0000000000..96aa6cd314
--- /dev/null
+++ b/keyboards/wings42/rev2/rev2.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 .
+ */
+
+#include "rev2.h"
diff --git a/keyboards/wings42/rev2/rev2.h b/keyboards/wings42/rev2/rev2.h
new file mode 100644
index 0000000000..4720592264
--- /dev/null
+++ b/keyboards/wings42/rev2/rev2.h
@@ -0,0 +1,46 @@
+/* Copyright 2021 yfuku
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_3x6_3_2( \
+ L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
+ L10, L11, L12, L13, L14, L15, L31, R33, R10, R11, R12, R13, R14, R15, \
+ L20, L21, L22, L23, L24, L25, L32, R34, R20, R21, R22, R23, R24, R25, \
+ L33, L34, L35, R30, R31, R32 \
+ ) \
+ { \
+ { L00, L01, L02, L03, L04, L05 }, \
+ { L10, L11, L12, L13, L14, L15 }, \
+ { L20, L21, L22, L23, L24, L25 }, \
+ { KC_NO, L31, L32, L33, L34, L35 }, \
+ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+ { R05, R04, R03, R02, R01, R00 }, \
+ { R15, R14, R13, R12, R11, R10 }, \
+ { R25, R24, R23, R22, R21, R20 }, \
+ { KC_NO, R34, R33, R32, R31, R30 }, \
+ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+ }
diff --git a/keyboards/wings42/rev2/rules.mk b/keyboards/wings42/rev2/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/keyboards/wings42/rules.mk b/keyboards/wings42/rules.mk
index 0904b3d766..74e894efec 100644
--- a/keyboards/wings42/rules.mk
+++ b/keyboards/wings42/rules.mk
@@ -19,4 +19,4 @@ AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes
-DEFAULT_FOLDER = wings42/rev1
+DEFAULT_FOLDER = wings42/rev2
diff --git a/keyboards/wings42/wings42.h b/keyboards/wings42/wings42.h
index 07c8823409..9412b7117a 100644
--- a/keyboards/wings42/wings42.h
+++ b/keyboards/wings42/wings42.h
@@ -24,3 +24,7 @@
#ifdef KEYBOARD_wings42_rev1_extkeys
# include "rev1_extkeys.h"
#endif
+#ifdef KEYBOARD_wings42_rev2
+# include "rev2.h"
+#endif
+