Skip to content

Commit

Permalink
Move non-assignment code to post_rules.mk (qmk#14207)
Browse files Browse the repository at this point in the history
* 40percentclub/ut47: move non-assignment code to post_rules.mk

* converter/palm_usb: move non-assignment code to post_rules.mk

* converter/sun_usb: move non-assignment code to post_rules.mk

* dm9records/ergoinu: move non-assignment code to post_rules.mk

* ergotaco: move non-assignment code to post_rules.mk

* handwired/symmetric70_proto: move non-assignment code to post_rules.mk

* hhkb/ansi: move non-assignment code to post_rules.mk

* hhkb/jp: move non-assignment code to post_rules.mk

* lfkeyboards/lfk78: move non-assignment code to post_rules.mk

* lfkeyboards/lfk87: move non-assignment code to post_rules.mk

* lfkeyboards/lfkpad: move non-assignment code to post_rules.mk

* lfkeyboards/mini1800: move non-assignment code to post_rules.mk

* manta60: move non-assignment code to post_rules.mk

* mschwingen/modelm: move non-assignment code to post_rules.mk

* newgame40: move non-assignment code to post_rules.mk

* numatreus: move non-assignment code to post_rules.mk

* rgbkb/zen: move non-assignment code to post_rules.mk

* rgbkb/zen/rev2: move non-assignment code to post_rules.mk

* Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk"

This reverts commit cffaf00.
  • Loading branch information
skullydazed authored and ptrxyz committed Nov 6, 2021
1 parent 80674c8 commit e5b714c
Show file tree
Hide file tree
Showing 34 changed files with 144 additions and 155 deletions.
4 changes: 4 additions & 0 deletions keyboards/40percentclub/ut47/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ifeq ($(strip $(LED_ENABLE)), yes)
OPT_DEFS += -DLED_ENABLE
SRC += led.c
endif
5 changes: 0 additions & 5 deletions keyboards/40percentclub/ut47/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,3 @@ AUDIO_ENABLE = no # Audio output
# custom matrix setup
CUSTOM_MATRIX = yes
SRC += matrix.c protocol/serial_uart.c

ifeq ($(strip $(LED_ENABLE)), yes)
OPT_DEFS += -DLED_ENABLE
SRC += led.c
endif
7 changes: 7 additions & 0 deletions keyboards/converter/palm_usb/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ifdef HARDWARE_SERIAL
# Untested with palm_usb
SRC += protocol/serial_uart.c
OPT_DEFS += -DHARDWARE_SERIAL
else
SRC += protocol/serial_soft.c
endif
7 changes: 0 additions & 7 deletions keyboards/converter/palm_usb/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes

SRC += matrix.c
ifdef HARDWARE_SERIAL
# Untested with palm_usb
SRC += protocol/serial_uart.c
OPT_DEFS += -DHARDWARE_SERIAL
else
SRC += protocol/serial_soft.c
endif

DEFAULT_FOLDER = converter/palm_usb/stowaway
6 changes: 6 additions & 0 deletions keyboards/converter/sun_usb/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ifdef HARDWARE_SERIAL
SRC += protocol/serial_uart.c
OPT_DEFS += -DHARDWARE_SERIAL
else
SRC += protocol/serial_soft.c
endif
6 changes: 0 additions & 6 deletions keyboards/converter/sun_usb/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,5 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes

SRC += matrix.c led.c
ifdef HARDWARE_SERIAL
SRC += protocol/serial_uart.c
OPT_DEFS += -DHARDWARE_SERIAL
else
SRC += protocol/serial_soft.c
endif

DEFAULT_FOLDER = converter/sun_usb/type5
9 changes: 9 additions & 0 deletions keyboards/dm9records/ergoinu/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifneq ($(strip $(ERGOINU)),)
ifeq ($(findstring promicroled, $(ERGOINU)), promicroled)
DISABLE_PROMICRO_LEDs = no
endif
endif

ifeq ($(strip $(DISABLE_PROMICRO_LEDs)), yes)
OPT_DEFS += -DDISABLE_PROMICRO_LEDs
endif
10 changes: 0 additions & 10 deletions keyboards/dm9records/ergoinu/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,3 @@ SRC += matrix.c serial.c split_util.c

# ergoinu configs
DISABLE_PROMICRO_LEDs = yes

ifneq ($(strip $(ERGOINU)),)
ifeq ($(findstring promicroled, $(ERGOINU)), promicroled)
DISABLE_PROMICRO_LEDs = no
endif
endif

ifeq ($(strip $(DISABLE_PROMICRO_LEDs)), yes)
OPT_DEFS += -DDISABLE_PROMICRO_LEDs
endif
8 changes: 8 additions & 0 deletions keyboards/ergotaco/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

# A bunch of stuff that you shouldn't touch unless you
# know what you're doing.
#
# No touchy, capiche?
ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX
endif
3 changes: 0 additions & 3 deletions keyboards/ergotaco/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,3 @@ COMMAND_ENABLE = yes
#
# No touchy, capiche?
SRC += matrix.c i2c_master.c
ifeq ($(strip $(DEBUG_MATRIX)), yes)
OPT_DEFS += -DDEBUG_MATRIX
endif
18 changes: 18 additions & 0 deletions keyboards/hhkb/ansi/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)

