summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-133-15/+74
|\|
| * [Keymap] Update personal crkbd keymap (#16624)jpe2302022-03-133-15/+74
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-0/+1
|\|
| * [Keyboard] add missing endif in glitch keyboard (#16629)jack2022-03-131-0/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-139-0/+401
|\|
| * [Keyboard] Add damapad (#16443)Matthew Dias2022-03-129-0/+401
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-138-0/+556
|\|
| * [Keyboard] Add Glitch (#16444)Matthew Dias2022-03-128-0/+556
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-121-1/+2
|\|
| * docs: fix code sample (#16623)Thomas Kriechbaumer2022-03-121-1/+2
| |
* | Redo workaround for pin_def errors on KINETIS (#16620)Joel Challis2022-03-112-4/+6
| | | | | | | | | | * Redo workaround for pin_def errors on KINETIS * Redo workaround for pin_def errors on KINETIS
* | Fix flipped One Shot logic (#16617)Pascal Getreuer2022-03-111-3/+4
| |
* | Workaround for pin_def errors on KINETIS (#16614)Joel Challis2022-03-111-0/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-112-0/+147
|\|
| * Acheron Elongate Delta: add info.json (#16615)James Young2022-03-111-0/+68
| |
| * DZ64RGB: add info.json (#16616)James Young2022-03-111-0/+79
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1116-0/+2310
|\|
| * [Keyboard] Add Mechlovin Infinity87.5 PCB (#15163)mechlovin2022-03-1016-0/+2310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add infinity87.5 * Update readme.md * Update keyboards/mechlovin/infinity875/config.h * Update keyboards/mechlovin/infinity875/info.json * Update keyboards/mechlovin/infinity875/rules.mk * Update keyboards/mechlovin/infinity875/rules.mk * Update keyboards/mechlovin/infinity875/config.h * Enable RGB matrix effect * update keymap default * undef RGB matrix effect * Update keyboards/mechlovin/infinity875/rules.mk * Update keyboards/mechlovin/infinity875/rules.mk * Update keyboards/mechlovin/infinity875/rules.mk * Update keyboards/mechlovin/infinity875/readme.md * Update keyboards/mechlovin/infinity875/infinity875.h * Update keyboards/mechlovin/infinity875/infinity875.h * Update keyboards/mechlovin/infinity875/info.json * Update keyboards/mechlovin/infinity875/infinity875.h * Update keyboards/mechlovin/infinity875/infinity875.h * Update keyboards/mechlovin/infinity875/info.json * Update keyboards/mechlovin/infinity875/info.json * Update keyboards/mechlovin/infinity875/info.json
* | Force platform pin defs to be included (#16611)Joel Challis2022-03-104-2/+2
| | | | | | | | | | * Force platform pin defs to be included * Always grab first header
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1011-0/+701
|\|
| * Personal user space and CRKBD R2G keymap (#15888)Rocco Meli2022-03-1011-0/+701
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * r2g folder groundwork * Default mb keymap featuring mb logos * Migrate Oled to keyboard folder * Move rules configs to support config better * update readmes * Liscnece update * Update config and fix issues caused by redef errs * funciton name adjusts, define specific rgb modes * move default oled font to postconfig * update oled in line with develop merge * fix return value * Add some default rgb matrix defines * del ugfx * remove #include <stdio.h> * create personal keymap for r2g * reduce firmware size * change keymap to follow physical layout * remove RGBlight config lines to make both sides work (@Dasky on MechboardsUK Discord) * strip down configuration, similar to crkbd/r2g:mb_via * remove wrong oled code overwriting the r2g one * broken code with RGB matrix (briks right side) * remove high max brightness limit * caps lock tap dance and RGB indicator for active caps lock * fix caps lock led on right side * add test macro * remove latex macro which is too slow * move caps lock tap dance to RALT and add space cadet shift * switch CTL with ALT in first layer * add tap dance for ESC/DEL * space cadet tap dance with caps lock; shift works by needs a short pause * add space cadet tap dance with caps lock on the right; shift works by needs a short pause and does not hold * make more keys transparent * enable auto shift and use logo on both oleds * add user oled logo, slows down linking considerably * oled name * add arrow keys in usual configuration and add linear configuration to symbol layer * add unicoede support * add accents * update to latest version * add colemak dh layer * report auto shift timeout * define layer name shorcuts correctly * disable VIA to enable more layers * enable NKRO * move some rules and unicode to user space * move oled and tap dances to user space * move tap dances fully out of keymap * expand unicode map * fix unicode code * revert changes to r2g, make it equal to merged code * revert changes to r2g, make it equal to merged code * clang-format userspace * clang-format config file * Update keyboards/crkbd/keymaps/rmeli/keymap.c * replace define with enum * add licenses
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-101-1/+2
|\|
| * CLI: Fix 'cd' subcommand on Windows (#16610)Erovia2022-03-101-1/+2
| | | | | | | | | | | | The 'cd' subcommand was failing as the current shell's Windows path was mangled while milc processed it. Using 'subprocess' directly avoids this issue and an extra layer of subshell.
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-101-0/+115
|\|
| * [Docs] Include ASCII diagram to explain tap-hold modes (#15873)WJH2022-03-101-0/+115
| | | | | | | | | | | | | | * [Docs] Include ASCII diagram to explain tap-hold modes * [Docs]: add examples for Default mode for Tap Hold * [Docs] fix some wrong explanation in tap_hold.md
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-102-0/+114
|\|
| * add chofstede keymap for gmmk/pro/iso (#16045)Christian Hofstede2022-03-102-0/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new keymap for GMMK with some additional mappings and led indicator for caps lock * add chofstede keymap * fix formatting * fix formatting * add readme * Update keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-106-0/+163
|\|
| * [Keyboard] lily58/glow_enc (#16101)Liashenko Volodymyr2022-03-106-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rgb-light and encoder for lily58 mod * add support for lily58 encoders (one per size) and rgb-light. The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc * add support for lily58 encoders (one per size) and rgb-light. The pcb and details here https://github.com/orvisevans/Lily58-Glow-Enc * Update keyboards/lily58/glowEnc/config.h * add GPL License to growEnc.h * rename folder according to requirement to lower case
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-104-0/+459
|\|
| * era1112 keymap for preonic (#16064)Era James2022-03-104-0/+459
| | | | | | | | | | | | | | | | | | | | | | | | | | Added the keymap I have been using as a daily driver for the last month. * good firmware 26 jan, best clicky mode stability so far * modified to reflect master branch coding style * further modified to reflect master branch coding style * improving clicky stability, tuned down clicky delay duration * changed name of keymap folder to use lowercase letters
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1027-0/+746
|\|
| * [Keyboard] Add MNK65 (#16400)kopibeng2022-03-109-0/+352
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com>
| * [Keyboard] Add omega4 (#16464)makenova2022-03-1018-0/+394
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1051-527/+4
|\|
| * Remove `matrix_key_count()` (#16603)Ryan2022-03-1051-527/+4
| | | | | | | | | | * Remove `matrix_key_count()` * Remove `matrix_bitpop()`
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-102-0/+55
|\|
| * [KEYBOARD] keyboardio/atreus: VIA support (#16604)Hao Xiang Liew2022-03-092-0/+55
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1014-11/+612
|\|
| * [keyboard]Add v1 to jones keyboard (#14405)Takeshi Nishio2022-03-0914-11/+612
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Change for latest information. * Update from v03_1 to v1. * Add v1 files. * Remove finished todo comment. * Fix COLUMN number, from "a" to "9". * Formatting * Update keyboards/jones/v1/rules.mk * Add license header. https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752035 * Implement better way to handle keycode for encoder. Use "action_exec" instead of "tap_code16" https://github.com/qmk/qmk_firmware/pull/14405#discussion_r710752924 * Move External EEPROM config to keyboard level * Move the lest of DYNAMIC_KEYMAP config to keyboard level https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094 * Move the rest of DYNAMIC_KEYMAP config to keyboard level https://github.com/qmk/qmk_firmware/pull/14405#discussion_r711668094 * Update keyboards/jones/v1/rules.mk * Update keyboards/jones/v1/rules.mk * Update keyboards/jones/v1/rules.mk
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-104-0/+483
|\|
| * Personalizacion del teclado de AdG (#15738)maherma-adg2022-03-094-0/+483
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Personalizacion del teclado de AdG Update layout description fix symbol layer * fix doc Colemak * explicitly define enabled animations * Change keymap folder name
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-102-6/+2
|\|
| * [Keyboard] Size reduction for kbdfans/kbd67/mkiirgb_iso (#16601)jack2022-03-092-6/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-094-0/+617
|\|
| * Add macOS-friendly keymap for GMMK Pro (ANSI) (#14333)Hansol Kim2022-03-094-0/+617
| | | | | | | | | | | | | | | | | | * Add macOS keymap for GMMK Pro (ANSI) * Change macOS keymap directory name to lowercase * Add toggleable layer with alternative keymap for function row * Update readme
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-095-0/+343
|\|
| * Add Gergoplex keymap for tgrosinger (#15148)Tony Grosinger2022-03-095-0/+343
| | | | | | | | | | | | | | * Add Gergoplex keymap for tgrosinger * Add improved shortcuts for PopOS * Add license
* | Missed some erroneous prints. (#16597)Nick Brassel2022-03-102-10/+12
| |
* | Fixup builds. (#16596)Nick Brassel2022-03-093-8/+10
| |