diff options
author | MakotoKurauchi <pluis@me.com> | 2020-12-15 20:14:14 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-15 20:14:14 +0900 |
commit | 0831a3181a51cf190aabcea504c1be2752bbc2be (patch) | |
tree | 5cedc6e0876ed6f121ec361e98a62ee8f851e783 /keyboards/helix/rev2/local_features.mk | |
parent | ac8cddda22aa0abc4f41405c7f94a56dc533dfc4 (diff) |
[Keymap] Helix default keymap oled update (#11152)
* update keyboards/helix/rev2/local_features.mk - Improved parsing of the `HELIX =` option
* add 'is_mac_mode()' into keyboards/helix/rev2/rev2.c
* update helix/rev2/keymaps/default/keymap.c: use rgblight query functions
* Makes the OLED driver used by the helix:default keymap switchable.
* use TOP/drivers/oled/oled_driver.c
`make helix:default`
or
`make OLED_SELECT=core helix:default`
* use helix/local_drivers/ssd1306.c
`make OLED_SELECT=local helix:default`
* Separated the OLED related code from keymap.c and moved it to oled_display.c.
* Change the 'led_test' keymap to follow the changes in the 'default' keymap.
* update helix/rev2/keymaps/default/oled_display.c
* add '#define OLED_UPDATE_INTERVAL 50' into keyboards/helix/rev2/config.h
* Support for OLED_UPDATE_INTERVAL, even for older types of OLED tasks
* add readme.md for helix/rev2
* Apply drashna's suggestions to rev2.c.
* Apply drashna's suggestions to rev3_4rows.c, rev3_5rows.c.
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
Diffstat (limited to 'keyboards/helix/rev2/local_features.mk')
-rw-r--r-- | keyboards/helix/rev2/local_features.mk | 156 |
1 files changed, 89 insertions, 67 deletions
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk index 1d0b55cbf1..ce3853a02c 100644 --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk @@ -10,6 +10,7 @@ KEYBOARD_LOCAL_FEATURES_MK := define HELIX_CUSTOMISE_MSG $(info Helix Spacific Build Options) $(info - OLED_ENABLE = $(OLED_ENABLE)) + $(info - OLED_SELECT = $(OLED_SELECT)) $(info - LED_BACK_ENABLE = $(LED_BACK_ENABLE)) $(info - LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE)) $(info - LED_ANIMATIONS = $(LED_ANIMATIONS)) @@ -20,9 +21,10 @@ endef define HELIX_HELP_MSG $(info Helix keyboard convenient command line option) $(info - make HELIX=<options> helix:<keymap>) - $(info - option= oled | no-oled | back | no-back | under | na | no-ani) - $(info - ios | sc | split-common | scan | verbose) - $(info - ex.) + $(info - option= oled | core-oled | local-oled | no-oled ) + $(info - back | no-back | under | na | no-ani ) + $(info - ios | sc | split-common | scan | verbose) + $(info - eg.) $(info - make HELIX=no-oled helix:<keymap>) $(info - make HELIX=oled,no-back helix:<keymap>) $(info - make HELIX=oled,under helix:<keymap>) @@ -32,65 +34,76 @@ define HELIX_HELP_MSG endef ifneq ($(strip $(HELIX)),) + define HELIX_OPTION_PARSE + # parce 'oled' 'back' 'under' 'ios' etc. + $(if $(SHOW_PARCE),$(info parse .$1.)) #debug + + ifeq ($(strip $1),help) + HELP=on + endif + ifneq ($(filter nooled no-oled,$(strip $1)),) + OLED_ENABLE = no + endif + ifeq ($(strip $1),oled) + OLED_ENABLE = yes + endif + ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),) + OLED_ENABLE = yes + OLED_SELECT = core + endif + ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),) + OLED_ENABLE = yes + OLED_SELECT = local + endif + ifneq ($(filter noback no-back nounder no-under,$(strip $1)),) + LED_BACK_ENABLE = no + LED_UNDERGLOW_ENABLE = no + endif + ifeq ($(strip $1),back) + LED_BACK_ENABLE = yes + LED_UNDERGLOW_ENABLE = no + endif + ifeq ($(strip $1),under) + LED_BACK_ENABLE = no + LED_UNDERGLOW_ENABLE = yes + endif + ifneq ($(filter na no_ani no-ani,$(strip $1)),) + LED_ANIMATIONS = no + endif + ifeq ($(strip $1),ios) + IOS_DEVICE_ENABLE = yes + endif + ifneq ($(filter sc split-common split_common,$(strip $1)),) + SPLIT_KEYBOARD = yes + endif + ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),) + SPLIT_KEYBOARD = no + endif + ifeq ($(strip $1),scan) + # use DEBUG_MATRIX_SCAN_RATE + # see docs/newbs_testing_debugging.md + OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE + CONSOLE_ENABLE = yes + SHOW_VERBOSE_INFO = yes + endif + ifeq ($(strip $1),verbose) + SHOW_VERBOSE_INFO = 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 HELIX_OPTION_PARSE + COMMA=, - helix_option := $(subst $(COMMA), , $(HELIX)) - ifneq ($(filter help,$(helix_option)),) - $(eval $(call HELIX_HELP_MSG)) - $(error ) - endif - ifneq ($(filter nooled,$(helix_option)),) - OLED_ENABLE = no - else ifneq ($(filter no-oled,$(helix_option)),) - OLED_ENABLE = no - else ifneq ($(filter oled,$(helix_option)),) - OLED_ENABLE = yes - endif - ifneq ($(filter noback,$(helix_option)),) - LED_BACK_ENABLE = no - LED_UNDERGLOW_ENABLE = no - else ifneq ($(filter no-back,$(helix_option)),) - LED_BACK_ENABLE = no - LED_UNDERGLOW_ENABLE = no - else ifneq ($(filter nounder,$(helix_option)),) - LED_BACK_ENABLE = no - LED_UNDERGLOW_ENABLE = no - else ifneq ($(filter no-under,$(helix_option)),) - LED_BACK_ENABLE = no - LED_UNDERGLOW_ENABLE = no - else ifneq ($(filter back,$(helix_option)),) - LED_BACK_ENABLE = yes - LED_UNDERGLOW_ENABLE = no - else ifneq ($(filter under,$(helix_option)),) - LED_BACK_ENABLE = no - LED_UNDERGLOW_ENABLE = yes - endif - ifneq ($(filter na,$(helix_option)),) - LED_ANIMATIONS = no - endif - ifneq ($(filter no_ani,$(helix_option)),) - LED_ANIMATIONS = no - endif - ifneq ($(filter no-ani,$(helix_option)),) - LED_ANIMATIONS = no - endif - ifneq ($(filter ios,$(helix_option)),) - IOS_DEVICE_ENABLE = yes - endif - ifneq ($(filter sc,$(helix_option)),) - SPLIT_KEYBOARD = yes - endif - ifneq ($(filter split-common,$(helix_option)),) - SPLIT_KEYBOARD = yes - endif - ifneq ($(filter scan,$(helix_option)),) - # use DEBUG_MATRIX_SCAN_RATE - # see docs/newbs_testing_debugging.md - OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE - CONSOLE_ENABLE = yes - SHOW_VERBOSE_INFO = yes - endif - ifeq ($(filter verbose,$(helix_option)), verbose) - SHOW_VERBOSE_INFO = yes + $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)), \ + $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME)))) + + ifeq ($(strip $(HELP)),on) + $(eval $(call HELIX_HELP_MSG)) + $(error ) endif SHOW_HELIX_OPTIONS = yes endif @@ -142,12 +155,21 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes) endif ifeq ($(strip $(OLED_ENABLE)), yes) - SRC += local_drivers/i2c.c - SRC += local_drivers/ssd1306.c - KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers - OPT_DEFS += -DOLED_ENABLE - ifeq ($(strip $(LOCAL_GLCDFONT)), yes) - OPT_DEFS += -DLOCAL_GLCDFONT + ifeq ($(strip $(OLED_SELECT)),core) + OLED_DRIVER_ENABLE = yes + ifeq ($(strip $(LOCAL_GLCDFONT)), yes) + OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\> + else + OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" + endif + else + SRC += local_drivers/i2c.c + SRC += local_drivers/ssd1306.c + KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers + OPT_DEFS += -DOLED_ENABLE + ifeq ($(strip $(LOCAL_GLCDFONT)), yes) + OPT_DEFS += -DLOCAL_GLCDFONT + endif endif endif |