summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-11-22Macros in JSON keymaps (#14374)Zach White
* 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>
2021-11-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-21Ocean Wang Ergo: Fix QMK Configurator Implementation (#15249)James Young
* 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.
2021-11-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-21Mokey Ginkgo65 Layout Macro Refactor (#15233)James Young
* 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
2021-11-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-21MW65 RGB Layout Macro Refactor (#15246)James Young
* 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.
2021-11-21Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-21MW75 Layout Macro Refactor (#15247)James Young
* 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.
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-20Tidy CI format error message (#15242)Joel Challis
* Tidy format error message
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-20Add Keyboardio Atreus 2 Bootloader to udev rules (#15241)Sergey Vlasov
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
2021-11-20Short term bodge for PRODUCT warning (#15240)Joel Challis
2021-11-20fix broken macro in transport.h (#15239)Balz Guenat
2021-11-20[Core] RISC-V toolchain and picolibc fixes (#15109)Stefan Kerkmann
* [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.
2021-11-20Rework encoders to enable asymmetric split keyboards (#12090)Balz Guenat
Co-authored-by: Balz Guenat <balz.guenat@siemens.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keymap] Initial simple keymap for ForeverAnApple (#14654)ForeverAnApple
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Added Jels88 (#15090)jels
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19Meletrix Zoom65 Refactor (#15222)James Young
2021-11-19Minimon Index Tab touch-up (#15224)James Young
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19Undead60M touch-up (#15214)James Young
2021-11-19Lime rev1: fix Configurator implementation (#15213)James Young
2021-11-20Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Fix xox70 via layout (#15220)Drashna Jaelre
2021-11-20 CI: Create GitHub Actions unit test workflow (#15223)Nick Brassel
* Create GitHub Actions unit test workflow * Create GitHub Actions unit test workflow - checkout submodules * Create GitHub Actions unit test workflow - update job name * Develop branch. * Update .github/workflows/unit_test.yml Co-authored-by: Joel Challis <git@zvecr.com> * Update .github/workflows/unit_test.yml Co-authored-by: Joel Challis <git@zvecr.com> * builddefs Co-authored-by: zvecr <git@zvecr.com>
2021-11-19[Bug] Fix timer include in override_wiring.c (#15221)Drashna Jaelre
* [Bug] Fix timer include in override_wiring.c * add platforms to keep parity with old method
2021-11-19Move tmk_core/common/<plat> (#13918)Joel Challis
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19Handwired Split65: Fix QMK Configurator Implementation (#15209)James Young
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Add xox70 (#15098)rhmokey
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keymap] 3w6 helltm keymap (with ascii art) (#15146)HellTM
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keymap] Sofle RGB - fixed switch and numpad layers (#15094)Andy
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Add Keebcats Denis PCB (#15154)Callum Hart
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Add b87 keyboard (#15091)jels
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19[Keyboard] Add TKL-FF v2 (#15144)Ramon Imbao
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-11-19Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-11-19[Keyboard] Aozora update (#15201)Nick Abe
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-11-19Merge remote-tracking branch 'origin/master' into developDrashna Jael're
2021-11-19[Keymap] Add yoshimaru46's keymap for Ergodash mini (#15191)Yoshihiro Saito
2021-11-19[Keyboard] Add Keebcats Dougal PCB (#15168)Callum Hart