Merge upstream master

7 files changed, 260 insertions, 0 deletions

diff --git a/keyboards/synthlabs/solo/config.h b/keyboards/synthlabs/solo/config.h
new file mode 100644
index 0000000000..2352ba2972
--- /dev/null
+++ b/keyboards/synthlabs/solo/config.h
@@ -0,0 +1,58 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+#define ENCODERS 1
+#define ENCODER_RESOLUTION 4
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B3 }
+#define ENCODERS_CW_KEY { { 2, 1 } }
+#define ENCODERS_CCW_KEY { { 0, 1 } }
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 7
+
+/*
+ * 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
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 1
+
+#define JOYSTICK_BUTTON_COUNT 13
+#define JOYSTICK_AXIS_COUNT 1
+#define JOYSTICK_AXIS_RESOLUTION 16
diff --git a/keyboards/synthlabs/solo/info.json b/keyboards/synthlabs/solo/info.json
new file mode 100644
index 0000000000..9fc26e0ab4
--- /dev/null
+++ b/keyboards/synthlabs/solo/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Solo",
+    "manufacturer": "Synth Labs",
+    "url": "http://solo.synthlabs.io",
+    "maintainer": "hongaaronc",
+    "bootloader": "atmel-dfu",
+    "processor": "atmega32u4",
+    "debounce": 5,
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D6", "B5", "B4", "D7", "B6", "D4"],
+            [null, "B7", null, null, null, null, null],
+            ["F0", "F7", "F4", "F5", "F6", "F1", "C7"]
+        ]
+    },
+    "usb": {
+        "vid": "0x534E",
+        "pid": "0x3031",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"P2 1", "x":3, "y":0, "w":0.5, "h":1.5, "matrix":[0,0]},
+                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
+                {"label":"P2 3", "x":4, "y":0, "w":0.5, "h":1.5, "matrix":[0,2]},
+                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
+                {"label":"P2 5", "x":5, "y":0, "w":0.5, "h":1.5, "matrix":[0,4]},
+                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
+                {"label":"P2 7", "x":6, "y":0, "w":0.5, "h":1.5, "matrix":[0,6]},
+
+                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
+                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
+                {"label":"P2 2", "x":3.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,1]},
+                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
+                {"label":"P2 4", "x":4.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,3]},
+                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
+                {"label":"P2 6", "x":5.5, "y":2, "w":0.5, "h":1.5, "matrix":[2,5]},
+                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
+            ]
+        },
+        "LAYOUT_left": {
+            "layout": [
+                {"label":"P1 2", "x":3.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,1]},
+                {"label":"P1 4", "x":4.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,3]},
+                {"label":"P1 6", "x":5.5, "y":0, "w":0.5, "h":1.5, "matrix":[0,5]},
+
+                {"label":"Knob CCW", "x":0, "y":1.25, "w":0.5, "matrix":[1,0]},
+                {"label":"Knob Press", "x":0.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":2, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P1 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[2,0]},
+                {"label":"P1 3", "x":4, "y":2, "w":0.5, "h":1.5, "matrix":[2,2]},
+                {"label":"P1 5", "x":5, "y":2, "w":0.5, "h":1.5, "matrix":[2,4]},
+                {"label":"P1 7", "x":6, "y":2, "w":0.5, "h":1.5, "matrix":[2,6]}
+            ]
+        },
+        "LAYOUT_right": {
+            "layout": [
+                {"label":"P2 6", "x":0.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,5]},
+                {"label":"P2 4", "x":1.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,3]},
+                {"label":"P2 2", "x":2.5, "y":0, "w":0.5, "h":1.5, "matrix":[2,1]},
+
+                {"label":"Knob CCW", "x":4, "y":1.25, "w":0.5, "matrix":[1,0] },
+                {"label":"Knob Press", "x":4.5, "y":1, "w":1.5, "h":1.5, "matrix":[1,1]},
+                {"label":"Knob CW", "x":6, "y":1.25, "w":0.5, "matrix":[1,2]},
+
+                {"label":"P2 7", "x":0, "y":2, "w":0.5, "h":1.5, "matrix":[0,6]},
+                {"label":"P2 5", "x":1, "y":2, "w":0.5, "h":1.5, "matrix":[0,4]},
+                {"label":"P2 3", "x":2, "y":2, "w":0.5, "h":1.5, "matrix":[0,2]},
+                {"label":"P2 1", "x":3, "y":2, "w":0.5, "h":1.5, "matrix":[0,0]}
+            ]
+        }
+    }
+}
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
new file mode 100644
index 0000000000..f450769b43
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/keymap.c
@@ -0,0 +1,30 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6,
+          KC_NO,   JS_7,  KC_NO,
+                                    JS_0,JS_1,JS_2,JS_3,JS_4,JS_5,JS_6
+    )
+};
+
+#if defined(JOYSTICK_ENABLE) && defined(ENCODER_ENABLE)
+
+int16_t joystick_position = 0;
+int16_t pulses_per_revolution = 24;     // Depends on encoder model. Usually 18ppr or 24ppr for Bourns EC11s.
+int16_t full_joystick_value = 32767;    // Equivalent to max value of int16. +full_joystick_value is +1.0 axis output. -full_joystick_value is -1.0 axis output.
+joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
+    [0] = JOYSTICK_AXIS_VIRTUAL
+};
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    joystick_position += (clockwise ? 2 : -2) * (full_joystick_value / pulses_per_revolution);  // +2 and -2 are used, since +1.0 and -1.0 axis output refers to positions at half of a full rotation
+    joystick_set_axis(0, joystick_position);
+
+    return true;
+}
+
+#endif
diff --git a/keyboards/synthlabs/solo/keymaps/gamepad/readme.md b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
new file mode 100644
index 0000000000..12e0df2cf2
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/gamepad/readme.md
@@ -0,0 +1,3 @@
+# Gamepad Synth Labs Solo Layout
+
+This keymap is intended for usage as a generic gamepad. The rotary encoder is mapped as a virtual 1-axis joystick.
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/keymap.c b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
new file mode 100644
index 0000000000..f274ba9c06
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/keymap.c
@@ -0,0 +1,72 @@
+// Copyright 2022 Aaron Hong (@hongaaronc)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "joystick.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_all(
+                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6,
+        JS_BUTTON8, MO(1), JS_BUTTON7,
+                                    JS_BUTTON0,JS_BUTTON1,JS_BUTTON2,JS_BUTTON3,JS_BUTTON4,JS_BUTTON5,JS_BUTTON6
+    ),
+    [1] = LAYOUT_all(
+                                    JS_BUTTON9,JS_BUTTON0,JS_BUTTON10, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12,
+        _______, _______, _______,
+                                    JS_BUTTON10,JS_BUTTON0,JS_BUTTON9, _______,JS_BUTTON11,JS_BUTTON1,JS_BUTTON12
+    ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+/* The amount of time the encoder has to remain stationary, before unregistering encoder bindings */
+uint16_t encoder_stationary_release_delay_ms = 25;
+
+uint16_t encoder_last_update_time = 0;
+
+enum {
+    CCW_JOYSTICK_BUTTON = 8,
+    CW_JOYSTICK_BUTTON = 7,
+};
+
+enum {
+    CCW_MACRO = SAFE_RANGE,
+    CW_MACRO,
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case CCW_MACRO:
+            unregister_joystick_button(CW_JOYSTICK_BUTTON);
+            register_joystick_button(CCW_JOYSTICK_BUTTON);
+            encoder_last_update_time = timer_read(); /* Update the last time that the encoder was detected as rotated */
+            return false;
+        case CW_MACRO:
+            unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+            register_joystick_button(CW_JOYSTICK_BUTTON);
+            encoder_last_update_time = timer_read();  /* Update the last time that the encoder was detected as rotated */
+            return false;
+        default:
+            return true;
+    }
+}
+
+void housekeeping_task_user(void) {
+    uint16_t current_time = timer_read();
+    uint16_t elapsed_time_since_last_update = current_time - encoder_last_update_time;
+
+    /* If an encoder has been stationary for encoder_stationary_release_delay_ms, then unregister the joystick buttons for both directions */
+    if (elapsed_time_since_last_update >= encoder_stationary_release_delay_ms) {
+        unregister_joystick_button(CCW_JOYSTICK_BUTTON);
+        unregister_joystick_button(CW_JOYSTICK_BUTTON);
+    }
+}
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [0] =   { ENCODER_CCW_CW(
+                CCW_MACRO,
+                CW_MACRO
+            ) },
+    [1] =   { ENCODER_CCW_CW(_______, _______) },
+};
+#endif
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/readme.md b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
new file mode 100644
index 0000000000..f56fa622d3
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/readme.md
@@ -0,0 +1,16 @@
+# IIDX Synth Labs Solo Layout
+
+This keymap is intended for usage as a gamepad for [beatmania IIDX INFINITAS](https://p.eagate.573.jp/game/infinitas/2/index.html).
+
+This keycap follows the default keymapping for the game, shown here:
+
+![Default Keymapping Settings Screen](https://i.imgur.com/Va48FnZ.png)
+
+The face buttons correspond directly to ボタン 1 - ボタン 7
+
+Turning the knob clockwise corresponds to スクラッチ-右回転
+Turning the knob counter-clockwise corresponds to スクラッチ-左回転
+
+While holding down the knob button
+* The bottom row of face buttons corresponds to ボタン E1 - ボタン E4
+* The top-left and top-right face buttons correspond to ボタン 1 and ボタン 2, for adjustment of in-game scroll speed
diff --git a/keyboards/synthlabs/solo/keymaps/iidx/rules.mk b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
new file mode 100644
index 0000000000..550de16143
--- /dev/null
+++ b/keyboards/synthlabs/solo/keymaps/iidx/rules.mk
@@ -0,0 +1,3 @@
+JOYSTICK_ENABLE = yes
+DEBOUNCE_TYPE = sym_eager_pk
+ENCODER_MAP_ENABLE = yes