Cleanup helix rules options #6952

MakotoKurauchi · 2019-10-07T06:36:53Z

Description

Added helix keyboard build NEW method.

  ## Helix build
  $ make helix:default            ## no oled, no backlight, no underglow
  $ make helix/rev2/back:default  ## no oled, with backlight, no underglow
  $ make helix/rev2/under:default ## no oled, no backlight, with underglow
  $ make helix/rev2/oled:default  ## with oled, no backlight, not underglow
  $ make helix/rev2/oled/back:default  ## with oled, with backlight, no underglow
  $ make helix/rev2/back/oled:default  ## with oled, with backlight, no underglow
  $ make helix/rev2/oled/under:default ## with oled, no backlight, with underglow
  $ make helix/rev2/under/oled:default ## with oled, no backlight, with underglow
    
  ## Helix pico build
  $ make helix/pico:default       ## no backlight, no underglow
  $ make helix/pico/back:default  ## with backlight, no underglow
  $ make helix/pico/under:default ## no backlight, with underglow

Simplified 'helix/rev2/keymap/*/rules.mk' and 'helix/pico/keymap/*/rules.mk'.
This is also in preparation for creating a new subdirectory for the helix code using split_common.
There are other minor changes to the old format such as config.h and rules.mk etc.

There is no change in compilation results for this PR.

Types of Changes

Checklist

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

No change in build result.

…onfig.h. No change in build result.

This is a preparation to create a new subdirectory for helix code using split_common. No change in build result. remove 'USE_I2C = yes', 'SUBPROJECT_rev1 = no' from keyboards/helix/rules.mk. follow code move from keyboards/helix/rules.mk to keyboards/helix/{rev1,rev2,pico}/rules.mk. ---- SRC += i2c.c SRC += serial.c SRC += ssd1306.c CUSTOM_MATRIX = yes ---

…vers/ No change in build result.

…ES_MK. No change in build result. * add keyboards/helix/pico/local_features.mk * add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/pico/rules.mk * remove HELIX_CUSTOMISE_MSG from keyboards/helix/pico/keymaps/*/rules.mk * remove HELIX= process from keyboards/helix/pico/keymaps/*/rules.mk * remove convert code(helix to standaerd) from keyboards/helix/pico/keymaps/*/rules.mk * add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/pico/keymaps/*/rules.mk

…ES_MK. No change in build result. * add keyboards/helix/rev2/local_features.mk * add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/rev2/rules.mk * remove HELIX_CUSTOMISE_MSG from keyboards/helix/rev2/keymaps/*/rules.mk * remove HELIX= process from keyboards/helix/rev2/keymaps/*/rules.mk * remove convert code(helix to standaerd) from keyboards/helix/rev2/keymaps/*/rules.mk * add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/rev2/keymaps/*/rules.mk

No change in build result. ## Helix build $ make helix:default ## no oled, no backlight, no underglow $ make helix/rev2/back:default ## no oled, with backlight, no underglow $ make helix/rev2/under:default ## no oled, no backlight, with underglow $ make helix/rev2/oled:default ## with oled, no backlight, not underglow $ make helix/rev2/oled/back:default ## with oled, with backlight, no underglow $ make helix/rev2/back/oled:default ## with oled, with backlight, no underglow $ make helix/rev2/oled/under:default ## with oled, no backlight, with underglow $ make helix/rev2/under/oled:default ## with oled, no backlight, with underglow ## Helix pico build $ make helix/pico:default ## no oled, no backlight, no underglow $ make helix/pico/back:default ## no oled, with backlight, no underglow $ make helix/pico/under:default ## no oled, no backlight, with underglow $ make helix/pico/oled:default ## with oled, no backlight, not underglow

This reverts commit 5dac20c.

This reverts commit ec49f63.

No change in build result.

Cleanup Helix-keyboard rules.mk files and build options.

keyboards/helix/pico/keymaps/default/readme_jp.md

keyboards/helix/pico/rules.mk

keyboards/helix/rev1/rules.mk

rm keyboards/helix/pico/oled/rules.mk

update helix's readmes. All the ':avrdude' was replaced with ':flash'.

mtei · 2019-10-10T11:30:30Z

Travis-CI reports a failure, but helix code compilation seems to have finished successfully.

What can I do to eliminate failure?

fauxpark · 2019-10-10T22:00:45Z

