summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-9/+9
|\
| * Fix generated file output while target exists (#12062)Joel Challis2021-02-286-9/+9
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-285-258/+301
|\|
| * Extract sendstring into its own compilation unit (#12060)Ryan2021-03-015-258/+301
| | | | | | | | | | | | | | * Extract sendstring into its own compilation unit * License headers? * Put this include in the header
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-285-10/+0
|\|
| * Remove unused keymap_config from ctrl keymaps (#12058)Joel Challis2021-02-285-10/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-0/+5
|\|
| * Modified tmk_core/rules.mk to avoid linking errors (#10728)Fabián González Martín2021-02-281-0/+5
| | | | | | | | | | | | | | * Modified tmk_core/rules.mk to avoid linking errors Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made * Comment updated
* | Format code according to conventions (#12056)github-actions[bot]2021-02-281-16/+8
| | | | | | Co-authored-by: QMK Bot <hello@qmk.fm>
* | Refactor of USB code within split_common (#11890)Joel Challis2021-02-2811-46/+160
| | | | | | | | | | | | | | | | | | | | | | * Initial refactor of usb code within split_common * Add headers * Correct disable condition * Format * Align func name
* | ARM - Refactor SLEEP_LED to support more platforms (#8403)Joel Challis2021-02-2825-71/+96
| | | | | | | | | | | | | | | | | | | | | | * Initial refactor of ARM SLEEP_LED to enable more platforms * fix build issues * Disable SLEEP_LED for boards with no caps lock code * Enable GPT14 for boards with caps lock code and SLEEP_LED enabled * Enable GPT for boards with caps lock code and SLEEP_LED enabled
* | Overhaul bootmagic logic to have single entrypoint (#8532)Joel Challis2021-02-2815-153/+227
| | | | | | | | | | * Relocate bootmagic logic to have single entrypoint * Align init of layer state
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-284-1/+34
|\|
| * Implement PLOOPY_DRAGSCROLL_INVERT option, which inverts the ploopy ↵Anomalocaridid2021-02-281-0/+5
| | | | | | | | trackball's DRAG_SCROLL's vertical scroll direction. (#12032)
| * Add RGB Matrix support for Preonic rev3 (#12008)Albert Y2021-02-283-1/+29
| | | | | | | | | | | | | | | | | | * Add g_led_config for RGB Matrix support * Corrected indentation * Undo indentation on existing rev3.c code Co-authored-by: filterpaper <filterpaper@localhost>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-3/+103
|\|
| * Kiko's Lab KL-90: Configurator bugfix (#11993)James Young2021-02-281-3/+103
| | | | | | | | | | | | | | * human-friendly formatting * correct key order * correct layout macro name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-243/+65
|\|
| * Keycapsss Kimiko rev1: Configurator bugfix (#11992)James Young2021-02-281-243/+65
| | | | | | | | | | * human-friendly formatting * fix key positioning and order
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-284-3/+18
|\|
| * [Keyboard] Update spiderisland/split78 (#11990)unrelentingtech2021-02-284-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] spiderisland/split78: add MCP23018 reset code Now, communication with the right side gets re-established after unplugging it and plugging it back in. * [Keyboard] spiderisland/split78: configure debouncing I've been experiencing particularly bad bounce on the 'A' key. Also, update maintainer github username
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-283-10/+56
|\|
| * Update lazydesigners/the40 (#11989)jackytrabbit2021-02-283-10/+56
| | | | | | | | | | | | | | | | | | | | | | * Update the40.h Update the40.h to fix keymap * Add VIA support for lazydesigners/the40 Add VIA support for lazydesigners/the40 * Update keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-287-60/+51
|\|
| * Compilation fixes for handwired/concertina/64key (#11987)James Young2021-02-287-60/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * concatenate config.h to 64key directory * move rules.mk to 64key directory This commit makes the firmware actually compile. * insert complete rules.mk contents Conforms the file to QMK's template. * move info.json to 64key directory * remove concertina.h This file no longer serves a purpose now that everything is in the 64key directory. * complete 64key readme.md Conforms the file more to QMK's template.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2837-8/+791
|\|
| * New Variants of Console Keyboard (#11973)gazeddy2021-02-2837-8/+791
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial push of console keyboard variants * update readme * fixed compilation issue * update Readme * added 18 and 27 key variants * missed commas * update info.json * added readme * correct info.json * correct info.json * info.json again * fixed keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-283-0/+52
|\|
| * [Keymap] Initial commit for keyboardio/atreus/dshields keymap. (#11946)Daniel Shields2021-02-283-0/+52
| | | | | | | | | | Incorporating changes suggested during pull request review. Co-authored-by: Daniel Shields <dshields@cboe.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-8/+8
|\|
| * Fix incorrect key for LALT and add modifiers to LED matrix (#11984)datafx2021-02-282-8/+8
| | | | | | Co-authored-by: datafx <digitalfx@phreak.tech>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-286-0/+378
|\|
| * [Keyboard] Dawn60 Rev1 RGB matrix port (#11970)Xelus222021-02-286-0/+378
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor * layout update * fix mods config * lto enable * add eeprom * refactor * final refactor
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2811-0/+667
|\|
| * Add Potato65 PCB (#11956)Aeonstrife2021-02-2811-0/+667
| | | | | | | | | | * Make initial set of files * Update readme.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-287-84/+102
|\|
| * Banana Split VIA Support (#11944)MechMerlin2021-02-287-84/+102
| | | | | | | | | | * add VIA keymap for bananasplit * refactor code to new standards
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2813-0/+382
|\|
| * Added support for barracuda keyboard (#11888)knaruo2021-02-2813-0/+382
| | | | | | - Added default and via keymaps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2810-0/+527
|\|
| * OddForge VE.A (#11875)MajorKoos2021-02-2810-0/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VEA Support * Update LEDs to use QMK methods * Enable Backlight * Update Vendor ID * Updates to enable split RGB * Update readme * Update to split RGB * remove unnecessary reference * Knight animation starts at the back * remove hardcoded variable Co-authored-by: Major Koos <MajorKoos@noreply.users.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-288-3/+176
|\|
| * [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2 (#11739)Andy Freeland2021-02-288-3/+176
| | | | | | | | | | | | | | | | | | * [Keyboard] Add 'LAYOUT_65_ansi_split_bs' support to KBDfans KBD67 rev2 This is already supported by VIA. * [Keymap] Fix kbd67 catrielmuller_camilad keymap * [Keyboard] Add my keymap for KBDfans KBD67 rev2 using 'LAYOUT_65_ansi_split_bs'
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-1/+16
|\|
| * Satisfaction 75 turn off backlight on suspend, restore config on wakeup (#11774)Mario Medina2021-02-282-1/+16
| | | | | | | | | | * Satisfaction 75 turn off backlight on suspend, restore config on wakeup * Disable SLEEP_LED_ENABLE because it has no effect
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-2814-0/+814
|\|
| * Added n60_s folder (#11455)NightlyBoards2021-02-2814-0/+814
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create Alter folder * Revert "Create Alter folder" This reverts commit 361103b821dbb22957b66cdedb0d11f996def71c. * Added n60_s folder * Fixed the url of the image in the readme * Updated readme * Updated readme * Updated readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-282-1/+136
|\|
| * [Docs] New section to modifier docs: Checking Modifier State (#10550)precondition2021-02-282-1/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added new section to docs: Checking Modifier State * Added id anchors to all headers in modifiers docs * Added a Wikipedia link to bitwise operators and... crosslinked to the QMK macro docs. * Added an explanation on the format of mod bitmask * Added .md extension to hyperlinks to macros docs * Corrected mod mask order and changed notation * Documented add_oneshot_mods and del_oneshot_mods * Mentioned modifier checks in the macro docs * Explained strict modifier checking i.e. using `get_mods() & MOD_MASK == MOD_MASK` instead of simply `get_mods() & MOD_MASK` * Added (un)register_mods to the docs * Put left term of comparison in parens
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-02-281-3/+3
|\|