summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developJames Young2021-08-0939-384/+815
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes merge conflicts in: - keyboards/bm40hsrgb/config.h - Conflict from PR 13132: - RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch - updated file with changes from master branch - keyboards/keebio/iris/keymaps/nstickney/keymap.c - Conflict from PR 11456: - layer_state_set_user() updated in develop branch, removed in master branch - updated file with changes from master branch
| * Limit RGB max brightness on KPrepublic BM-series keyboards (#13132)Daniil Yastremskiy2021-08-096-10/+29
| |
| * Support all the 0.2 Ferris variants (#12653)Pierre Chevalier2021-08-0921-11/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Support all the 0.2 Ferris variants For the Compact, the High and the Mini, create a new directory so each keyboard may have the correct USB descriptor and a readme with more specific information about it. For the Bling, also add support for the underglow functionality. Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the name of the company I incorporated to sell keyboards, and change the default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more descriptive. I didn't update the 0.1 variants as I don't intend to sell these kits with "Cuddly Keyboards". The firmware is mostly there to support existing users. Update the "hardware availability" to point to my new website: cuddlykeyboards.com. * Add RGB mode toggle to my keymap and to the default keymap * Improve wording in the readme
| * [User] changes to nstickney's keymaps (#11456)Stick2021-08-0912-362/+477
| | | | | | | | | | | | 0) Built a Bastyl, gave away the ErgoDoxEZ 1) UNICODEMAP 2) Iris left is now Elite-C 3) New QMK flashing instructions
* | Remove backwards compatibility of debounce names (#13877)Joel Challis2021-08-0911-56/+10
| | | | | | | | | | | | | | * Remove backwards compatibility of debounce names * Update docs * Update keyboards/keymaps
* | Remove ONEHAND_ENABLE (#13920)Joel Challis2021-08-095-7/+3
| |
* | Fixup rgb matrix config for KBD67 mkII boards (#13931)Drashna Jaelre2021-08-094-340/+198
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-092-0/+199
|\|
| * [Keymap] new keymap for nui_mini (#13924)Edvard Sire2021-08-092-0/+199
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-093-0/+87
|\|
| * [Keymap] Add kbd67 mkiirgb keymap (#13884)Pascal Pfeil2021-08-093-0/+87
| | | | | | | | Co-authored-by: Spaceman <rionlion100@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Make default keymap for GMMK Pro reflect stock (#13850)Andre Brait2021-08-095-24/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-098-0/+170
|\|
| * [Keyboard] Add TouhouPad (#13915)Michele Ferri2021-08-098-0/+170
| | | | | | | | | | | | | | * Touhoupad rev 2 * cleanup for PR * fixes after review
* | Merge remote-tracking branch 'origin/master' into developZach White2021-08-0935-18/+3370
|\| | | | | | | | | Conflicts: keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
| * Fix generate api (#13930)Zach White2021-08-092-2/+2
| | | | | | | | | | * Add missing returncode to exit() * fix the aozora/hotswap vendor id
| * make json imports more robust (#13928)Zach White2021-08-091-1/+4
| |
| * [Keymap] rootiest for planck/rev6/ (#13294)Chris2021-08-094-0/+2137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * squashed commits to master * Fix in case of missing user_song_list Substitutes missing songs with safe versions Also updated and added detail to keymap readme * Adjust Readme to match qmk contrib conventions * Update keyboards/planck/keymaps/rootiest/config.h * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Update keyboards/planck/keymaps/rootiest/keymap.c * Fixed license header to GPLv2+ * Fix Volume key delay Use a static number instead of removed MEDIA_KEY_DELAY * Use TAP_CODE_DELAY * added license to config.h * Clean up formatting - Fixed markdown in readme - Removed extra commented line from config.h * Update keyboards/planck/keymaps/rootiest/config.h
| * [Keyboard] Undead 60M (#13735)jfescobar182021-08-089-0/+343
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add Aozora (hotswap) keyboard (#13919)Phooood2021-08-087-0/+254
| | | | | | | | | | | | | | | | | | | | | | * Initial Commit * added header to hotswap.c * added keymap-specific reamdme.md * minor adjustments * Requested corrections to readme's
| * [Keyboard] Add kbdfans kbd67 mkii rgb v3 (#13714)datafx2021-08-0713-135/+632
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Fix compilation issue. (#13926)Nick Brassel2021-08-091-1/+1
| |
* | Add support for STM32F407x MCUs. (#13718)thpoll832021-08-099-2/+447
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add support for STM32F407x MCUs. * Removing STMF407 MCU variation * Update quantum/mcu_selection.mk Remove options for dfu flashing Co-authored-by: Ryan <fauxpark@gmail.com> * DISABLE STM32_USB_USE_OTG1 * Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h Co-authored-by: thomas.pollak <thomas.pollak@dynatrace.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0821-4/+310
|\|
| * [Keyboard] Add Pancake v2 (#13839)Spaceman2021-08-0721-4/+310
| | | | | | | | 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-082-1/+15
|\|
| * [Keyboard] Added CapsLED and ScrollLock LEDs (#13837)Ananya Kirti2021-08-072-1/+15
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | [Keymap] Drashna split transport improvement (#13905)Drashna Jaelre2021-08-0712-71/+204
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix up split stuff * Fix Split perf issues * Allow LTO to be disabled * Fixup WPM and encoders * Fixup qmk keys per scan * Add bootloader info * Change encoder pins * Fixup corne oled code * Expand transport sync * Improve user transport * Cleanup mouse processing at keymap level * Improve layer checking for mouse layering
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-084-17/+114
|\|
| * [Keyboard] a1200 converter minor changes (#13848)8bits4ever2021-08-074-17/+114
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0812-0/+338
|\|
| * [Keyboard] Gorthage Truck - New PCB (#13909)jpuerto962021-08-0712-0/+338
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-086-139/+106
|\|
| * [Keyboard] Clean up lfkpad and add keymap (#13881)Pascal Pfeil2021-08-076-139/+106
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-081-0/+104
|\|
| * [Keyboard] Adding my Nyquist keymap (#13858)peott-fr2021-08-071-0/+104
| |
* | [Keyboard] Fix matrix_output_unselect_delay for handwired/xealousbrown (#13913)Drashna Jaelre2021-08-081-3/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-073-22/+10
|\|
| * [Keyboard] fixes for KBD67 rev2 (#13906)kb-elmo2021-08-073-22/+10
| |
* | Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines Part 2 (#13912)Drashna Jaelre2021-08-074-5/+4
| |
* | Refactor `quantum/command.{c,h}` for code size & {read,maintain}ability (#11842)Liyang HU2021-08-072-317/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * quantum/command.c: coalesce `print()`s in `command_common_help()` & `print_version()` Also undo some damage by clang-format in b624f32f94 * quantum/command.c: replace `print(…); print_{,val_}{dec,hex}*(…);` sequences with single `xprintf(…)` `print_{dec,hex}*(…)` are just `#define`s for `xprintf(…)` anyway. Each additional `xprintf(…)` costs ~8 bytes: the call instructions, plus an additional NUL terminator. This _really_ adds up: this commit saves 814 bytes on my ATmega32. * quantum/command.c: optimise `mousekey_console()` for size & legibility Made various tweaks to the interface, but still functionally identical. Assume `KC_1`…`KC_0` to be contiguous, and removed `numkey2num(…)` entirely. It was exported in `command.h` by 1a0bac8bcc for no obvious reason, before which it was `static`. I doubt anyone uses it. `mousekey_console()` is now enabled regardless of `MK_3_SPEED`. Needs fleshing out for things other than the X11 variant though. This commit saves 638 bytes on my ATmega32.
* | Remove Full Bootmagic (#13846)James Young2021-08-062007-2440/+2083
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-0710-1/+734
|\|
| * [Keyboard] Added 67mk_E PCB (#13869)kb-elmo2021-08-069-0/+733
| | | | | | | | | | * added 67mk_E PCB * add layouts
| * [Keyboard] Modify key drive pins for mojo68 (#13863)bomb2021-08-061-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-075-10/+20
|\|
| * [Keyboard] Use new matrix_output_select_delay api (#13861)Alex Ong2021-08-065-10/+20
| | | | | | | | | | * Use new matrix_output_select_delay api * Updated delay to 15 after more spamming
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-078-0/+474
|\|
| * [Keyboard] add handwired/oem_ansi_fullsize (#13857)Cian Johnston2021-08-068-0/+474
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add new keyboard oem_ansi_fullsize * clang-fmt * Update keyboards/handwired/oem_ansi_fullsize/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/handwired/oem_ansi_fullsize/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * update info.json using qmk c2json * update info.json * move diagram to readme * add matrix cols/rows to info.json * fixup! add matrix cols/rows to info.json * rename layout, fix block comment * s/ansi_fullsize/fullsize_ansi/g Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-08-071-0/+66
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 22:56:56 +0000