The Travis error seems to be unrelated, although it decided to run make all:default even though only the helix keyboard folder was modified. The default helix keymaps compiled OK.

drashna · 2019-10-12T05:19:13Z

@mtei as long as the default keymaps for the keyboard compile, that's mostly what we're looking for from travis. If other stuff fails, that's okay.

@fauxpark that may be due to the merges in the PR, and github just not tracking it well. I know the same happens when you force push, since it loses track of what commits are the recent changes.

keyboards/helix/rules.mk

…s.mk No change in build result.

remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rule…

* add temporary test shell-spript * Use LINK_TIME_OPTIMIZATION_ENABLE instead of Link_Time_Optimization No change in build result. * Helix config.h use '#pragma once' No change in build result. * Helix helix.h,rev?/rev?.h,pico/pico.h use '#pragma once' No change in build result. * Use drivers/avr/pro_micro.h instead of keyboards/helix/pro_micro.h No change in build result. * remove keyboards/helix/{rev2|pico}/serial_config.h No change in build result. * 'HELIX_ROWS' macro is now referenced only in rev1/config.h and rev2/config.h. No change in build result. * The contents of helix/rules.mk were distributed to subdirectories. This is a preparation to create a new subdirectory for helix code using split_common. No change in build result. remove 'USE_I2C = yes', 'SUBPROJECT_rev1 = no' from keyboards/helix/rules.mk. follow code move from keyboards/helix/rules.mk to keyboards/helix/{rev1,rev2,pico}/rules.mk. ---- SRC += i2c.c SRC += serial.c SRC += ssd1306.c CUSTOM_MATRIX = yes --- * helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_drivers/ No change in build result. * Simplified 'helix/pico/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK. No change in build result. * add keyboards/helix/pico/local_features.mk * add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/pico/rules.mk * remove HELIX_CUSTOMISE_MSG from keyboards/helix/pico/keymaps/*/rules.mk * remove HELIX= process from keyboards/helix/pico/keymaps/*/rules.mk * remove convert code(helix to standaerd) from keyboards/helix/pico/keymaps/*/rules.mk * add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/pico/keymaps/*/rules.mk * Simplified 'helix/rev2/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATURES_MK. No change in build result. * add keyboards/helix/rev2/local_features.mk * add 'KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk' into keyboards/helix/rev2/rules.mk * remove HELIX_CUSTOMISE_MSG from keyboards/helix/rev2/keymaps/*/rules.mk * remove HELIX= process from keyboards/helix/rev2/keymaps/*/rules.mk * remove convert code(helix to standaerd) from keyboards/helix/rev2/keymaps/*/rules.mk * add 'include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))' into keyboards/helix/rev2/keymaps/*/rules.mk * Added helix keyboard build NEW method. No change in build result. ## Helix build $ make helix:default ## no oled, no backlight, no underglow $ make helix/rev2/back:default ## no oled, with backlight, no underglow $ make helix/rev2/under:default ## no oled, no backlight, with underglow $ make helix/rev2/oled:default ## with oled, no backlight, not underglow $ make helix/rev2/oled/back:default ## with oled, with backlight, no underglow $ make helix/rev2/back/oled:default ## with oled, with backlight, no underglow $ make helix/rev2/oled/under:default ## with oled, no backlight, with underglow $ make helix/rev2/under/oled:default ## with oled, no backlight, with underglow ## Helix pico build $ make helix/pico:default ## no oled, no backlight, no underglow $ make helix/pico/back:default ## no oled, with backlight, no underglow $ make helix/pico/under:default ## no oled, no backlight, with underglow $ make helix/pico/oled:default ## with oled, no backlight, not underglow * add temporary test shell-spript * test end remove test script. Revert "add temporary test shell-spript" This reverts commit 5dac20c. * test end remove test script. Revert "add temporary test shell-spript" This reverts commit ec49f63. * Extended the 'HELIX=' option. add keyword 'verbose', 'no_ani'. No change in build result. * update keyboards/helix/{rev2,pico}/keymaps/default/readme.md * rename KEYBOARD_TOP_DIR to HELIX_TOP_DIR in rules.mk * update keyboards/helix/{rev2,pico}/keymaps/default/readme_jp.md * rm keyboards/helix/pico/oled/rules.mk * update helix's readmes. All the ':avrdude' was replaced with ':flash'. * remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rules.mk No change in build result.

