summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Migrate more `fn_actions` stuff (#13502)Ryan
2021-07-14Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-15Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509)Ryan
2021-07-14Merge remote-tracking branch 'origin/master' into developZach White
Resolved Conflicts: keyboards/checkerboards/nop60/info.json
2021-07-14switch to qmk-dotty-dict (#13460)Zach White
2021-07-14correct data info.json (#13544)mechlovin
rouge87 and rogue87
2021-07-14[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb
(#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-13Traveller handwired layout macro refactor (#13539)James Young
2021-07-13Lucid Phantom soldered: layout macro touch-up (#13540)James Young
2021-07-13RGB Matrix support for Scylla (#13415)Albert Y
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-13Refactor Drop boards to custom matrix lite (#13468)Joel Challis
2021-07-13[Keyboard] Add ianklug grooveboard (#13536)Ian Klug
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-13[Keyboard} Add ISO support for the GMMK Pro (#13532)Anton
* Added iso layer support for the GMMK Pro iso version * Adjusted the mapping * aligning with best practises * aligning with comments from PR * Added iso layout to info.json
2021-07-13Ortho 5x14 handwired info.json correction (#13538)James Young
* ortho5x14 handwired: correct info.json data Last key was incorrectly positioned. * fix readme typo
2021-07-134pplet AEKISO60 keymap/macro touch-up (#13528)James Young
Moves the ISO Enter keycode to the home row for more consistency with the rest of QMK. Also grid-aligns the keycodes and adds a block comment for the layout macro.
2021-07-13Ergoarrows info.json touch-up (#13537)James Young
* human-friendly formatting Add line breaks between rows and halves. * fix rounding issues Fixes issues with y-offset values due to rounding in KLE. * remove layout dead space; re-mirror halves Removes the empty white space from the layout, and aligns the keys on the right half so they are a mirror of the left half.
2021-07-13[Feature] Key Overrides (#11422)Jonas Gessner
2021-07-13[Keyboard] Montex add VIA support and keymap. (#13488)AnthonyL
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
2021-07-13[Keyboard] fixes and additions to the Marauder keyboard (#13462)Cosmin
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-13AMJ60 Refactor (#13530)James Young
* rename LAYOUT to LAYOUT_all * refactor default keymap - add license header - use layer_names enum - use LAYOUT_all macro - update keymap to be more generic - use QMK-native keycode aliases * info.json: human-friendly formatting * convert LAYOUT_iso into a proper LAYOUT_60_iso * LAYOUT_all bugfix In the physical sense, position k3d is to the left of k3c. * rework LAYOUT_max into LAYOUT_60_ansi_split_bs_rshift * remove LAYOUT_iso_splitrshift and iso_split_rshift keymap * rework LAYOUT_hhkb into LAYOUT_60_hhkb * amj60.h cleanup - add license header - use #pragma once include guard - concatenate layout block comments - remove unnecessary function headers * add license header to amj60.c * align config.h to QMK template * align rules.mk to QMK template * enable Community Layout support * modernize readme.md - add PCB image - convert keyboard data to list - add flashing and bootloader instructions - update Docs links
2021-07-13[Keyboard] Update Symmetric70 keyboard prototype (#12707)Takeshi ISHII
* update handwired/symmetric70_proto/matrix.c * make keyboards/handwired/symmetric70_proto/promicro/ * add symmetric70_proto/debug_config.h, update symmetric70_proto/local_features.mk etc. set MATRIX_IO_DELAY macro make MTEST=mdelay0 symmetric70_proto/promicro:default:flash make MTEST=mdelay1 symmetric70_proto/promicro:default:flash make MTEST=mdelay10 symmetric70_proto/promicro:default:flash make MTEST=mdelay30 symmetric70_proto/promicro:default:flash set DEBUG_MATRIX_SCAN_RATE_ENABLE yes make MTEST=scan symmetric70_proto/promicro:default:flash set MATRIX_DEBUG_DELAY and MATRIX_IO_DELAY macro make MTEST=matrix_debug_delay,mdelay0 symmetric70_proto/promicro:default:flash set MATRIX_DEBUG_SCAN make MTEST=matrix_debug_scan symmetric70_proto/promicro:default:flash * add symmetric70_proto/matrix_debug/readme.md * update symmetric70_proto/matrix_debug/readme.md * update handwired/symmetric70_proto/readme.md * update handwired/symmetric70_proto/readme.md * update handwired/symmetric70_proto/*/readme.md * add handwired/symmetric70_proto/matrix_fast/ * update handwired/symmetric70_proto/matrix_fast/readme.md * fix typo in handwired/symmetric70_proto/matrix_fast/readme.md * update config.h under handwired/symmetric70_proto/promicro * add Proton C support to handwired/symmetric70_proto * add handwired/symmetric70_proto/proton_c/readme.md * add promicro/*/readme.md proton_c/*/readme.md * update handwired/symmetric70_proto/proton_c/proton_c.c support MATRIX_IO_DELAY_DEFAULT for testing. * Added another implementation of 'adaptive_delay'. * update symmetric70_proto/local_features.mk * update symmetric70_proto/matrix_fast/gpio_extr.h * add matrix_output_unselect_delay_ports() * add MTEST=adaptive_delay_fast option * update symmetric70_proto/matrix_debug/readme.md * update symmetric70_proto/matrix_fast/readme.md * update symmetric70_proto/matrix_debug/readme.md * Erase garbage * fix symmetric70_proto/proton_c/proton_c.c * improve adaptive_delay_fast in symmetric70_proto/matrix_debug/matrix.c * update symmetric70_proto/matrix_debug/readme.md * fix symmetric70_proto/matrix_debug/readme.md * Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/symmetric70_proto/proton_c/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/local_features.mk Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_debug/readme.md Co-authored-by: Nick Brassel <nick@tzarc.org> * Update keyboards/handwired/symmetric70_proto/matrix_fast/matrix_config_expand.c Co-authored-by: Nick Brassel <nick@tzarc.org> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-07-13Keyboards/sol rev2 fix (#13533)XScorpion2
* Fixed a recent develop error * minor fix cause I am tired
2021-07-13Change the prototype of matrix_output_unselect_delay() (#13045)Takeshi ISHII
The prototype of matrix_output_unselect_delay() has been changed as follows. ```c void matrix_output_unselect_delay(uint8_t line, bool key_pressed); ``` Currently, no keyboard seems to be redefining `matrix_output_unselect_delay()`, so there is no change in the system behavior. With this change, the keyboard level code can get some optimization hints, for example, the following. ```c void matrix_output_unselect_delay(uint8_t line, bool key_pressed) { /* If none of the keys are pressed, * there is no need to wait for time for the next line. */ if (key_pressed) { #ifdef MATRIX_IO_DELAY # if MATRIX_IO_DELAY > 0 wait_us(MATRIX_IO_DELAY); # endif #else wait_us(30); #endif } } ```
2021-07-131UP Keyboards 1UP60HTE layout macro touch-up (#13529)James Young
* rename LAYOUT_tsangan to LAYOUT_60_tsangan_hhkb ... and enable Community Layout support. * use four-space indent and QMK-native keycode aliases * rules.mk touch-up - remove Bootloader selection header comments - unify Build Options comment header to QMK template - align inline comments * readme.md touch-up - convert metadata to list - add Flashing command * move layout macro alias to info.json * apply friendly formatting to info.json * restore badger keymap to previous (don't edit user keymap)
2021-07-12Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up (#13527)James Young
* scale layout data Seems the KLE data that was imported to make the original file was scaled 1.25x. This commit removes the scaling. * human-friendly formatting Insert line breaks between physical layout rows. * remove instances where width or height is set to 1 The width and height of a key is defaulted to 1 if not provided by the JSON data, so there's no reason to set it manually.
2021-07-12Checker Boards NOP60 touch-up (#13526)James Young
* apply human-friendly formatting to info.json * fix JSON tree errors in info.json * rename layout macros - rename LAYOUT_2x3u to LAYOUT_60_tsangan_hhkb_split_space - rename LAYOUT_7u to LAYOUT_60_tsangan_hhkb * rename 2x3u keymap to default
2021-07-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-12ID67 codebase touch-up (#13521)James Young
* correct layout data Fix incorrect key sizes/positions. * rename LAYOUT to LAYOUT_65_ansi_blocker * tweak human-friendly formatting for info.json Add new lines for new rows. * adjust keycode alignment in via keymap * clean up extra lines in readme file * enable 65_ansi_blocker Community Layout support * clean up rules.mk Aligns the inline comments.
2021-07-12[Keymap] add simple gmmk pro macos keymap with rgb (#13504)Alex Marmon
2021-07-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-12[Keyboard] RGB Matrix support for TBK Mini (#13506)Albert Y
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-12Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver (#13480)Chris Cullin
2021-07-12Fix two out of bounds accesses from #13330. (#13525)Joakim Tufvegren
Two occurrences of `MATRIX_ROWS` weren't properly changed to `ROWS_PER_HAND` in #13330, causing a crash during boot on at least my Ergodox Infinity (including #13481).
2021-07-12Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-12[Keyboard] Add Bloop65 (#13388)Kwabena Aduse-Poku
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-11Unify matrix for split common and regular matrix (#13330)Drashna Jaelre
2021-07-11Matrix consistency check (#13470)Zach White
* Add a check to make sure the matrix sizes match the actual matrix size * make flake8 happy
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-11[Keyboard] Update lazydesigners/the60/rev2/rev2.h (#13505)jackytrabbit
Update lazydesigners/the60/rev2/rev2.h
2021-07-11[Keyboard] CapsUnlocked CU7 (#13429)Rys Sommefeldt
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-11[Keymap] Fix Corne Via Layout properly (#13518)Drashna Jaelre
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-11[Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510)James Young
2021-07-11first pass: matrix consistency improvements (#13471)Zach White
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-11Fixed the Helix keymap 'fraanrosi' compile issues (#13514)Takeshi ISHII
According to `helix/rev2/keymaps/fraanrosi/readme.md`, this keymap should be compiled with the following command: ``` make helix/rev2/under:fraanrosi ``` Therefore, when compiling all helix keymaps with the following command, an error occurs when compiling `fraanrosi`. ``` make helix:all ``` Therefore, add `LED_UNDERGLOW_ENABLE = yes` to `keymaps/fraanrosi/rules.mk` to suppress the error.
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-07-10[Keymap] plattfot - Keymap updates for Kyria (#13449)Fredrik Salomonsson
- Major change in the keymap to work with EurKey. Which relaxes some constraints it had before when it had to take in consideration two layouts. With this the parenthesis can be moved to a better location instead of being in the top right corner. This also allows esc, del and rctrl to be moved to the base layer. Only downside is that ctrl+lalt needed to be removed and instead AltGr takes it's place. Add rctrl on right thumb cluster to compensate for this which need some reorganization on the thumb cluster. - Split the symbol and function keys layer into two layers, one for each hand. Make it easier to press symbols and function keys. - Add some symbols specific for the EurKey layout. - Change from running C-<tab> S-C-<tab> to page up/down for the right rotary. As holding ctrl and using page up/down works the same in firefox. Which allows the rotary to be useful for other things. - Move scroll lock and insert to right rotary. - Introducing close tap (CLO_TAP), which is a combination of the double tap feature and my macros. E.g. pressing CLO_TAP and ( will generate ()←. Which removes the need of the macros and makes it more useful than DBL_TAP as it now saves me some keypresses. CLO_TAP exist on both the left and right hand layers to make it easy to use. - Use text for the secondary oled, firmware is too big after rebasing on upstream master. - Update image in the readme to reflect my new layout.
2021-07-11Merge remote-tracking branch 'origin/master' into developQMK Bot