summaryrefslogtreecommitdiffstats
path: root/keyboards/helix
Commit message (Collapse)AuthorAgeFilesLines
* Fix helix/rev2 not working properly when using split_common. (#16512)Takeshi ISHII2022-03-036-7/+9
| | | | | | | | | | | When helix/rev2 was using split_common, it didn't work properly and I couldn't type on the right hand side. The cause is that the following code, added in 0.16.0 to `quantum/keyboard.c`, does not include `quantum/split_common/split_util.h` but instead includes `keyboards/helix/rev2/split_util.h`. Therefore, `split_pre_init()/split_post_init()` in `quantum/split_common/split_util.c` was not called. ```c #ifdef SPLIT_KEYBOARD # include "split_util.h" #endif ```
* Fix mistakes in the include path in `helix/rev2/local_features.mk`. (#16507)Takeshi ISHII2022-03-032-4/+6
| | | | | | | | | | | | ```diff --- a/keyboards/helix/rev2/local_features.mk +++ b/keyboards/helix/rev2/local_features.mk @@ -6,7 +6,7 @@ # KEYBOARD_LOCAL_FEATURES_MK := --include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File ded icated to maintenance +-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance ```
* Change 'helix/rev2:default' setting to use split_common (#16432)Takeshi ISHII2022-03-0211-114/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* fix helix/rev2:edvorakjp build error (#16433)Takeshi ISHII2022-02-271-1/+1
| | | | | 'helix/rev2/keymaps/edvorakjp' was no longer buildable due to changes made by #14864. The reason is that the prototype of `oled_task_user()` was changed in keymaps/edvorakjp/oled.c, but keymaps/edvorakjp/oled.h was not changed. Therefore, I modified the prototype in keymaps/edvorakjp/oled.h.
* Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-2218-911/+165
|\
| * Helix/pico move to split_common (#16418)Takeshi ISHII2022-02-2118-913/+165
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-02-1717-1670/+0
|\|
| * [Keyboard] Remove Helix/rev1 (#16389)Takeshi ISHII2022-02-1717-1672/+0
| |
* | Bodge for helix build failures (#16376)Joel Challis2022-02-163-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-12-147-250/+250
|\|
| * Remove unnecessary backslash-escapes in default keymaps (#15472)Ryan2021-12-147-250/+250
| | | | | | | | | | | | | | * Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-091-1/+1
|\|
| * Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-094-76/+0
|\|
| * Remove empty config.h from default-ish keymaps (#15429)Ryan2021-12-094-76/+0
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-12-086-37/+2
|\|
| * Remove references to Makefile in keyboard-level rules.mk (#15427)Ryan2021-12-076-37/+2
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-021-2/+0
|\|
| * Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-011-2/+0
| |
* | [Core] Remove matrix_is_modified() and debounce_is_active() (#15349)Stefan Kerkmann2021-11-293-18/+0
|/
* [Core] Change OLED task function to be boolean (#14864)Drashna Jaelre2021-11-0210-12/+22
| | | | | | | | | | | | | * [Core] Add kb level callbacks to OLED driver * Update keyboards and keymaps * Update docs * Update userspace configs * Add fix for my keymap ... * update lefty
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-291-1/+0
|\
| * Remove redundant `UNICODE_ENABLE = no` in keyboard-level rules.mk (#14633)Ryan2021-09-301-1/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developJames Young2021-09-262-106/+0
|\|
| * Remove unused `IS_COMMAND()` instances and Magic Key definitions (#14610)James Young2021-09-262-106/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused IS_COMMAND() instances from keyboard-level config.h, 0-9 * Remove unused IS_COMMAND() instances from keyboard-level config.h, A-B * Remove unused IS_COMMAND() instances from keyboard-level config.h, C-D * Remove unused IS_COMMAND() instances from keyboard-level config.h, E-G * Remove unused IS_COMMAND() instances from keyboard-level config.h, handwired * Remove unused IS_COMMAND() instances from keyboard-level config.h, H-M * Remove unused IS_COMMAND() instances from keyboard-level config.h, N-R * Remove unused IS_COMMAND() instances from keyboard-level config.h, S-Z * Remove unused Magic Key definitions from keyboard-level config.h, 0-9 * Remove unused Magic Key definitions from keyboard-level config.h, A * Remove unused Magic Key definitions from keyboard-level config.h, B * Remove unused Magic Key definitions from keyboard-level config.h, C * Remove unused Magic Key definitions from keyboard-level config.h, D-E * Remove unused Magic Key definitions from keyboard-level config.h, F-H * Remove unused Magic Key definitions from keyboard-level config.h, handwired * Remove unused Magic Key definitions from keyboard-level config.h, I-K * Remove unused Magic Key definitions from keyboard-level config.h, L-M * Remove unused Magic Key definitions from keyboard-level config.h, N-R * Remove unused Magic Key definitions from keyboard-level config.h, S-V * Remove unused Magic Key definitions from keyboard-level config.h, W-Z * Merge remote-tracking branch 'upstream/master' into clean/command_and_magic * Remove remaining unused IS_COMMAND() instances from keyboard-level config.h
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-213-3/+3
|\|
| * Remove audio pin references in rules.mk (#14532)Ryan2021-09-213-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-181-49/+4
|\|
| * fix link error for helix/rev3_5rows:five_rows (#14466)Takeshi ISHII2021-09-181-49/+4
| | | | | | | | This is a tentative quick fix. I was adding the same functions for both #14426 and #14427 and they were in conflict.
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-09-178-28/+256
|\|
| * [Keymap] Update Helix:five_rows OLED code (#14427)Takeshi ISHII2021-09-168-28/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Stop using snprintf() in keymaps/five_rows/oled_display.c. The binary size becomes 1350 bytes smaller. make HELIX=verbose,core-oled helix/rev2/sc:five_rows (104 bytes over) -> (95%, 1256 bytes free) make helix/rev3_5rows:five_rows (528 bytes over) -> (97%, 830 bytes free) * add matrix scan rate display to OLED for keymaps/five_rows * add matrix_output_unselect_delay.c to helix keymaps/five_rows * add GPLv2 header * apply review comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-168-239/+587
|\|
| * [Keyboard] Increase the way to add oled code for helix/rev3. (#14426)Takeshi ISHII2021-09-168-239/+587
| | | | | | | | | | | | | | | | | | | | | | * move rev3_Xrows/oled_display.c to rev3_Xrows/keymaps/default/oled_display.c * add dummy rev3_Xrows/oled_display.c * Add default minimum oled_task_user() to helix/rev3_Xrows/rev3_Xrows.c * remove unnecessary comment in rev3_Xrows/keymaps/default/oled_display.c * copy rev3_Xrows/keymaps/default/oled_display.c to rev3_Xrows/keymaps/via/oled_display.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-121-1/+0
|\|
| * Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379)Ryan2021-09-121-1/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-125-10/+0
|\|
| * Remove width, height and key_count from info.json (#14274)Ryan2021-09-125-10/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-101-7/+0
|\|
| * Remove bootloader listings from rules.mk (#14330)Ryan2021-09-101-7/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-057-84/+0
|\|
| * Remove empty override functions (#14312)Ryan2021-09-057-84/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove empty override functions, 0-9 * Remove empty override functions, A-D * Remove empty override functions, E-H * Remove empty override functions, handwired * Remove empty override functions, I-L * Remove empty override functions, M-P * Remove empty override functions, Q-T * Remove empty override functions, U-Z
* | Change keyboard level include guards to `pragma once` (#14248)Ryan2021-09-018-32/+8
| | | | | | | | | | | | | | | | | | * Change keyboard level include guards to `pragma once` And clean up a lot of layout macros * Oops * Remove dangling endif
* | [Keyboard] Helix use `post_rules.mk` (#14216)Takeshi ISHII2021-08-3114-49/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 ```
* [Keyboard] fix compile error `make helix/rev2/sc:all` (#14214)Takeshi ISHII2021-08-291-8/+19
|
* [Core] Refactor OLED to allow easy addition of other types (#13454)Xelus222021-08-2414-22/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add docs * core changes * update keyboards to new OLED * updated users to new OLED * update layouts to new OLED * fixup docs * drashna's suggestion * fix up docs * new keyboards with oled * core split changes * remaining keyboard files * Fix The Helix keyboards oled options * reflect develop Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
* [Keymap] fix helix:fraanrosi compile error caused by #13677. (#14061)Takeshi ISHII2021-08-191-1/+4
| | | | I'm against using RGBLIGHT_ANIMATIONS because this happens. See also #8688.
* Remove MIDI Configuration boilerplate (#11151)James Young2021-08-163-41/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove keyboard-level instances of `MIDI_ENABLE = no` Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]*MIDI_ENABLE[ \t]*=[ \t]*no/d' {} + ``` Co-Authored-By: Nick Brassel <nick@tzarc.org> * fix case-sensitivity issues on MIDI_ENABLE Change instances of `MIDI_ENABLE = YES` to `MIDI_ENABLE = yes`. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE[ \t]*=[ \t]*[Yy][Ee][Ss];MIDI_ENABLE = yes;g' {} + ``` * replace `# MIDI controls` with `# MIDI support` Replace `# MIDI controls` with `# MIDI support` in keyboard-level `rules.mk` files. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*MIDI[ \t]*\(controls\|support\).*;# MIDI support;g' {} + ``` * align inline comments Aligns the inline comments to the length used by the QMK AVR rules.mk template. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;MIDI_ENABLE *= *yes.*;MIDI_ENABLE = yes # MIDI support;g' {} + ``` * remove commented instances of `MIDI_ENABLE` from keyboard `rules.mk` files Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#\([ \t]*MIDI_ENABLE\) = yes; \1 = no ;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;^\([ \t]*\)\(MIDI_ENABLE = no\);\2\1;' {} + find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e '/^[ #]\+MIDI_ENABLE *= *no/d' {} + ``` * remove MIDI configuration boilerplate from keyboard config.h files Co-authored-by: Nick Brassel <nick@tzarc.org>
* Remove Full Bootmagic (#13846)James Young2021-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * disambiguate Bootmagic rules in keymaps The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic. This commit edits the files to specify that full Bootmagic is intended. * remove BOOTMAGIC_ENABLE=full setting * unify commented BOOTMAGIC_ENABLE rules in keyboards Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} + ``` * remove commented Bootmagic rules from keymap/user level Command: ``` find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} + ``` * update keyboard BOOTMAGIC_ENABLE rule formatting Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later). Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + ``` * update keyboards' BOOTMAGIC_ENABLE settings Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Command: ``` find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' + ``` * update keymap/user BOOTMAGIC_ENABLE settings Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' + ``` * remove and replace inline comments in keyboards and keymap/user files Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`. Commands: ``` find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' + find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' + ``` * rename improperly named makefiles Some files intended to be used as makefiles had improper names causing them to not be used as intended when building. This commit corrects the filenames of the affected files. * update renamed file with new rule formatting * update QMK's template files Updates QMK's `rules.mk` templates to use the new inline comment. * update QMK Docs - remove documentation of full Bootmagic - update links to Bootmagic Lite doc - add doc for Magic Keycodes * rules.mk patch for coarse/ixora and coarse/vinta
* Fix up builds after #8591 (#13900)Nick Brassel2021-08-061-1/+0
|
* Merge remote-tracking branch 'upstream/master' into developNick Brassel2021-08-024-2/+6
|\