mtei and others added 21 commits September 25, 2019 21:53

add temporary test shell-spript

5dac20c

Use LINK_TIME_OPTIMIZATION_ENABLE instead of Link_Time_Optimization

1a8461a

No change in build result.

Helix config.h use '#pragma once'

16cd01f

No change in build result.

Helix helix.h,rev?/rev?.h,pico/pico.h use '#pragma once'

5a717ba

No change in build result.

Use drivers/avr/pro_micro.h instead of keyboards/helix/pro_micro.h

05093bf

No change in build result.

remove keyboards/helix/{rev2|pico}/serial_config.h

37bca31

No change in build result.

'HELIX_ROWS' macro is now referenced only in rev1/config.h and rev2/c…

fbcd471

…onfig.h. No change in build result.

helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_dri…

dc8cd57

…vers/ No change in build result.

add temporary test shell-spript

ec49f63

test end remove test script. Revert "add temporary test shell-spript"

a53f20c

This reverts commit 5dac20c.

test end remove test script. Revert "add temporary test shell-spript"

466951b

This reverts commit ec49f63.

Extended the 'HELIX=' option. add keyword 'verbose', 'no_ani'.

2b20720

No change in build result.

update keyboards/helix/{rev2,pico}/keymaps/default/readme.md

96d1cc3

rename KEYBOARD_TOP_DIR to HELIX_TOP_DIR in rules.mk

ca4c0be

update keyboards/helix/{rev2,pico}/keymaps/default/readme_jp.md

6ec7ed8

Merge pull request #20 from mtei/cleanup-helix-rules-options

1fd87b2

Cleanup Helix-keyboard rules.mk files and build options.

rm keyboards/helix/pico/oled/rules.mk

2087800

noroadsleft requested a review from drashna October 7, 2019 19:48

drashna requested a review from a team October 8, 2019 00:41

drashna reviewed Oct 8, 2019

View reviewed changes

drashna added keyboard optimization labels Oct 8, 2019

drashna requested a review from a team October 8, 2019 01:12

MakotoKurauchi and others added 3 commits October 8, 2019 13:03

Merge pull request #21 from mtei/cleanup-helix-rules-options

3eb8f1b

rm keyboards/helix/pico/oled/rules.mk

update helix's readmes. All the ':avrdude' was replaced with ':flash'.

5ca0492

Merge pull request #22 from mtei/cleanup-helix-rules-options

2d44fdd

update helix's readmes. All the ':avrdude' was replaced with ':flash'.

drashna approved these changes Oct 8, 2019

View reviewed changes

mtei mentioned this pull request Oct 14, 2019

Cleanup rules.mk for 32U4 keyboards, H #7030

Merged

13 tasks

fauxpark reviewed Oct 14, 2019

View reviewed changes

keyboards/helix/rules.mk Outdated Show resolved Hide resolved

mtei and others added 2 commits October 15, 2019 08:58

remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rule…

4dd70fd

…s.mk No change in build result.

Merge pull request #23 from mtei/cleanup-helix-rules-options

c5133be

remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rule…

drashna merged commit 881f27b into qmk:master Oct 16, 2019

mtei mentioned this pull request Dec 7, 2019

Added workaround for serial.c issue when LTO_ENABLE=yes for the Helix. #7558

Merged

13 tasks

MakotoKurauchi deleted the cleanup-helix-rules-options2 branch February 16, 2020 08:40

mtei mentioned this pull request Mar 14, 2020

add 'include keyboard_features.mk' into build_keyboard.mk #8422

Merged

13 tasks

mtei mentioned this pull request Apr 25, 2020

Reduce Helix keyboard build variation #8669

Merged

13 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cleanup helix rules options #6952

Cleanup helix rules options #6952

MakotoKurauchi commented Oct 7, 2019 •

edited

Loading

mtei commented Oct 10, 2019

fauxpark commented Oct 10, 2019

drashna commented Oct 12, 2019

Cleanup helix rules options #6952

Cleanup helix rules options #6952

Conversation

MakotoKurauchi commented Oct 7, 2019 • edited Loading

Description

There is no change in compilation results for this PR.

Types of Changes

Checklist

mtei commented Oct 10, 2019

fauxpark commented Oct 10, 2019

drashna commented Oct 12, 2019

MakotoKurauchi commented Oct 7, 2019 •

edited

Loading