From d1074a0620f7f4f137379a6b6ba603d0c127fb72 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Mon, 16 Oct 2023 14:18:07 +0800
Subject: [PATCH 1/7] Update host.c and chibios.c
---
tmk_core/protocol/chibios/chibios.c | 34 +++++++++++++++++++++++++----
tmk_core/protocol/host.c | 14 ++++++++++--
2 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 4d97f1cd82e6..74d8040df5f3 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -179,10 +179,35 @@ void protocol_post_init(void) {
host_set_driver(driver);
}
+#if defined(STM32_USB_USE_OTG1)
+void protocol_pre_task(void) {
+# if !defined(NO_USB_STARTUP_CHECK)
+ if (USB_DRIVER.state == USB_SUSPENDED) {
+ dprintln("suspending keyboard");
+ while (USB_DRIVER.state == USB_SUSPENDED) {
+ /* Do this in the suspended state */
+ suspend_power_down(); // on AVR this deep sleeps for 15ms
+ /* Remote wakeup */
+ if ((USB_DRIVER.status & USB_GETSTATUS_REMOTE_WAKEUP_ENABLED) && suspend_wakeup_condition()) {
+ usbWakeupHost(&USB_DRIVER);
+ wait_ms(300);
+ }
+ }
+ /* Woken up */
+ // variables has been already cleared by the wakeup hook
+ send_keyboard_report();
+# ifdef MOUSEKEY_ENABLE
+ mousekey_send();
+# endif /* MOUSEKEY_ENABLE */
+ }
+# endif
+ usb_event_queue_task();
+}
+#else
void protocol_pre_task(void) {
usb_event_queue_task();
-#if !defined(NO_USB_STARTUP_CHECK)
+# if !defined(NO_USB_STARTUP_CHECK)
if (USB_DRIVER.state == USB_SUSPENDED) {
dprintln("suspending keyboard");
while (USB_DRIVER.state == USB_SUSPENDED) {
@@ -197,12 +222,13 @@ void protocol_pre_task(void) {
/* Woken up */
// variables has been already cleared by the wakeup hook
send_keyboard_report();
-# ifdef MOUSEKEY_ENABLE
+# ifdef MOUSEKEY_ENABLE
mousekey_send();
-# endif /* MOUSEKEY_ENABLE */
+# endif /* MOUSEKEY_ENABLE */
}
-#endif
+# endif
}
+#endif
void protocol_post_task(void) {
#ifdef CONSOLE_ENABLE
diff --git a/tmk_core/protocol/host.c b/tmk_core/protocol/host.c
index 2c6654e9a652..29df948b2693 100644
--- a/tmk_core/protocol/host.c
+++ b/tmk_core/protocol/host.c
@@ -131,11 +131,16 @@ void host_system_send(uint16_t usage) {
last_system_usage = usage;
if (!driver) return;
-
+#if defined(STM32_USB_USE_OTG1)
+ static report_extra_t report;
+ report.report_id = REPORT_ID_SYSTEM;
+ report.usage = usage;
+#else
report_extra_t report = {
.report_id = REPORT_ID_SYSTEM,
.usage = usage,
};
+#endif
(*driver->send_extra)(&report);
}
@@ -151,11 +156,16 @@ void host_consumer_send(uint16_t usage) {
#endif
if (!driver) return;
-
+#if defined(STM32_USB_USE_OTG1)
+ static report_extra_t report;
+ report.report_id = REPORT_ID_CONSUMER;
+ report.usage = usage;
+#else
report_extra_t report = {
.report_id = REPORT_ID_CONSUMER,
.usage = usage,
};
+#endif
(*driver->send_extra)(&report);
}
From d6394693b13740b1e61cf0ba011b5337165bb0b2 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Mon, 16 Oct 2023 14:22:03 +0800
Subject: [PATCH 2/7] Update chibios lib
---
lib/chibios | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/chibios b/lib/chibios
index 11edb1610980..eea3b8c4acb3 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit 11edb1610980f213b9f83161e1715a46fb7e4c51
+Subproject commit eea3b8c4acb36d839de7813fdfa3e74ca84e02f6
From 74f31a21e8ec772a408aceff86e78941065dd2ab Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Mon, 16 Oct 2023 16:07:34 +0800
Subject: [PATCH 3/7] Update x4
---
keyboards/keychron/x3/readme.md | 2 +-
keyboards/keychron/x4/ansi/red/config.h | 46 +++
keyboards/keychron/x4/ansi/red/info.json | 125 ++++++++
.../x4/ansi/red/keymaps/default/keymap.c | 61 ++++
.../x4/ansi/red/keymaps/keychron/keymap.c | 77 +++++
.../x4/ansi/red/keymaps/keychron/rules.mk | 3 +
.../keychron/x4/ansi/red/keymaps/via/keymap.c | 61 ++++
.../keychron/x4/ansi/red/keymaps/via/rules.mk | 1 +
keyboards/keychron/x4/ansi/red/red.c | 113 ++++++++
keyboards/keychron/x4/ansi/red/rules.mk | 1 +
keyboards/keychron/x4/config.h | 32 +++
keyboards/keychron/x4/halconf.h | 24 ++
keyboards/keychron/x4/info.json | 120 ++++++++
keyboards/keychron/x4/mcuconf.h | 34 +++
keyboards/keychron/x4/readme.md | 26 ++
.../keychron/x4/via_json/x4_ansi_red.json | 271 ++++++++++++++++++
keyboards/keychron/x4/x4.c | 29 ++
lib/chibios | 2 +-
18 files changed, 1026 insertions(+), 2 deletions(-)
create mode 100755 keyboards/keychron/x4/ansi/red/config.h
create mode 100755 keyboards/keychron/x4/ansi/red/info.json
create mode 100755 keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c
create mode 100755 keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c
create mode 100755 keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk
create mode 100755 keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c
create mode 100755 keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
create mode 100755 keyboards/keychron/x4/ansi/red/red.c
create mode 100755 keyboards/keychron/x4/ansi/red/rules.mk
create mode 100755 keyboards/keychron/x4/config.h
create mode 100755 keyboards/keychron/x4/halconf.h
create mode 100755 keyboards/keychron/x4/info.json
create mode 100755 keyboards/keychron/x4/mcuconf.h
create mode 100755 keyboards/keychron/x4/readme.md
create mode 100755 keyboards/keychron/x4/via_json/x4_ansi_red.json
create mode 100755 keyboards/keychron/x4/x4.c
diff --git a/keyboards/keychron/x3/readme.md b/keyboards/keychron/x3/readme.md
index c61e790c41f5..c700ef538136 100755
--- a/keyboards/keychron/x3/readme.md
+++ b/keyboards/keychron/x3/readme.md
@@ -10,7 +10,7 @@ A customizable 80% TKL keyboard.
Make example for this keyboard (after setting up your build environment):
- make keychron/x1/ansi/red:default
+ make keychron/x3/ansi/red:default
Flashing example for this keyboard:
diff --git a/keyboards/keychron/x4/ansi/red/config.h b/keyboards/keychron/x4/ansi/red/config.h
new file mode 100755
index 000000000000..2d9142046749
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/config.h
@@ -0,0 +1,46 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#pragma once
+
+#ifdef LED_MATRIX_ENABLE
+/* RGB Matrix Driver Configuration */
+# define DRIVER_COUNT 1
+# define DRIVER_ADDR_1 0b1110100
+
+/* RGB Matrix Configuration */
+# define LED_MATRIX_LED_COUNT 81
+
+/* Scan phase of led driver set as MSKPHASE_6CHANNEL(defined as 0x03 in CKLED2001.h) */
+# define PHASE_CHANNEL MSKPHASE_6CHANNEL
+# define CKLED2001_CURRENT_TUNE \
+ { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+
+/* turn off effects when suspended */
+# define LED_DISABLE_WHEN_USB_SUSPENDED
+
+// LED Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
+// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
+# define LED_MATRIX_KEYPRESSES
+# define LED_MATRIX_KEYRELEASES
+#endif
+
+/* Encoder Configuration*/
+#ifdef ENCODER_ENABLE
+# define ENCODER_DEFAULT_POS 0x3
+#endif
diff --git a/keyboards/keychron/x4/ansi/red/info.json b/keyboards/keychron/x4/ansi/red/info.json
new file mode 100755
index 000000000000..6ab175c6499a
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/info.json
@@ -0,0 +1,125 @@
+{
+ "usb": {
+ "pid": "0x0240",
+ "device_version": "1.0.0"
+ },
+ "features": {
+ "led_matrix": true,
+ "encoder": true
+ },
+ "encoder": {
+ "enabled": true,
+ "rotary": [
+ {"pin_a": "B14", "pin_b": "B15", "resolution": 4}
+ ]
+ },
+ "led_matrix": {
+ "driver": "ckled2001",
+ "animations": {
+ "none": true,
+ "solid": true,
+ "breathing": true,
+ "band_pinwheel": true,
+ "band_spiral": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "dual_beacon": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_multinexus": true,
+ "solid_splash": true,
+ "wave_left_right": true,
+ "wave_up_down": true,
+ "effect_max": true
+ },
+ "layout": [
+ {"matrix":[0, 0], "flags":1, "x":0, "y":0},
+ {"matrix":[0, 1], "flags":1, "x":18, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":33, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":48, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":62, "y":0},
+ {"matrix":[0, 5], "flags":1, "x":81, "y":0},
+ {"matrix":[0, 6], "flags":1, "x":95, "y":0},
+ {"matrix":[0, 7], "flags":1, "x":110, "y":0},
+ {"matrix":[0, 8], "flags":1, "x":125, "y":0},
+ {"matrix":[0, 9], "flags":1, "x":143, "y":0},
+ {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+ {"matrix":[0, 11], "flags":1, "x":173, "y":0},
+ {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+ {"matrix":[0, 13], "flags":1, "x":206, "y":0},
+
+ {"matrix":[1, 0], "flags":1, "x":0, "y":15},
+ {"matrix":[1, 1], "flags":4, "x":15, "y":15},
+ {"matrix":[1, 2], "flags":4, "x":29, "y":15},
+ {"matrix":[1, 3], "flags":4, "x":44, "y":15},
+ {"matrix":[1, 4], "flags":4, "x":59, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":73, "y":15},
+ {"matrix":[1, 6], "flags":4, "x":88, "y":15},
+ {"matrix":[1, 7], "flags":4, "x":103, "y":15},
+ {"matrix":[1, 8], "flags":4, "x":118, "y":15},
+ {"matrix":[1, 9], "flags":4, "x":132, "y":15},
+ {"matrix":[1, 10], "flags":4, "x":147, "y":15},
+ {"matrix":[1, 11], "flags":4, "x":162, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+ {"matrix":[1, 13], "flags":1, "x":198, "y":15},
+ {"matrix":[1, 14], "flags":1, "x":224, "y":15},
+
+ {"matrix":[2, 0], "flags":1, "x":4, "y":26},
+ {"matrix":[2, 1], "flags":4, "x":22, "y":26},
+ {"matrix":[2, 2], "flags":4, "x":37, "y":26},
+ {"matrix":[2, 3], "flags":4, "x":51, "y":26},
+ {"matrix":[2, 4], "flags":4, "x":66, "y":26},
+ {"matrix":[2, 5], "flags":4, "x":81, "y":26},
+ {"matrix":[2, 6], "flags":4, "x":95, "y":26},
+ {"matrix":[2, 7], "flags":4, "x":110, "y":26},
+ {"matrix":[2, 8], "flags":4, "x":125, "y":26},
+ {"matrix":[2, 9], "flags":4, "x":140, "y":26},
+ {"matrix":[2, 10], "flags":4, "x":154, "y":26},
+ {"matrix":[2, 11], "flags":4, "x":169, "y":26},
+ {"matrix":[2, 12], "flags":4, "x":184, "y":26},
+ {"matrix":[2, 13], "flags":4, "x":202, "y":26},
+ {"matrix":[2, 14], "flags":1, "x":224, "y":26},
+
+ {"matrix":[3, 0], "flags":9, "x":6, "y":38},
+ {"matrix":[3, 1], "flags":4, "x":26, "y":38},
+ {"matrix":[3, 2], "flags":4, "x":40, "y":38},
+ {"matrix":[3, 3], "flags":4, "x":55, "y":38},
+ {"matrix":[3, 4], "flags":4, "x":70, "y":38},
+ {"matrix":[3, 5], "flags":4, "x":84, "y":38},
+ {"matrix":[3, 6], "flags":4, "x":99, "y":38},
+ {"matrix":[3, 7], "flags":4, "x":114, "y":38},
+ {"matrix":[3, 8], "flags":4, "x":129, "y":38},
+ {"matrix":[3, 9], "flags":4, "x":143, "y":38},
+ {"matrix":[3, 10], "flags":4, "x":158, "y":38},
+ {"matrix":[3, 11], "flags":4, "x":173, "y":38},
+ {"matrix":[3, 13], "flags":1, "x":196, "y":38},
+ {"matrix":[3, 14], "flags":1, "x":224, "y":38},
+
+ {"matrix":[4, 0], "flags":1, "x":9, "y":49},
+ {"matrix":[4, 2], "flags":4, "x":33, "y":49},
+ {"matrix":[4, 3], "flags":4, "x":48, "y":49},
+ {"matrix":[4, 4], "flags":4, "x":62, "y":49},
+ {"matrix":[4, 5], "flags":4, "x":77, "y":49},
+ {"matrix":[4, 6], "flags":4, "x":92, "y":49},
+ {"matrix":[4, 7], "flags":4, "x":106, "y":49},
+ {"matrix":[4, 8], "flags":4, "x":121, "y":49},
+ {"matrix":[4, 9], "flags":4, "x":136, "y":49},
+ {"matrix":[4, 10], "flags":4, "x":151, "y":49},
+ {"matrix":[4, 11], "flags":4, "x":165, "y":49},
+ {"matrix":[4, 13], "flags":1, "x":185, "y":49},
+ {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+ {"matrix":[5, 0], "flags":1, "x":2, "y":61},
+ {"matrix":[5, 1], "flags":1, "x":20, "y":61},
+ {"matrix":[5, 2], "flags":1, "x":39, "y":61},
+ {"matrix":[5, 6], "flags":4, "x":94, "y":61},
+ {"matrix":[5, 10], "flags":1, "x":147, "y":61},
+ {"matrix":[5, 11], "flags":1, "x":162, "y":61},
+ {"matrix":[5, 12], "flags":1, "x":176, "y":61},
+ {"matrix":[5, 13], "flags":1, "x":195, "y":64},
+ {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+ {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+ ]
+ }
+}
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c b/keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c
new file mode 100755
index 000000000000..429befa6fd9d
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c
@@ -0,0 +1,61 @@
+/* Copyright 202 @ 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+ WIN_BASE,
+ WIN_FN,
+ WIN_L2,
+ WIN_L3,
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [WIN_BASE] = LAYOUT_82_ansi(
+ KC_ESC, 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_DEL, KC_MUTE,
+ KC_GRV, 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_HOME,
+ 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_BSLS, KC_PGUP,
+ 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, KC_PGDN,
+ 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_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_82_ansi(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_L2] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+ [WIN_L3] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c b/keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c
new file mode 100755
index 000000000000..b7ae2fca34f2
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c
@@ -0,0 +1,77 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+#include "keychron_ft_common.h"
+
+enum layers {
+ WIN_BASE,
+ WIN_FN,
+ WIN_L2,
+ WIN_L3,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [WIN_BASE] = LAYOUT_82_ansi(
+ KC_ESC, 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_DEL, KC_MUTE,
+ KC_GRV, 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_HOME,
+ 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_BSLS, KC_PGUP,
+ 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, KC_PGDN,
+ 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_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_82_ansi(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_L2] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+ [WIN_L3] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+ housekeeping_task_keychron();
+ housekeeping_task_keychron_ft();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron(keycode, record)) {
+ return false;
+ }
+ if (!process_record_keychron_ft(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk b/keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk
new file mode 100755
index 000000000000..3c9fcc5c98c2
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c b/keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c
new file mode 100755
index 000000000000..0af845e432fc
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c
@@ -0,0 +1,61 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ WIN_BASE,
+ WIN_FN,
+ WIN_L2,
+ WIN_L3,
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [WIN_BASE] = LAYOUT_82_ansi(
+ KC_ESC, 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_DEL, KC_MUTE,
+ KC_GRV, 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_HOME,
+ 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_BSLS, KC_PGUP,
+ 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, KC_PGDN,
+ 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_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_82_ansi(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, BL_DOWN, BL_UP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, BL_TOGG,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ BL_TOGG, BL_STEP, BL_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, BL_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, GU_TOGG, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_L2] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+ [WIN_L3] = LAYOUT_82_ansi(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk b/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
new file mode 100755
index 000000000000..1e5b99807cb7
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/x4/ansi/red/red.c b/keyboards/keychron/x4/ansi/red/red.c
new file mode 100755
index 000000000000..d24851551585
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/red.c
@@ -0,0 +1,113 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#include "quantum.h"
+
+#ifdef LED_MATRIX_ENABLE
+// clang-format off
+const ckled2001_led PROGMEM g_ckled2001_leds[LED_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ * driver
+ * | LED address
+ * | | */
+ {0, A_16},
+ {0, A_15},
+ {0, A_14},
+ {0, A_13},
+ {0, A_12},
+ {0, A_11},
+ {0, A_10},
+ {0, A_9 },
+ {0, A_8 },
+ {0, A_7 },
+ {0, A_6 },
+ {0, A_5 },
+ {0, A_4 },
+ {0, A_3 },
+
+ {0, B_16},
+ {0, B_15},
+ {0, B_14},
+ {0, B_13},
+ {0, B_12},
+ {0, B_11},
+ {0, B_10},
+ {0, B_9 },
+ {0, B_8 },
+ {0, B_7 },
+ {0, B_6 },
+ {0, B_5 },
+ {0, B_4 },
+ {0, B_3 },
+ {0, B_2 },
+
+ {0, C_16},
+ {0, C_15},
+ {0, C_14},
+ {0, C_13},
+ {0, C_12},
+ {0, C_11},
+ {0, C_10},
+ {0, C_9 },
+ {0, C_8 },
+ {0, C_7 },
+ {0, C_6 },
+ {0, C_5 },
+ {0, C_4 },
+ {0, C_3 },
+ {0, C_2 },
+
+ {0, D_16},
+ {0, D_15},
+ {0, D_14},
+ {0, D_13},
+ {0, D_12},
+ {0, D_11},
+ {0, D_10},
+ {0, D_9 },
+ {0, D_8 },
+ {0, D_7 },
+ {0, D_6 },
+ {0, D_5 },
+ {0, D_3 },
+ {0, D_2 },
+
+ {0, E_16},
+ {0, E_14},
+ {0, E_13},
+ {0, E_12},
+ {0, E_11},
+ {0, E_10},
+ {0, E_9 },
+ {0, E_8 },
+ {0, E_7 },
+ {0, E_6 },
+ {0, E_5 },
+ {0, E_3 },
+ {0, E_2 },
+
+ {0, F_16},
+ {0, F_15},
+ {0, F_14},
+ {0, F_10},
+ {0, F_6 },
+ {0, F_5 },
+ {0, F_4 },
+ {0, F_3 },
+ {0, F_2 },
+ {0, F_1 },
+};
+#endif
diff --git a/keyboards/keychron/x4/ansi/red/rules.mk b/keyboards/keychron/x4/ansi/red/rules.mk
new file mode 100755
index 000000000000..6e7633bfe015
--- /dev/null
+++ b/keyboards/keychron/x4/ansi/red/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/x4/config.h b/keyboards/keychron/x4/config.h
new file mode 100755
index 000000000000..3cf99fab5e27
--- /dev/null
+++ b/keyboards/keychron/x4/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#pragma once
+
+/* I2C Driver Configuration */
+#define I2C1_CLOCK_SPEED 400000
+#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+/* User used eeprom */
+#define EECONFIG_USER_DATA_SIZE 1
+
+/* Factory test keys */
+#define FN_KEY1 MO(1)
+#define FN_KEY2 MO(3)
diff --git a/keyboards/keychron/x4/halconf.h b/keyboards/keychron/x4/halconf.h
new file mode 100755
index 000000000000..463d177eabc7
--- /dev/null
+++ b/keyboards/keychron/x4/halconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 QMK
+ *
+ * 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 HAL_USE_I2C TRUE
+#ifdef ENCODER_ENABLE
+# define PAL_USE_CALLBACKS TRUE
+#endif
+
+#include_next
diff --git a/keyboards/keychron/x4/info.json b/keyboards/keychron/x4/info.json
new file mode 100755
index 000000000000..a4b2515ba326
--- /dev/null
+++ b/keyboards/keychron/x4/info.json
@@ -0,0 +1,120 @@
+{
+ "keyboard_name": "Lemokey X4",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "usb": {
+ "vid": "0x362D"
+ },
+ "matrix_pins": {
+ "cols": ["A0", "A1", "A2", "A3", "C0", "C1", "C2", "C3", "A8", "C12", "B9", "C6", "C7", "C4", "C5", "A15"],
+ "rows": ["B0", "B1", "B8", "B3", "B4", "B5"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "C9"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "layouts": {
+ "LAYOUT_82_ansi": {
+ "layout": [
+ {"matrix":[0,0], "x":0, "y":0},
+ {"matrix":[0,1], "x":1.25, "y":0},
+ {"matrix":[0,2], "x":2.25, "y":0},
+ {"matrix":[0,3], "x":3.25, "y":0},
+ {"matrix":[0,4], "x":4.25, "y":0},
+ {"matrix":[0,5], "x":5.5, "y":0},
+ {"matrix":[0,6], "x":6.5, "y":0},
+ {"matrix":[0,7], "x":7.5, "y":0},
+ {"matrix":[0,8], "x":8.5, "y":0},
+ {"matrix":[0,9], "x":9.75, "y":0},
+ {"matrix":[0,10], "x":10.75, "y":0},
+ {"matrix":[0,11], "x":11.75, "y":0},
+ {"matrix":[0,12], "x":12.75, "y":0},
+ {"matrix":[0,13], "x":14, "y":0},
+ {"matrix":[0,14], "x":15.25, "y":0},
+
+ {"matrix":[1,0], "x":0, "y":1.25},
+ {"matrix":[1,1], "x":1, "y":1.25},
+ {"matrix":[1,2], "x":2, "y":1.25},
+ {"matrix":[1,3], "x":3, "y":1.25},
+ {"matrix":[1,4], "x":4, "y":1.25},
+ {"matrix":[1,5], "x":5, "y":1.25},
+ {"matrix":[1,6], "x":6, "y":1.25},
+ {"matrix":[1,7], "x":7, "y":1.25},
+ {"matrix":[1,8], "x":8, "y":1.25},
+ {"matrix":[1,9], "x":9, "y":1.25},
+ {"matrix":[1,10], "x":10, "y":1.25},
+ {"matrix":[1,11], "x":11, "y":1.25},
+ {"matrix":[1,12], "x":12, "y":1.25},
+ {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+ {"matrix":[1,14], "x":15.25, "y":1.25},
+
+ {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
+ {"matrix":[2,1], "x":1.5, "y":2.25},
+ {"matrix":[2,2], "x":2.5, "y":2.25},
+ {"matrix":[2,3], "x":3.5, "y":2.25},
+ {"matrix":[2,4], "x":4.5, "y":2.25},
+ {"matrix":[2,5], "x":5.5, "y":2.25},
+ {"matrix":[2,6], "x":6.5, "y":2.25},
+ {"matrix":[2,7], "x":7.5, "y":2.25},
+ {"matrix":[2,8], "x":8.5, "y":2.25},
+ {"matrix":[2,9], "x":9.5, "y":2.25},
+ {"matrix":[2,10], "x":10.5, "y":2.25},
+ {"matrix":[2,11], "x":11.5, "y":2.25},
+ {"matrix":[2,12], "x":12.5, "y":2.25},
+ {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+ {"matrix":[2,14], "x":15.25, "y":2.25},
+
+ {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+ {"matrix":[3,1], "x":1.75, "y":3.25},
+ {"matrix":[3,2], "x":2.75, "y":3.25},
+ {"matrix":[3,3], "x":3.75, "y":3.25},
+ {"matrix":[3,4], "x":4.75, "y":3.25},
+ {"matrix":[3,5], "x":5.75, "y":3.25},
+ {"matrix":[3,6], "x":6.75, "y":3.25},
+ {"matrix":[3,7], "x":7.75, "y":3.25},
+ {"matrix":[3,8], "x":8.75, "y":3.25},
+ {"matrix":[3,9], "x":9.75, "y":3.25},
+ {"matrix":[3,10], "x":10.75, "y":3.25},
+ {"matrix":[3,11], "x":11.75, "y":3.25},
+ {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+ {"matrix":[3,14], "x":15.25, "y":3.25},
+
+ {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
+ {"matrix":[4,2], "x":2.25, "y":4.25},
+ {"matrix":[4,3], "x":3.25, "y":4.25},
+ {"matrix":[4,4], "x":4.25, "y":4.25},
+ {"matrix":[4,5], "x":5.25, "y":4.25},
+ {"matrix":[4,6], "x":6.25, "y":4.25},
+ {"matrix":[4,7], "x":7.25, "y":4.25},
+ {"matrix":[4,8], "x":8.25, "y":4.25},
+ {"matrix":[4,9], "x":9.25, "y":4.25},
+ {"matrix":[4,10], "x":10.25, "y":4.25},
+ {"matrix":[4,11], "x":11.25, "y":4.25},
+ {"matrix":[4,13], "x":12.25, "y":4.25, "w":1.75},
+ {"matrix":[4,14], "x":14.25, "y":4.5},
+
+ {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+ {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
+ {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+ {"matrix":[5,10], "x":10, "y":5.25},
+ {"matrix":[5,11], "x":11, "y":5.25},
+ {"matrix":[5,12], "x":12, "y":5.25},
+ {"matrix":[5,13], "x":13.25, "y":5.5},
+ {"matrix":[5,14], "x":14.25, "y":5.5},
+ {"matrix":[5,15], "x":15.25, "y":5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/x4/mcuconf.h b/keyboards/keychron/x4/mcuconf.h
new file mode 100755
index 000000000000..494b71483ff9
--- /dev/null
+++ b/keyboards/keychron/x4/mcuconf.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 QMK
+ *
+ * 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_next
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000U
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 8
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE 168
+#undef STM32_PLLP_VALUE
+#define STM32_PLLP_VALUE 4
+#undef STM32_PLLQ_VALUE
+#define STM32_PLLQ_VALUE 7
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/x4/readme.md b/keyboards/keychron/x4/readme.md
new file mode 100755
index 000000000000..b8fd67e07c7e
--- /dev/null
+++ b/keyboards/keychron/x4/readme.md
@@ -0,0 +1,26 @@
+# Lemokey X4
+
+![Lemokey X4]()
+
+A customizable 75% keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Lemokey X4
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/x4/ansi/red:default
+
+Flashing example for this keyboard:
+
+ make keychron/x4/ansi/red:default:flash
+
+## bootloader
+
+Enter the bootloader in two ways:
+
+* **Bootmagic reset**: Hold down the key located at *K00*, commonly programmed as *Esc* while plugging in the keyboard.
+* **Physical reset button**: Briefly press the RESET button under the spacebar.
+
+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/keychron/x4/via_json/x4_ansi_red.json b/keyboards/keychron/x4/via_json/x4_ansi_red.json
new file mode 100755
index 000000000000..31e044b399f0
--- /dev/null
+++ b/keyboards/keychron/x4/via_json/x4_ansi_red.json
@@ -0,0 +1,271 @@
+{
+ "name": "Lemokey X3 ANSI Red",
+ "vendorId": "0x362D",
+ "productId": "0x0230",
+ "keycodes": ["qmk_lighting"],
+ "customKeycodes": [
+ {"name": "Mission Control","title": "Mission Control in macOS","shortName": "MCtrl"},
+ {"name": "Launch Pad","title": "Launch Pad in macOS","shortName": "LPad"},
+ {"name": "Left Option","title": "Left Option in macOS","shortName": "LOpt"},
+ {"name": "Right Option","title": "Right Option in macOS","shortName": "ROpt"},
+ {"name": "Left Cmd","title": "Left Command in macOS","shortName": "LCmd"},
+ {"name": "Right Cmd","title": "Right Command in macOS","shortName": "RCmd"},
+ {"name": "Siri","title": "Siri in macOS","shortName": "Siri"},
+ {"name": "Task View","title": "Task View in windows","shortName": "Task"},
+ {"name": "File Explorer","title": "File Explorer in windows","shortName": "File"},
+ {"name": "Screen Shot","title": "Screenshot in macOS","shortName": "SShot"},
+ {"name": "Cortana","title": "Cortana in windows","shortName": "Cortana"}
+ ],
+ "matrix": {"rows": 6, "cols": 21},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "c": "#777777"
+ },
+ "0,0\nESC",
+ {
+ "x": 1,
+ "c": "#cccccc"
+ },
+ "0,1",
+ "0,2",
+ "0,3",
+ "0,4",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa"
+ },
+ "0,5",
+ "0,6",
+ "0,7",
+ "0,8",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "0,9",
+ "0,10",
+ "0,11",
+ "0,12",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,14",
+ "0,15",
+ "0,16"
+ ],
+ [
+ {
+ "y": 0.25
+ },
+ "1,0",
+ {
+ "c": "#cccccc"
+ },
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ "1,12",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,13",
+ {
+ "x": 0.25
+ },
+ "1,14",
+ "1,15",
+ "1,16",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "1,17",
+ "1,18",
+ "1,19",
+ "1,20"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "2,0",
+ {
+ "c": "#cccccc"
+ },
+ "2,1",
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ "2,12",
+ {
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "2,13",
+ {
+ "x": 0.25
+ },
+ "2,14",
+ "2,15",
+ "2,16",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "2,17",
+ "2,18",
+ "2,19",
+ {
+ "h": 2
+ },
+ "2,20"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,0",
+ {
+ "c": "#cccccc"
+ },
+ "3,1",
+ "3,2",
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6",
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "3,13",
+ {
+ "x": 3.5,
+ "c": "#cccccc"
+ },
+ "3,17",
+ "3,18",
+ "3,19"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 2.25
+ },
+ "4,0",
+ {
+ "c": "#cccccc"
+ },
+ "4,2",
+ "4,3",
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7",
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ {
+ "c": "#aaaaaa",
+ "w": 2.75
+ },
+ "4,13",
+ {
+ "x": 1.25,
+ "c": "#777777"
+ },
+ "4,15",
+ {
+ "x": 1.25,
+ "c": "#cccccc"
+ },
+ "4,17",
+ "4,18",
+ "4,19",
+ {
+ "c": "#777777",
+ "h": 2
+ },
+ "4,20"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,0",
+ {
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2",
+ {
+ "c": "#cccccc",
+ "w": 6.25
+ },
+ "5,6",
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,10",
+ {
+ "w": 1.25
+ },
+ "5,11",
+ {
+ "w": 1.25
+ },
+ "5,12",
+ {
+ "w": 1.25
+ },
+ "5,13",
+ {
+ "x": 0.25,
+ "c": "#777777"
+ },
+ "5,14",
+ "5,15",
+ "5,16",
+ {
+ "x": 0.25,
+ "c": "#cccccc",
+ "w": 2
+ },
+ "5,17",
+ "5,18"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/x4/x4.c b/keyboards/keychron/x4/x4.c
new file mode 100755
index 000000000000..b1bf2decdc69
--- /dev/null
+++ b/keyboards/keychron/x4/x4.c
@@ -0,0 +1,29 @@
+/* Copyright 2023 @ 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 .
+ */
+
+#include "quantum.h"
+
+void eeconfig_init_kb(void) {
+#if (EECONFIG_KB_DATA_SIZE) == 0
+ // Reset Keyboard EEPROM value to blank, rather than to a set value
+ eeconfig_update_kb(0);
+#endif
+ keymap_config.raw = eeconfig_read_keymap();
+ keymap_config.nkro = 1;
+ eeconfig_update_keymap(keymap_config.raw);
+
+ eeconfig_init_user();
+}
diff --git a/lib/chibios b/lib/chibios
index eea3b8c4acb3..c717c1b99809 160000
--- a/lib/chibios
+++ b/lib/chibios
@@ -1 +1 @@
-Subproject commit eea3b8c4acb36d839de7813fdfa3e74ca84e02f6
+Subproject commit c717c1b99809b9ea27a63ba955ba426170563fcb
From 47ea587ef0fc3ea94d169ae6335f0684ee143aef Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Mon, 16 Oct 2023 17:04:06 +0800
Subject: [PATCH 4/7] Update x4
---
.../ansi_encoder/keymaps/keychron/rules.mk | 5 --
.../keychron/x4/ansi/red/keymaps/via/rules.mk | 1 -
.../x4/{ansi => ansi_encoder}/red/config.h | 3 +
.../x4/{ansi => ansi_encoder}/red/info.json | 0
.../red/keymaps/default/keymap.c | 9 +++
.../ansi_encoder/red/keymaps/default/rules.mk | 1 +
.../red/keymaps/keychron/keymap.c | 9 +++
.../red/keymaps/keychron/rules.mk | 1 +
.../red/keymaps/via/keymap.c | 9 +++
.../x4/ansi_encoder/red/keymaps/via/rules.mk | 2 +
.../x4/{ansi => ansi_encoder}/red/red.c | 0
.../x4/{ansi => ansi_encoder}/red/rules.mk | 0
keyboards/keychron/x4/readme.md | 4 +-
keyboards/keychron/x4/x4.c | 60 +++++++++++++++++++
quantum/encoder.c | 11 +++-
quantum/encoder.h | 3 +-
16 files changed, 108 insertions(+), 10 deletions(-)
delete mode 100755 keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/config.h (96%)
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/info.json (100%)
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/keymaps/default/keymap.c (93%)
create mode 100755 keyboards/keychron/x4/ansi_encoder/red/keymaps/default/rules.mk
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/keymaps/keychron/keymap.c (94%)
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/keymaps/keychron/rules.mk (71%)
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/keymaps/via/keymap.c (93%)
create mode 100755 keyboards/keychron/x4/ansi_encoder/red/keymaps/via/rules.mk
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/red.c (100%)
rename keyboards/keychron/x4/{ansi => ansi_encoder}/red/rules.mk (100%)
diff --git a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
index 5a08c68ec613..936769ddc6e2 100755
--- a/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q1v2/ansi_encoder/keymaps/keychron/rules.mk
@@ -1,9 +1,4 @@
VIA_ENABLE = yes
ENCODER_MAP_ENABLE = yes
-<<<<<<< HEAD
include keyboards/keychron/common/common.mk
-=======
-VPATH += keyboards/keychron/common
-SRC += keychron_common.c
->>>>>>> temp
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk b/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
deleted file mode 100755
index 1e5b99807cb7..000000000000
--- a/keyboards/keychron/x4/ansi/red/keymaps/via/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-VIA_ENABLE = yes
diff --git a/keyboards/keychron/x4/ansi/red/config.h b/keyboards/keychron/x4/ansi_encoder/red/config.h
similarity index 96%
rename from keyboards/keychron/x4/ansi/red/config.h
rename to keyboards/keychron/x4/ansi_encoder/red/config.h
index 2d9142046749..2ccb0b521279 100755
--- a/keyboards/keychron/x4/ansi/red/config.h
+++ b/keyboards/keychron/x4/ansi_encoder/red/config.h
@@ -24,6 +24,9 @@
/* RGB Matrix Configuration */
# define LED_MATRIX_LED_COUNT 81
+/* Winlock indicator */
+# define LED_WIN_LOCK_INDEX 72
+
/* Scan phase of led driver set as MSKPHASE_6CHANNEL(defined as 0x03 in CKLED2001.h) */
# define PHASE_CHANNEL MSKPHASE_6CHANNEL
# define CKLED2001_CURRENT_TUNE \
diff --git a/keyboards/keychron/x4/ansi/red/info.json b/keyboards/keychron/x4/ansi_encoder/red/info.json
similarity index 100%
rename from keyboards/keychron/x4/ansi/red/info.json
rename to keyboards/keychron/x4/ansi_encoder/red/info.json
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c b/keyboards/keychron/x4/ansi_encoder/red/keymaps/default/keymap.c
similarity index 93%
rename from keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c
rename to keyboards/keychron/x4/ansi_encoder/red/keymaps/default/keymap.c
index 429befa6fd9d..c94fded11a20 100755
--- a/keyboards/keychron/x4/ansi/red/keymaps/default/keymap.c
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/default/keymap.c
@@ -59,3 +59,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)},
+ [WIN_L2] = { ENCODER_CCW_CW(_______, _______)},
+ [WIN_L3] = { ENCODER_CCW_CW(_______, _______)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/x4/ansi_encoder/red/keymaps/default/rules.mk b/keyboards/keychron/x4/ansi_encoder/red/keymaps/default/rules.mk
new file mode 100755
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c b/keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/keymap.c
similarity index 94%
rename from keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c
rename to keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/keymap.c
index b7ae2fca34f2..f1741d6832b8 100755
--- a/keyboards/keychron/x4/ansi/red/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/keymap.c
@@ -59,6 +59,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)},
+ [WIN_L2] = { ENCODER_CCW_CW(_______, _______)},
+ [WIN_L3] = { ENCODER_CCW_CW(_______, _______)}
+};
+#endif // ENCODER_MAP_ENABLE
+
// clang-format on
void housekeeping_task_user(void) {
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk b/keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/rules.mk
similarity index 71%
rename from keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk
rename to keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/rules.mk
index 3c9fcc5c98c2..936769ddc6e2 100755
--- a/keyboards/keychron/x4/ansi/red/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/keychron/rules.mk
@@ -1,3 +1,4 @@
VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c b/keyboards/keychron/x4/ansi_encoder/red/keymaps/via/keymap.c
similarity index 93%
rename from keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c
rename to keyboards/keychron/x4/ansi_encoder/red/keymaps/via/keymap.c
index 0af845e432fc..294bf8efb91c 100755
--- a/keyboards/keychron/x4/ansi/red/keymaps/via/keymap.c
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/via/keymap.c
@@ -59,3 +59,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN] = { ENCODER_CCW_CW(BL_DOWN, BL_UP)},
+ [WIN_L2] = { ENCODER_CCW_CW(_______, _______)},
+ [WIN_L3] = { ENCODER_CCW_CW(_______, _______)}
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/x4/ansi_encoder/red/keymaps/via/rules.mk b/keyboards/keychron/x4/ansi_encoder/red/keymaps/via/rules.mk
new file mode 100755
index 000000000000..f1adcab005e8
--- /dev/null
+++ b/keyboards/keychron/x4/ansi_encoder/red/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/x4/ansi/red/red.c b/keyboards/keychron/x4/ansi_encoder/red/red.c
similarity index 100%
rename from keyboards/keychron/x4/ansi/red/red.c
rename to keyboards/keychron/x4/ansi_encoder/red/red.c
diff --git a/keyboards/keychron/x4/ansi/red/rules.mk b/keyboards/keychron/x4/ansi_encoder/red/rules.mk
similarity index 100%
rename from keyboards/keychron/x4/ansi/red/rules.mk
rename to keyboards/keychron/x4/ansi_encoder/red/rules.mk
diff --git a/keyboards/keychron/x4/readme.md b/keyboards/keychron/x4/readme.md
index b8fd67e07c7e..5ff03e9b2308 100755
--- a/keyboards/keychron/x4/readme.md
+++ b/keyboards/keychron/x4/readme.md
@@ -10,11 +10,11 @@ A customizable 75% keyboard.
Make example for this keyboard (after setting up your build environment):
- make keychron/x4/ansi/red:default
+ make keychron/x4/ansi_encoder/red:default
Flashing example for this keyboard:
- make keychron/x4/ansi/red:default:flash
+ make keychron/x4/ansi_encoder/red:default:flash
## bootloader
diff --git a/keyboards/keychron/x4/x4.c b/keyboards/keychron/x4/x4.c
index b1bf2decdc69..a4f2c5c8b48b 100755
--- a/keyboards/keychron/x4/x4.c
+++ b/keyboards/keychron/x4/x4.c
@@ -16,6 +16,8 @@
#include "quantum.h"
+static uint8_t win_lock_state = 0;
+
void eeconfig_init_kb(void) {
#if (EECONFIG_KB_DATA_SIZE) == 0
// Reset Keyboard EEPROM value to blank, rather than to a set value
@@ -25,5 +27,63 @@ void eeconfig_init_kb(void) {
keymap_config.nkro = 1;
eeconfig_update_keymap(keymap_config.raw);
+ win_lock_state = 0;
+ eeconfig_update_user_datablock(&win_lock_state);
+
eeconfig_init_user();
}
+
+void keyboard_post_init_kb(void) {
+ eeconfig_read_user_datablock(&win_lock_state);
+
+ keyboard_post_init_user();
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_user(keycode, record)) {
+ return false;
+ }
+ switch (keycode) {
+#ifdef LED_MATRIX_ENABLE
+ case BL_TOGG:
+ if (record->event.pressed) {
+ switch (led_matrix_get_flags()) {
+ case LED_FLAG_ALL: {
+ led_matrix_set_flags(LED_FLAG_NONE);
+ led_matrix_set_value_all(0);
+ } break;
+ default: {
+ led_matrix_set_flags(LED_FLAG_ALL);
+ } break;
+ }
+ }
+ if (!led_matrix_is_enabled()) {
+ led_matrix_set_flags(LED_FLAG_ALL);
+ led_matrix_enable();
+ }
+ return false;
+#endif
+ case GU_TOGG:
+ if (record->event.pressed) {
+ win_lock_state = !win_lock_state;
+ eeconfig_update_user_datablock(&win_lock_state);
+ }
+ return true;
+ default:
+ return true;
+ }
+}
+
+bool led_matrix_indicators_kb(void) {
+ if (!led_matrix_indicators_user()) {
+ return false;
+ }
+ if (win_lock_state) {
+ led_matrix_set_value(LED_WIN_LOCK_INDEX, 0xFF);
+ } else {
+ if (!led_matrix_get_flags()) {
+ led_matrix_set_value(LED_WIN_LOCK_INDEX, 0);
+ }
+ }
+ return true;
+}
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 7ab194ed5290..d077f77cb838 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -61,6 +61,7 @@ static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1,
static uint8_t encoder_state[NUM_ENCODERS] = {0};
static int8_t encoder_pulses[NUM_ENCODERS] = {0};
+static bool encoder_interrupt_update[NUM_ENCODERS] = {false};
// encoder counts
static uint8_t thisCount;
@@ -248,15 +249,23 @@ bool encoder_read(void) {
bool changed = false;
for (uint8_t i = 0; i < thisCount; i++) {
uint8_t new_status = (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
- if ((encoder_state[i] & 0x3) != new_status) {
+ if ((encoder_state[i] & 0x3) != new_status || encoder_interrupt_update[i]) {
encoder_state[i] <<= 2;
encoder_state[i] |= new_status;
changed |= encoder_update(i, encoder_state[i]);
+ encoder_interrupt_update[i] = false;
}
}
return changed;
}
+void encoder_interrupt_read(uint8_t index) {
+ encoder_state[index] <<= 2;
+ encoder_state[index] |= (readPin(encoders_pad_a[index]) << 0) | (readPin(encoders_pad_b[index]) << 1);
+ encoder_pulses[index] += encoder_LUT[encoder_state[index] & 0xF];
+ encoder_interrupt_update[index] = true;
+}
+
#ifdef SPLIT_KEYBOARD
void last_encoder_activity_trigger(void);
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 1cbac98cb57a..1ab80362216e 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -27,10 +27,11 @@ bool encoder_read(void);
bool encoder_update_kb(uint8_t index, bool clockwise);
bool encoder_update_user(uint8_t index, bool clockwise);
+void encoder_interrupt_read(uint8_t index);
#ifdef SPLIT_KEYBOARD
-void encoder_state_raw(uint8_t* slave_state);
+ void encoder_state_raw(uint8_t* slave_state);
void encoder_update_raw(uint8_t* slave_state);
# if defined(ENCODERS_PAD_A_RIGHT)
From ab272c3d05f2844985762ab35f002ecf98836bce Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Mon, 16 Oct 2023 17:06:11 +0800
Subject: [PATCH 5/7] Update x4 via json
---
...ansi_red.json => x4_ansi_encoder_red.json} | 115 +++++-------------
1 file changed, 32 insertions(+), 83 deletions(-)
rename keyboards/keychron/x4/via_json/{x4_ansi_red.json => x4_ansi_encoder_red.json} (72%)
mode change 100755 => 100644
diff --git a/keyboards/keychron/x4/via_json/x4_ansi_red.json b/keyboards/keychron/x4/via_json/x4_ansi_encoder_red.json
old mode 100755
new mode 100644
similarity index 72%
rename from keyboards/keychron/x4/via_json/x4_ansi_red.json
rename to keyboards/keychron/x4/via_json/x4_ansi_encoder_red.json
index 31e044b399f0..8c3f83181174
--- a/keyboards/keychron/x4/via_json/x4_ansi_red.json
+++ b/keyboards/keychron/x4/via_json/x4_ansi_encoder_red.json
@@ -1,7 +1,7 @@
{
- "name": "Lemokey X3 ANSI Red",
+ "name": "Lemokey X4 ANSI Knob Red",
"vendorId": "0x362D",
- "productId": "0x0230",
+ "productId": "0x0240",
"keycodes": ["qmk_lighting"],
"customKeycodes": [
{"name": "Mission Control","title": "Mission Control in macOS","shortName": "MCtrl"},
@@ -16,7 +16,7 @@
{"name": "Screen Shot","title": "Screenshot in macOS","shortName": "SShot"},
{"name": "Cortana","title": "Cortana in windows","shortName": "Cortana"}
],
- "matrix": {"rows": 6, "cols": 21},
+ "matrix": {"rows": 6, "cols": 16},
"layouts": {
"keymap": [
[
@@ -25,7 +25,7 @@
},
"0,0\nESC",
{
- "x": 1,
+ "x": 0.25,
"c": "#cccccc"
},
"0,1",
@@ -33,16 +33,14 @@
"0,3",
"0,4",
{
- "x": 0.5,
- "c": "#aaaaaa"
+ "x": 0.25
},
"0,5",
"0,6",
"0,7",
"0,8",
{
- "x": 0.5,
- "c": "#cccccc"
+ "x": 0.25
},
"0,9",
"0,10",
@@ -52,9 +50,11 @@
"x": 0.25,
"c": "#aaaaaa"
},
- "0,14",
- "0,15",
- "0,16"
+ "0,13",
+ {
+ "x": 0.25
+ },
+ "0,14\n\n\n\n\n\n\n\n\ne0"
],
[
{
@@ -84,21 +84,10 @@
{
"x": 0.25
},
- "1,14",
- "1,15",
- "1,16",
- {
- "x": 0.25,
- "c": "#cccccc"
- },
- "1,17",
- "1,18",
- "1,19",
- "1,20"
+ "1,14"
],
[
{
- "c": "#aaaaaa",
"w": 1.5
},
"2,0",
@@ -125,24 +114,10 @@
{
"x": 0.25
},
- "2,14",
- "2,15",
- "2,16",
- {
- "x": 0.25,
- "c": "#cccccc"
- },
- "2,17",
- "2,18",
- "2,19",
- {
- "h": 2
- },
- "2,20"
+ "2,14"
],
[
{
- "c": "#aaaaaa",
"w": 1.75
},
"3,0",
@@ -166,16 +141,13 @@
},
"3,13",
{
- "x": 3.5,
- "c": "#cccccc"
+ "x": 0.25,
+ "c": "#aaaaaa"
},
- "3,17",
- "3,18",
- "3,19"
+ "3,14"
],
[
{
- "c": "#aaaaaa",
"w": 2.25
},
"4,0",
@@ -194,29 +166,21 @@
"4,11",
{
"c": "#aaaaaa",
- "w": 2.75
+ "w": 1.75
},
- "4,13",
+ "4,13"
+ ],
+ [
{
- "x": 1.25,
+ "y": -0.75,
+ "x": 14.25,
"c": "#777777"
},
- "4,15",
- {
- "x": 1.25,
- "c": "#cccccc"
- },
- "4,17",
- "4,18",
- "4,19",
- {
- "c": "#777777",
- "h": 2
- },
- "4,20"
+ "4,14"
],
[
{
+ "y": -0.25,
"c": "#aaaaaa",
"w": 1.25
},
@@ -235,36 +199,21 @@
},
"5,6",
{
- "c": "#aaaaaa",
- "w": 1.25
+ "c": "#aaaaaa"
},
"5,10",
- {
- "w": 1.25
- },
"5,11",
+ "5,12"
+ ],
+ [
{
- "w": 1.25
- },
- "5,12",
- {
- "w": 1.25
- },
- "5,13",
- {
- "x": 0.25,
+ "y": -0.75,
+ "x": 13.25,
"c": "#777777"
},
+ "5,13",
"5,14",
- "5,15",
- "5,16",
- {
- "x": 0.25,
- "c": "#cccccc",
- "w": 2
- },
- "5,17",
- "5,18"
+ "5,15"
]
]
}
From 2bd71899bb35fe9bd5c1bffafe601805c50289a9 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Tue, 17 Oct 2023 09:21:26 +0800
Subject: [PATCH 6/7] Format encoder.c
---
quantum/encoder.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/quantum/encoder.c b/quantum/encoder.c
index d077f77cb838..807ed9b449cf 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -59,8 +59,8 @@ static uint8_t encoder_resolutions[NUM_ENCODERS] = ENCODER_RESOLUTIONS;
#endif
static int8_t encoder_LUT[] = {0, -1, 1, 0, 1, 0, 0, -1, -1, 0, 0, 1, 0, 1, -1, 0};
-static uint8_t encoder_state[NUM_ENCODERS] = {0};
-static int8_t encoder_pulses[NUM_ENCODERS] = {0};
+static uint8_t encoder_state[NUM_ENCODERS] = {0};
+static int8_t encoder_pulses[NUM_ENCODERS] = {0};
static bool encoder_interrupt_update[NUM_ENCODERS] = {false};
// encoder counts
From f6df8a1ca2dde5cf68ca34160eea6f044a28757b Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Tue, 17 Oct 2023 09:23:35 +0800
Subject: [PATCH 7/7] Format encoder.h
---
quantum/encoder.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/quantum/encoder.h b/quantum/encoder.h
index 1ab80362216e..d3c80572179e 100644
--- a/quantum/encoder.h
+++ b/quantum/encoder.h
@@ -31,7 +31,7 @@ void encoder_interrupt_read(uint8_t index);
#ifdef SPLIT_KEYBOARD
- void encoder_state_raw(uint8_t* slave_state);
+void encoder_state_raw(uint8_t* slave_state);
void encoder_update_raw(uint8_t* slave_state);
# if defined(ENCODERS_PAD_A_RIGHT)