diff options
author | Takeshi ISHII <2170248+mtei@users.noreply.github.com> | 2022-03-02 20:15:10 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-02 20:15:10 +0900 |
commit | e73f8e942c8f0aa4b471669436d16ad785b63a38 (patch) | |
tree | 9870e7381f13d887ef13cd017fc3c43514a770b4 /keyboards/helix/rev2/keymaps | |
parent | 09a43b12cbb914eb239ce447ad89004f0304be71 (diff) |
Change 'helix/rev2:default' setting to use split_common (#16432)
* add licenses message to helix/rev2 files
* Minimize the processing of helix/rev2/local_features.mk
* Changed helix/rev2 default setting to use split_common
* fix helix/rev2:edvorakjp build error
* Remove unnecessary '#include' from keymap.c
* helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz
* Revert "fix helix/rev2:edvorakjp build error"
This reverts commit 731dbbe15155b3efe2ff9f5ad61c7d0cf529e837.
Separated into a single PR #16433.
* Revert "Changed helix/rev2 default setting to use split_common"
This reverts commit e76dbd7762e06e0781ee004213878b1a5029fa98.
* add 'SPLIT_*_STATE_ENABLE' into helix/rev2/config.h
* Revert "helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz"
This reverts commit 9b316c1c6a532f908f2ac430233089797ce7c794.
* change helix:default to use split_common
* change helix:five_rows to use split_common
* add comment into helix/rev2/rules.mk
* change helix:led_test to use split_common
Diffstat (limited to 'keyboards/helix/rev2/keymaps')
-rw-r--r-- | keyboards/helix/rev2/keymaps/default/keymap.c | 8 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/default/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/keymap.c | 10 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/five_rows/rules.mk | 2 | ||||
-rw-r--r-- | keyboards/helix/rev2/keymaps/led_test/rules.mk | 2 |
5 files changed, 7 insertions, 17 deletions
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c index 88820dac8a..c3994d3184 100644 --- a/keyboards/helix/rev2/keymaps/default/keymap.c +++ b/keyboards/helix/rev2/keymaps/default/keymap.c @@ -15,14 +15,6 @@ */ #include QMK_KEYBOARD_H -#include "bootloader.h" -#ifdef PROTOCOL_LUFA -#include "lufa.h" -#include "split_util.h" -#endif -#ifdef AUDIO_ENABLE - #include "audio.h" -#endif // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk index 2aa62bc830..508c4ba40e 100644 --- a/keyboards/helix/rev2/keymaps/default/rules.mk +++ b/keyboards/helix/rev2/keymaps/default/rules.mk @@ -1,3 +1,5 @@ +SPLIT_KEYBOARD = yes + LTO_ENABLE = yes # if firmware size over limit, try this option # Helix Spacific Build Options diff --git a/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/keyboards/helix/rev2/keymaps/five_rows/keymap.c index 16eff49244..2b3f6233c1 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/keymap.c +++ b/keyboards/helix/rev2/keymaps/five_rows/keymap.c @@ -15,15 +15,7 @@ */ #include QMK_KEYBOARD_H -#include "util.h" -#include "bootloader.h" -#ifdef PROTOCOL_LUFA -#include "lufa.h" -#include "split_util.h" -#endif -#ifdef CONSOLE_ENABLE - #include <print.h> -#endif + #include "layer_number.h" extern keymap_config_t keymap_config; diff --git a/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/keyboards/helix/rev2/keymaps/five_rows/rules.mk index e4d0390c3a..60dc4b61a6 100644 --- a/keyboards/helix/rev2/keymaps/five_rows/rules.mk +++ b/keyboards/helix/rev2/keymaps/five_rows/rules.mk @@ -1,3 +1,5 @@ + SPLIT_KEYBOARD = yes + CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration # CONSOLE_ENABLE and COMMAND_ENABLE diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk index 3ab27acfc2..1dc12bb1cb 100644 --- a/keyboards/helix/rev2/keymaps/led_test/rules.mk +++ b/keyboards/helix/rev2/keymaps/led_test/rules.mk @@ -5,6 +5,8 @@ # See TOP/keyboards/helix/rules.mk for a list of options that can be set. # See TOP/docs/config_options.md for more information. # +SPLIT_KEYBOARD = yes + LTO_ENABLE = no # if firmware size over limit, try this option # Helix Spacific Build Options |