summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-152-31/+44
|\
| * Modify my keymap (#11407)Reibl János Dániel2021-01-152-31/+44
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-154-3/+52
|\|
| * Adds VIA support for the KPRepublic's BM60 Poker (#11267)Peter Peterson2021-01-154-3/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP working on new keymap * tweaking keymap * updated keymap * cleaned up a little bit * New preonic keymap * my preonic keymap * added mac layout * preonic map update * cleaning up old repo * cleaning up to match upstream * more cleanup * removing old keymaps * cleaned up commit history for bm60poker via support * cleaned up via keymap * fixed copywrite Co-authored-by: Peter Peterson <ppeterson@noao.edu>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-151-268/+70
|\|
| * Afternoon Labs Breeze Rev0: Configurator key sequence fix (#11550)James Young2021-01-151-268/+70
| | | | | | | | | | * human-friendly formatting * correct key order
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-01-15162-180/+980
|\|
| * Cutie Club Borsdorf: Configurator key sequence fix (#11549)James Young2021-01-141-3/+146
| | | | | | | | | | * human-friendly formatting * correct key order (ISO Enter)
| * [Keyboard] Add cool836A 1_2 (#11467)Ohashi2021-01-148-0/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 1st trial on 1_2 * remove keymaps/default/km_default.c * fix cool836A.h * fix keymap.c into 3x12 * rename to cool836a (not 'A') * remove cool836A (not a) * remove backslashes at keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * update keymap.c (add licence) * Update keyboards/cool836a/keymaps/default/readme.md removed "<br>" in line 2 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 4 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/keymaps/default/readme.md remove "<br>" in line 8 Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/cool836a/cool836a.h remove cool836a.h line 30:36 Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Adafruit BLE cleanups (#11556)Ryan2021-01-153-32/+26
| |
| * arm_atsam: temporarily lower raw HID endpoint/report size (#11554)Ryan2021-01-151-1/+1
| |
| * [Keymap] Adds ymdk/ymd09 andys8 layout (#11320)Andy2021-01-141-0/+65
| | | | | | | | Custom layout for macropad. It shows the usage of macros with unicode, and other layouts (ISO-DE) with unicode, emojis, and git commands.
| * allow customizing decrease delay of rgb heatmap (#11322)André Silva2021-01-143-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow customizing decrease delay of rgb heatmap * rename rgb typing heatmap decrease delay variable * address review comments * nix-shell: add clang-tools required for formatting the C code * heatmap: use real timer to track decrement rate * heatmap: fix ifndef var name typo * heatmap: add docs * Update docs/feature_rgb_matrix.md Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
| * [Keymap] Add domnantas lily58 keymap (#10910)Domantas2021-01-144-0/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Initialize domnantas layout * Update oled status display * Layout and oled changes * Updates to keymap * Add F keys and page moves * Add media keys, rearrange home and end * Add instructions * Swap backspace and enter * Remove unnecesary Enter keymap * - Change display timeout - Update minus sign to work on both English and Lithuanian layouts * Add copyright header * Replace static strings with PSTR * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/lily58/keymaps/domnantas/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Remove `DESCRIPTION`, B-D (#11513)Ryan2021-01-15152-153/+1
| |
* | Revert "Keep track of last matrix activity (#10730)"Nick Brassel2021-01-153-30/+15
| | | | | | | | This reverts commit 79d1db332477963555416d9fff82ecac4399bd52.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-141-5/+18
|\|
| * Updated documentation for new BDN9 board revisions (#11380)Nick Blyumberg2021-01-141-5/+18
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Danny <nooges@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-142-19/+17
|\|
| * [Keyboard] eliminate nested layout warnings in kbd75 (#11540)Joshua Diamond2021-01-132-19/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1412-5/+336
|\|
| * [Keyboard] Added Ortho support to Program Yoink kb (#11534)melonbred2021-01-1312-5/+336
| | | | | | | | | | * Added Ortho support * Updated JSON
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-144-1/+61
|\|
| * [Keyboard] Add VIA support for CA66 (#11522)J.Flanagan2021-01-134-1/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add VIA support made changes to add VIA support for the CA66 - added VIA keymap.c, readme.md, rules.mk - changes made to main rules.mk to keep firmware size down (mousekey_enable = no; backlight_enable = no) - changed VENDOR_ID in config.h from 0xFEED to 0x504B (PK) * Minor changes to CA66 for VIA support edited keymap info enabled backlight * Update vendorID Change to vendorID to remove conflict with previously chosen vendorID already in use * Update keyboards/playkbtw/ca66/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/playkbtw/ca66/keymaps/via/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/playkbtw/ca66/keymaps/via/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-149-0/+245
|\|
| * [Keyboard] Add ISO Macro keyboard (#11517)duoshock2021-01-139-0/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | * - * - * - * - * - Co-authored-by: online <33636898+online@users.noreply.github.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1411-0/+561
|\|
| * [Keyboard] Add new afternoonlabs/breeze/rev0 split keyboard (#11510)Eithan Shavit2021-01-1311-0/+561
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding new breeze keyboard under afternoonlabs * Compiling only Rev0, moving readme there * Apply suggestions from code review Addressing review comments, removing legacy description config. Removing copy paste leftovers Co-authored-by: Drashna Jaelre <drashna@live.com> * Addressing review, remove empty rules.mk * typos * Apply suggestions from code review Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Eithan Shavit <eithan@fb.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1414-0/+1888
|\|
| * [Keyboard] Add Hub20 keyboard (#11497)Josh Johnson2021-01-1314-0/+1888
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add Hub20 support * Keymap formatting cleanup Co-authored-by: Ryan <fauxpark@gmail.com> * Delete bootloader_defs.h as no longer required * Correct make / flashing example Co-authored-by: Ryan <fauxpark@gmail.com> * Update rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1410-0/+542
|\|
| * [Keyboard] Add Rect44 keyboard (#11484)koshinoya2021-01-1310-0/+542
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Rect44 keyboard * Update keyboards/rect44/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete config.h files in keymaps * Update keyboards/rect44/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/rect44/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/rect44/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-143-0/+87
|\|
| * [Keymp] add gwillad's keymap for prime_e (#11477)Adam Gwilliam2021-01-133-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | * new keymap * Update keyboards/primekb/prime_e/keymaps/gwillad/keymap.c use a more concise pin setting method Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Adam Gwilliam <agwilliam@yaharasoftware.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-1413-0/+644
|\|
| * [Keyboard] Add space space keyboard (#11425)qpockets2021-01-1313-0/+644
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add space_space keyboard * update space_space readme * fix space_space formatting issue * add layout readme, vid & pid * experiment * readme fix * readme fix * readme fix * readme formatting * readme formatting * readme formatting * Update keymap.c change I+O combo to O+P because of accidental activation * Update keymap.c change I+O combo to O+P because of accidental activation * Update readme.md change keymap readme to reflect keymap changes * Apply suggestions from code review remove deprecated "key count" from .json Co-authored-by: Drashna Jaelre <drashna@live.com> * Apply suggestions from code review -move combo and modtap defines to the keymap level -formatting issues Co-authored-by: Joel Challis <git@zvecr.com> * move combo defines to keymap level and update config.h * Apply suggestions from code review add lower resolution readme picture and sleep LED note Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-149-0/+260
|\|
| * [Keyboard] Adding new keyboard UD_40 ortho version (#11401)David Dejaeghere2021-01-139-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding keyboard UD_40 Ortho * Update keyboards/mechstudio/ud_40_ortho/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * fixing syntax after merging suggestions * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/default/keymap.c Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/ud_40_ortho.h Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/mechstudio/ud_40_ortho/config.h Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: David <david@tarpit.be> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-143-0/+154
|\|
| * [Keymap] own Lily58 keymap (#11395)Christian Eiden2021-01-133-0/+154
| | | | | | | | | | | | | | | | | | * [Keymap] own Lily58 keymap Signed-off-by: Christian Eiden <christian@eiden.ch> * adjustments of personal keymap Signed-off-by: Christian Eiden <christian@eiden.ch>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-01-144-0/+241
|\|
| * [Keymap] urbanvanilla keymap for drop/alt (#11365)James2021-01-134-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |