Skip to content

Commit

Permalink
Fix helix/rev2 not working properly when using split_common. (#16512)
Browse files Browse the repository at this point in the history
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
```
  • Loading branch information
mtei authored Mar 3, 2022
1 parent ae2c77c commit 4a66bdf
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 7 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#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"

Expand All @@ -14,7 +19,3 @@ 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){}
7 changes: 4 additions & 3 deletions keyboards/helix/rev2/local_features.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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

########
Expand Down

0 comments on commit 4a66bdf

Please sign in to comment.