summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | update feature_tap_dance.md translation (#13496)s-show2021-08-181-82/+88
| | | | | | | | | | | | | | | | | | | | | | * update feature_tap_dance.md translation * Update docs/ja/feature_tap_dance.md Co-authored-by: shela <shelaf@users.noreply.github.com> * update based on comment. Co-authored-by: shela <shelaf@users.noreply.github.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-179-0/+652
| |\ | |/ |/|
* | [Keyboard] add n6 keyboard (#13768)yulei2021-08-179-0/+652
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-172-50/+75
| |\ | |/ |/|
* | [Keyboard] bastardkb/skeletyl: fix LED configuration (#14030)Charly Delay2021-08-172-50/+75
| |
| * Fix wait_us overflow in matrix for dactyl based boards (#14039)Drashna Jaelre2021-08-172-2/+2
| |
| * Add a lot more data to info.json (#13366)Zach White2021-08-1617-99/+654
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add some split data to info.json * add tags * add half of config_options.md to info.json * add support for designating master split * sort out split transport and primary * fix bad data in UNUSED_PINS * fixup custom transport * wip * allow for setting split right half keyboard matrix * add SPLIT_USB_DETECT * minor cleanup * fix an erroneous message * rework split.usb_detect * adding missing rgblight vars to info.json * add mouse_key to info.json * add all remaining options from docs/config_options.md * fix audio voices * qmk info: Change text output to use dotted notation * tweak layout output * resolve alias names * break out some functions to make flake8 happy * add a field for bootloader instructions * qmk generate-info-json: add a write-to-file argument Adds an argument that instructs qmk generate-info-json to write the output to a file instead of just to the terminal. * -arg_only, +action Because it was never my intention that one would have to specify a value for the argument that enables writing the file. * Bring qmk generate-info-json inline with other generate commands * pytest fixup * fix esca/getawayvan * fix data driven errors for bpiphany converters * features.force_nkro -> usb.force_nkro * split.primary->split.main * fix esca/getawayvan_f042 * fix the bpiphany converters for real * fix bpiphany/tiger_lily * Apply suggestions from code review Co-authored-by: Nick Brassel <nick@tzarc.org> * fix generate-api errors * fix matrix pin extraction for split boards * fix ploopyco/trackball_nano/rev1_001 Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-164-8/+11
| |\ | |/ |/|
* | ryanbaekr rb86: rename LAYOUT_numpad_6x17 to LAYOUT (#14011)James Young2021-08-164-8/+11
| | | | | | This keyboard isn't a numpad.
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-162-8/+67
| |\ | |/ |/|
* | MisonoWorks Chocolate Bar Configurator fixes (#14009)James Young2021-08-162-8/+67
| | | | | | | | | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * info.json: correct key sequence Places the arrow keys in the proper place in sequence. * correct maintainer's GitHub link in readme User changed their GitHub username; previous URL was Error 404.
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-163-283/+531
| |\ | |/ |/|
* | Linworks Fave87 Layout Macro Refactor (#14008)James Young2021-08-163-283/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * correct LAYOUT_tkl_ansi data Number row was positioned 0.25u too low. * correct LAYOUT_tkl_ansi macro - remove position K027 (right half of Split Backspace) - remove position K096 (right portion of Split Right Shift) * correct LAYOUT_tkl_iso macro - remove position K027 (right half of Split Backspace) - remove position K096 (right portion of Split Right Shift) * enable Community Layout support * add LAYOUT_tkl_ansi_split_bs_rshift and LAYOUT_tkl_iso_split_bs_rshift
| * Unify behaviour of wait on AVR (#14025)Joel Challis2021-08-161-2/+20
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-163-5/+32
| |\ | |/ |/|
* | Pimentoso TouhouPad Layout Macro refactor (#14010)James Young2021-08-163-5/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * physically arrange layout macro, phase 1 Break the keymap up into rows. * physically arrange layout macro, phase 2 Moves the Escape and Enter keys to the top row. * refactor default keymap - use QMK short-form keycodes - grid align keycodes * physically arrange layout macro, phase 3 Moves the X key (Bomb) to the bottom row. * physically arrange layout macro, phase 4 Physically arrange the Escape and Enter keys. * physically arrange layout macro, phase 5 Physically arrange the arrow keys. * physically arrange layout macro, phase 6 Physically align the X (Bomb) key. * align escape characters in layout macro * info.json: apply human-friendly formatting
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-161-2/+2
| |\ | |/ |/|
* | Fix line endings in keyboards/absinthe/keymaps/via/rules.mk (#14028)James Young2021-08-151-2/+2
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-166-56/+269
| |\ | |/ |/|
* | Gorthage Truck Refactor (#14006)James Young2021-08-156-56/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * info.json: make key labels more friendly to `qmk info -l` * correct LAYOUT_3u key sequence * correct LAYOUT_7u key sequence * correct LAYOUT_10u key sequence * refactor default keymap - use QMK short-form keycodes - update grid alignment - use four-space indent - touch up with `qmk cformat` * refactor 10u keymap - use QMK short-form keycodes - add encoder_update_user() function - update grid alignment - use four-space indent * refactor 7u keymap - use QMK short-form keycodes - add encoder_update_user() function - update grid alignment - use four-space indent * refactor gorthage_truck.h - update grid alignments - use XXX for KC_NO - insert omitted KC_NO instances * correct keyboard metadata in info.json - use GitHub username for maintainer - correct keyboard dimensions * add encoder_update_kb() function to gorthage_truck.c Gives QMK Configurator compile jobs encoder functionality. * update maintainer field in info.json As requested by jpuerto96 (s8erdude).
| * Move all the flash logic from tmk_core (#13927)Joel Challis2021-08-157-269/+278
| |
| * Fixup Audio startup and add to documents (#13606)Drashna Jaelre2021-08-153-1/+30
| | | | | | | | | | * Fixup Audio startup and add to documents * fix doc descriptions
| * Remove MIDI Configuration boilerplate (#11151)James Young2021-08-16879-5365/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Defer the expensive search for layout macros until info.json has been ↵Zach White2021-08-161-19/+24
| | | | | | | | | | | | | | processed (#14007) * defer the expensive search for layout macros until info.json has been processed * fixup names
| * Fix ifdefs for OLED split sync code (#14017)Drashna Jaelre2021-08-154-6/+7
| |
| * Enable sync of OLED/ST7565 display on/off state on Splits (#13542)Drashna Jaelre2021-08-155-21/+123
| | | | | | | | | | | | | | | | | | * Enable sync of OLED/ST7565 display on/off state on Splits * Only send if states are not matched Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org>
| * Merge remote-tracking branch 'upstream/master' into developfauxpark2021-08-1520-457/+434
| |\ | |/ |/|
* | AL1 refactor (#13679)Ryan2021-08-1510-414/+391
| |
* | LFKeyboards: Replace `KC_FNx` with `F(x)` (#13999)Ryan2021-08-1510-44/+44
| |
| * Fix errors that have cropped up in develop (#14005)Zach White2021-08-152-15/+1
| | | | | | | | | | * frooastboard: remove duplicate values from config.h * pistachio_pro: remove unused pin D5
| * [Keyboard] ez_maker/directpins for easy one-offs in qmk_configurator (#13321)Zach White2021-08-1447-0/+1141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new keyboard: handwired/directpins * fix promicro keyboard_name * add teensy2 and teensy2++ support * align with handwired/onekey * tweak pids * add teensy 3.2 and teensy lc to directpins * move directpins from handwired to ez_maker * add docs for easy maker
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-0/+714
| |\ | |/ |/|
* | [Keyboard] Add TKL-FF PCB (#14003)Ramon Imbao2021-08-1410-0/+714
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+216
| |\ | |/ |/|
* | [Keyboard] add Stealth macropad (#13986)Rifaa Subekti2021-08-149-0/+216
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-75/+80
| |\ | |/ |/|
* | Rework keymap_extras docs (#13949)Ryan2021-08-151-75/+80
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-145-60/+76
| |\ | |/ |/|
* | Ducky One2mini Layout Macro fixes (#14002)James Young2021-08-145-60/+76
| |
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-141-4/+537
| |\ | |/ |/|
* | Function96 V2 Configurator fixes (#13996)James Young2021-08-141-4/+537
| | | | | | | | | | | | | | | | | | * info.json: apply human-friendly formatting * correct key sequence for LAYOUT_iso * correct key sequence for LAYOUT_iso_splitspace * add layout data for LAYOUT_all
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-143-111/+133
| |\ | |/ |/|
* | Orthocode Layout Macro rework (#13995)James Young2021-08-143-111/+133
| | | | | | | | | | | | | | | | | | | | | | | | * move rotary encoder to top row of layout macro Makes the layout macro and keycodes resemble the assembled keyboard. * update info.json data - convert tabs to spaces - use human-friendly formatting - fill in key object labels - adjust object sequence for layout macro changes
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-144-37/+131
| |\ | |/ |/|
* | Noxary 378 Layout Macro rework (#13998)James Young2021-08-144-37/+131
| | | | | | | | | | * physically arrange layout macro * add info.json
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-149-0/+292
| |\ | |/ |/|
* | add falcon keyboard (#13674)yulei2021-08-149-0/+292
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added falcon keyboard * Update keyboards/matrix/falcon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/matrix/falcon/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * added description for the bootloader * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-1410-70/+466
| |\ | |