summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] add oled and encoder function to lck75 (#11825)im a can what do you think lmao?
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Modification of ErgoArrows info.json (#11980)Salicylic-acid3
The order of key descriptions in ErgoArrows info.json was wrong, so it has been corrected.
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Add barleycorn smd keyboard (#12200)Matthew Dias
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] add via keymap to afternoonlabs breeze keyboard (#12247)devriesp
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Add KMAC VIA keymap (#12224)kaylanm
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16Pimentoso Paddino02 clean-up (#12263)James Young
* 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
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-17Add bootmagic support for hub16 and hub20 (#12257)peepeetee
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-17TKC M0lly refactor (#12227)Ryan
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keymap] Mojito - removed layer macros (#12201)Mojitas
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] fix bm68rgb default keymap (#12199)peepeetee
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Fix issue with process_record_kb in Torn (#12189)Kyle McAlpine
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keymap] stanrc85 keymap updates (#12184)stanrc85
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Added Roses Lite Support (#12173)Gavin Austin
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16[Keyboard] Add YMDK NP24 (ATmega32U4 with 6 RGB LEDs) (#12120)Simon Arlott
2021-03-17core: add support for MK66F18 (Teensy 3.6) micro controller (#12258)Michael Stapelberg
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
2021-03-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16box75: fix key positioning in info.json (#12256)James Young
* fix key positioning for box75
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16Pizza Keyboards Pizza65 addition (#11604)Matteo Montemarani
* 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>
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-16add support for Noah AVR PCB (#11563)kb-elmo
* add support for Noah AVR PCB * Update info.json * Update readme.md * Update keyboards/kb_elmo/noah_avr/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keymap.c * Apply suggestions from code review Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-16Fixes for recent info.json files (#12248)James Young
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-15Keyboard/grandiceps (#11933)vattern
* Add Grandiceps keyboard * Fix info.json * Fix typo * Fix typo * cleanup format * move mcu files to root * Updated with PR changes * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> * PR issues for chibios confmigrate * PR Changes Co-authored-by: Thys de Wet <thys@vectorphoto.co.uk> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-15M10-A refactor (#12242)James Young
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-15Add missing info.json files for keyboards (#12239)James Young
Recent changes to QMK Configurator's API have made it so an info.json file is required for QMK Configurator to know how to render the keyboard in question. This PR adds info.json files for keyboards that did not have them, with a few exceptions for boards whose layouts I was unable to determine. * add info.json file for 2key2crawl * add info.json file for 40percentclub/4x4 * add info.json file for 40percentclub/5x5 * add info.json file for 4pplet/aekiso60/rev_a * add info.json file for 4pplet/steezy60/rev_a * add info.json file for 6ball * add info.json file for 7c8/framework * add info.json file for aeboards/constellation * add info.json file for alpine65 * add info.json file for aplyard/aplx6 * add info.json file for arch_36 * add info.json file for arisu * add info.json file for box75 * add info.json file for butterstick * add info.json file for four_banger * add info.json file for geekboards/tester * add info.json file for handwired/2x5keypad * add info.json file for handwired/412_64 * add info.json file for handwired/42 * add info.json file for handwired/aplx2 * add info.json file for handwired/brain * add info.json file for handwired/cans12er * add info.json file for handwired/ck4x4 * add info.json file for handwired/d48 * add info.json file for handwired/dactyl_manuform/dmote/62key * add info.json file for handwired/daishi * add info.json file for handwired/hexon38 * add info.json file for handwired/jot50 * add info.json file for handwired/jotanck * add info.json file for handwired/jotpad16 * add info.json file for handwired/k8split * add info.json file for handwired/myskeeb * add info.json file for handwired/nicekey * add info.json file for handwired/onekey * add info.json file for handwired/postageboard * add info.json file for handwired/riblee_f401 * add info.json file for handwired/riblee_f411 * add info.json file for handwired/rs60 * add info.json file for handwired/splittest * add info.json file for handwired/trackpoint * add info.json file for handwired/traveller * add info.json file for hhkb_lite_2 * add info.json file for honeycomb * add info.json file for ivy/rev1 * add info.json file for keebio/viterbi * add info.json file for laptreus * add info.json file for latin47ble * add info.json file for latin64ble * add info.json file for launchpad/rev1 * add info.json file for lets_split_eh/eh * add info.json file for mechmini/v1 * add info.json file for meira * add info.json file for meishi * add info.json file for merge/iso_macro * add info.json file for mschwingen/modelm * add info.json file for pabile/p20 * add info.json files for pimentoso/paddino02 rev1, rev2/left, and rev2/right * add info.json file for rgbkb/pan * add info.json files for runner3680 3x6, 3x7, 3x8, 4x6, 4x7, 4x8, 5x6, 5x7, and 5x8 * add info.json file for sck/gtm * add info.json file for splitish * add info.json file for standaside * add info.json file for ungodly/launch_pad * add info.json file for xelus/trinityxttkl * Revert "add info.json file for rgbkb/pan" This reverts commit 280b89bc6157023a621a9864f5d74d59d62bb511. * correct maintainer for ivy/rev1
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-15Format code according to conventions (#12244)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-15Fix keycode mappings for via and ensure they don't change within protocol ↵xyzz
(#12130) * Fix keycode mappings for via and ensure they don't change within protocol * Update keycodes * Fix broken keyboards * added the missing keycodes found in via * Remove invalid keycodes Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
2021-03-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-14[Keyboard] Added Adellein Keyboard/PCB (#11547)NightlyBoards
2021-03-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-03-14[Keymap] Add yhaliaw keymap for Planck/Rev6.1. (#11318)yhaliaw