OPT_DEFS += -DHHKB_RN42_ENABLE

# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
# HHKB Alt controller.
RN42_DIR = ../rn42

SRC += serial_uart.c \
../rn42/suart.S \
../rn42/rn42.c \
../rn42/rn42_task.c \
../rn42/battery.c \
../rn42/main.c

VPATH += $(RN42_DIR)

endif
20 changes: 0 additions & 20 deletions keyboards/hhkb/ansi/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
# project specific files
SRC = matrix.c

ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)

OPT_DEFS += -DHHKB_RN42_ENABLE

# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
# HHKB Alt controller.
RN42_DIR = ../rn42

SRC += serial_uart.c \
../rn42/suart.S \
../rn42/rn42.c \
../rn42/rn42_task.c \
../rn42/battery.c \
../rn42/main.c

VPATH += $(RN42_DIR)

endif


# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
# debug-on: all

Expand Down
18 changes: 18 additions & 0 deletions keyboards/hhkb/jp/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)

OPT_DEFS += -DHHKB_RN42_ENABLE

# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
# HHKB Alt controller.
RN42_DIR = ../rn42

SRC += serial_uart.c \
../rn42/suart.S \
../rn42/rn42.c \
../rn42/rn42_task.c \
../rn42/battery.c \
../rn42/main.c

VPATH += $(RN42_DIR)

endif
20 changes: 0 additions & 20 deletions keyboards/hhkb/jp/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,6 @@ CUSTOM_MATRIX = yes # Custom matrix file for the HHKB
# project specific files
SRC = matrix.c

ifeq ($(strip $(HHKB_RN42_ENABLE)), yes)

OPT_DEFS += -DHHKB_RN42_ENABLE

# Support for the RN42 Bluetooth module. This is the BT module in Hasu's BT
# HHKB Alt controller.
RN42_DIR = ../rn42

SRC += serial_uart.c \
../rn42/suart.S \
../rn42/rn42.c \
../rn42/rn42_task.c \
../rn42/battery.c \
../rn42/main.c

VPATH += $(RN42_DIR)

endif


# debug-on: EXTRAFLAGS += -DDEBUG -DDEBUG_ACTION
# debug-on: all

Expand Down
14 changes: 14 additions & 0 deletions keyboards/lfkeyboards/lfk78/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Extra source files for IS3731 lighting
SRC += TWIlib.c issi.c lighting.c

ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif

ifeq ($(strip $(CAPSLOCK_LED)), yes)
TMK_COMMON_DEFS += -DCAPSLOCK_LED
endif
15 changes: 0 additions & 15 deletions keyboards/lfkeyboards/lfk78/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,4 @@ ISSI_ENABLE = yes # If the I2C pullup resistors aren't install thi
WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms
CAPSLOCK_LED = no # Toggle back light LED of Caps Lock

# Extra source files for IS3731 lighting
SRC = TWIlib.c issi.c lighting.c

ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif

ifeq ($(strip $(CAPSLOCK_LED)), yes)
TMK_COMMON_DEFS += -DCAPSLOCK_LED
endif

DEFAULT_FOLDER = lfkeyboards/lfk78/revj
13 changes: 13 additions & 0 deletions keyboards/lfkeyboards/lfk87/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
ifeq ($(LFK_REV), A)
MCU = at90usb1286
else
MCU = at90usb646
endif

ifeq ($(strip $(ISSI_ENABLE)), yes)
OPT_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
OPT_DEFS += -DWATCHDOG_ENABLE
endif
15 changes: 0 additions & 15 deletions keyboards/lfkeyboards/lfk87/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
#
LFK_REV = C

ifeq ($(LFK_REV), A)
MCU = at90usb1286
else
MCU = at90usb646
endif
BOOTLOADER = atmel-dfu
OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)

Expand Down Expand Up @@ -39,13 +34,3 @@ SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend

ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled
WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan isn't run every 250ms



ifeq ($(strip $(ISSI_ENABLE)), yes)
OPT_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
OPT_DEFS += -DWATCHDOG_ENABLE
endif
7 changes: 7 additions & 0 deletions keyboards/lfkeyboards/lfkpad/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif
8 changes: 0 additions & 8 deletions keyboards/lfkeyboards/lfkpad/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,4 @@ WATCHDOG_ENABLE = no # Resets keyboard if matrix_scan() isn't run every

