summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-0438-0/+2011
|\
| * [Keyboard] Add Keyboards GL516s (#14950)Salicylic-acid32022-02-0438-0/+2011
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-044-13/+16
|\|
| * Mokey xox70hot: rename LAYOUT to LAYOUT_tkl_nofrow_ansi_tsangan (#16193)James Young2022-02-034-13/+16
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-041-1/+1
|\|
| * Point out that deferred execution needs to be enabled in rules.mk (#16196)Nick Brassel2022-02-041-1/+1
| |
* | Ensure `version.h` is recreated each build. (#16188)Nick Brassel2022-02-042-6/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-031-0/+1
|\|
| * Fix axis inversion (#16179)Richard2022-02-031-0/+1
| |
* | Create a build error if no bootloader is specified. (#16181)Nick Brassel2022-02-033-3/+10
| | | | | | | | | | | | | | | | | | * Create a build error if no bootloader is specified. * Update builddefs/bootloader.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-025-313/+449
|\|
| * Fix a couple of mismatched info.json layout names (#16164)Ryan2022-02-025-313/+449
| | | | | | | | | | | | | | * Fix a couple of mismatched info.json layout names * Fix layouts * Clean up layouts
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-020-0/+0
|\|
| * Fixup line endings for kt60-M.Nick Brassel2022-02-031-17/+17
| |
* | Format code according to conventions (#16169)QMK Bot2022-02-021-17/+17
| |
* | Fixup builds so that teensy EEPROM knows which MCU it's targeting. (#16168)Nick Brassel2022-02-021-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-0211-0/+331
|\|
| * [Keyboard] Add keyten kt60-M (#16150)Ivan Gromov2022-02-0111-0/+331
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-023-52/+106
|\|
| * [Keymap] Add MacOS layer (#16151)Andre Brait2022-02-013-52/+106
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Fix issues with Python Tests (#16162)Drashna Jaelre2022-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | * Reformat python due to yapf changes * Fix pytest keymap list test * revert formatting * Use contra, because, well https://www.reddit.com/r/MechanicalKeyboards/comments/8riofq/did_i_kill_my_contra/
* | Remove old .gitignore entry. Add more macOS junk exclusions. (#16167)Nick Brassel2022-02-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-0211-186/+373
|\|
| * [Keyboard] Added keymaps for SPRH and update encoder (#16098)joedinkle2022-02-0111-186/+373
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-024-1/+94
|\|
| * `qmk doctor`: display qmk_firmware version tag (#16155)Ryan2022-02-012-1/+14
| |
| * [Keyboard] Add YMDK sp64 VIA support (#16152)Adrian Fleiszer2022-02-012-0/+80
| |
* | Fixup multibuild filegen (#16166)Nick Brassel2022-02-022-2/+8
| | | | | | | | | | * Add env variable support to multibuild. * Generate version.h in build-specific location.
* | Don't make EEPROM size assumptions with dynamic keymaps. (#16054)Nick Brassel2022-02-0217-153/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't make EEPROM size assumptions with dynamic keymaps. * Add support for checking against emulated flash, error out if someone attempts to build a board without specifying EEPROM size. * Reorder defines so that MCU is considered last. * Refactor EEPROM definitions for simplicity. * Fix max sizing of kabedon/kabedon980. * Fix max sizing of mechlovin/olly/jf. * Fix unit tests. * Review comments, add messages with values during build failures.
* | [Keyboard] move woodkeys.click keyboards to /woodkeys (#16113)peepeetee2022-01-3191-10/+10
| |
* | [Keyboard] move @drhigsby 's boards into /drhigsby (#16041)peepeetee2022-01-3151-11/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-011-0/+49
|\|
| * [Keyboard] enable rgb modes for jkb65 (#16159)Drashna Jaelre2022-01-311-0/+49
| |
* | [Keyboard] move @vuhopkep 's keebs into /hnahkb (#16102)peepeetee2022-01-3124-6/+6
| |
* | [Keyboard] fix missed .noci in reviung move (#16107)peepeetee2022-01-312-0/+0
| |
* | [Keyboard] move @tominabox1 's keebs into /tominabox1 (#16109)peepeetee2022-01-3175-7/+7
| |
* | [Keyboard] move niu_mini to /kbdfans (#16112)peepeetee2022-01-3150-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-015-16/+55
|\|
| * [Keyboard] R2 version of jadookb/jkb65 (#16129)WiZ.GG2022-01-315-16/+55
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] move @omkbd 's boards to /omkbd (#16116)peepeetee2022-01-31161-51/+51
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-011-3/+3
|\|
| * [Keyboard] ReadMe corrections for crkbd (#16149)Ben Allen2022-01-311-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-013-35/+3
|\|
| * [Keyboard] Typo correction in ferris sweep readme (#16148)Albert Y2022-01-311-1/+1
| |
| * [Keyboard] Simplify handedness for cradio (#16147)Albert Y2022-01-312-34/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-012-0/+4
|\|
| * [Docs] Add reference to data sync options for RGB (#16144)Albert Y2022-01-312-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-02-0110-21/+31
|\|
| * Fixed a bug in pin assignment. (#16158)takishim2022-02-0110-21/+31
| | | | | | | | | | | | Added original copyright notice. Assign the tilde key to layer 1. Co-authored-by: takishim <tadashi@kishimo.to>
* | Small fix for Sol 3 brightness limits (#16157)XScorpion22022-02-012-10/+10
| |