summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-061-0/+116
|\
| * handwired/ortho_brass: add QMK Configurator data (#15755)James Young2022-01-051-0/+116
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-061-1/+59
|\|
| * cannonkeys/adelie: Fix QMK Configurator Implementation (#15754)James Young2022-01-051-1/+59
| | | | | | | | | | * info.json: apply friendly formatting * info.json: correct key sequence
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-053-6/+6
|\|
| * [Keyboard] Remove locking support for Boardsource LP boards (#15747)Albert Y2022-01-053-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-051-56/+57
|\|
| * eol=lf, where appropriate (#15752)Nick Brassel2022-01-051-56/+57
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-052-10/+219
|\|
| * Fix info.json for kbdfans/odin/{rgb,soldered} (#15750)Sergey Vlasov2022-01-052-10/+219
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * kbdfans/odin/*: Reformat info.json to be human-readable Apply `qmk format-json` to the `info.json` files for `kbdfans/odin/rgb` and `kbdfans/odin/soldered; no actual content changes. * kbdfans/odin/*: Fix key ordering in info.json The order of key entries in `info.json` did not match the order of layout macro arguments (apparently the keys in the cursor block, which are shifted down by 0.25u with respect to the rest of keys, were treated as separate rows). Fix the order to make the configurator produce proper keymaps.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-051-1/+1
|\|
| * [Keymap] Fix onekey oled keymap (#15751)Drashna Jaelre2022-01-051-1/+1
| |
* | Fixes for bootloader refactor build failures (#15638)Ryan2022-01-0627-121/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-0578-6668/+0
|\|
| * Remove stale docs translations (#15737)Joel Challis2022-01-0478-6668/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-031-5/+4
|\|
| * Refix "No C files in filelist: None" (#15728)Joel Challis2022-01-031-5/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-032-11/+14
|\|
| * Fix "No C files in filelist: None" (#15560)Joel Challis2022-01-032-11/+14
| | | | | | | | | | | | | | * Fix "No C files in filelist: None" * Align other commands * force absolute paths
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-035-9/+13
|\|
| * [Docs] Note the order of enumerated custom keycodes (#15706)Albert Y2022-01-031-0/+2
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * [Keyboard] change bm60hsrgb/rev2 layout to LAYOUT_60_ansi_arrow (#15701)peepeetee2022-01-034-9/+11
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-031-0/+3
|\|
| * [Keyboard] Keychron Q1: Turn off RGB during PC suspend (#15685)ripdog2022-01-021-0/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-033-24/+32
|\|
| * Fix DracuLad keymap to accomodate for breaking changes. (#15713)Mango The Fourth2022-01-033-24/+32
| | | | | | Co-authored-by: MangoIV <mangoiv@outlook.com>
* | Format code according to conventions (#15705)QMK Bot2022-01-021-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-021-8/+10
|\|
| * Volume as default encoder documentation example (#15678)Albert Y2022-01-021-8/+10
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | move @yangdigi 's keyboards to a YDKB folder (#15681)peepeetee2022-01-0227-3/+3
| |
* | Update pmw3360 comments to match the datasheet better, fix delays. (#15682)uqs2022-01-024-16/+26
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-021-68/+68
|\|
| * Revert "mkiirgb/v3: Swap R and G lanes to achieve correct RGB. (#15511)" ↵Vino Rodrigues2022-01-021-68/+68
| | | | | | | | | | (#15660) This reverts commit 235c666f3d79ca42f8bc529bf006473396cb0bba.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-01-011-3/+3
|\|
| * BM60HSRGB Poker rev2: Fix QMK Configurator Implementation (#15697)James Young2022-01-011-3/+3
| | | | | | | | | | | | | | * fix layout macro reference * correct layout data * correct maintainer field
* | Format code according to conventions (#15693)QMK Bot2021-12-311-1/+1
| |
* | Fix split pointing for analog joystick (#15691)Dasky2021-12-311-2/+4
| | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-311-2/+2
|\|
| * [Bug] Fix analog joystick to mouse compilation (#15677)Dasky2021-12-301-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-3064-1162/+1290
|\|
| * [Keymap] Reorganization, cleanup and readmes for drashna code (#15617)Drashna Jaelre2021-12-2964-1162/+1290
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-291-1/+2
|\|
| * Fix compilation-database command under MSYS (#15652)Joel Challis2021-12-301-1/+2
| | | | | | | | | | * Fix compilation-database command under MSYS * Add comment
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2910-99/+158
|\|
| * [Keyboard] Update to ZSA Keyboards (#15644)Drashna Jaelre2021-12-2910-99/+158
| |
* | [Keyboard] Fix compiler issue with tractyl manuform 4x6 (#15646)Drashna Jaelre2021-12-291-4/+2
| |
* | [Keyboard] Update grs_70ec to use newer custom matrix (#15609)Drashna Jaelre2021-12-291-47/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-291-1/+1
|\|
| * [Keyboard] Fix via keymap in charue/charon keyboard (#15642)Drashna Jaelre2021-12-301-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-2962-35/+1203
|\|