summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2410-0/+245
|\
| * Add UC-1 keypad (#11926)duoshock2021-03-2410-0/+245
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-232-34/+50
|\|
| * Configurator fixes for handwired/concertina/64key (#12316)Viktor Eikman2021-03-232-34/+50
| | | | | | | | | | * Fixed bug that was hiding a key in info.json. * Improvements to presentation.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-237-11/+351
|\|
| * Add Sinc Rev. 2 (#12138)Danny2021-03-237-11/+351
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-231-1/+1
|\|
| * Update readme.md on quefrency (#12276)Luca Di Bartolomeo2021-03-231-1/+1
| | | | | | | | | | | | | | | | * Update readme.md on quefrency Fix incorrect flashing instructions * Update keyboards/keebio/quefrency/readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-231-1/+9
|\|
| * use layout aliases when processing info.json (#12333)Zach White2021-03-221-1/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-218-8/+8
|\|
| * Fix Kira80 license headers (#12303)kb-elmo2021-03-218-8/+8
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Durgod keyboard refactor in preparation for adding additional durgod ↵Donald Kjer2021-03-2128-1296/+504
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | keyboards (#11978) * Durgod keyboard refactor in preparation for adding additional durgod keyboards * Moving Durgod board configuration into a common location * Reformatting layout macro whitespace * Moving TGUI key functionality to the keyboard level * Replacing default keymap.c with keymap.json * Changing default and default_toggle_mac_windows keymaps to LAYOUT_all * Increasing EEPROM size to support more VIA layers * Fixing media keys; KC_MRWD/KC_MFFD => KC_MPRV/KC_NXT * Move ISO Enter key to the correct row in Durgod K320 * Minor whitespace and readme cleanup for K320 * Changing durgod/k320 debounce back to default * Simplifying DURGOD_STM32_F070's chconf.h Co-authored-by: Simon Arlott <sa.me.uk> Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-201-13/+14
|\|
| * Boston: correct LAYOUT macro data (#12282)James Young2021-03-201-13/+14
| | | | | | | | | | | | - correct macro reference - add missing encoder position - correct maintainer value to reference keyboard maintainer's GitHub account - remove trailing whitespace
* | LED Matrix: Additional common_features.mk tweaks (#12187)Ryan2021-03-201-5/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-2043-0/+1947
|\|
| * [Keyboard] Vanana, Vaguette Lite, and Waaffle (#11441)noclew2021-03-1943-0/+1947
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * added Vanana / Vaguette Lite / Waaffle * changed extra GPIO allocations of Waaffle and Vanana * Apply suggestions from code review changed layout name of vaguette Lite / requested by drashna * Apply suggestions from code review Requested keymap changes have been made. * all changes requested by collaborators are made * RGB config updated / keymap updated * fixed vaguette lite info.json * fixed vaguette lite info.json * fixed vaguette lite info.json * Apply suggestions from code review request changes are made * pre rename h * vaguettelite reanmed to lowercases * fixed vanana keymap * Apply suggestions from code review * changed Bootmagic key of VaguetteLite as suggested * Updated via keymap of Vaguette Lite as suggested * add vaguette lite 6.25 layout * added vaguette lite noclew keymap * updated vaguette lite 6.25u keymap description * updated vanana default keymap * updated keymap spacing * reabased from the official repo * Update keymap.c fixed vaguette lite keymap * Apply suggestions from code review All the requested changes by a collaborator were made. * updated info.json of Vanana and readme files of Vanana and waffle * rename LAYOUT_waaffle to LAYOUT_ortho_5x16 Also adjusts the info.json data to put a visual gap between the extension and main PCBs. * make rules.mk and info.json specific to rev3 Removes nckiibs/waaffle as a build target, as it redirects to the only extant revision in the repository. * add controller board build targets Adds build targets for Pro Micro and Elite-C builds, with appropriate defaults for each. Running `make nckiibs/waaffle/rev3` defaults to a Pro Micro-based build.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-193-113/+86
|\|
| * Sirius UniGo66 touch-up (#12280)James Young2021-03-193-113/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * un-nest layout macros * use #pragma once include guard in unigo66.h * unify rules.mk to QMK AVR template - remove Bootloader selection comment block - unify Build Option header comment - align Build Option rules and inline comments * remove unused LAYOUT_all macro * update readme.md to match QMK template
* | Format code according to conventions (#12292)github-actions[bot]2021-03-191-9/+6
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | ARM WS2812 SPI config (baudrate and circular buffer) (#12216)Xelus222021-03-192-4/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial commit * include circular buffer command * add endif * circular buffer mode * remove untrue comment * revamp and add documentation * do not allow WS2812_SPI_SYNC & CIRCULAR_BUFFER
* | Consistently use bin/qmk when that script is called (#12286)Zach White2021-03-183-3/+4
| | | | | | | | | | * Pass QMK_BIN down to build_keyboard.mk * choose the correct qmk script
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-181-5/+11
|\|
| * `qmk doctor`: Don't run udev checks under WSL (#12231)Ryan2021-03-191-5/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1815-0/+323
|\|
| * [Keyboard] Add Pachi (#12132)Xelus222021-03-1915-0/+323
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-184-10/+8
|\|
| * Fixed keymap names of Noah AVR (#12265)kb-elmo2021-03-194-10/+8
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-182-5/+80
|\|
| * Aleblazer Zodiark touch-up (#12279)James Young2021-03-182-5/+80
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-182-4/+4
|\|
| * [CI] Format code according to conventions (#12277)github-actions[bot]2021-03-182-4/+4
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-189-401/+392
|\|
| * XT converter cleanup (#12264)Ryan2021-03-189-401/+392
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-178-0/+302
|\|
| * Adding Keyboard: GMMK Pro (#12030)Salman2021-03-188-0/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * GMMK Pro QMK Firmware Code * info.json added * updated info.json for the unused keys * redoing info.json * readme for pro * gmmk initial readme * pipeline fix, issue with compiling gmmk.h * gmmk pro code formatting changes * removed rules.mk * noci file * Updates * updated matrix function to match keymap * updating the keymap layout, renaming matrix, updating layout name to LAYOUT * fauxpark changes added * PID VID updates * removed chconfig and made rules.mk comments cleaner Co-authored-by: Drashna Jael're <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-178-0/+328
|\|
| * [Keyboard] Add handwired/bolek keyboard (#12234)klausweiss2021-03-178-0/+328
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-175-0/+908
|\|
| * [Keymap] jumper149 keymap for the dztech/dz65rgb (#12142)Felix Springer2021-03-175-0/+908
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-179-0/+1196
|\|
| * [Keymap] Add userspace rverst (#12205)Robert Verst2021-03-179-0/+1196
| | | | | | Co-authored-by: Robert Verst <robert.verst@tobit.com>
* | [Keyboard] Split RGB Matrix Zygomorph support (#11083)XScorpion22021-03-163-71/+49
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-178-0/+351
|\|
| * [Keyboard] Add support for ortho4exent (#11699)tszaboo2021-03-168-0/+351
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.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-03-175-159/+130
|\|
| * [Keyboard] add oled and encoder function to lck75 (#11825)im a can what do you think lmao?2021-03-165-159/+130
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-171-51/+52
|\|
| * [Keyboard] Modification of ErgoArrows info.json (#11980)Salicylic-acid32021-03-161-51/+52
| | | | | | The order of key descriptions in ErgoArrows info.json was wrong, so it has been corrected.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 14:31:42 +0000