summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-203-31/+153
|\|
| * Undead60M touch-up (#15214)James Young2021-11-192-15/+85
| |
| * Lime rev1: fix Configurator implementation (#15213)James Young2021-11-191-16/+68
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-201-25/+29
|\|
| * [Keyboard] Fix xox70 via layout (#15220)Drashna Jaelre2021-11-191-25/+29
| |
* | CI: Create GitHub Actions unit test workflow (#15223)Nick Brassel2021-11-202-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* | [Bug] Fix timer include in override_wiring.c (#15221)Drashna Jaelre2021-11-191-1/+1
| | | | | | | | | | * [Bug] Fix timer include in override_wiring.c * add platforms to keep parity with old method
* | Move tmk_core/common/<plat> (#13918)Joel Challis2021-11-19107-54/+54
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-61/+53
|\|
| * Handwired Split65: Fix QMK Configurator Implementation (#15209)James Young2021-11-191-61/+53
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-199-0/+488
|\|
| * [Keyboard] Add xox70 (#15098)rhmokey2021-11-199-0/+488
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-0/+160
|\|
| * [Keymap] 3w6 helltm keymap (with ascii art) (#15146)HellTM2021-11-191-0/+160
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-191-14/+14
|\|
| * [Keymap] Sofle RGB - fixed switch and numpad layers (#15094)Andy2021-11-191-14/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-199-0/+550
|\|
| * [Keyboard] Add Keebcats Denis PCB (#15154)Callum Hart2021-11-199-0/+550
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-1918-1/+588
|\|
| * [Keyboard] Add b87 keyboard (#15091)jels2021-11-1910-0/+382
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add TKL-FF v2 (#15144)Ramon Imbao2021-11-198-1/+206
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-1910-8/+102
|\|
| * [Keyboard] Aozora update (#15201)Nick Abe2021-11-1910-8/+102
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-11-1955-172/+1926
|\|
| * [Keymap] Add yoshimaru46's keymap for Ergodash mini (#15191)Yoshihiro Saito2021-11-194-0/+152
| |
| * [Keyboard] Add Keebcats Dougal PCB (#15168)Callum Hart2021-11-199-0/+302
| |
| * [Keyboard] Add MTBKeys MTB60 Keyboard (Solderable and Hotswap edition) (#14222)Kyle Gieselman2021-11-1914-0/+578
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>