summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename TICK to TICK_EVENT to prevent naming conflicts (#16649)Stefan Kerkmann2022-03-142-2/+2
|
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1412-0/+368
|\
| * [Keyboard] Add BAMFK-1 (#16409)Danny2022-03-1412-0/+368
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-147-9/+8
|\|
| * Disable RGB matrix pixel animations for some boards (#16643)Ryan2022-03-143-9/+0
| | | | | | | | | | * idobao/id87/v2: disable RGB matrix pixel animations * Same for two more boards
| * keebio/iris: Add ifdefs to encoder callbacks (#16642)Ryan2022-03-144-0/+8
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-141-0/+10
|\|
| * bolsa/damapad - Fix missing layout macro (#16639)Joel Challis2022-03-131-0/+10
| |
* | Mousekeys fix (#16640)jack2022-03-131-0/+1
| |
* | Fix oneshot toggle logic (#16630)Drashna Jaelre2022-03-145-16/+15
| | | | | | | | | | | | | | * Fix oneshot toggle logic * Enable oneshots by default * Decrement eeconfig magic number due to eeconfig changes
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-143-3/+3
|\|
| * Fix 40percentclub USB descriptors (#16638)jack2022-03-143-3/+3
| |
* | [Core] Move `has_mouse_report_changed` function to `report.c` (#16543)Drashna Jaelre2022-03-145-23/+32
| | | | | | | | | | | | | | * Move 'has_mouse_report_changed' checkto report.c * change mousekeys to use memcpy * fix linting issues
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-1/+91
|\|
| * ISP flashing guide: add instructions for flashing STM32duino bootloader (#16568)Ryan2022-03-131-1/+91
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1370-269/+237
|\|
| * Move keyboard USB IDs and strings to data driven: 0-9 (#16481)Ryan2022-03-1370-269/+237
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1311-169/+41
|\|
| * USB-USB converter cleanup (#16618)Ryan2022-03-1311-169/+41
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1316-150/+489
|\|
| * [Keyboard] Add "Uno" rev2 (#14071)Spencer Peterson2022-03-1316-150/+489
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Add "Uno" rev2 Adds support for the second revision of Uno, courtesy of @Snipeye. * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Update keyboards/uno/uno.h * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/keymaps/demo/keymap.c * Update keyboards/uno/rev2/rules.mk * Update keyboards/uno/rev1/rules.mk * Align rules.mk comments * Update keyboards/uno/info.json * Update keyboards/uno/rev1/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev2/config.h * Update keyboards/uno/rev1/config.h
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-139-0/+651
|\|
| * [Keyboard] Add support for Jels60 (#16605)jels2022-03-139-0/+651
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-131-0/+1
|\|
| * helix:edvorakjp keymap change to use split_common (#16532)Takeshi ISHII2022-03-131-0/+1
| |
* | 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