commit 4a66bdf29443607ae01c1a6c87b657f89d3a1769 parent ae2c77c8272a3b90c75dc2750a0f13a9cd629953 Author: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Date: Fri, 4 Mar 2022 05:23:49 +0900 Fix helix/rev2 not working properly when using split_common. (#16512) When helix/rev2 was using split_common, it didn't work properly and I couldn't type on the right hand side. The cause is that the following code, added in 0.16.0 to `quantum/keyboard.c`, does not include `quantum/split_common/split_util.h` but instead includes `keyboards/helix/rev2/split_util.h`. Therefore, `split_pre_init()/split_post_init()` in `quantum/split_common/split_util.c` was not called. ```c #ifdef SPLIT_KEYBOARD # include "split_util.h" #endif ``` Diffstat:
7 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/custom/matrix.c diff --git a/keyboards/helix/rev2/split_scomm.c b/keyboards/helix/rev2/custom/split_scomm.c diff --git a/keyboards/helix/rev2/split_scomm.h b/keyboards/helix/rev2/custom/split_scomm.h diff --git a/keyboards/helix/rev2/split_util.c b/keyboards/helix/rev2/custom/split_util.c diff --git a/keyboards/helix/rev2/custom/split_util.h b/keyboards/helix/rev2/custom/split_util.h @@ -0,0 +1,21 @@ +#pragma once + +#ifdef SPLIT_KEYBOARD +# error This is helix local split_util.h. +# error This header file is used only when SPLIT_KEYBOARD=no. +#endif + +#include <stdbool.h> +#include "eeconfig.h" + +#define SLAVE_I2C_ADDRESS 0x32 + +extern volatile bool isLeftHand; + +// slave version of matix scan, defined in matrix.c +void matrix_slave_scan(void); + +void split_keyboard_setup(void); +bool is_helix_master(void); + +void matrix_master_OLED_init (void); diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk @@ -52,9 +52,10 @@ ifneq ($(strip $(SPLIT_KEYBOARD)), yes) CUSTOM_MATRIX = yes - SRC += rev2/matrix.c - SRC += rev2/split_util.c - SRC += rev2/split_scomm.c + SRC += rev2/custom/matrix.c + SRC += rev2/custom/split_util.c + SRC += rev2/custom/split_scomm.c + KEYBOARD_PATHS += $(HELIX_TOP_DIR)/rev2/custom endif ######## diff --git a/keyboards/helix/rev2/split_util.h b/keyboards/helix/rev2/split_util.h @@ -1,20 +0,0 @@ -#pragma once - -#include <stdbool.h> -#include "eeconfig.h" - -#define SLAVE_I2C_ADDRESS 0x32 - -extern volatile bool isLeftHand; - -// slave version of matix scan, defined in matrix.c -void matrix_slave_scan(void); - -void split_keyboard_setup(void); -bool is_helix_master(void); - -void matrix_master_OLED_init (void); - -// stubs as this is handled by legacy code -static inline void split_pre_init(void){} -static inline void split_post_init(void){}