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

10 files changed, 564 insertions, 0 deletions

diff --git a/keyboards/keychron/q2/rev_0113/config.h b/keyboards/keychron/q2/rev_0113/config.h
new file mode 100644
index 0000000000..21ada693c0
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/config.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * 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
+
+/* USB Device descriptor parameter */
+#define PRODUCT_ID      0x0113
+#define DEVICE_VER      0x0100
+
+/* Encoder used pins */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { B5 }
+
+/* Specifies the number of pulses the encoder registers between each detent */
+#define ENCODER_RESOLUTION 2
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/info.json b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
new file mode 100644
index 0000000000..8448d4c995
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"#~", "x":12.75, "y":2.25},
+            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+            {"label":"|", "x":1.25, "y":3.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e3e6cf7376
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/default/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * 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
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = SAFE_RANGE,
+    KC_LAUNCHPAD
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_iso_68(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, 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_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_iso_68(
+        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_MUTE,
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, 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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_iso_68(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_iso_68(
+        KC_WAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/info.json b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
new file mode 100644
index 0000000000..6111f83d23
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "Keychron Q2",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "layouts": {
+        "LAYOUT_iso_68": {
+            "layout": [
+            {"label":"Mute", "x":15.25, "y":0, "w":0.75},
+            {"label":"Vol-", "x":16, "y":0, "w":0.75, "h":0.5},
+            {"label":"Vol+", "x":16, "y":0.5, "w":0.75, "h":0.5},
+
+            {"label":"Esc", "x":0, "y":0.25},
+            {"label":"!", "x":1, "y":0.25},
+            {"label":"@", "x":2, "y":0.25},
+            {"label":"", "x":3, "y":0.25},
+            {"label":"$", "x":4, "y":0.25},
+            {"label":"%", "x":5, "y":0.25},
+            {"label":"^", "x":6, "y":0.25},
+            {"label":"&", "x":7, "y":0.25},
+            {"label":"*", "x":8, "y":0.25},
+            {"label":"(", "x":9, "y":0.25},
+            {"label":")", "x":10, "y":0.25},
+            {"label":"_", "x":11, "y":0.25},
+            {"label":"+", "x":12, "y":0.25},
+            {"label":"Backspace", "x":13, "y":0.25, "w":2},
+
+            {"label":"Tab", "x":0, "y":1.25, "w":1.5},
+            {"label":"Q", "x":1.5, "y":1.25},
+            {"label":"W", "x":2.5, "y":1.25},
+            {"label":"E", "x":3.5, "y":1.25},
+            {"label":"R", "x":4.5, "y":1.25},
+            {"label":"T", "x":5.5, "y":1.25},
+            {"label":"Y", "x":6.5, "y":1.25},
+            {"label":"U", "x":7.5, "y":1.25},
+            {"label":"I", "x":8.5, "y":1.25},
+            {"label":"O", "x":9.5, "y":1.25},
+            {"label":"P", "x":10.5, "y":1.25},
+            {"label":"{", "x":11.5, "y":1.25},
+            {"label":"}", "x":12.5, "y":1.25},
+            {"label":"Delete", "x":15.25, "y":1.25},
+
+            {"label":"Caps Lock", "x":0, "y":2.25, "w":1.75},
+            {"label":"A", "x":1.75, "y":2.25},
+            {"label":"S", "x":2.75, "y":2.25},
+            {"label":"D", "x":3.75, "y":2.25},
+            {"label":"F", "x":4.75, "y":2.25},
+            {"label":"G", "x":5.75, "y":2.25},
+            {"label":"H", "x":6.75, "y":2.25},
+            {"label":"J", "x":7.75, "y":2.25},
+            {"label":"K", "x":8.75, "y":2.25},
+            {"label":"L", "x":9.75, "y":2.25},
+            {"label":":", "x":10.75, "y":2.25},
+            {"label":"\"", "x":11.75, "y":2.25},
+            {"label":"#~", "x":12.75, "y":2.25},
+            {"label":"Enter", "x":13.75, "y":2.25, "w":1.25},
+            {"label":"Home", "x":15.25, "y":2.25},
+
+            {"label":"Shift", "x":0, "y":3.25, "w":1.25},
+            {"label":"|", "x":1.25, "y":3.25},
+            {"label":"Z", "x":2.25, "y":3.25},
+            {"label":"X", "x":3.25, "y":3.25},
+            {"label":"C", "x":4.25, "y":3.25},
+            {"label":"V", "x":5.25, "y":3.25},
+            {"label":"B", "x":6.25, "y":3.25},
+            {"label":"N", "x":7.25, "y":3.25},
+            {"label":"M", "x":8.25, "y":3.25},
+            {"label":"<", "x":9.25, "y":3.25},
+            {"label":">", "x":10.25, "y":3.25},
+            {"label":"?", "x":11.25, "y":3.25},
+            {"label":"Shift", "x":12.25, "y":3.25, "w":1.75},
+            {"label":"Up", "x":14.25, "y":3.5},
+
+            {"label":"Ctrl", "x":0, "y":4.25, "w":1.25},
+            {"label":"Win", "x":1.25, "y":4.25, "w":1.25},
+            {"label":"Alt", "x":2.5, "y":4.25, "w":1.25},
+            {"label":"Space", "x":3.75, "y":4.25, "w":6.25},
+            {"label":"Alt", "x":10, "y":4.25},
+            {"label":"Fn1", "x":11, "y":4.25},
+            {"label":"Fn2", "x":12, "y":4.25},
+            {"label":"Left", "x":13.25, "y":4.5},
+            {"label":"Down", "x":14.25, "y":4.5},
+            {"label":"Right", "x":15.25, "y":4.5} ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9c7ad72be7
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/keymap.c
@@ -0,0 +1,154 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * 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
+
+enum layers{
+    MAC_BASE,
+    WIN_BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+enum custom_keycodes {
+    KC_MISSION_CONTROL = USER00,
+    KC_LAUNCHPAD,
+    KC_TASK,
+    KC_FLXP
+};
+
+#define KC_WAVE S(KC_GRV)
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_all(
+        KC_ESC,  KC_1,    KC_2,    KC_F3,   KC_F4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,   KC_BSPC,          KC_MUTE,
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, 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_LOPT, KC_LCMD,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RCMD, MO(_FN1), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_BASE] = 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_BSPC,          KC_MUTE,
+        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_DEL,
+        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_NUHS,  KC_ENT,           KC_HOME,
+        KC_LSFT, KC_NUBS, 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_LGUI, KC_LALT,                            KC_SPC,  KC_VOLD, KC_VOLU,          KC_RALT, MO(_FN2), MO(_FN3), KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [_FN1] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN2] = LAYOUT_all(
+        KC_GRV,  KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD,  KC_VOLU,  KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_FN3] = LAYOUT_all(
+        KC_WAVE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,   KC_F12,   KC_TRNS,          KC_TRNS,
+        RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,                    KC_TRNS,
+        KC_TRNS, RGB_RMOD,RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, 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, KC_TRNS, KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS)
+};
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#define ENCODERS 1
+static uint8_t  encoder_state[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = {{ 8, 4 }};
+static keypos_t encoder_ccw[ENCODERS]  = {{ 7, 4 }};
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = true,
+        .time = (timer_read() | 1)
+    };
+    encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
+    action_exec(encoder_event);
+}
+
+void encoder_action_unregister(void) {
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index]) {
+            keyevent_t encoder_event = (keyevent_t) {
+                .key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index],
+                .pressed = false,
+                .time = (timer_read() | 1)
+            };
+            encoder_state[index] = 0;
+            action_exec(encoder_event);
+        }
+    }
+}
+
+void matrix_scan_user(void) {
+    encoder_action_unregister();
+}
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    return false;
+};
+
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case KC_MISSION_CONTROL:
+            if (record->event.pressed) {
+                host_consumer_send(0x29F);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_LAUNCHPAD:
+            if (record->event.pressed) {
+                host_consumer_send(0x2A0);
+            } else {
+                host_consumer_send(0);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_TASK:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_TAB);
+            }
+            return false;  // Skip all further processing of this key
+        case KC_FLXP:
+            if (record->event.pressed) {
+                register_code(KC_LWIN);
+                register_code(KC_E);
+            } else {
+                unregister_code(KC_LWIN);
+                unregister_code(KC_E);
+            }
+            return false;  // Skip all further processing of this key
+        default:
+            return true;  // Process all other keycodes normally
+    }
+}
diff --git a/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk b/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk
new file mode 100644
index 0000000000..bee21da528
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/keychron/q2/rev_0113/readme.md b/keyboards/keychron/q2/rev_0113/readme.md
new file mode 100644
index 0000000000..1d808cbb73
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q2 and support encoder
+
+- Enable EC11 rotary encoder
+- Turn colckwise to increase volume and turn anti-colckwise to decrease volume
+- Press top right key pushbutton to mute
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.c b/keyboards/keychron/q2/rev_0113/rev_0113.c
new file mode 100644
index 0000000000..c9413d023d
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.c
@@ -0,0 +1,31 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * 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"
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/keychron/q2/rev_0113/rev_0113.h b/keyboards/keychron/q2/rev_0113/rev_0113.h
new file mode 100644
index 0000000000..21d20463e9
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rev_0113.h
@@ -0,0 +1,48 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * 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 "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    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,           K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46, K47, K48,      K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { 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,  K2C, K2D, K2E, }, \
+    { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, K47, K48, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
+#define LAYOUT_iso_68( \
+    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,           K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K1D,      K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E,     \
+    K40, K41, K42,                K46,                K4A, K4B, K4C, K4D, K2C, K4E \
+) { \
+    { 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,  K2C, K2D, K2E, }, \
+    { K30, K31,  K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,  XXX, K3D, K3E, }, \
+    { K40, K41,  K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B,  K4C, K4D, K4E, }  \
+}
diff --git a/keyboards/keychron/q2/rev_0113/rules.mk b/keyboards/keychron/q2/rev_0113/rules.mk
new file mode 100644
index 0000000000..52d0bce592
--- /dev/null
+++ b/keyboards/keychron/q2/rev_0113/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+# MCU = STM32L432
+MCU = cortex-m4
+ARMV = 7
+MCU_FAMILY = STM32
+MCU_SERIES = STM32L4xx
+MCU_LDSCRIPT = STM32L432xB
+MCU_STARTUP = stm32l4xx
+BOARD = GENERIC_STM32_L433XC
+PLATFORM_NAME = platform_l432
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c