diff options
| author | QMK Bot <hello@qmk.fm> | 2022-03-03 20:24:53 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2022-03-03 20:24:53 +0000 |
| commit | 77ea1bdac4f015f6edb2af8821d2e22e56813a23 (patch) | |
| tree | 7ceb2a0adb37b903990505f7ed14ce20bd04cdb6 /keyboards | |
| parent | b16af15750c809f9fb3ba01ed03e6ab9aedf9dd5 (diff) | |
| parent | 4a66bdf29443607ae01c1a6c87b657f89d3a1769 (diff) | |
| download | qmk_firmware-77ea1bdac4f015f6edb2af8821d2e22e56813a23.tar.gz qmk_firmware-77ea1bdac4f015f6edb2af8821d2e22e56813a23.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
| -rw-r--r-- | keyboards/helix/rev2/custom/matrix.c (renamed from keyboards/helix/rev2/matrix.c) | 0 | ||||
| -rw-r--r-- | keyboards/helix/rev2/custom/split_scomm.c (renamed from keyboards/helix/rev2/split_scomm.c) | 0 | ||||
| -rw-r--r-- | keyboards/helix/rev2/custom/split_scomm.h (renamed from keyboards/helix/rev2/split_scomm.h) | 0 | ||||
| -rw-r--r-- | keyboards/helix/rev2/custom/split_util.c (renamed from keyboards/helix/rev2/split_util.c) | 0 | ||||
| -rw-r--r-- | keyboards/helix/rev2/custom/split_util.h (renamed from keyboards/helix/rev2/split_util.h) | 9 | ||||
| -rw-r--r-- | keyboards/helix/rev2/local_features.mk | 7 |
6 files changed, 9 insertions, 7 deletions
diff --git a/keyboards/helix/rev2/matrix.c b/keyboards/helix/rev2/custom/matrix.c index 699c15358b..699c15358b 100644 --- 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 index 378781b98c..378781b98c 100644 --- 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 index 16887eb74f..16887eb74f 100644 --- 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 index ab40315487..ab40315487 100644 --- a/keyboards/helix/rev2/split_util.c +++ b/keyboards/helix/rev2/custom/split_util.c diff --git a/keyboards/helix/rev2/split_util.h b/keyboards/helix/rev2/custom/split_util.h index 535949118a..3b1d4249f5 100644 --- a/keyboards/helix/rev2/split_util.h +++ b/keyboards/helix/rev2/custom/split_util.h @@ -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){} diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk index cfff8fd64d..c6f818bf39 100644 --- 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 ######## |