From d044197f7658abde287c51a5112e97c7a4406cea Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Tue, 15 Aug 2023 17:41:53 +0800 Subject: Update q8 pro --- keyboards/keychron/q8_pro/ansi_encoder/config.h | 2 ++ keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk | 1 - keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk | 1 - keyboards/keychron/q8_pro/info.json | 3 +++ keyboards/keychron/q8_pro/iso_encoder/config.h | 2 ++ keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk | 1 - keyboards/keychron/q8_pro/q8_pro.c | 8 +++++++- keyboards/keychron/q8_pro/readme.md | 4 ++-- 8 files changed, 16 insertions(+), 6 deletions(-) diff --git a/keyboards/keychron/q8_pro/ansi_encoder/config.h b/keyboards/keychron/q8_pro/ansi_encoder/config.h index 98446227c4..5efaf6b5ee 100755 --- a/keyboards/keychron/q8_pro/ansi_encoder/config.h +++ b/keyboards/keychron/q8_pro/ansi_encoder/config.h @@ -21,6 +21,8 @@ # define DRIVER_COUNT 2 # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ # define DRIVER_1_LED_TOTAL 29 # define DRIVER_2_LED_TOTAL 39 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk index 2408ee532a..ee32568148 100644 --- a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk +++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk @@ -1,2 +1 @@ ENCODER_MAP_ENABLE = yes -OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk index b8562c8f4e..f1adcab005 100644 --- a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes ENCODER_MAP_ENABLE = yes -OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/q8_pro/info.json b/keyboards/keychron/q8_pro/info.json index 64754e2ac4..827e0c9352 100755 --- a/keyboards/keychron/q8_pro/info.json +++ b/keyboards/keychron/q8_pro/info.json @@ -57,5 +57,8 @@ "rotary": [ {"pin_a": "A0", "pin_b": "A10"} ] + }, + "dynamic_keymap": { + "layer_count": 5 } } diff --git a/keyboards/keychron/q8_pro/iso_encoder/config.h b/keyboards/keychron/q8_pro/iso_encoder/config.h index 1f3e014278..4e80c93740 100755 --- a/keyboards/keychron/q8_pro/iso_encoder/config.h +++ b/keyboards/keychron/q8_pro/iso_encoder/config.h @@ -21,6 +21,8 @@ # define DRIVER_COUNT 2 # define DRIVER_ADDR_1 0b1110111 # define DRIVER_ADDR_2 0b1110100 + +/* RGB Matrix Configuration */ # define DRIVER_1_LED_TOTAL 29 # define DRIVER_2_LED_TOTAL 40 # define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) diff --git a/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk index b8562c8f4e..f1adcab005 100755 --- a/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk +++ b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes ENCODER_MAP_ENABLE = yes -OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5 diff --git a/keyboards/keychron/q8_pro/q8_pro.c b/keyboards/keychron/q8_pro/q8_pro.c index eade1dce33..14bb965a82 100755 --- a/keyboards/keychron/q8_pro/q8_pro.c +++ b/keyboards/keychron/q8_pro/q8_pro.c @@ -136,7 +136,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { #if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) static void encoder_pad_cb(void *param) { - encoder_inerrupt_read((uint32_t)param & 0XFF); + encoder_inerrupt_read((uint32_t)param & 0xFF); } #endif @@ -312,3 +312,9 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { } } #endif + +void suspend_wakeup_init_kb(void) { + // code will run on keyboard wakeup + clear_keyboard(); + send_keyboard_report(); +} diff --git a/keyboards/keychron/q8_pro/readme.md b/keyboards/keychron/q8_pro/readme.md index 62631503d5..6a3ed73d34 100755 --- a/keyboards/keychron/q8_pro/readme.md +++ b/keyboards/keychron/q8_pro/readme.md @@ -1,12 +1,12 @@ # Keychron Q8 Pro -![Keychron Q8 Pro] +![Keychron Q8 Pro](https://i.imgur.com/dZBGbrs.jpg) A customizable 65% Alice keyboard. * Keyboard Maintainer: [Keychron](https://github.com/keychron) * Hardware Supported: Keychron Q8 Pro -* Hardware Availability: +* Hardware Availability:[Keychron Q8 Pro (Alice Layout) QMK/VIA Wireless Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q8-pro-alice-layout-qmk-via-wireless-custom-mechanical-keyboard) Make example for this keyboard (after setting up your build environment): -- cgit v1.2.3