summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-2125-0/+1781
|\
| * Add Keychron C2 Pro (#20701)lalalademaxiya12023-06-2025-0/+1781
| | | | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-2110-0/+735
|\|
| * [Keyboard] Add Monsgeek M5 (#21182)jonylee@hfd2023-06-2010-0/+735
| | | | | | | | | | Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-211-2/+2
|\|
| * [Docs] Code markdown amendment (#21323)Albert Y2023-06-201-2/+2
| |
* | ProtoTypist PT-60 Refactor (#21322)James Young2023-06-205-72/+103
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-213-16/+23
|\|
| * NovelKeys NK+: correct layout data (#21317)James Young2023-06-213-16/+23
| | | | | | | | | | | | | | * NovelKeys NK+: correct layout data Add key sizes to the layout data. * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-217-45/+103
|\|
| * Planck Matrix Fixes (#21196)Jack Humbert2023-06-205-31/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix non-default keymap compiling, initial matrix state, watchdog options * fix: allow planck/rev7 to be used with ENCODER_ENABLE = no * chore: update function name on all cases. * remove old midi tone option Co-authored-by: Ryan <fauxpark@gmail.com> * fixes abhixec's planck keymap * add audio enable condition to abhixec's planck keymap * add audio enable condition to all muse includes * Revert "add audio enable condition to all muse includes" This reverts commit 9779e908970dbf7cf81b1a3f968ef2e85ae2b76f. * Revert "add audio enable condition to abhixec's planck keymap" This reverts commit 24c742a5e8ddd55c45ce9f1917b0cb237d4bf721. * Revert "fixes abhixec's planck keymap" This reverts commit 4bb085d1ff00febc92ff6211da4fb776c6379fad. --------- Co-authored-by: Peter.Falken <luis@bitjester.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Kalakos Bahrnob65 Configurator Layout Touch-Up (#21309)James Young2023-06-202-14/+61
| | | | | | | | | | | | | | * [enhancement] add matrix diagram * [refactor] friendly-format info.json * [enhancement] remove key overlaps
* | Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (#21272)Nick Brassel2023-06-218-66/+59
| |
* | EC Pro X JIS Layout Touch-Up (#21260)James Young2023-06-203-85/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [refactor] update `info.json` for readability - sort the JSON objects representing the keyboard's keys in the order: - label, matrix, x, y, w, h - convert numeric JSON values to integers where appropriate * [refactor] remove key labels from `info.json` * [refactor] keymap refactor - grid-align keycodes * [bugfix] move Enter key to home row Moves the JSON object representing the Enter key to the home row. Fixes an issue that resulted in correct key assignment only if the keymap being compiled/flashed was based upon the `via` keymap.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-202-44/+44
|\|
| * KJ-Modify RS40 Configurator Touch-Up (#21311)James Young2023-06-202-44/+44
| | | | | | | | | | | | | | | | | | | | | | | | * [refactor] friendly-format info.json * [enhancement] remove key overlap Fix a key overlap in the Configurator rendering between LCtrl and Fn2. * [enhancement] replace store links with product links Replace URLs that point to the vendor's shop with URLs to the vendor's product listing.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-2024-0/+1478
|\|
| * [Keyboard] Add Keychron C1 Pro (#20700)lalalademaxiya12023-06-2024-0/+1478
| | | | | | | | | | | | Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-206-0/+188
|\|
| * [Keyboard] Add Alisaie (#21266)Roberts Kursitis2023-06-206-0/+188
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-208-0/+150
|\|
| * [Keyboard] Add bigsmoothknob (#21265)Derek2023-06-208-0/+150
| | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: jack <0x6a73@protonmail.com>
* | Move kb83 keyboard (#20761)jonylee@hfd2023-06-1912-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move hfdkb/keyboard_sw/k83 --> inland/kb83 * move hfdkb/keyboard_sw/k83 --> inland/kb83 * Update data/mappings/keyboard_aliases.hjson * Update keyboard_aliases.hjson * fixed the Configurator layout data * fixed the Configurator layout data * Revert "Update keyboard_aliases.hjson" This reverts commit c085c547656d09a14b9b0fad6a00f9551106719f. * Revert "fixed the Configurator layout data" * Update keyboard_aliases.hjson * Update info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-201-0/+2
|\|
| * [Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (#21290)Drashna Jaelre2023-06-191-0/+2
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-204-72/+944
|\|
| * dnworks SBL Community Layout Support and Touch-Up (#21267)James Young2023-06-194-72/+944
| |
* | Fixup `nightly_boards/n40_o` (#21307)jack2023-06-199-85/+36
| |
* | Remove encoder in-matrix workaround code (#20389)jack2023-06-19241-5234/+1105
| |
* | Fixup `dekunukem/duckypad` (#21298)jack2023-06-197-143/+94
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-191-13/+13
|\|
| * Tsubasa Handwired: correct layout data (#21295)James Young2023-06-191-13/+13
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-191-25/+26
|\|
| * HFDKB K83 Configurator Layout Fix (#21297)James Young2023-06-181-25/+26
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-196-0/+437
|\|
| * [Keyboard] Add support for Alveus MX PCB (#21238)mechlovin2023-06-186-0/+437
| | | | | | | | Co-authored-by: jack <0x6a73@protonmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-197-0/+55
|\|
| * Swap G431 to transient EEPROM. Add G431 and G474 onekeys. (#21282)Nick Brassel2023-06-197-0/+55
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-196-231/+265
|\|
| * Geistmaschine Geist Layout Refactor and Touch-Up (#21288)James Young2023-06-186-231/+265
| |
* | Remove default `TAPPING_TERM` from keyboard config.h (#21284)Ryan2023-06-1848-144/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-181-2/+2
|\|
| * [refactor] correct layout data (#21289)James Young2023-06-181-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-182-6/+6
|\|
| * preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114)Sergey Vlasov2023-06-182-6/+6
| | | | | | | | | | | | | | | | Apparently layouts with 2u keys were not correctly converted into the `info.json` format (the old C layout macros used the arguments for such keys multiple times to cover all possible 1u locations; this is not supported in `info.json`, and the single matrix location for 2u keys was chosen incorrectly in some cases). Fix the layout definitions to match the real PCB wiring.
* | Move `RGBLED_NUM` to data driven (#21278)Ryan2023-06-182160-2058/+2194
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-181-1/+1
|\|
| * Fix up operator precedence in RGBLIGHT (#21280)Nick Brassel2023-06-181-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2023-06-171-18/+18
|\|
| * Dymium65 Layout Touch-Up (#21269)James Young2023-06-171-18/+18
| | | | | | | | | | * [refactor] friendly-format info.json * [refactor] correct layout data
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 10:18:28 +0000