aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-031-1/+1
|\
| * Fix Lily58 Lite Rev3 reversed columns (#24968)Armand du Parc Locmaria2025-03-031-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-033-0/+174
|\|
| * add keyboard: zwerg (#24918)floookay2025-03-033-0/+174
| | | | | | | | | | Co-authored-by: jack <jack@pngu.org> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-035-0/+690
|\|
| * Keycult Zero (#24927)yiancar2025-03-035-0/+690
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initial Commit for Keycult Zero * Update keyboards/keycult/keycult_zero/keycult_zero.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/keycult/keycult_zero/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: yiancar <yiancar@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-0219-0/+1554
|\|
| * Add splitkb.com's Elora (#22557)leah-splitkb2025-03-0219-0/+1554
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add splitkb's Elora * WIP * Make requested changes * fix missing call to keyboard init user for elora * sync vial_qmk with qmk * Add fixes * Add encoder quadrature and update files * Update Readme * Implement changes * Remove encoder driver from keyboard.json * make requested changed * Implement changes and remove myriad_task as it wasn't actually doing anything. * Remove myriad.h from matrix.c * Simplify OLED code debug * Update RGB keycodes (qmk#24484) * remove rules.mk (qmk#23281) * Add matrix state sync --------- Co-authored-by: NapOli1084 <10320176+NapOli1084@users.noreply.github.com> Co-authored-by: harveysch <126267034+harvey-splitkb@users.noreply.github.com> Co-authored-by: harvey <harvey@splitkb.com> Co-authored-by: VeyPatch <126267034+VeyPatch@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-023-0/+189
|\|
| * [Keyboard] Valor Rev3 (#22581)Xelus222025-03-023-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial valor * update * fixup and move to info.json * clean up keymap * code review from lesshonor * Update keyboards/xelus/valor/rev3/readme.md Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> * Update readme.md * Update keyboards/xelus/valor/rev3/rev3.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update rev3.c * Remove custom rev3.c * remove via keymap * remove empty rules.mk * Update keyboards/xelus/valor/rev3/keymaps/default/keymap.c Co-authored-by: jack <jack@pngu.org> --------- Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Xelus22 <> Co-authored-by: jack <jack@pngu.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-0214-0/+1104
|\|
| * Add Keychron C2 Pro V2 (#24900)adophoxia2025-03-0214-0/+1104
| | | | | | Same changes as for C1 Pro V2
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-0216-0/+1093
|\|
| * Add Keychron C1 Pro V2 (#24899)adophoxia2025-03-0216-0/+1093
| | | | | | | | | | | | | | | | | | * Add C1 Pro V2 * Remove default values for f401xC generic board definition * Update clang and copyright years * Add version description
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-013-0/+1009
|\|
| * Adding support for the VKR 94 (#24883)blindassassin1112025-03-013-0/+1009
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding support for the VKR 94 * Update keyboards/viktus/vkr94/keyboard.json Co-authored-by: Joel Challis <git@zvecr.com> * Delete keyboards/viktus/vkr94/config.h * Delete keyboards/viktus/vkr94/rules.mk * Update readme.md --------- Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-015-0/+121
|\|
| * Add keyboard suika15tone (#24947)suikagiken2025-03-015-0/+121
| | | | | | | | | | | | | | | | | | | | | | * Add keyboard suika15tone * Update keyboards/suikagiken/suika15tone/keyboard.json Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-014-0/+166
|\|
| * Add Chickpad (#24895)era2025-03-014-0/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ChickPad Add ChickPad * Add Chickpad Add Chickpad * Add PCB image Add PCB image * Update keyboards/era/sirind/chickpad/keyboard.json Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/era/sirind/chickpad/config.h Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/era/sirind/chickpad/keymaps/default/keymap.c Co-authored-by: jack <0x6a73@protonmail.com> * Update keyboards/era/sirind/chickpad/readme.md Co-authored-by: jack <0x6a73@protonmail.com> --------- Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: jack <jack@pngu.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-011-3/+3
|\|
| * [Docs] Fix example code in quantum_painter.md (#24897)Eric Banker2025-03-011-3/+3
| | | | | | https://github.com/qmk/qmk_firmware/issues/24896
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-013-0/+92
|\|
| * Add Janky No.9 (#24910)telybelly2025-03-013-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Janky No.9 Add Janky No.9 * Update readme.md * Update keyboard.json updated as per waffle87 suggestions, and run qmk format-json * Apply suggestions from code review updated as per suggestions from zvecr Co-authored-by: Joel Challis <git@zvecr.com> --------- Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-012-0/+2
|\|
| * Add `tkl_f13_ansi_tsangan` community layout to novelkeys/nk87* (#24730)arcmags2025-03-012-0/+2
| | | | | | | | | | | | | | | | | | * missing LAYOUTS added to novelkeys/nk87*/rules.mk * Revert "missing LAYOUTS added to novelkeys/nk87*/rules.mk" This reverts commit 43917bfc3638ebde58bc8c2b6b8cbc477343b646. * missing community layouts added to novelkeys/nk87*/keyboard.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-03-013-0/+145
|\|
| * Add Handwired Cherry Protype (#24806)Danny2025-03-013-0/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add handwired Cherry Protype * Fix instructions * Replace tabs with spaces Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/protype/keyboard.json Co-authored-by: Drashna Jaelre <drashna@live.com> --------- Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-02-2810-0/+747
|\|
| * Add Mechboards Lily58 variant and common code. (#24937)Dasky2025-02-2810-0/+747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add lily58 and common code * Apply suggestions from code review Co-authored-by: jack <jack@pngu.org> * Apply suggestions from code review Co-authored-by: jack <jack@pngu.org> --------- Co-authored-by: jack <jack@pngu.org>
* | [Cleanup] Handling of optional `*.mk` files (#24952)Pablo Martínez2025-02-281-30/+11
| | | | | | replace check + `include` with `-include`
* | Implement battery level interface (#24666)Joel Challis2025-02-2812-0/+275
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Branch point for 2025q2 breaking change.Nick Brassel2025-02-271-0/+4
| |
* | Merge remote-tracking branch 'upstream/master' into developNick Brassel2025-02-270-0/+0
|\|
| * Merge remote-tracking branch 'upstream/develop'Nick Brassel2025-02-27585-4855/+9774
| |\ | |/ |/|
* | Merge point for 2025q1 breaking change.Nick Brassel2025-02-271-4/+0
| |
* | 2025q1 develop changelog (#24949)Joel Challis2025-02-275-11/+148
| | | | | | | | Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Community modules (#24848)Nick Brassel2025-02-2637-84/+987
| |
* | fix EEPROM driver for STM32L0/1 cat.1 devices (#24928)Joel Beckmeyer2025-02-261-9/+36
| |
* | Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24938)Joel Challis2025-02-227-9/+15
| |
* | Updates to Ploopy Classic, Mouse, and Thumb for RP2040 hardware upgrade (#24880)ploopyco2025-02-2138-99/+311
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-02-201-1/+1
|\|
| * Bump JamesIves/github-pages-deploy-action from 4.7.2 to 4.7.3 (#24933)dependabot[bot]2025-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](https://github.com/jamesives/github-pages-deploy-action/compare/v4.7.2...v4.7.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-02-181-0/+2
|\|
| * Fix startup sound for Planck (#24893)Juno Nguyen2025-02-181-0/+2
| |
* | Created SH1107 driver for quantum painter (#24724)Steve Storck2025-02-166-0/+339
| | | | | | | | Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Migrate some DEFAULT_FOLDER to keyboard_aliases.hjson (#24915)Joel Challis2025-02-1637-58/+90
| |
* | Update for 'A-JAZZ AKC084' ('A-JAZZ AKP846') (#24868)Nizhegorodtsev Vyacheslav Sergeyevich2025-02-163-13/+13
| | | | | | Fix indicators, image, bootloader instructions and default keymap for 'A-JAZZ AKC084'
* | Patch up issue for inverted complementary output on Backlight (#24794)HorrorTroll2025-02-161-2/+2
| | | | | | Change complementary output to active high, when backlight on state is 1
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2025-02-161-1/+1
|\|