Browse Source

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
```
pull/16520/head
Takeshi ISHII 2 years ago
committed by GitHub
parent
commit
4a66bdf294
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 7 deletions
  1. +0
    -0
      keyboards/helix/rev2/custom/matrix.c
  2. +0
    -0
      keyboards/helix/rev2/custom/split_scomm.c
  3. +0
    -0
      keyboards/helix/rev2/custom/split_scomm.h
  4. +0
    -0
      keyboards/helix/rev2/custom/split_util.c
  5. +5
    -4
      keyboards/helix/rev2/custom/split_util.h
  6. +4
    -3
      keyboards/helix/rev2/local_features.mk

keyboards/helix/rev2/matrix.c → keyboards/helix/rev2/custom/matrix.c View File


keyboards/helix/rev2/split_scomm.c → keyboards/helix/rev2/custom/split_scomm.c View File


keyboards/helix/rev2/split_scomm.h → keyboards/helix/rev2/custom/split_scomm.h View File


keyboards/helix/rev2/split_util.c → keyboards/helix/rev2/custom/split_util.c View File


keyboards/helix/rev2/split_util.h → keyboards/helix/rev2/custom/split_util.h View File

@ -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"
@ -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){}

+ 4
- 3
keyboards/helix/rev2/local_features.mk View File

@ -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
########


Loading…
Cancel
Save