summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-149-0/+370
|\
| * [Keyboard] Tidying up my projects and subprojects (#13289)Koobaczech2021-07-149-0/+370
| | | | | | | | | | Co-authored-by: Erovia <Erovia@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ethan Madden <maddene@madden.ninja>
* | Migrate more `fn_actions` stuff (#13502)Ryan2021-07-1517-791/+497
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-142-3/+3
|\|
| * Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509)Ryan2021-07-152-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into developZach White2021-07-14168-1453/+10346
|\| | | | | | | | | Resolved Conflicts: keyboards/checkerboards/nop60/info.json
| * switch to qmk-dotty-dict (#13460)Zach White2021-07-142-1/+2
| |
| * correct data info.json (#13544)mechlovin2021-07-142-2/+2
| | | | | | rouge87 and rogue87
| * [Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… ↵bomb2021-07-1459-0/+6118
| | | | | | | | | | (#13494) Co-authored-by: Ryan <fauxpark@gmail.com>
| * Traveller handwired layout macro refactor (#13539)James Young2021-07-133-126/+129
| |
| * Lucid Phantom soldered: layout macro touch-up (#13540)James Young2021-07-133-31/+30
| |
| * RGB Matrix support for Scylla (#13415)Albert Y2021-07-133-3/+68
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
| * Refactor Drop boards to custom matrix lite (#13468)Joel Challis2021-07-134-286/+74
| |
| * [Keyboard] Add ianklug grooveboard (#13536)Ian Klug2021-07-1311-0/+337
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard} Add ISO support for the GMMK Pro (#13532)Anton2021-07-133-0/+197
| | | | | | | | | | | | | | | | | | | | * 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
| * Ortho 5x14 handwired info.json correction (#13538)James Young2021-07-132-2/+2
| | | | | | | | | | | | | | * ortho5x14 handwired: correct info.json data Last key was incorrectly positioned. * fix readme typo
| * 4pplet AEKISO60 keymap/macro touch-up (#13528)James Young2021-07-133-48/+60
| | | | | | 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.
| * Ergoarrows info.json touch-up (#13537)James Young2021-07-131-79/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * [Keyboard] Montex add VIA support and keymap. (#13488)AnthonyL2021-07-133-1/+55
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
| * [Keyboard] fixes and additions to the Marauder keyboard (#13462)Cosmin2021-07-137-10/+265
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * AMJ60 Refactor (#13530)James Young2021-07-1313-471/+563
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [Keyboard] Update Symmetric70 keyboard prototype (#12707)Takeshi ISHII2021-07-1335-64/+1865
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * 1UP Keyboards 1UP60HTE layout macro touch-up (#13529)James Young2021-07-137-100/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| * Ergonomic Vertical Keyboard (EVK) handwired info.json touch-up (#13527)James Young2021-07-121-92/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Checker Boards NOP60 touch-up (#13526)James Young2021-07-126-16/+156
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* | [Feature] Key Overrides (#11422)Jonas Gessner2021-07-1314-3/+984
| |
* | Keyboards/sol rev2 fix (#13533)XScorpion22021-07-131-9/+19
| | | | | | | | | | * Fixed a recent develop error * minor fix cause I am tired
* | Change the prototype of matrix_output_unselect_delay() (#13045)Takeshi ISHII2021-07-133-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 } } ```
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-126-30/+36
|\|
| * ID67 codebase touch-up (#13521)James Young2021-07-126-30/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | [Keymap] add simple gmmk pro macos keymap with rgb (#13504)Alex Marmon2021-07-122-0/+73
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-123-4/+61
|\|
| * [Keyboard] RGB Matrix support for TBK Mini (#13506)Albert Y2021-07-123-4/+61
| | | | | | Co-authored-by: filterpaper <filterpaper@localhost>
* | Enable g_is31_leds PROGMEM for RGB Matrix IS31FL3737 driver (#13480)Chris Cullin2021-07-125-24/+30
| |
* | Fix two out of bounds accesses from #13330. (#13525)Joakim Tufvegren2021-07-121-2/+2
| | | | | | | | | | 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).
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1213-0/+422
|\|
| * [Keyboard] Add Bloop65 (#13388)Kwabena Aduse-Poku2021-07-1213-0/+422
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Unify matrix for split common and regular matrix (#13330)Drashna Jaelre2021-07-113-353/+126
| |
* | Matrix consistency check (#13470)Zach White2021-07-111-0/+46
| | | | | | | | | | * Add a check to make sure the matrix sizes match the actual matrix size * make flake8 happy
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-119-10/+225
|\|
| * [Keyboard] Update lazydesigners/the60/rev2/rev2.h (#13505)jackytrabbit2021-07-111-10/+10
| | | | | | Update lazydesigners/the60/rev2/rev2.h
| * [Keyboard] CapsUnlocked CU7 (#13429)Rys Sommefeldt2021-07-118-0/+215
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+1
|\|
| * [Keymap] Fix Corne Via Layout properly (#13518)Drashna Jaelre2021-07-111-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-1113-292/+297
|\|
| * [Keyboard] Wuque Studio Ikki68 Aurora codebase touch-up (#13510)James Young2021-07-1113-292/+297
| |
* | first pass: matrix consistency improvements (#13471)Zach White2021-07-1122-28/+28
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-111-0/+3
|\|
| * Fixed the Helix keymap 'fraanrosi' compile issues (#13514)Takeshi ISHII2021-07-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-07-113-182/+233
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 19:28:37 +0000