summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-243-130/+33
|\
| * Revert "handwired/split89 Layout Macro Refactor (#15210)" (#15284)James Young2021-11-233-130/+33
| | | | | | | | | | This reverts commit 26ae43219001dfe20aa525b6fb35f2aeb2b76617. Requested by jurassic73.
* | New Keyboard: TGR Jane CE (#14713)MechMerlin2021-11-2423-0/+330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * move ce and v2ce into their own directories * update copyright notices * change LAYOUT macro names * remove community layout support for the original layouts * fix LAYOUT macro names * change info.json for the common layouts * fix tsangan LAYOUT * fix layout all * Update keyboards/tgr/jane/v2ce/keymaps/via/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/v2ce.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * remove unneeded file * one more time for good measure * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/tgr/jane/v2ce/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2310-72/+301
|\|
| * Portal 66 Layout Macro Refactor (#15255)James Young2021-11-2310-72/+301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * soldered.h: use QMK 3-character notation * soldered.h: add matrix diagram * portal_66/soldered: rename LAYOUT_65_ansi_split_bs to LAYOUT_65_ansi_blocker_split_bs * portal_66/soldered: rename LAYOUT_65_ansi to LAYOUT_65_ansi_blocker * portal_66/soldered: rename LAYOUT_65_tsangan_split_bs to LAYOUT_65_ansi_blocker_tsangan_split_bs * portal_66/soldered: rename LAYOUT_65_iso to LAYOUT_65_iso_blocker * portal_66/soldered: add LAYOUT_65_iso_blocker_split_bs * portal_66/soldered: add LAYOUT_65_iso_blocker_tsangan_split_bs * portal_66/soldered: enable Community Layout support * hotswap.h: use QMK 3-character notation * hotswap.h: add matrix diagram * portal_66/hotswap: rename LAYOUT to LAYOUT_65_ansi_blocker * portal_66/hotswap: enable Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-234-150/+273
|\|
| * Pluckey: Fix QMK Configurator Implementation (#15254)James Young2021-11-234-150/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_all * pluckey.h: add matrix diagram * pluckey.h: use XXX for KC_NO * add LAYOUT_ergo macro with keymap `info.json` had layout data for this macro, but the macro was not present in the source code. * info.json: correct key sequence Fixes incorrect key assignments in QMK Configurator.
* | [Tests] Increase QMK test coverage take 2 (#15269)Stefan Kerkmann2021-11-2348-246/+2703
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add per-test keymaps * Add better trace and info logs for failed unit-tests * Add layer state assertion with tracing message * Use individual test binaries configuration options * Add basic qmk functionality tests * Add tap hold configurations tests * Add auto shift tests Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-231-4/+3
|\|
| * Ignore exit codes for formatters (#15276)Joel Challis2021-11-231-4/+3
| |
* | [Keyboard] Disable features on SplitKB boards to fit under size (#15262)Drashna Jaelre2021-11-222-2/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-231-0/+1
|\|
| * Ignore exit codes for formatters (#15275)Joel Challis2021-11-231-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-231-3/+4
|\|
| * Ignore deleted files when formatting codebase (#15274)Joel Challis2021-11-231-3/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-231-4/+5
|\|
| * qmk format-python - filter for Python files (#15271)Joel Challis2021-11-231-4/+5
| | | | | | | | | | * qmk format-python filter all files * filter changed files too
* | Revert "[Tests] Increase QMK test coverage (#13789)"Nick Brassel2021-11-2349-2688/+265
| | | | | | | | This reverts commit b6054c0206609f3755f71d819643644d250288b0.
* | [Tests] Increase QMK test coverage (#13789)Stefan Kerkmann2021-11-2349-265/+2688
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add per-test keymaps * Add better trace and info logs for failed unit-tests * Add layer state assertion with tracing message * Use individual test binaries configuration options * Add basic qmk functionality tests * Add tap hold configurations tests * Add auto shift tests * `qmk format-c * Fix tests Co-authored-by: Nick Brassel <nick@tzarc.org>
* | [Docs] Squeezing space out of AVR (#15243)Drashna Jaelre2021-11-233-0/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Docs] Squeezing space out of AVR * Add more info * Apply suggestions from code review Co-authored-by: Nick Brassel <nick@tzarc.org> * Add oled section * Apply suggestions from code review Co-authored-by: Nick Brassel <nick@tzarc.org> * Update layers and intro wording * Rename doc file * add get_u8_str support * oled clarifications Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Add uint to char functions (#15244)Drashna Jaelre2021-11-232-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add uint to char functions * appease the all mighty lint * Further appease Lint * Update functions * Add doxygen comment * Update quantum/quantum.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Apply suggestions from code review Co-authored-by: Nick Brassel <nick@tzarc.org> * Add declaration for get_numeric_string * fix formatting and bug Co-authored-by: Nick Brassel <nick@tzarc.org>
* | [Keyboard] Disable console on Keebio foldkb and iris rev3 (#15260)Drashna Jaelre2021-11-233-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-221-1/+1
|\|
| * layer_combo → sd_combo (#15266)precondition2021-11-231-1/+1
| |
* | [Keymap] Disable console on Sofle default keymap (#15261)Drashna Jaelre2021-11-221-1/+1
| |
* | [Keyboard] Enable LTO on viktus/sp_mini via keymap (#15263)Drashna Jaelre2021-11-221-1/+1
| |
* | Macros in JSON keymaps (#14374)Zach White2021-11-2216-33/+319
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * macros in json keymaps * add advanced macro support to json * add a note about escaping macro strings * add simple examples * format json * add support for language specific keymap extras * switch to dictionaries instead of inline text for macros * use SS_TAP on the innermost tap keycode * add the new macro format to the schema * document the macro limit * add the json keyword for syntax highlighting * fix format that vscode screwed up * Update feature_macros.md * add tests for macros * change ding to beep * add json support for SENDSTRING_BELL * update doc based on feedback from sigprof * document host_layout * remove unused var * improve carriage return handling * support tab characters as well * Update docs/feature_macros.md Co-authored-by: Nick Brassel <nick@tzarc.org> * escape backslash characters * format * flake8 * Update quantum/quantum_keycodes.h Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-215-40/+198
|\|
| * Ocean Wang Ergo: Fix QMK Configurator Implementation (#15249)James Young2021-11-215-40/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * info.json: apply friendly formatting * info.json: update labels; reposition keys * wang_ergo.h: use XXX for KC_NO * wang_ergo.h: add matrix diagram * rename LAYOUT to LAYOUT_all * move Backspace keycode to top row Moves the matrix argument/keycode for Backspace to its proper position at the end of the top row. * add LAYOUT_2x2u with keymap * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-215-517/+631
|\|
| * Mokey Ginkgo65 Layout Macro Refactor (#15233)James Young2021-11-215-517/+631
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * rename LAYOUT to LAYOUT_65_ansi_blocker; enable Community Layout support * refactor default keymaps Updates grid alignment of keycodes, and adds a Function layer to the default keymap. * refactor LAYOUT_iso into LAYOUT_65_iso_blocker_split_bs Adds missing KC_NUBS position, and moves Enter keycode to home row (consistent with QMK Community Layout). * remove LAYOUT_split_left_shift With the changes to LAYOUT_65_iso_blocker_split_bs, LAYOUT_split_left_shift maps all the same positions, but in a different sequence, making it redundant. * refactor LAYOUT_7u_space to LAYOUT_65_iso_blocker_tsangan_split_bs Moves Enter keycode to home row. * remove LAYOUT_split_space_1 LAYOUT_split_space_1 differs from LAYOUT_split_space_2 only in the sizes of the split spacebars, and I like the layout rendering of LAYOUT_split_space_2 better. :) * refactor LAYOUT_split_space_2 into LAYOUT_all ANSI Enter, split Backspace, split Left Shift, and Split Spacebar. * add LAYOUT_65_ansi_blocker_split_bs * add LAYOUT_65_ansi_blocker_tsangan_split_bs * add LAYOUT_65_iso_blocker * ginkgo65.h: touch-up block diagrams * info.json: use maintainer's GitHub username * bugfix layout macros Position k1D wasn't being assigned on the ISO layouts or LAYOUT_all. * rules.mk: update Community Layout support
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-214-68/+84
|\|
| * MW65 RGB Layout Macro Refactor (#15246)James Young2021-11-214-68/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mw65_rgb.h: use QMK 3-character notation for matrix identifiers * mw65_rgb.h: add matrix diagram * info.json: apply friendly formatting Update key labels for QMK CLI rendering. * move rotary encoder keycodes to top row * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-214-87/+108
|\|
| * MW75 Layout Macro Refactor (#15247)James Young2021-11-214-87/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mw75.h: use QMK 3-character matrix identifiers * update stock keymaps Use QMK-native keycode aliases, and update grid alignment of keycodes. * mw75.h: add matrix diagram * info.json: apply friendly formatting * move rotary encoder keycodes to top row * info.json: update maintainer field Use the maintainer's GitHub username.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-201-2/+3
|\|
| * Tidy CI format error message (#15242)Joel Challis2021-11-201-2/+3
| | | | | | * Tidy format error message
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-201-0/+3
|\|
| * Add Keyboardio Atreus 2 Bootloader to udev rules (#15241)Sergey Vlasov2021-11-201-0/+3
| | | | | | | | | | | | The Keyboardio Atreus 2 Bootloader is a clone of the Caterina bootloader with different USB VID:PID values (1209:2302): https://github.com/keyboardio/Atreus2-Bootloader
* | Short term bodge for PRODUCT warning (#15240)Joel Challis2021-11-201-1/+1
| |
* | fix broken macro in transport.h (#15239)Balz Guenat2021-11-201-1/+2
| |
* | [Core] RISC-V toolchain and picolibc fixes (#15109)Stefan Kerkmann2021-11-203-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Core] Fix RISC-V toolchain installation The risc-v toolchain is only available on distributions based on Debian 11+ so we check for their availability before installing them. * [Core] Fix heap symbols and syscalls for picolibc picolibc internally uses __heap_start and __heap_end instead of the defacto chibios linker script standard __heap_base__ and __heap_end__ therefore we introduce these symbols as an alias. Usually all memory used within QMK is statically allocated, but some algorithms make usage of malloc and friends. Also the timeval struct is not defined by picolibc for syscalls, therefore it is declared as stub.
* | Rework encoders to enable asymmetric split keyboards (#12090)Balz Guenat2021-11-2014-58/+575
| | | | | | | | Co-authored-by: Balz Guenat <balz.guenat@siemens.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-204-0/+464
|\|
| * [Keymap] Initial simple keymap for ForeverAnApple (#14654)ForeverAnApple2021-11-194-0/+464
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-209-0/+455
|\|
| * [Keyboard] Added Jels88 (#15090)jels2021-11-199-0/+455
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2030-553/+1215
|\|
| * Meletrix Zoom65 Refactor (#15222)James Young2021-11-1924-531/+813
| |
| * Minimon Index Tab touch-up (#15224)James Young2021-11-196-22/+402
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 03:12:53 +0000