summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-087-0/+241
|\
| * [Keyboard] Add Rama Works M4-A (#16570)Jason Barnachea2022-03-087-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | * Initial commit Add Rama Works M4-A keyboard. * Update default keymap.c * Update keyboards/machine_industries/m4_a/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-1/+35
|\|
| * `qmk info`: Nicer rendering of big-ass enter (#16541)Ryan2022-03-081-1/+35
| | | | | | | | | | * `qmk info`: Nicer rendering of big-ass enter * Formatting...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-083-0/+50
|\|
| * [keymap] Add via support for Iskar (#16575)drewpyun2022-03-083-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * iskar initial commit * testing * added info.json to iskar * Updated read.me * updated info.json removed unnessary keymap folders, fixed rules.mk, added second layer to default layout, added vendor/product id, tested and compiled * Update readme.md * Update readme.md * updated info.json, formatted files according to PR checklist * Update keyboards/drewkeys/iskar/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/drewkeys/iskar/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * added keymaps onto iskar.h that was referenced in info.json * changed filename to lowercase to match guidelines * initial commit of VIA files * edited via keymap Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0814-0/+370
|\|
| * [Keyboard] Add Y&R Studio zhou65 keyboard (#14192)JX2022-03-0814-0/+370
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-089-0/+508
|\|
| * [Keyboard] Add Novus 60% keyboard (#16473)Callum Hart2022-03-089-0/+508
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Asymmetric encoders, encoder tests. (#16068)Nick Brassel2022-03-0827-138/+921
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-0/+1
|\|
| * [Keyboard] Fix late9/rev1 (#16576)jack2022-03-071-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-083-2/+2
|\|
| * Oddball: set default pointing device driver (#16574)Ryan2022-03-083-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0817-0/+935
|\|
| * [Keyboard] Add Iskar (#16562)drewpyun2022-03-078-0/+688
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add mini winni (#15341)Matthew Dias2022-03-079-0/+247
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0810-0/+300
|\|
| * [Keyboard] Add rb69 (#16526)Ryan Baker2022-03-0710-0/+300
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-084-0/+62
|\|
| * Add HS version of Nebula65b due to different number of per-key-RGB (#16514)yiancar2022-03-074-0/+62
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: yiancar <yiancar@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-084-14/+14
|\|
| * [Bug] Rename has_mouse_report_changed parameters (#16417)ZiTe2022-03-074-14/+14
| | | | | | | | | | | | | | Fixes compilation issues when bluetooth is enabled, due to issues with cpp used by bluetooth code. Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-084-6/+6
|\|
| * [Keyboard] Update encoder code for macro3 (#16005)Albert Y2022-03-074-6/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0814-0/+587
|\|
| * [Keyboard] Add LATE-9 keyboard (#13966)rookiebwoy2022-03-0714-0/+587
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0826-0/+1478
|\|
| * [Keyboard] Idobao ID87 v2 (#15875)peepeetee2022-03-0710-0/+483
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keyboard] Add Winry315 keyboard (#15894)Sergey Vlasov2022-03-0716-0/+995
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-087-0/+373
|\|
| * [Keyboard] Add KB58 (#15896)Beanaccle2022-03-077-0/+373
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0810-0/+587
|\|
| * [Keyboard] TKC Portico68 v2 (#15916)TerryMathews2022-03-0710-0/+587
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0827-0/+2414
|\|
| * [Keyboard] Uthol (#16393)Uthol2022-03-0727-0/+2414
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0820-0/+1317
|\|
| * [Keyboard] Add parallel 65 (#16445)Matthew Dias2022-03-0720-0/+1317
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-3/+3
|\|
| * Fix in-page links in reference_info_json.md (#16487)peepeetee2022-03-071-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-082-0/+96
|\|
| * [Keymap] Add nabos keymap to dactyl_manuform (5x6) (#16547)Nabos2022-03-072-0/+96
| | | | | | Co-authored-by: Nicolas Ballet <balletn@igbmc.fr>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-082-34/+18
|\|
| * [Keyboard] Change maximum LED brightness for naked48 (#16564)Salicylic-acid32022-03-072-34/+18
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-081-1/+1
|\|
| * [Keyboard] Change vendor ID for sick68 keyboard (#16563)Umberto Baldi2022-03-071-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-087-0/+283
|\|
| * [Keyboard] Add Morizon (#16549)Steven Karrmann2022-03-077-0/+283
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-0811-0/+294
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 16:59:16 +0000