summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1714-0/+797
|\|
| * [Keyboard] Add barleycorn smd keyboard (#12200)Matthew Dias2021-03-1614-0/+797
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-173-0/+102
|\|
| * [Keyboard] add via keymap to afternoonlabs breeze keyboard (#12247)devriesp2021-03-163-0/+102
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-173-2/+53
|\|
| * [Keyboard] Add KMAC VIA keymap (#12224)kaylanm2021-03-163-2/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-176-27/+74
|\|
| * Pimentoso Paddino02 clean-up (#12263)James Young2021-03-166-27/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fork rules.mk to be version-specific * remove pimentoso/paddino02 as a keyboard target This commit makes it so QMK API doesn't identify pimentoso/paddino02 as a build target on its own, because there's no actionable code here. * add image to readme.md * unify rules.mk files to QMK AVR template - remove Bootloader selection comment block - sort Build Option rules - unify inline comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-174-2/+16
|\|
| * Add bootmagic support for hub16 and hub20 (#12257)peepeetee2021-03-174-2/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-178-332/+307
|\|
| * TKC M0lly refactor (#12227)Ryan2021-03-178-332/+307
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-172-73/+89
|\|
| * [Keymap] Mojito - removed layer macros (#12201)Mojitas2021-03-162-73/+89
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-171-1/+1
|\|
| * [Keyboard] fix bm68rgb default keymap (#12199)peepeetee2021-03-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-171-1/+1
|\|
| * [Keyboard] Fix issue with process_record_kb in Torn (#12189)Kyle McAlpine2021-03-161-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-171-2/+2
|\|
| * [Keymap] stanrc85 keymap updates (#12184)stanrc852021-03-161-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1710-0/+412
|\|
| * [Keyboard] Added Roses Lite Support (#12173)Gavin Austin2021-03-1610-0/+412
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-178-0/+360
|\|
| * [Keyboard] Add YMDK NP24 (ATmega32U4 with 6 RGB LEDs) (#12120)Simon Arlott2021-03-168-0/+360
| |
* | core: add support for MK66F18 (Teensy 3.6) micro controller (#12258)Michael Stapelberg2021-03-175-3/+34
| | | | | | This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-161-4/+4
|\|
| * box75: fix key positioning in info.json (#12256)James Young2021-03-161-4/+4
| | | | | | * fix key positioning for box75
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-03-1514-0/+704
|\|
| * Pizza Keyboards Pizza65 addition (#11604)Matteo Montemarani2021-03-1614-0/+704
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Pizza65 from Pizza Keyboards Addition of Pizza65 * Update pizza65.h * Update info.json * Update mcuconf.h * Update rules.mk * Updated makefile * Update keyboards/pizzakeyboards/pizza65/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/pizzakeyboards/pizza65/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/ansi_blocker_doublebs/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/via/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/pizzakeyboards/pizza65/info.json Co-authored-by: Ryan <fauxpark@gmail.com> * Chibios Config migration * Update keyboards/pizzakeyboards/pizza65/readme.md Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com> * Update keyboards/pizzakeyboards/pizza65/readme.md Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com> * Update keyboards/pizzakeyboards/pizza65/pizza65.h Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com> * Update rules.mk nk rollover activation * conf updates * Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker/keymap.c Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com> * Update keyboards/pizzakeyboards/pizza65/keymaps/iso_blocker_doublebs/keymap.c Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com> * Update keymap.c thanks to Acaban * Update pizza65.h update to the iso_blocker_doublebs layout macro * Delete chconf.h Deleting after the ChibiOS-conf migration. * Delete config.h Deleting after the ChibiOS-conf migration. * Revert "Delete config.h" This reverts commit 16d64619e68578382aca3b1475968563b662d07f. * Delete mcuconf.h Deleting after ChibiOS-conf migration. * Delete halconf.h Deleting after ChibiOS-conf migrations. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Jonas Gessner <JonasGessner@users.noreply.github.com> Co-authored-by: Davide Riccardo Caliendo <drc0@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 06:37:42 +0000