From 63b0646f70bf70fa6079b6b104cdbc8cf85acd2d Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Fri, 20 Mar 2020 00:27:13 +0900 Subject: [PATCH 1/6] modify helix config. 'helix/rev2' always OLED on --- keyboards/helix/pico/local_features.mk | 58 +++++++++----- .../pico/{sc/back => split_common}/rules.mk | 1 + .../helix/rev2/keymaps/led_test/rules.mk | 4 +- keyboards/helix/rev2/local_features.mk | 76 ++++++++++++++----- keyboards/helix/rev2/rules.mk | 2 +- keyboards/helix/rev2/split_common/rules.mk | 2 + 6 files changed, 104 insertions(+), 39 deletions(-) rename keyboards/helix/pico/{sc/back => split_common}/rules.mk (51%) create mode 100644 keyboards/helix/rev2/split_common/rules.mk diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/local_features.mk index 0277a3d227c0..de86c2062203 100644 --- a/keyboards/helix/pico/local_features.mk +++ b/keyboards/helix/pico/local_features.mk @@ -5,6 +5,8 @@ # combinations of standard options) into QMK standard options. # +KEYBOARD_LOCAL_FEATURES_MK := + define HELIX_CUSTOMISE_MSG $(info Helix Spacific Build Options) $(info - OLED_ENABLE = $(OLED_ENABLE)) @@ -15,42 +17,61 @@ define HELIX_CUSTOMISE_MSG $(info ) endef +define HELIX_HELP_MSG + $(info Helix keyboard convenient command line option) + $(info - make HELIX= helix/pico:) + $(info - option= oled | back | under | na | no-ani) + $(info - ios | sc | split-common | scan | verbose) + $(info - ex.) + $(info - make HELIX=oled helix/pico:) + $(info - make HELIX=back helix/pico:) + $(info - make HELIX=under helix/pico:) + $(info - make HELIX=back,na helix/pico:) + $(info - make HELIX=back,ios helix/pico:) + $(info ) +endef + ifneq ($(strip $(HELIX)),) - ### Helix keyboard keymap: convenient command line option - ## make HELIX= helix/pico: - ## option= oled | back | under | no_ani | na | ios | verbose - ## ex. - ## make HELIX=oled helix/pico: - ## make HELIX=oled,back helix/pico: - ## make HELIX=oled,under helix/pico: - ## make HELIX=oled,back,na helix/pico: - ## make HELIX=oled,back,ios helix/pico: - ## - ifeq ($(findstring oled,$(HELIX)), oled) + COMMA=, + helix_option := $(subst $(COMMA), , $(HELIX)) + ifneq ($(filter help,$(helix_option)),) + $(eval $(call HELIX_HELP_MSG)) + $(error ) + endif + ifneq ($(filter oled,$(helix_option)),) OLED_ENABLE = yes endif - ifeq ($(findstring back,$(HELIX)), back) + ifneq ($(filter back,$(helix_option)),) LED_BACK_ENABLE = yes - else ifeq ($(findstring under,$(HELIX)), under) + else ifneq ($(filter under,$(helix_option)),) LED_UNDERGLOW_ENABLE = yes endif - ifeq ($(findstring na,$(HELIX)), na) + ifneq ($(filter na,$(helix_option)),) LED_ANIMATIONS = no endif - ifeq ($(findstring no_ani,$(HELIX)), no_ani) + ifneq ($(filter no_ani,$(helix_option)),) LED_ANIMATIONS = no endif - ifeq ($(findstring ios,$(HELIX)), ios) + ifneq ($(filter no-ani,$(helix_option)),) + LED_ANIMATIONS = no + endif + ifneq ($(filter ios,$(helix_option)),) IOS_DEVICE_ENABLE = yes endif - ifeq ($(findstring scan,$(HELIX)), scan) + 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 ($(findstring verbose,$(HELIX)), verbose) + ifneq ($(filter verbose,$(helix_option)),) SHOW_VERBOSE_INFO = yes endif SHOW_HELIX_OPTIONS = yes @@ -120,6 +141,7 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),) $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE)) $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) $(info -- OPT_DEFS = $(OPT_DEFS)) + $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) $(info -- LINK_TIME_OPTIMIZATION_ENABLE = $(LINK_TIME_OPTIMIZATION_ENABLE)) $(info ) endif diff --git a/keyboards/helix/pico/sc/back/rules.mk b/keyboards/helix/pico/split_common/rules.mk similarity index 51% rename from keyboards/helix/pico/sc/back/rules.mk rename to keyboards/helix/pico/split_common/rules.mk index 066fffb74af2..4ed0672a7086 100644 --- a/keyboards/helix/pico/sc/back/rules.mk +++ b/keyboards/helix/pico/split_common/rules.mk @@ -1 +1,2 @@ +SPLIT_KEYBOARD = yes LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk index fb0b5a547622..a3fc26f8c05c 100644 --- a/keyboards/helix/rev2/keymaps/led_test/rules.mk +++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk @@ -14,8 +14,8 @@ LINK_TIME_OPTIMIZATION_ENABLE = no # if firmware size over limit, try this opti OLED_ENABLE = yes # OLED_ENABLE # LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.) -# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) -LED_ANIMATIONS = yes # LED animations +LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) +LED_ANIMATIONS = yes # LED animations # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) SRC += led_test_init.c diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk index 4b120936dedd..6e84eaceb19e 100644 --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk @@ -5,6 +5,8 @@ # combinations of standard options) into QMK standard options. # +KEYBOARD_LOCAL_FEATURES_MK := + define HELIX_CUSTOMISE_MSG $(info Helix Spacific Build Options) $(info - OLED_ENABLE = $(OLED_ENABLE)) @@ -15,42 +17,79 @@ define HELIX_CUSTOMISE_MSG $(info ) endef +define HELIX_HELP_MSG + $(info Helix keyboard convenient command line option) + $(info - make HELIX= helix:) + $(info - option= oled | no-oled | back | no-back | under | na | no-ani) + $(info - ios | sc | split-common | scan | verbose) + $(info - ex.) + $(info - make HELIX=no-oled helix:) + $(info - make HELIX=oled,no-back helix:) + $(info - make HELIX=oled,under helix:) + $(info - make HELIX=oled,back,na helix:) + $(info - make HELIX=oled,back,ios helix:) + $(info ) +endef + ifneq ($(strip $(HELIX)),) - ### Helix keyboard keymap: convenient command line option - ## make HELIX= helix: - ## option= oled | back | under | na | ios - ## ex. - ## make HELIX=oled helix: - ## make HELIX=oled,back helix: - ## make HELIX=oled,under helix: - ## make HELIX=oled,back,na helix: - ## make HELIX=oled,back,ios helix: - ## - ifeq ($(findstring oled,$(HELIX)), oled) + 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 - ifeq ($(findstring back,$(HELIX)), back) + 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 - else ifeq ($(findstring under,$(HELIX)), under) + LED_UNDERGLOW_ENABLE = no + else ifneq ($(filter under,$(helix_option)),) + LED_BACK_ENABLE = no LED_UNDERGLOW_ENABLE = yes endif - ifeq ($(findstring na,$(HELIX)), na) + ifneq ($(filter na,$(helix_option)),) LED_ANIMATIONS = no endif - ifeq ($(findstring no_ani,$(HELIX)), no_ani) + ifneq ($(filter no_ani,$(helix_option)),) LED_ANIMATIONS = no endif - ifeq ($(findstring ios,$(HELIX)), ios) + ifneq ($(filter no-ani,$(helix_option)),) + LED_ANIMATIONS = no + endif + ifneq ($(filter ios,$(helix_option)),) IOS_DEVICE_ENABLE = yes endif - ifeq ($(findstring scan,$(HELIX)), scan) + 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 ($(findstring verbose,$(HELIX)), verbose) + ifeq ($(filter verbose,$(helix_option)), verbose) SHOW_VERBOSE_INFO = yes endif SHOW_HELIX_OPTIONS = yes @@ -119,6 +158,7 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),) $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE)) $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE)) $(info -- OPT_DEFS = $(OPT_DEFS)) + $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD)) $(info -- LINK_TIME_OPTIMIZATION_ENABLE = $(LINK_TIME_OPTIMIZATION_ENABLE)) $(info ) endif diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk index db584c0b23ba..d5d69c979ce3 100644 --- a/keyboards/helix/rev2/rules.mk +++ b/keyboards/helix/rev2/rules.mk @@ -2,7 +2,7 @@ KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features. # Helix Spacific Build Options default values HELIX_ROWS = 5 # Helix Rows is 4 or 5 -OLED_ENABLE = no # OLED_ENABLE +OLED_ENABLE = yes # OLED_ENABLE LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) diff --git a/keyboards/helix/rev2/split_common/rules.mk b/keyboards/helix/rev2/split_common/rules.mk new file mode 100644 index 000000000000..4ed0672a7086 --- /dev/null +++ b/keyboards/helix/rev2/split_common/rules.mk @@ -0,0 +1,2 @@ +SPLIT_KEYBOARD = yes +LED_BACK_ENABLE = yes From f35bbb0e8155aa3a610bbd88e5081a14dab8b6cc Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Fri, 20 Mar 2020 00:30:03 +0900 Subject: [PATCH 2/6] reduce helix build variation pattern MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit | name in the previous version | name in the new version | | ---------------------------- | ------------------------| | helix/rev1 | helix/rev1 | | helix/pico | helix/pico | | helix/pico/back | helix/pico/back | | helix/pico/under | helix/pico/under | | helix/pico/sc | -- | | helix/pico/sc/back | helix/pico/split_common | | helix/pico/sc/under | -- | | helix/rev2 (=helix) | -- | | helix/rev2/back | -- | | helix/rev2/back/oled | -- | | helix/rev2/oled | helix/rev2　(=helix) | | helix/rev2/oled/back | helix/rev2/back | | helix/rev2/oled/under | helix/rev2/under | | helix/rev2/sc | -- | | helix/rev2/sc/back | -- | | helix/rev2/sc/oled | -- | | helix/rev2/sc/oledback | helix/rev2/split_common | | helix/rev2/sc/oledunder | -- | | helix/rev2/sc/under | -- | | helix/rev2/under | -- | | helix/rev2/under/oled | -- | --- keyboards/helix/pico/sc/rules.mk | 1 - keyboards/helix/pico/sc/under/rules.mk | 1 - keyboards/helix/rev2/back/oled/rules.mk | 1 - keyboards/helix/rev2/oled/back/rules.mk | 1 - keyboards/helix/rev2/oled/rules.mk | 1 - keyboards/helix/rev2/oled/under/rules.mk | 1 - keyboards/helix/rev2/sc/back/rules.mk | 1 - keyboards/helix/rev2/sc/oled/rules.mk | 1 - keyboards/helix/rev2/sc/oledback/rules.mk | 2 -- keyboards/helix/rev2/sc/oledunder/rules.mk | 2 -- keyboards/helix/rev2/sc/rules.mk | 1 - keyboards/helix/rev2/sc/under/rules.mk | 1 - keyboards/helix/rev2/under/oled/rules.mk | 1 - 13 files changed, 15 deletions(-) delete mode 100644 keyboards/helix/pico/sc/rules.mk delete mode 100644 keyboards/helix/pico/sc/under/rules.mk delete mode 100644 keyboards/helix/rev2/back/oled/rules.mk delete mode 100644 keyboards/helix/rev2/oled/back/rules.mk delete mode 100644 keyboards/helix/rev2/oled/rules.mk delete mode 100644 keyboards/helix/rev2/oled/under/rules.mk delete mode 100644 keyboards/helix/rev2/sc/back/rules.mk delete mode 100644 keyboards/helix/rev2/sc/oled/rules.mk delete mode 100644 keyboards/helix/rev2/sc/oledback/rules.mk delete mode 100644 keyboards/helix/rev2/sc/oledunder/rules.mk delete mode 100644 keyboards/helix/rev2/sc/rules.mk delete mode 100644 keyboards/helix/rev2/sc/under/rules.mk delete mode 100644 keyboards/helix/rev2/under/oled/rules.mk diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk deleted file mode 100644 index d38a61809075..000000000000 --- a/keyboards/helix/pico/sc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SPLIT_KEYBOARD = yes diff --git a/keyboards/helix/pico/sc/under/rules.mk b/keyboards/helix/pico/sc/under/rules.mk deleted file mode 100644 index a37aa6fab370..000000000000 --- a/keyboards/helix/pico/sc/under/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LED_UNDERGLOW_ENABLE = yes diff --git a/keyboards/helix/rev2/back/oled/rules.mk b/keyboards/helix/rev2/back/oled/rules.mk deleted file mode 100644 index dd68e9d3b090..000000000000 --- a/keyboards/helix/rev2/back/oled/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/helix/rev2/oled/back/rules.mk b/keyboards/helix/rev2/oled/back/rules.mk deleted file mode 100644 index 066fffb74af2..000000000000 --- a/keyboards/helix/rev2/oled/back/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev2/oled/rules.mk b/keyboards/helix/rev2/oled/rules.mk deleted file mode 100644 index dd68e9d3b090..000000000000 --- a/keyboards/helix/rev2/oled/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/helix/rev2/oled/under/rules.mk b/keyboards/helix/rev2/oled/under/rules.mk deleted file mode 100644 index a37aa6fab370..000000000000 --- a/keyboards/helix/rev2/oled/under/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LED_UNDERGLOW_ENABLE = yes diff --git a/keyboards/helix/rev2/sc/back/rules.mk b/keyboards/helix/rev2/sc/back/rules.mk deleted file mode 100644 index 066fffb74af2..000000000000 --- a/keyboards/helix/rev2/sc/back/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev2/sc/oled/rules.mk b/keyboards/helix/rev2/sc/oled/rules.mk deleted file mode 100644 index dd68e9d3b090..000000000000 --- a/keyboards/helix/rev2/sc/oled/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes diff --git a/keyboards/helix/rev2/sc/oledback/rules.mk b/keyboards/helix/rev2/sc/oledback/rules.mk deleted file mode 100644 index 645984f865ad..000000000000 --- a/keyboards/helix/rev2/sc/oledback/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -LED_BACK_ENABLE = yes diff --git a/keyboards/helix/rev2/sc/oledunder/rules.mk b/keyboards/helix/rev2/sc/oledunder/rules.mk deleted file mode 100644 index e415cbd49208..000000000000 --- a/keyboards/helix/rev2/sc/oledunder/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -OLED_ENABLE = yes -LED_UNDERGLOW_ENABLE = yes diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk deleted file mode 100644 index d38a61809075..000000000000 --- a/keyboards/helix/rev2/sc/rules.mk +++ /dev/null @@ -1 +0,0 @@ -SPLIT_KEYBOARD = yes diff --git a/keyboards/helix/rev2/sc/under/rules.mk b/keyboards/helix/rev2/sc/under/rules.mk deleted file mode 100644 index a37aa6fab370..000000000000 --- a/keyboards/helix/rev2/sc/under/rules.mk +++ /dev/null @@ -1 +0,0 @@ -LED_UNDERGLOW_ENABLE = yes diff --git a/keyboards/helix/rev2/under/oled/rules.mk b/keyboards/helix/rev2/under/oled/rules.mk deleted file mode 100644 index dd68e9d3b090..000000000000 --- a/keyboards/helix/rev2/under/oled/rules.mk +++ /dev/null @@ -1 +0,0 @@ -OLED_ENABLE = yes From c48af9d88b3c977da428c008d989bd8206028e28 Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Fri, 20 Mar 2020 00:34:56 +0900 Subject: [PATCH 3/6] helix/rev2/keymaps/xulkal/rules.mk: Explicitly disable helix standard post-processing **Compilation result does not change** --- keyboards/helix/rev2/keymaps/xulkal/rules.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/keyboards/helix/rev2/keymaps/xulkal/rules.mk index 03800f9bb95b..7fac4df7e102 100644 --- a/keyboards/helix/rev2/keymaps/xulkal/rules.mk +++ b/keyboards/helix/rev2/keymaps/xulkal/rules.mk @@ -11,3 +11,6 @@ OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" OPT_DEFS += -DOLED_90ROTATION SPLIT_KEYBOARD = yes + +# Explicitly disable helix standard post-processing +KEYBOARD_LOCAL_FEATURES_MK := From 498c27adb6d584345014450c20eaffe635cf5fde Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Fri, 20 Mar 2020 01:09:01 +0900 Subject: [PATCH 4/6] helix readmes update --- .../helix/pico/keymaps/default/readme.md | 8 ++--- .../helix/rev2/keymaps/default/readme.md | 36 +++++++------------ .../helix/rev2/keymaps/default/readme_jp.md | 21 +++++------ 3 files changed, 27 insertions(+), 38 deletions(-) diff --git a/keyboards/helix/pico/keymaps/default/readme.md b/keyboards/helix/pico/keymaps/default/readme.md index 3c097247e527..e5b1dc821d9b 100644 --- a/keyboards/helix/pico/keymaps/default/readme.md +++ b/keyboards/helix/pico/keymaps/default/readme.md @@ -116,15 +116,13 @@ build ``` $ make helix/pico:default $ make helix/pico/back:default # with backlight -$ make HELIX=no_ani helix/pico/back:default # with backlight without animation +$ make HELIX=no-ani helix/pico/back:default # with backlight without animation $ make helix/pico/under:default # with underglow ``` -build (experimental use of split_common) +build (experimental use of split_common with backlight) ``` -$ make helix/pico/sc:default -$ make helix/pico/sc/back:default -$ make helix/pico/sc/under:default +$ make helix/pico/split_common:default ``` flash to keyboard diff --git a/keyboards/helix/rev2/keymaps/default/readme.md b/keyboards/helix/rev2/keymaps/default/readme.md index 1237e5d5b62f..a24bfd713458 100644 --- a/keyboards/helix/rev2/keymaps/default/readme.md +++ b/keyboards/helix/rev2/keymaps/default/readme.md @@ -112,7 +112,7 @@ see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk` # you can uncomment and edit follows 7 Variables # jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。 # HELIX_ROWS = 5 # Helix Rows is 4 or 5 -# OLED_ENABLE = no # OLED_ENABLE +# OLED_ENABLE = yes # OLED_ENABLE # LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" # LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) @@ -128,35 +128,25 @@ $ cd qmk_firmware build ``` -$ make helix:default -$ make helix/rev2/back:default # with backlight -$ make HELIX=no_ani helix/rev2/back:default # with backlight without animation -$ make helix/rev2/under:default # with underglow -$ make helix/rev2/oled:default # with oled -$ make helix/rev2/oled/back:default # with oled and backlight -$ make helix/rev2/oled/under:default # with oled and underglow +$ make helix:default # with oled +$ make helix/rev2/back:default # with oled and backlight +$ make HELIX=no-ani helix/rev2/back:default # with oled and backlight without animation +$ make helix/rev2/under:default # with oled and underglow +$ make HELIX=no-oled helix:default # without oled ``` -build (experimental use of split_common) +build (experimental use of split_common with backlight and oled) ``` -$ make helix/rev2/sc:default -$ make helix/rev2/sc/back:default -$ make helix/rev2/sc/under:default -$ make helix/rev2/sc/oled:default -$ make helix/rev2/sc/oledback:default -$ make helix/rev2/sc/oledunder:default +$ make helix/rev2/split_common:default ``` flash to keyboard ``` -$ make helix:default:flash -$ make helix/rev2/back:default:flash # with backlight -$ make HELIX=no_ani helix/rev2/back:default:flash # with backlight without animation -$ make helix/rev2/under:default:flash # with underglow -$ make helix/rev2/oled:default:flash # with oled -$ make helix/rev2/oled/back:default:flash # with oled and backlight -$ make helix/rev2/oled/under:default:flash # with oled and underglow - +$ make helix:default:flash # with oled +$ make helix/rev2/back:default:flash # with oled and backlight +$ make HELIX=no-ani helix/rev2/back:default:flash # with oled and backlight without animation +$ make helix/rev2/under:default:flash # with oled and underglow +$ make HELIX=no-oled helix:default:flash # without oled ``` ## Link diff --git a/keyboards/helix/rev2/keymaps/default/readme_jp.md b/keyboards/helix/rev2/keymaps/default/readme_jp.md index 2dfab351b0c6..5f0295f8f346 100644 --- a/keyboards/helix/rev2/keymaps/default/readme_jp.md +++ b/keyboards/helix/rev2/keymaps/default/readme_jp.md @@ -30,7 +30,7 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、 # you can uncomment and edit follows 7 Variables # jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。 # HELIX_ROWS = 5 # Helix Rows is 4 or 5 -# OLED_ENABLE = no # OLED_ENABLE +# OLED_ENABLE = yes # OLED_ENABLE # LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" # LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.) # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) @@ -61,11 +61,12 @@ rules.mk の下記の部分を編集して no を yes に変更してくださ LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.) ``` -## OLEDを有効にする +## OLEDを無効にする -rules.mk の下記の部分を編集して no を yes に変更してください。 +OLED はデフォルトで有効になっています。 +無効にしたいときは rules.mk の下記の部分を編集して yes を no に変更してください。 ``` -OLED_ENABLE = yes # OLED_ENABLE +OLED_ENABLE = no # OLED_ENABLE ``` ## iPad/iPhoneサポートを有効にする。 @@ -104,9 +105,9 @@ $ make helix:default:clean 上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。 -OLED を有効にしてコンパイルしてキーボードへの書き込む。 +OLED を無効にしてコンパイルしてキーボードへの書き込む。 ``` -$ make helix/rev2/oled:default:flash +$ make HELIX=no-oled helix/rev2:default:flash ``` RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。 @@ -119,14 +120,14 @@ RGB Underglow を有効にしてコンパイルしてキーボードへ書き込 $ make helix/rev2/under:default:flash ``` -OLED とRGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。 +OLED を無効にして、RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。 ``` -$ make helix/rev2/oled/back:default:flash +$ make HELIX=no-oled helix/rev2/back:default:flash ``` -OLED とRGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。 +OLED を無効にして、RGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。 ``` -$ make helix/rev2/oled/under:default:flash +$ make HELIX=no-oled helix/rev2/under:default:flash ``` ## リンク From 9eee4962d5a2d80e50bd189ad5a2dc656b035c89 Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Thu, 2 Apr 2020 22:28:29 +0900 Subject: [PATCH 5/6] add temporary test script --- keyboards/helix/helix-build-variation-test.sh | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 keyboards/helix/helix-build-variation-test.sh diff --git a/keyboards/helix/helix-build-variation-test.sh b/keyboards/helix/helix-build-variation-test.sh new file mode 100644 index 000000000000..0fa73661b307 --- /dev/null +++ b/keyboards/helix/helix-build-variation-test.sh @@ -0,0 +1,55 @@ +export SKIP_VERSION=yes +export SKIP_DEBUG_INFO=yes + +function rename_hex() { + sed -e 's/helix_pico_sc_back/helix_pico_split_common/' \ + -e 's/helix_rev2_oled_back/helix_rev2_back/' \ + -e 's/helix_rev2_oled_under/helix_rev2_under/' \ + -e 's/helix_rev2_oled/helix_rev2/' \ + -e 's/helix_rev2_sc_oledback/helix_rev2_split_common/' +} + +OLD_NAMES="helix/rev1 + helix/pico + helix/pico/back + helix/pico/under + helix/pico/sc/back + helix/rev2/oled + helix/rev2/oled/back + helix/rev2/oled/under + helix/rev2/sc/oledback" + +NEW_NAMES="helix/rev1 + helix/pico + helix/pico/back + helix/pico/under + helix/pico/split_common + helix/rev2 + helix/rev2/back + helix/rev2/under + helix/rev2/split_common" + + # === build on master === +git checkout `git merge-base master reduce_helix_build_variation` +git log -1 --oneline --decorate > /tmp/master_md5.txt +for i in $OLD_NAMES +do + make $i:all:clean + make $i:all + md5 .build/*.hex | rename_hex >> /tmp/master_md5.txt + make $i:all:clean +done + + # === build on reduce_helix_build_variation === +git checkout reduce_helix_build_variation +git log -4 --oneline --decorate > /tmp/branch_md5.txt +for i in $NEW_NAMES +do + make $i:all:clean + make $i:all + md5 .build/*.hex >> /tmp/branch_md5.txt + make $i:all:clean +done + + # === +diff -u /tmp/master_md5.txt /tmp/branch_md5.txt From 05ee6f07ce34c5c32c3b6fb8ccbbbf3973934851 Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Thu, 2 Apr 2020 22:36:53 +0900 Subject: [PATCH 6/6] test end. -- Revert "add temporary test script" This reverts commit 6229ed41f2ff8bac52015150837eaa51d9815e13. --- keyboards/helix/helix-build-variation-test.sh | 55 ------------------- 1 file changed, 55 deletions(-) delete mode 100644 keyboards/helix/helix-build-variation-test.sh diff --git a/keyboards/helix/helix-build-variation-test.sh b/keyboards/helix/helix-build-variation-test.sh deleted file mode 100644 index 0fa73661b307..000000000000 --- a/keyboards/helix/helix-build-variation-test.sh +++ /dev/null @@ -1,55 +0,0 @@ -export SKIP_VERSION=yes -export SKIP_DEBUG_INFO=yes - -function rename_hex() { - sed -e 's/helix_pico_sc_back/helix_pico_split_common/' \ - -e 's/helix_rev2_oled_back/helix_rev2_back/' \ - -e 's/helix_rev2_oled_under/helix_rev2_under/' \ - -e 's/helix_rev2_oled/helix_rev2/' \ - -e 's/helix_rev2_sc_oledback/helix_rev2_split_common/' -} - -OLD_NAMES="helix/rev1 - helix/pico - helix/pico/back - helix/pico/under - helix/pico/sc/back - helix/rev2/oled - helix/rev2/oled/back - helix/rev2/oled/under - helix/rev2/sc/oledback" - -NEW_NAMES="helix/rev1 - helix/pico - helix/pico/back - helix/pico/under - helix/pico/split_common - helix/rev2 - helix/rev2/back - helix/rev2/under - helix/rev2/split_common" - - # === build on master === -git checkout `git merge-base master reduce_helix_build_variation` -git log -1 --oneline --decorate > /tmp/master_md5.txt -for i in $OLD_NAMES -do - make $i:all:clean - make $i:all - md5 .build/*.hex | rename_hex >> /tmp/master_md5.txt - make $i:all:clean -done - - # === build on reduce_helix_build_variation === -git checkout reduce_helix_build_variation -git log -4 --oneline --decorate > /tmp/branch_md5.txt -for i in $NEW_NAMES -do - make $i:all:clean - make $i:all - md5 .build/*.hex >> /tmp/branch_md5.txt - make $i:all:clean -done - - # === -diff -u /tmp/master_md5.txt /tmp/branch_md5.txt