summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-199-0/+230
|\
| * [Keyboard] Add Dystopia keyboard (#11997)Sanctified-git2021-04-189-0/+230
| | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-138/+354
|\|
| * [Keyboard] Update MJ61 architecture to support multi version (#11787)MelGeek2021-04-188-138/+354
| | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1911-0/+411
|\|
| * [Keyboard] Adding of Monarch keyboard (#11769)RinoSolutions2021-04-1811-0/+411
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ramon Imbao <ramonimbao@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1910-0/+289
|\|
| * [Keyboard] Added Koolertron AMAG23 (#11725)Ian McLinden2021-04-1810-0/+289
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-198-0/+421
|\|
| * [Keyboard] Add Tau4 keyboard (#11361)Oliver Gaskell2021-04-188-0/+421
| | | | | | | | | | | | with default and i2cscanner keymaps Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-194-125/+15
|\|
| * Fixup Satisfaction75 bootprocess. (#12621)Nick Brassel2021-04-194-125/+15
| | | | | | | | | | | | | | | | | | | | - 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-181-2/+2
|\|
| * Add RGB controls to picture; label Layer 3 correctly (#12337)Richard Dawe2021-04-181-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-183-0/+63
|\|
| * Keymap: Orthocarpus keymap for idobo (#12462)Giorgi Chavchanidze2021-04-183-0/+63
| | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-182-0/+155
|\|
| * keyboardio/atreus: Add ardumont keymap (#12479)Antoine R. Dumont2021-04-182-0/+155
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1817-55/+644
|\|
| * Add ferris 0.2 (#12133)Pierre Chevalier2021-04-1817-55/+644
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-178-0/+790
|\|
| * mcrown crkbd new keymap (#12092)MarioCorona2021-04-178-0/+790
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-165-2/+223
|\|
| * Ergodone via support (#11618)Harshit Goel2021-04-165-2/+223
| | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-161-0/+2
|\|
| * Bug in beautifier script, compound modifiers not correctly parsed (#12595)sendmmsg2021-04-161-0/+2
| |
* | Add missing RGB_MODE_TWINKLE / RGB_M_TW keycodes (#11935)Joshua Diamond2021-04-153-0/+10
| | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-151-25/+22
|\|
| * Fix audio on WT60-XT (#12526)Wilba2021-04-151-25/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-154-258/+452
|\|
| * Optimize NIBBLE oled_bongocat keymap to reduce flash usage (#12330)Jay Greco2021-04-154-258/+452
| | | | | | | | | | | | | | | | | | | | * Optimize with squeez-o frame compression Adds VIA support! * Clean up for PR + Add copyright header - Remove debug print statements
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-151-5/+7
|\|
| * update readme (#12322)MechMerlin2021-04-151-5/+7
| |
* | LED Matrix: Task system (#12580)Ryan2021-04-153-91/+176
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1523-86/+169
|\|
| * Add support for tab completion (#12411)Zach White2021-04-1423-86/+169
| | | | | | | | | | | | | | * Add support for tab completion * make flake8 happy * Add documentation
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-149-0/+785
|\|
| * Dactyl manuform 5x6 2 5 keymap (#11353)Jan Christoph Ebersbach2021-04-149-0/+785
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1410-0/+535
|\|
| * [Keyboard] CyberGear Macro25 (#12518)Marius Kavoliunas2021-04-1410-0/+535
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-1412-0/+372
|\|
| * [Keyboard] Add Caffeinated Studios Serpent65 (#12578)J.Flanagan2021-04-1312-0/+372
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-141-1/+1
|\|
| * Correct layout macro name in Cannonkeys Ortho75 info.json (#12581)James Young2021-04-131-1/+1
| |
* | [CI] Format code according to conventions (#12570)github-actions[bot]2021-04-131-1/+1
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-04-132-0/+38
|\|
| * [Keymap] ANAVI Macro Pad 2 add Google Meet keymap (#12449)Leon Anavi2021-04-132-0/+38
| | | | | | | | | | | | | | | | | | This keymap for ANAVI Macro Pad 2 contains a couple of shortcuts for Google Meet: - left key: turn on/off the microphone (mute button) - right key: turn on/off the camera Signed-off-by: Leon Anavi <leon@anavi.org>
* | Terrazzo: Fix wrong LED Matrix function names (#12561)Ryan2021-04-139-12/+12
| |
* | LED Matrix: suspend code (#12509)Ryan2021-04-135-27/+49
| |
* | [Keymap] Add kzar keymap for Kinesis Advantage (#12444)Dave Vandyke2021-04-134-0/+438
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 20:25:09 +0000