summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-21Keebio Cepstrum Configurator Touch-Up (#21310)James Young
* [enhancement] remove redundant layout data Remove the redundant layout data from the keyboard-level `info.json`. * [enhancement] correct JSON syntax in rev1/info.json * [enhancement] friendly-format rev1/info.json * [enhancement] correct layout data
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20Add Keychron C2 Pro (#20701)lalalademaxiya1
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>
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20[Keyboard] Add Monsgeek M5 (#21182)jonylee@hfd
Co-authored-by: adophoxia <100170946+adophoxia@users.noreply.github.com> Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20ProtoTypist PT-60 Refactor (#21322)James Young
2023-06-20[Docs] Code markdown amendment (#21323)Albert Y
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-21NovelKeys NK+: correct layout data (#21317)James Young
* NovelKeys NK+: correct layout data Add key sizes to the layout data. * [refactor] rename LAYOUT to LAYOUT_65_xt_ansi_blocker_tsangan
2023-06-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20Planck Matrix Fixes (#21196)Jack Humbert
* 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>
2023-06-21Consolidate `KEYBOARD_OUTPUT`+`KEYMAP_OUTPUT`=>`INTERMEDIATE_OUTPUT` (#21272)Nick Brassel
2023-06-20EC Pro X JIS Layout Touch-Up (#21260)James Young
* [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.
2023-06-20Kalakos Bahrnob65 Configurator Layout Touch-Up (#21309)James Young
* [enhancement] add matrix diagram * [refactor] friendly-format info.json * [enhancement] remove key overlaps
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20KJ-Modify RS40 Configurator Touch-Up (#21311)James Young
* [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.
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20[Keyboard] Add Keychron C1 Pro (#20700)lalalademaxiya1
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>
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20[Keyboard] Add Alisaie (#21266)Roberts Kursitis
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-20[Keyboard] Add bigsmoothknob (#21265)Derek
Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-19Move kb83 keyboard (#20761)jonylee@hfd
* 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
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-19[Docs] Add note about `ENABLE_COMPILE_KEYCODE` to docs (#21290)Drashna Jaelre
Co-authored-by: Ryan <fauxpark@gmail.com>
2023-06-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-19dnworks SBL Community Layout Support and Touch-Up (#21267)James Young
2023-06-19Fixup `nightly_boards/n40_o` (#21307)jack
2023-06-19Remove encoder in-matrix workaround code (#20389)jack
2023-06-19Fixup `dekunukem/duckypad` (#21298)jack
2023-06-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-19Tsubasa Handwired: correct layout data (#21295)James Young
2023-06-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18HFDKB K83 Configurator Layout Fix (#21297)James Young
2023-06-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18[Keyboard] Add support for Alveus MX PCB (#21238)mechlovin
Co-authored-by: jack <0x6a73@protonmail.com>
2023-06-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-19Swap G431 to transient EEPROM. Add G431 and G474 onekeys. (#21282)Nick Brassel
2023-06-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18Geistmaschine Geist Layout Refactor and Touch-Up (#21288)James Young
2023-06-18Remove default `TAPPING_TERM` from keyboard config.h (#21284)Ryan
2023-06-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18[refactor] correct layout data (#21289)James Young
2023-06-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18preonic/rev3{,_drop}: Fix layouts with 2u keys (#21114)Sergey Vlasov
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.
2023-06-18Move `RGBLED_NUM` to data driven (#21278)Ryan
2023-06-18Merge remote-tracking branch 'origin/master' into developQMK Bot
2023-06-18Fix up operator precedence in RGBLIGHT (#21280)Nick Brassel