summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Capsunlocked CU80 Squish and Refactor (#12193)maz0r
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Helen80 matrix fixes (#11969)LIParadise
Co-authored-by: LIParadise <a58524andy>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Add Dystopia keyboard (#11997)Sanctified-git
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Sanctified <Sanctified@users.noreply.github.com>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Adding of Monarch keyboard (#11769)RinoSolutions
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Added Koolertron AMAG23 (#11725)Ian McLinden
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18[Keyboard] Add Tau4 keyboard (#11361)Oliver Gaskell
with default and i2cscanner keymaps Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-04-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-19Fixup Satisfaction75 bootprocess. (#12621)Nick Brassel
- Use normal ChibiOS I2C driver. - Move drawing code to housekeeping -- previously it was during matrix scan, which gets executed during bootmagic checks. However, bootmagic is invoked before QWIIC subsystem is enabled, which means I2C isn't configured yet. All I2C calls to the OLED fail with timeouts while bootmagic is being checked. Housekeeping ensures this is executed once the system has initialised and settled. - QWIIC OLED driver: properly clear out OLED buffer when clearing screen.
2021-04-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18Add RGB controls to picture; label Layer 3 correctly (#12337)Richard Dawe
2021-04-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18Keymap: Orthocarpus keymap for idobo (#12462)Giorgi Chavchanidze
* Keymap: Orthocarpus keymap for idobo * Update keyboards/idobo/keymaps/gkbd_75/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18keyboardio/atreus: Add ardumont keymap (#12479)Antoine R. Dumont
2021-04-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-18Add ferris 0.2 (#12133)Pierre Chevalier
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-17Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-17mcrown crkbd new keymap (#12092)MarioCorona
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-16Ergodone via support (#11618)Harshit Goel
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-16Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-16Bug in beautifier script, compound modifiers not correctly parsed (#12595)sendmmsg
2021-04-15Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes (#11935)Joshua Diamond
* Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes * Better comment Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15Fix audio on WT60-XT (#12526)Wilba
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15Optimize NIBBLE oled_bongocat keymap to reduce flash usage (#12330)Jay Greco
* Optimize with squeez-o frame compression Adds VIA support! * Clean up for PR + Add copyright header - Remove debug print statements
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-15update readme (#12322)MechMerlin
2021-04-15LED Matrix: Task system (#12580)Ryan
2021-04-15Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14Add support for tab completion (#12411)Zach White
* Add support for tab completion * make flake8 happy * Add documentation
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14Dactyl manuform 5x6 2 5 keymap (#11353)Jan Christoph Ebersbach
* feat(keymap): add DactylManuform w/ 2 extra keys and 5 thumb keys * fix(keymap): add missing readme * chore: add gpl2 license header * chore: add gpl2 license header * docs[dactyl_manuform_5x6_2_5]: reformat readme Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-14[Keyboard] CyberGear Macro25 (#12518)Marius Kavoliunas
* add cybergear macro25 keyboard * add readme and fix file namings * rename readme.md * separate default and via keymaps * add info.json * unify info.json and key coordinates * remove via json * add missing via layers * Update keyboards/cybergear/macro25/keymaps/via/rules.mk * Update keyboards/cybergear/macro25/macro25.c * Update keyboards/cybergear/macro25/macro25.h * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * Update keyboards/cybergear/macro25/readme.md * remove unnecessary config.h parameters * Update keyboards/cybergear/macro25/config.h * remove MATRIX_ROWS and COLS from config.h * Apply suggestions from code review set to LAYOUT_ortho_2x5 and fix grammar
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13[Keyboard] Add Caffeinated Studios Serpent65 (#12578)J.Flanagan
2021-04-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-04-13Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young
2021-04-13[CI] Format code according to conventions (#12570)github-actions[bot]
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-13Merge remote-tracking branch 'origin/master' into developQMK Bot