From 5544bf8524c77ad09d32cf2b0f6dc40f7b05ee01 Mon Sep 17 00:00:00 2001 From: Takeshi ISHII <2170248+mtei@users.noreply.github.com> Date: Sat, 26 Dec 2020 02:38:07 +0900 Subject: [Keymap] update rules.mk and config.h of `helix/rev2:five_rows` (#11302) * update keyboards/helix/rev2/keymaps/five_rows/rules.mk: oled selection, led animation selection * add OLED_UPDATE_INTERVAL support into keyboards/helix/rev2/keymaps/five_rows/oled_display.c Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks. * Add 'HELIX=debug/no-debug' option into 'helix/rev2/keymaps/five_rows/rules.mk' --- keyboards/helix/rev2/keymaps/five_rows/rules.mk | 57 +++++++++++++++---------- 1 file changed, 34 insertions(+), 23 deletions(-) (limited to 'keyboards/helix/rev2/keymaps/five_rows/rules.mk') diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk index 83cdb30d0c..fbde2fe6a6 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk @@ -12,6 +12,7 @@ # yes, yes +3200 # no, yes +400 LTO_ENABLE = no # if firmware size over limit, try this option +LED_ANIMATIONS = yes # Helix Spacific Build Options # you can uncomment and edit follows 7 Variables @@ -26,8 +27,8 @@ HELIX_ROWS = 5 # Helix Rows is 4 or 5 ifneq ($(strip $(HELIX)),) define KEYMAP_OPTION_PARSE - # $xinfo .$1.x #debug - # parse 'dispoff', 'consle', 'stdole', 'oled', 'sc' + # parse 'dispoff', 'consloe', 'na', 'ani', 'mini-ani' + $(if $(SHOW_PARCE),$(info parse -$1-)) #debug ifeq ($(strip $1),dispoff) OLED_ENABLE = no OLED_DRIVER_ENABLE = no @@ -37,19 +38,26 @@ ifneq ($(strip $(HELIX)),) ifeq ($(strip $1),console) CONSOLE_ENABLE = yes endif - ifeq ($(strip $1),stdole) - ## make HELIX=stdole helix:five_rows -- use TOP/drivers/oled/oled_driver.c - OLED_ENABLE = new + ifeq ($(strip $1),debug) + DEBUG_CONFIG = yes endif - ifeq ($(strip $1),oled) - ## make HELIX=oled helix:five_rows -- use helix/local_drivers/ssd1306.c - OLED_ENABLE = yes + ifneq ($(filter nodebug no-debug no_debug,$(strip $1)),) + DEBUG_CONFIG = no endif - ifeq ($(strip $1),back) - LED_BACK_ENABLE = yes + ifneq ($(filter na no_ani no-ani,$(strip $1)),) + LED_ANIMATIONS = no endif - ifeq ($(strip $1),sc) - SPLIT_KEYBOARD = yes + ifneq ($(filter mini-ani mini_ani,$(strip $1)),) + LED_ANIMATIONS = mini + endif + ifneq ($(filter ani animation,$(strip $1)),) + LED_ANIMATIONS = yes + endif + ifeq ($(strip $1),lto) + LTO_ENABLE = yes + endif + ifneq ($(filter nolto no-lto no_lto,$(strip $1)),) + LTO_ENABLE = no endif endef # end of KEYMAP_OPTION_PARSE @@ -58,20 +66,23 @@ ifneq ($(strip $(HELIX)),) $(call KEYMAP_OPTION_PARSE,$(A_OPTION_NAME)))) endif -ifeq ($(strip $(OLED_ENABLE)), new) - OLED_DRIVER_ENABLE = yes - OLED_ENABLE = no - SRC += oled_display.c - ifeq ($(strip $(LOCAL_GLCDFONT)), yes) - OPT_DEFS += -DOLED_FONT_H=\ - else - OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" - endif +ifeq ($(strip $(LED_ANIMATIONS)), yes) + OPT_DEFS += -DLED_ANIMATIONS_LEVEL=2 endif -ifeq ($(strip $(OLED_ENABLE)), yes) - SRC += oled_display.c + +ifeq ($(strip $(LED_ANIMATIONS)), mini) + OPT_DEFS += -DLED_ANIMATIONS_LEVEL=1 + LED_ANIMATIONS = yes +endif + +ifeq ($(strip $(DEBUG_CONFIG)), yes) + OPT_DEFS += -DDEBUG_CONFIG endif # convert Helix-specific options (that represent combinations of standard options) # into QMK standard options. include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) + +ifeq ($(strip $(OLED_ENABLE)), yes) + SRC += oled_display.c +endif -- cgit v1.2.3