SRC = TWIlib.c issi.c lighting.c

ifeq ($(strip $(ISSI_ENABLE)), yes)
TMK_COMMON_DEFS += -DISSI_ENABLE
endif

ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
endif

LAYOUTS = numpad_6x4
9 changes: 9 additions & 0 deletions keyboards/lfkeyboards/mini1800/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
ifeq ($(LFK_REV), A)
MCU = at90usb1286
else
MCU = at90usb646
endif

ifeq ($(strip $(ISSI_ENABLE)), yes)
# TMK_COMMON_DEFS += -DISSI_ENABLE
endif
9 changes: 0 additions & 9 deletions keyboards/lfkeyboards/mini1800/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,12 @@
# Set to A or C
LFK_REV = C

ifeq ($(LFK_REV), A)
MCU = at90usb1286
else
MCU = at90usb646
endif
BOOTLOADER = atmel-dfu
OPT_DEFS += -DLFK_TKL_REV_$(LFK_REV)

# Extra source files for IS3731 lighting
SRC = TWIlib.c issi.c lighting.c

ifeq ($(strip $(ISSI_ENABLE)), yes)
# TMK_COMMON_DEFS += -DISSI_ENABLE
endif

# Build Options
# change yes to no to disable
#
Expand Down
3 changes: 3 additions & 0 deletions keyboards/manta60/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
OPT_DEFS += -DIOS_DEVICE_ENABLE
endif
4 changes: 0 additions & 4 deletions keyboards/manta60/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,3 @@ AUDIO_ENABLE = no # Audio output
SPLIT_KEYBOARD = yes

IOS_DEVICE_ENABLE = no # connect to IOS device (iPad, iPhone)

ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
OPT_DEFS += -DIOS_DEVICE_ENABLE
endif
3 changes: 3 additions & 0 deletions keyboards/mschwingen/modelm/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifeq ($(strip $(UART_DEBUG)), yes)
OPT_DEFS += -DUART_DEBUG
endif
4 changes: 0 additions & 4 deletions keyboards/mschwingen/modelm/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,4 @@ OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS28

LTO_ENABLE = yes

ifeq ($(strip $(UART_DEBUG)), yes)
OPT_DEFS += -DUART_DEBUG
endif

DEFAULT_FOLDER = mschwingen/modelm/led_wired
3 changes: 3 additions & 0 deletions keyboards/newgame40/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes)
OPT_DEFS += -DIOS_DEVICE_ENABLE
endif
4 changes: 0 additions & 4 deletions keyboards/newgame40/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@ UNICODE_ENABLE = yes # Unicode
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
IOS_DEVICE_ENABLE = no # connect to IOS Device

ifeq ($(strip $(IOS_DEVICE_ENABLE )), yes)
OPT_DEFS += -DIOS_DEVICE_ENABLE
endif

# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend

Expand Down
3 changes: 3 additions & 0 deletions keyboards/numatreus/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ifeq ($(strip $(LED_ANIMATIONS)), yes)
OPT_DEFS += -DLED_ANIMATIONS
endif
4 changes: 0 additions & 4 deletions keyboards/numatreus/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,5 @@ UNICODE_ENABLE = yes # Unicode
RGBLIGHT_ENABLE = no
LED_ANIMATIONS = no

ifeq ($(strip $(LED_ANIMATIONS)), yes)
OPT_DEFS += -DLED_ANIMATIONS
endif

# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
14 changes: 14 additions & 0 deletions keyboards/rgbkb/zen/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
ifeq ($(strip $(CTPC)), yes)
CONVERT_TO_PROTON_C=yes
endif

ifeq ($(strip $(CONVERT_TO_PROTON_C)), yes)
SPLIT_KEYBOARD = no # currently unsupported on ARM
RGBLIGHT_ENABLE = no # currently unsupported on ARM

EXTRAFLAGS += -DUSE_PROTON_C
else
# Currently moved to Pro Micro only section because of lack of Proton-C support
SPLIT_KEYBOARD = yes
RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
endif
5 changes: 5 additions & 0 deletions keyboards/rgbkb/zen/rev2/post_rules.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Setup so that OLED can be turned on/off easily
ifeq ($(strip $(OLED_ENABLE)), yes)
# Custom local font file
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
endif
6 changes: 0 additions & 6 deletions keyboards/rgbkb/zen/rev2/rules.mk
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
ENCODER_ENABLE = yes

OLED_ENABLE = no

# Setup so that OLED can be turned on/off easily
ifeq ($(strip $(OLED_ENABLE)), yes)
# Custom local font file
OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
endif
Loading

0 comments on commit e5b714c

Please sign in to comment.