summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--builddefs/generic_features.mk1
-rw-r--r--common_features.mk7
-rw-r--r--tmk_core/common.mk86
-rw-r--r--tmk_core/protocol.mk76
4 files changed, 84 insertions, 86 deletions
diff --git a/builddefs/generic_features.mk b/builddefs/generic_features.mk
index ff02d56bbe..2281a82917 100644
--- a/builddefs/generic_features.mk
+++ b/builddefs/generic_features.mk
@@ -31,6 +31,7 @@ GENERIC_FEATURES = \
LEADER \
PROGRAMMABLE_BUTTON \
SPACE_CADET \
+ SWAP_HANDS \
TAP_DANCE \
VELOCIKEY \
WPM \
diff --git a/common_features.mk b/common_features.mk
index 1d7e955cdf..0d6b86b1ef 100644
--- a/common_features.mk
+++ b/common_features.mk
@@ -326,6 +326,13 @@ ifneq ($(strip $(VARIABLE_TRACE)),no)
endif
endif
+ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
+ SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c
+ OPT_DEFS += -DSLEEP_LED_ENABLE
+
+ NO_SUSPEND_POWER_DOWN := yes
+endif
+
VALID_BACKLIGHT_TYPES := pwm timer software custom
BACKLIGHT_ENABLE ?= no
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index 8fa1a31e80..555b942c9d 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -10,92 +10,6 @@ TMK_COMMON_SRC += \
# Use platform provided print if it exists
-include $(TMK_PATH)/$(PLATFORM_COMMON_DIR)/printf.mk
-SHARED_EP_ENABLE = no
-MOUSE_SHARED_EP ?= yes
-ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
- TMK_COMMON_DEFS += -DKEYBOARD_SHARED_EP
- SHARED_EP_ENABLE = yes
- # With the current usb_descriptor.c code,
- # you can't share kbd without sharing mouse;
- # that would be a very unexpected use case anyway
- MOUSE_SHARED_EP = yes
-endif
-
-ifeq ($(strip $(MOUSE_ENABLE)), yes)
- OPT_DEFS += -DMOUSE_ENABLE
- ifeq ($(strip $(MOUSE_SHARED_EP)), yes)
- TMK_COMMON_DEFS += -DMOUSE_SHARED_EP
- SHARED_EP_ENABLE = yes
- endif
-endif
-
-ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
- TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE
- SHARED_EP_ENABLE = yes
-endif
-
-ifeq ($(strip $(RAW_ENABLE)), yes)
- TMK_COMMON_DEFS += -DRAW_ENABLE
-endif
-
-ifeq ($(strip $(CONSOLE_ENABLE)), yes)
- TMK_COMMON_DEFS += -DCONSOLE_ENABLE
-else
- # TODO: decouple this so other print backends can exist
- TMK_COMMON_DEFS += -DNO_PRINT
- TMK_COMMON_DEFS += -DNO_DEBUG
-endif
-
-ifeq ($(strip $(NKRO_ENABLE)), yes)
- ifeq ($(PROTOCOL), VUSB)
- $(info NKRO is not currently supported on V-USB, and has been disabled.)
- else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
- $(info NKRO is not currently supported with Bluetooth, and has been disabled.)
- else
- TMK_COMMON_DEFS += -DNKRO_ENABLE
- SHARED_EP_ENABLE = yes
- endif
-endif
-
-ifeq ($(strip $(RING_BUFFERED_6KRO_REPORT_ENABLE)), yes)
- TMK_COMMON_DEFS += -DRING_BUFFERED_6KRO_REPORT_ENABLE
-endif
-
-ifeq ($(strip $(SLEEP_LED_ENABLE)), yes)
- TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/sleep_led.c
- TMK_COMMON_DEFS += -DSLEEP_LED_ENABLE
- TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
-endif
-
-ifeq ($(strip $(NO_SUSPEND_POWER_DOWN)), yes)
- TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
-endif
-
-ifeq ($(strip $(SWAP_HANDS_ENABLE)), yes)
- TMK_COMMON_DEFS += -DSWAP_HANDS_ENABLE
-endif
-
-ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
- TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
-endif
-
-ifeq ($(strip $(DIGITIZER_SHARED_EP)), yes)
- TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
- SHARED_EP_ENABLE = yes
-endif
-
-ifeq ($(strip $(DIGITIZER_ENABLE)), yes)
- TMK_COMMON_DEFS += -DDIGITIZER_ENABLE
- ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
- TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
- SHARED_EP_ENABLE = yes
- endif
-endif
-
-ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
- TMK_COMMON_DEFS += -DSHARED_EP_ENABLE
-endif
-
# Search Path
VPATH += $(TMK_PATH)/$(COMMON_DIR)
VPATH += $(TMK_PATH)/$(PLATFORM_COMMON_DIR)
diff --git a/tmk_core/protocol.mk b/tmk_core/protocol.mk
index 359ddbfef1..a8723e6b2e 100644
--- a/tmk_core/protocol.mk
+++ b/tmk_core/protocol.mk
@@ -6,6 +6,82 @@ TMK_COMMON_SRC += \
$(PROTOCOL_DIR)/usb_device_state.c \
$(PROTOCOL_DIR)/usb_util.c \
+SHARED_EP_ENABLE = no
+MOUSE_SHARED_EP ?= yes
+ifeq ($(strip $(KEYBOARD_SHARED_EP)), yes)
+ TMK_COMMON_DEFS += -DKEYBOARD_SHARED_EP
+ SHARED_EP_ENABLE = yes
+ # With the current usb_descriptor.c code,
+ # you can't share kbd without sharing mouse;
+ # that would be a very unexpected use case anyway
+ MOUSE_SHARED_EP = yes
+endif
+
+ifeq ($(strip $(MOUSE_ENABLE)), yes)
+ OPT_DEFS += -DMOUSE_ENABLE
+ ifeq ($(strip $(MOUSE_SHARED_EP)), yes)
+ TMK_COMMON_DEFS += -DMOUSE_SHARED_EP
+ SHARED_EP_ENABLE = yes
+ endif
+endif
+
+ifeq ($(strip $(EXTRAKEY_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DEXTRAKEY_ENABLE
+ SHARED_EP_ENABLE = yes
+endif
+
+ifeq ($(strip $(RAW_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DRAW_ENABLE
+endif
+
+ifeq ($(strip $(CONSOLE_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DCONSOLE_ENABLE
+else
+ # TODO: decouple this so other print backends can exist
+ TMK_COMMON_DEFS += -DNO_PRINT
+ TMK_COMMON_DEFS += -DNO_DEBUG
+endif
+
+ifeq ($(strip $(NKRO_ENABLE)), yes)
+ ifeq ($(PROTOCOL), VUSB)
+ $(info NKRO is not currently supported on V-USB, and has been disabled.)
+ else ifeq ($(strip $(BLUETOOTH_ENABLE)), yes)
+ $(info NKRO is not currently supported with Bluetooth, and has been disabled.)
+ else
+ TMK_COMMON_DEFS += -DNKRO_ENABLE
+ SHARED_EP_ENABLE = yes
+ endif
+endif
+
+ifeq ($(strip $(RING_BUFFERED_6KRO_REPORT_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DRING_BUFFERED_6KRO_REPORT_ENABLE
+endif
+
+ifeq ($(strip $(NO_SUSPEND_POWER_DOWN)), yes)
+ TMK_COMMON_DEFS += -DNO_SUSPEND_POWER_DOWN
+endif
+
+ifeq ($(strip $(NO_USB_STARTUP_CHECK)), yes)
+ TMK_COMMON_DEFS += -DNO_USB_STARTUP_CHECK
+endif
+
+ifeq ($(strip $(DIGITIZER_SHARED_EP)), yes)
+ TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
+ SHARED_EP_ENABLE = yes
+endif
+
+ifeq ($(strip $(DIGITIZER_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DDIGITIZER_ENABLE
+ ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DDIGITIZER_SHARED_EP
+ SHARED_EP_ENABLE = yes
+ endif
+endif
+
+ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
+ TMK_COMMON_DEFS += -DSHARED_EP_ENABLE
+endif
+
ifeq ($(strip $(USB_HID_ENABLE)), yes)
include $(TMK_DIR)/protocol/usb_hid.mk
endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 20:07:31 +0000