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

10 files changed, 339 insertions, 0 deletions

diff --git a/keyboards/winry/winry315/keymaps/default/keymap.c b/keyboards/winry/winry315/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a0bc2706ca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Base
+    [_BASE] = LAYOUT_top(
+            KC_HOME,      KC_MUTE,     KC_MPLY,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+
+    // RGB configuration
+    [_RGB] = LAYOUT_top(
+            RGB_M_P,      RGB_M_B,     RGB_M_R,
+        RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+        RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+        KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Left encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Right encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/default/readme.md b/keyboards/winry/winry315/keymaps/default/readme.md
new file mode 100644
index 0000000000..685bea5767
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Winry315
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/config.h b/keyboards/winry/winry315/keymaps/left_numpad/config.h
new file mode 100644
index 0000000000..acb72b5bb4
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/keymap.c b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
new file mode 100644
index 0000000000..8864b1b45a
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
@@ -0,0 +1,81 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_left(
+        KC_MPLY,    U_LTESC, KC_BSPC, KC_PENT,
+                    KC_P7,   KC_P8,   KC_P9,
+        KC_MUTE,    KC_P4,   KC_P5,   KC_P6,
+                    KC_P1,   KC_P2,   KC_P3,
+        KC_HOME,    KC_P0,   KC_P0,   KC_PDOT
+    ),
+
+    /* RGB configuration */
+    [_RGB] = LAYOUT_left(
+        RGB_M_R,    KC_TRNS, RGB_SPD, RGB_SPI,
+                    RGB_TOG, RGB_HUD, RGB_HUI,
+        RGB_M_B,    RGB_M_P, RGB_SAD, RGB_SAI,
+                    KC_NO,   RGB_VAD, RGB_VAI,
+        RGB_M_P,    KC_NLCK, RGB_RMOD,RGB_MOD
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Bottom encoder (left in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Top encoder (right in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/readme.md b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
new file mode 100644
index 0000000000..9562c2fc19
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
@@ -0,0 +1,3 @@
+# The “Left Numpad” keymap for Winry315
+
+This is a keymap example for the Winry315 board in the “left” orientation (the board is rotated so that the encoders are on the left side, and the keys are in 5 rows of 3 keys).  The `LAYOUT_left` macro is used for this orientation, and `WINRY315_DEFAULT_ORIENTATION` is redefined in `config.h` to change the behavior of RGB Matrix effects.
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h
new file mode 100644
index 0000000000..5fc0e02531
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/config.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+// Enable a limited form of RGB Matrix support in VIA (requires redefining the
+// effect list in the VIA JSON, which then becomes not 100% compatible with the
+// RGBLIGHT firmwares).
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+// Enable the workaround for the speed parameter mismatch between RGBLIGHT and
+// RGB Matrix, so that the speed slider in VIA behaves in a more useful way.
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
new file mode 100644
index 0000000000..96dfe74bca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
@@ -0,0 +1,85 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ * Copyright 2022 Sergey Vlasov (@sigprof)
+ *
+ * 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 3 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 "encoder_actions.h"
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#    ifndef ENCODER_TAP_DURATION_MS
+#        define ENCODER_TAP_DURATION_MS 10
+#    endif
+
+#    define ENCODER_STATE_CW 0x01
+#    define ENCODER_STATE_CCW 0x02
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static uint16_t encoder_timer[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
+    // clang-format off
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = pressed,
+        .time = (timer_read() | 1)
+    };
+    // clang-format on
+    action_exec(encoder_event);
+}
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index] && (timer_elapsed(encoder_timer[index]) >= ENCODER_TAP_DURATION_MS)) {
+            bool clockwise       = !!(encoder_state[index] & ENCODER_STATE_CW);
+            encoder_state[index] = 0;
+            exec_encoder_action(index, clockwise, false);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    if (encoder_state[index]) {
+        bool was_clockwise   = !!(encoder_state[index] & ENCODER_STATE_CW);
+        encoder_state[index] = 0;
+        exec_encoder_action(index, was_clockwise, false);
+    }
+    encoder_state[index] = clockwise ? ENCODER_STATE_CW : ENCODER_STATE_CCW;
+    encoder_timer[index] = timer_read();
+    exec_encoder_action(index, clockwise, true);
+#    endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
+
+#endif
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.h b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * 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 3 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"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c
new file mode 100644
index 0000000000..67598ac337
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+#define LAYOUT_via(             \
+      k17,     k15,    k16,     \
+    k23,k22, k19,k18, k21,k20,  \
+     k00, k01, k02, k03, k04,   \
+     k05, k06, k07, k08, k09,   \
+     k10, k11, k12, k13, k14    \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 } \
+}
+
+#define U_LTESC LT(1, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_via(
+            KC_HOME,           KC_MUTE,           KC_MPLY,
+        KC_PGUP, KC_PGDN,  KC_VOLD, KC_VOLU,  KC_MPRV, KC_MNXT,
+             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+             U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+    [1] = LAYOUT_via(
+            RGB_M_P,           RGB_M_B,           RGB_M_R,
+        RGB_HUD, RGB_HUI,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,
+             RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+             RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+             KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+    [2 ... 7] = LAYOUT_via(
+            KC_TRNS,           KC_TRNS,           KC_TRNS,
+        KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+// clang-format on
diff --git a/keyboards/winry/winry315/keymaps/via/rules.mk b/keyboards/winry/winry315/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6098ef3ad8
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+SRC += encoder_actions.c