diff options
author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2021-08-31 16:58:07 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-31 16:58:07 +0900 |
commit | b8c68afb2f46fba3bae2a0cb6fdef867f95353a8 (patch) | |
tree | 058f0dd43b8228cfa63ea0162383c45bd1c6aa53 | |
parent | bab997c8c4240aa639d53258c926d37ce448db2e (diff) | |
download | qmk_firmware-b8c68afb2f46fba3bae2a0cb6fdef867f95353a8.tar.gz qmk_firmware-b8c68afb2f46fba3bae2a0cb6fdef867f95353a8.zip |
[Keyboard] Helix use `post_rules.mk` (#14216)
* Helix/pico use post_rules.mk insted of local_features.mk
Tested with the following procedure.
```
git checkout 77a93fec79 (qmk/develop)
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
git checkout helix_use_post_rules.mk
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
```
* Helix/rev2 use post_rules.mk
Tested with the following procedure.
```
git checkout 77a93fec79 (qmk/develop)
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
make helix/rev2:all:check-md5
make helix/rev2/sc:all:check-md5
git checkout helix_use_post_rules.mk
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
make helix/rev2:all:check-md5
make helix/rev2/sc:all:check-md5
```
-rw-r--r-- | keyboards/helix/pico/keymaps/biacco/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/pico/keymaps/default/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/pico/keymaps/mtei/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/pico/post_rules.mk (renamed from keyboards/helix/pico/local_features.mk) | 4 | ||||
-rw-r--r-- | keyboards/helix/pico/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/default/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/fraanrosi/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/froggy/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/froggy_106/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/led_test/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/yshrsmz/rules.mk | 4 | ||||
-rw-r--r-- | keyboards/helix/rev2/post_rules.mk | 3 |
14 files changed, 4 insertions, 49 deletions
diff --git a/keyboards/helix/pico/keymaps/biacco/rules.mk b/keyboards/helix/pico/keymaps/biacco/rules.mk index 37e49977c..993ade267 100644 --- a/keyboards/helix/pico/keymaps/biacco/rules.mk +++ b/keyboards/helix/pico/keymaps/biacco/rules.mk | |||
@@ -18,7 +18,3 @@ LTO_ENABLE = no # if firmware size over limit, try this option | |||
18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
19 | LED_ANIMATIONS = no # LED animations | 19 | LED_ANIMATIONS = no # LED animations |
20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
21 | |||
22 | # convert Helix-specific options (that represent combinations of standard options) | ||
23 | # into QMK standard options. | ||
24 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk index 8f198e380..8977897f9 100644 --- a/keyboards/helix/pico/keymaps/default/rules.mk +++ b/keyboards/helix/pico/keymaps/default/rules.mk | |||
@@ -18,7 +18,3 @@ LTO_ENABLE = no # if firmware size over limit, try this option | |||
18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
19 | # LED_ANIMATIONS = yes # LED animations | 19 | # LED_ANIMATIONS = yes # LED animations |
20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
21 | |||
22 | # convert Helix-specific options (that represent combinations of standard options) | ||
23 | # into QMK standard options. | ||
24 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/pico/keymaps/mtei/rules.mk b/keyboards/helix/pico/keymaps/mtei/rules.mk index 165233f5f..05a60f67d 100644 --- a/keyboards/helix/pico/keymaps/mtei/rules.mk +++ b/keyboards/helix/pico/keymaps/mtei/rules.mk | |||
@@ -18,7 +18,3 @@ LTO_ENABLE = no # if firmware size over limit, try this option | |||
18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 18 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
19 | # LED_ANIMATIONS = yes # LED animations | 19 | # LED_ANIMATIONS = yes # LED animations |
20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 20 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
21 | |||
22 | # convert Helix-specific options (that represent combinations of standard options) | ||
23 | # into QMK standard options. | ||
24 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/pico/local_features.mk b/keyboards/helix/pico/post_rules.mk index be5c739f9..38573d75a 100644 --- a/keyboards/helix/pico/local_features.mk +++ b/keyboards/helix/pico/post_rules.mk | |||
@@ -1,12 +1,10 @@ | |||
1 | # | 1 | # |
2 | # local_features.mk contains post-processing rules for the Helix keyboard. | 2 | # post_rules.mk contains post-processing rules for the Helix keyboard. |
3 | # | 3 | # |
4 | # Post-processing rules convert keyboard-specific shortcuts (that represent | 4 | # Post-processing rules convert keyboard-specific shortcuts (that represent |
5 | # combinations of standard options) into QMK standard options. | 5 | # combinations of standard options) into QMK standard options. |
6 | # | 6 | # |
7 | 7 | ||
8 | KEYBOARD_LOCAL_FEATURES_MK := | ||
9 | |||
10 | define HELIX_CUSTOMISE_MSG | 8 | define HELIX_CUSTOMISE_MSG |
11 | $(info Helix Spacific Build Options) | 9 | $(info Helix Spacific Build Options) |
12 | $(info - OLED_ENABLE = $(OLED_ENABLE)) | 10 | $(info - OLED_ENABLE = $(OLED_ENABLE)) |
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk index cb9a70e00..12caec37e 100644 --- a/keyboards/helix/pico/rules.mk +++ b/keyboards/helix/pico/rules.mk | |||
@@ -1,5 +1,3 @@ | |||
1 | KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk | ||
2 | |||
3 | # Helix Spacific Build Options default values | 1 | # Helix Spacific Build Options default values |
4 | OLED_ENABLE = no # OLED_ENABLE | 2 | OLED_ENABLE = no # OLED_ENABLE |
5 | LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" | 3 | LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c" |
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk index c16f3e2b8..58b43a6bd 100644 --- a/keyboards/helix/rev2/keymaps/default/rules.mk +++ b/keyboards/helix/rev2/keymaps/default/rules.mk | |||
@@ -29,7 +29,3 @@ OLED_SELECT = core | |||
29 | ifeq ($(strip $(OLED_ENABLE)), yes) | 29 | ifeq ($(strip $(OLED_ENABLE)), yes) |
30 | SRC += oled_display.c | 30 | SRC += oled_display.c |
31 | endif | 31 | endif |
32 | |||
33 | # convert Helix-specific options (that represent combinations of standard options) | ||
34 | # into QMK standard options. | ||
35 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk index e59ce7332..5f7e4668f 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk | |||
@@ -95,7 +95,3 @@ endif | |||
95 | ifeq ($(strip $(OLED_ENABLE)), yes) | 95 | ifeq ($(strip $(OLED_ENABLE)), yes) |
96 | SRC += oled_display.c | 96 | SRC += oled_display.c |
97 | endif | 97 | endif |
98 | |||
99 | # convert Helix-specific options (that represent combinations of standard options) | ||
100 | # into QMK standard options. | ||
101 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk index d44382f86..7c4a7b604 100644 --- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk | |||
@@ -17,7 +17,3 @@ HELIX_ROWS = 5 # Helix Rows is 4 or 5 | |||
17 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 17 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
18 | # LED_ANIMATIONS = yes # LED animations | 18 | # LED_ANIMATIONS = yes # LED animations |
19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
20 | |||
21 | # convert Helix-specific options (that represent combinations of standard options) | ||
22 | # into QMK standard options. | ||
23 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk index 462a83f6e..98585b0d6 100644 --- a/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk +++ b/keyboards/helix/rev2/keymaps/fraanrosi/rules.mk | |||
@@ -22,7 +22,3 @@ LED_ANIMATIONS = yes # LED animations | |||
22 | 22 | ||
23 | LED_BACK_ENABLE = no | 23 | LED_BACK_ENABLE = no |
24 | LED_UNDERGLOW_ENABLE = yes | 24 | LED_UNDERGLOW_ENABLE = yes |
25 | |||
26 | # convert Helix-specific options (that represent combinations of standard options) | ||
27 | # into QMK standard options. | ||
28 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/froggy/rules.mk b/keyboards/helix/rev2/keymaps/froggy/rules.mk index 5a0fd9a2b..2d01c43fe 100644 --- a/keyboards/helix/rev2/keymaps/froggy/rules.mk +++ b/keyboards/helix/rev2/keymaps/froggy/rules.mk | |||
@@ -17,7 +17,3 @@ LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.) | |||
17 | LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 17 | LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
18 | LED_ANIMATIONS = yes # LED animations | 18 | LED_ANIMATIONS = yes # LED animations |
19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
20 | |||
21 | # convert Helix-specific options (that represent combinations of standard options) | ||
22 | # into QMK standard options. | ||
23 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk index 5a0fd9a2b..2d01c43fe 100644 --- a/keyboards/helix/rev2/keymaps/froggy_106/rules.mk +++ b/keyboards/helix/rev2/keymaps/froggy_106/rules.mk | |||
@@ -17,7 +17,3 @@ LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.) | |||
17 | LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 17 | LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
18 | LED_ANIMATIONS = yes # LED animations | 18 | LED_ANIMATIONS = yes # LED animations |
19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
20 | |||
21 | # convert Helix-specific options (that represent combinations of standard options) | ||
22 | # into QMK standard options. | ||
23 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk index 8b590eee8..3ab27acfc 100644 --- a/keyboards/helix/rev2/keymaps/led_test/rules.mk +++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk | |||
@@ -23,7 +23,3 @@ ifeq ($(strip $(OLED_ENABLE)), yes) | |||
23 | SRC += oled_display.c | 23 | SRC += oled_display.c |
24 | endif | 24 | endif |
25 | SRC += led_test_init.c | 25 | SRC += led_test_init.c |
26 | |||
27 | # convert Helix-specific options (that represent combinations of standard options) | ||
28 | # into QMK standard options. | ||
29 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk index 83dcc9b3b..cd436cd9a 100644 --- a/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk +++ b/keyboards/helix/rev2/keymaps/yshrsmz/rules.mk | |||
@@ -17,7 +17,3 @@ OLED_ENABLE = yes # OLED_ENABLE | |||
17 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) | 17 | # LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.) |
18 | LED_ANIMATIONS = no # LED animations | 18 | LED_ANIMATIONS = no # LED animations |
19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) | 19 | # IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone) |
20 | |||
21 | # convert Helix-specific options (that represent combinations of standard options) | ||
22 | # into QMK standard options. | ||
23 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
diff --git a/keyboards/helix/rev2/post_rules.mk b/keyboards/helix/rev2/post_rules.mk new file mode 100644 index 000000000..4c671d451 --- /dev/null +++ b/keyboards/helix/rev2/post_rules.mk | |||
@@ -0,0 +1,3 @@ | |||
1 | ifneq ($(strip $(KEYBOARD_LOCAL_FEATURES_MK)),) | ||
2 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | ||
3 | endif | ||