~ruther/qmk_firmware

77ea1bdac4f015f6edb2af8821d2e22e56813a23 — QMK Bot 3 years ago b16af15 + 4a66bdf
Merge remote-tracking branch 'origin/master' into develop
R keyboards/helix/rev2/matrix.c => keyboards/helix/rev2/custom/matrix.c +0 -0
R keyboards/helix/rev2/split_scomm.c => keyboards/helix/rev2/custom/split_scomm.c +0 -0
R keyboards/helix/rev2/split_scomm.h => keyboards/helix/rev2/custom/split_scomm.h +0 -0
R keyboards/helix/rev2/split_util.c => keyboards/helix/rev2/custom/split_util.c +0 -0
R keyboards/helix/rev2/split_util.h => keyboards/helix/rev2/custom/split_util.h +5 -4
@@ 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){}

M keyboards/helix/rev2/local_features.mk => keyboards/helix/rev2/local_features.mk +4 -3
@@ 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

########