Merge remote-tracking branch 'origin/master' into develop

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

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