From 940411d2cb1702e2b3cb5e0e563d328da1005029 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Tue, 15 Aug 2023 11:50:34 +0800 Subject: Add pad interrupt of k11 pro knob version --- keyboards/keychron/k11_pro/k11_pro.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'keyboards/keychron/k11_pro') diff --git a/keyboards/keychron/k11_pro/k11_pro.c b/keyboards/keychron/k11_pro/k11_pro.c index 9189ef8586..3c02df0c4f 100755 --- a/keyboards/keychron/k11_pro/k11_pro.c +++ b/keyboards/keychron/k11_pro/k11_pro.c @@ -135,8 +135,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENBALE) -static void encoder0_pad_cb(void *param) { +#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) +static void encoder_pad_cb(void *param) { encoder_inerrupt_read((uint32_t)param & 0xFF); } #endif @@ -157,16 +157,16 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); -#endif -#ifdef ENCODER_ENBALE +# ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; - for (uint8_t i = 0; i < NUM_ENCODERS; i++) { + for (uint32_t i = 0; i < NUM_ENCODERS; i++) { palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES); palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES); - palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, &i); - palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, &i); + palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); + palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } +# endif #endif power_on_indicator_timer_buffer = sync_timer_read32() | 1; -- cgit v1.2.3 From 031f5132817f56f3c874be396815b3999349f8a2 Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Mon, 28 Aug 2023 10:11:32 +0800 Subject: Update q8 pro and k11 pro --- keyboards/keychron/k11_pro/k11_pro.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/keychron/k11_pro') diff --git a/keyboards/keychron/k11_pro/k11_pro.c b/keyboards/keychron/k11_pro/k11_pro.c index 3c02df0c4f..6ad7649bab 100755 --- a/keyboards/keychron/k11_pro/k11_pro.c +++ b/keyboards/keychron/k11_pro/k11_pro.c @@ -135,7 +135,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) +#if defined(ENCODER_ENABLE) static void encoder_pad_cb(void *param) { encoder_inerrupt_read((uint32_t)param & 0xFF); } @@ -156,8 +156,9 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); +#endif -# ifdef ENCODER_ENABLE +#ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; for (uint32_t i = 0; i < NUM_ENCODERS; i++) { @@ -166,7 +167,6 @@ void keyboard_post_init_kb(void) { palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } -# endif #endif power_on_indicator_timer_buffer = sync_timer_read32() | 1; -- cgit v1.2.3 From 25e294a39bbbff8c8617eaf6f88e797a6e323e25 Mon Sep 17 00:00:00 2001 From: Salvatore La Bua Date: Mon, 4 Sep 2023 20:39:47 +0900 Subject: Change fn1 keycap size to 1u instead of 1.25 --- keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json | 3 +-- keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json | 3 +-- keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json | 3 +-- keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'keyboards/keychron/k11_pro') diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json index 5c6acd35ba..e0e3a10a84 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_rgb.json @@ -290,8 +290,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json index a0288b2601..49279b4765 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_encoder_white.json @@ -229,8 +229,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json index 2e181484c6..55a3d2153c 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_rgb.json @@ -290,8 +290,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], diff --git a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json index 5d856f4f1f..c1ad185bee 100755 --- a/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json +++ b/keyboards/keychron/k11_pro/via_json/k11_pro_ansi_white.json @@ -229,8 +229,7 @@ }, "4,3", { - "c": "#aaaaaa", - "w": 1.25 + "c": "#aaaaaa" }, "4,6" ], -- cgit v1.2.3