diff options
| author | fauxpark <fauxpark@gmail.com> | 2021-09-21 20:19:07 +1000 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2021-09-21 20:19:07 +1000 |
| commit | 94572d74b54ff835a9a1e8adda459d4481274453 (patch) | |
| tree | 6168569f18e4e9890fd96e12cc7b389f35c4acd8 /keyboards/helix | |
| parent | 20ea5f3fb5ba108153148e57981a7e804fd4be61 (diff) | |
| parent | 6b74e48f81fd22f4b982c686df9c8d1f8efae571 (diff) | |
| download | qmk_firmware-94572d74b54ff835a9a1e8adda459d4481274453.tar.gz qmk_firmware-94572d74b54ff835a9a1e8adda459d4481274453.zip | |
Merge remote-tracking branch 'upstream/master' into develop
Diffstat (limited to 'keyboards/helix')
| -rw-r--r-- | keyboards/helix/pico/keymaps/default/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/helix/pico/qmk_conf/rules.mk | 2 | ||||
| -rw-r--r-- | keyboards/helix/rules.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk index 8977897f9..8a4a0df28 100644 --- a/keyboards/helix/pico/keymaps/default/rules.mk +++ b/keyboards/helix/pico/keymaps/default/rules.mk | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | # See TOP/docs/config_options.md for more information. | 6 | # See TOP/docs/config_options.md for more information. |
| 7 | # | 7 | # |
| 8 | EXTRAKEY_ENABLE = yes # Audio control and System control | 8 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 9 | AUDIO_ENABLE = yes # Audio output on port B5 | 9 | AUDIO_ENABLE = yes # Audio output |
| 10 | LTO_ENABLE = no # if firmware size over limit, try this option | 10 | LTO_ENABLE = no # if firmware size over limit, try this option |
| 11 | 11 | ||
| 12 | # Helix Spacific Build Options | 12 | # Helix Spacific Build Options |
diff --git a/keyboards/helix/pico/qmk_conf/rules.mk b/keyboards/helix/pico/qmk_conf/rules.mk index 966e64d61..e2993b3f8 100644 --- a/keyboards/helix/pico/qmk_conf/rules.mk +++ b/keyboards/helix/pico/qmk_conf/rules.mk | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | EXTRAKEY_ENABLE = yes # Audio control and System control | 1 | EXTRAKEY_ENABLE = yes # Audio control and System control |
| 2 | AUDIO_ENABLE = yes # Audio output on port B5 | 2 | AUDIO_ENABLE = yes # Audio output |
| 3 | 3 | ||
| 4 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) | 4 | include $(strip $(KEYBOARD_LOCAL_FEATURES_MK)) |
diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk index 916261383..2e13e452a 100644 --- a/keyboards/helix/rules.mk +++ b/keyboards/helix/rules.mk | |||
| @@ -17,7 +17,7 @@ CONSOLE_ENABLE = no # Console for debug | |||
| 17 | COMMAND_ENABLE = no # Commands for debug and configuration | 17 | COMMAND_ENABLE = no # Commands for debug and configuration |
| 18 | NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work | 18 | NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work |
| 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality | 19 | BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality |
| 20 | AUDIO_ENABLE = no # Audio output on port C6 | 20 | AUDIO_ENABLE = no # Audio output |
| 21 | UNICODE_ENABLE = no # Unicode | 21 | UNICODE_ENABLE = no # Unicode |
| 22 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. | 22 | RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. |
| 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE | 23 | # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE |