summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into developfauxpark2022-02-1914-19/+25
|\
| * Fix a couple of boards being wrongly identified as AVR (#16377)Ryan2022-02-192-1/+7
| |
| * [Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373)Simon2022-02-1711-16/+16
| |
| * Fix build error for LED Matrix effect solid_reactive_wide. (#16383)Joakim Tufvegren2022-02-171-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2022-02-1723-1980/+532
|\|
| * `mokey/xox70`: clean up layouts (#16375)Ryan2022-02-175-310/+531
| |
| * [Bug] Re-add call to `suspend_power_down_kb()` (#16382)Joakim Tufvegren2022-02-171-0/+1
| |
| * [Keyboard] Remove Helix/rev1 (#16389)Takeshi ISHII2022-02-1717-1672/+0
| |
* | Align new-keyboard with recent schema updates (#16378)Joel Challis2022-02-162-3/+3
| |
* | Bodge for helix build failures (#16376)Joel Challis2022-02-163-0/+12
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-151-2/+2
|\|
| * Update USB VID and PID for Aya (#16363)Dan Nixon2022-02-151-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-153-3/+3
|\|
| * Add extra braces for trackball keymaps (#16361)Ryan2022-02-153-3/+3
| |
* | Align docs to new-keyboard behaviour (#16357)Joel Challis2022-02-154-188/+169
| |
* | Allow NO_PIN within info.json (#16359)Joel Challis2022-02-151-0/+4
| |
* | Various fixes for new-keyboard (#16358)Joel Challis2022-02-154-1/+31
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-157-15/+9
|\|
| * Fix multiple definition errors for trackball "boards" with no keys (#16350)Ryan2022-02-157-15/+9
| |
* | CLI: Minor additions #12795 (#16276)Erovia2022-02-142-52/+76
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-141-25/+25
|\|
| * Xenon: correct QMK Configurator key sequence (#16332)James Young2022-02-131-25/+25
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-1413-48/+1450
|\|
| * Mode M75S Layout Additions, Configurator Data and Code Touch-Up (#16327)James Young2022-02-1313-48/+1450
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * m75s.h: correct matrix position identifier `K5C` is actually on row 4, so it should be `K4C`. * m75s.h: add matrix diagram * add QMK Configurator data * polish whitespace - convert tabs to spaces - update indent to four spaces - remove trailing whitespace * update readme Didn't seem to be fully updated after being copied from the M65S codebase. * add LAYOUT_ansi with keymap ANSI layout with 2u Backspace. * add LAYOUT_iso with keymap ISO layout with 2u Backspace. * add LAYOUT_ansi_tsangan with keymap ANSI layout with 2u Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan with keymap ISO layout with 2u Backspace and 7u Spacebar. * add LAYOUT_ansi_split_bs with keymap ANSI layout with Split Backspace. * add LAYOUT_iso_split_bs with keymap ISO layout with Split Backspace. * add LAYOUT_ansi_tsangan_split_bs with keymap ANSI layout with Split Backspace and 7u Spacebar. * add LAYOUT_iso_tsangan_split_bs with keymap ISO layout with Split Backspace and 7u Spacebar.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-142-331/+331
|\|
| * Digicarp65: fix layouts (#16328)Ryan2022-02-142-331/+331
| |
* | Fix compilation of ChibiOS UART driver (#16348)Joel Challis2022-02-131-1/+1
| | | | | | Cherry picked fix from 15724
* | Format code according to conventions (#16322)QMK Bot2022-02-12345-3252/+4939
| |
* | Update keyboard mapping for all moved boards this cycle (#16312)Drashna Jaelre2022-02-121-0/+610
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-123-128/+348
|\|
| * [Keyboard] Convert Maxr1998/Phoebe to use info.json where possible (#16309)Max Rumpf2022-02-113-128/+348
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-129-0/+657
|\|
| * [Keyboard] Lulu keyboard by boardsource (#15951)cole smith2022-02-119-0/+657
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Clang-format tweaks (#15906)Ryan2022-02-111-0/+4
| |
* | [Keyboard] move g heavy industry boards into /gboards (#16040)peepeetee2022-02-1189-22/+22
| | | | | | Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-1214-0/+1247
|\|
| * [Keymap] Add uqs' keymaps for various boards and ploopy mouse (#16265)uqs2022-02-1114-0/+1247
| |
* | move montex to IDOBAO vendor folder (#15668)peepeetee2022-02-129-2/+2
| | | | | | | | | | * move montex to IDOBAO vendor folder * move montex to montex/v1
* | move @satt99 's comet46 to satt/ (#16059)peepeetee2022-02-1228-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-121-0/+105
|\|
| * Add wren configurator data (#16321)Joel Challis2022-02-121-0/+105
| |
* | move mechkeys keyboards into the mechkeys/ vendor folder (#15760)peepeetee2022-02-1179-13/+13
| | | | | | | | | | | | | | * move mechkeys keyboards to mechkeys/ * fix compilation * fix default folder
* | move @takashiski 's keebs into /takashiski (#16089)peepeetee2022-02-1150-6/+6
| |
* | Added external spi flash driver. (#15419)Joy Lee2022-02-114-0/+547
| |
* | Fix right side ws2812 leds having two indices (#15985)Dasky2022-02-111-3/+8
| | | | | | | | | | * Fix right side leds having two indices * remove redundant left check
* | Pass in the keyrecord_t of the dual-role/tapping key when calling per-key ↵precondition2022-02-113-11/+11
| | | | | | | | | | | | | | tap hold functions (#15938) * Replace keyp by &tapping_key in the record arg of per-key tap hold funcs * Replace NULL by &(keyrecord_t){} in 2nd arg of get_tapping_term
* | Various fixes for matrix _RIGHT handling (#16292)Joel Challis2022-02-111-8/+8
| | | | | | | | | | * Various fixes for matrix _RIGHT handling * clang
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-111-1/+1
|\|
| * handwired/promethium: fix missing include (#16317)Ryan2022-02-111-1/+1
| |
* | ps2/avr: use the correct file name (#16316)Idan Kamara2022-02-111-1/+1
| | | | | | | | | | This was missed in https://github.com/qmk/qmk_firmware/pull/14895. Thanks to fauxpark for spotting this.