03f7bec6c8
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 04:55:03 +00:00
311cf865dc
[Keymap] Keebio Iris rev4 - keymap with dual encoder support ( #13063 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-15 21:54:36 -07:00
e2c5893405
core: make RESET key work with Teensy 4.x ( #13076 )
...
related to https://github.com/kinx-project/kint/issues/5
2021-06-15 21:53:27 -07:00
d37900b906
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 04:28:45 +00:00
4720aa4a34
Change Lufa-MS size ( #13183 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-15 21:28:17 -07:00
06971da0be
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 04:20:45 +00:00
ed0451bc28
Make atmel-dfu and chibios-dfu flashing behave more like caterina flashing. ( #12552 )
...
This commit makes atmel-dfu and chibios-dfu bootloaders retry to detect the bootloader
every 0,5 seconds (now configurable via the BOOTLOADER_RETRY_TIME makefile variable),
and a period is printed after every try. This is a much more pleasant behaviour than
the 5s retry timeout.
2021-06-16 14:20:44 +10:00
2d6fe6eed4
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 04:20:30 +00:00
22cd151fc3
[Keyboard] suv ( #12957 )
2021-06-15 21:20:15 -07:00
96c8afea2d
[Keyboard] hatchback ( #12958 )
2021-06-15 21:20:03 -07:00
346f4548db
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 04:18:48 +00:00
3966599940
[Keyboard] Add via support for the Leopold FC980C ( #12860 )
2021-06-15 21:18:20 -07:00
ff61df103e
Limit saturation for RGB_MATRIX_JELLYBEAN_RAINDROPS ( #12669 )
...
* Set saturation limit to jellybean_raindrops_anim.h
* Use faster bit-shift maths and qadd8
* Remove extra parenthesis
* Single bitmask operation is sufficient.
Co-authored-by: filterpaper <filterpaper@localhost>
2021-06-16 14:04:21 +10:00
a0959f1b33
Add asym_eager_defer_pk debounce type ( #12689 )
2021-06-16 14:00:37 +10:00
b151153211
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 03:54:19 +00:00
09e22b9cfc
[Keymap] ANAVI Macro Pad 2 add Skype keymap ( #12664 )
...
This keymap for ANAVI Macro Pad 2 contains a couple of Skype
shortcuts for MS Windows and GNU/Linux distributions:
- Ctrl+M: Mute/unmute microphone
- Ctrl+Shift+K: Start/stop camera
Signed-off-by: Leon Anavi <leon@anavi.org>
2021-06-15 20:53:49 -07:00
41ba616463
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 03:39:48 +00:00
9cf4148aa9
[Keymap] add new keymap for pteron ( #12474 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-15 20:39:17 -07:00
d82e5055dd
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 03:36:03 +00:00
c00a9937f2
[Docs] Update one_shot_keys.md ( #12291 )
2021-06-15 20:35:31 -07:00
3be3cdafa2
Merge remote-tracking branch 'origin/master' into develop
2021-06-16 03:34:34 +00:00
d0a3506d0f
[Keyboard] Add 'LAYOUT_65_ansi_split_bs_2_right_mods' support to KBDfans KBD67 rev2 ( #12053 )
2021-06-15 20:34:00 -07:00
f5c2f7153d
[Keyboard] Moved tokyo60/ into tokyokeyboard/tokyo60/. ( #12023 )
...
* Moved tokyo60/ into tokyokeyboard/tokyo60/.
* Updated make instruction, fixed broken image link
* Fixed still broken image link.
2021-06-15 20:21:13 -07:00
640f0fc7c6
Merge remote-tracking branch 'origin/master' into develop
2021-06-15 21:43:53 +00:00
3d546c0853
add tender/macrowo_pad ( #12786 )
...
* add tender/macrowo_pad
* add another layer for via keymap
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2021-06-16 07:43:18 +10:00
d7ecfa8382
Merge remote-tracking branch 'origin/master' into develop
2021-06-15 03:07:31 +00:00
a9525d88a3
[Keymap] Update readme for ploopy nano keymap ( #12733 )
...
The readme from the Ploopy Mini was accidentally put as the Ploopy
Nano readme. The Ploopy Nano does not ship with VIA by default.
2021-06-14 20:06:55 -07:00
a2a524afbb
Merge remote-tracking branch 'origin/master' into develop
2021-06-14 23:52:31 +00:00
0713797c58
Ensure that safe_commands always run ( #13199 )
...
* ensure that safe_commands always run
* import the config subcommand in bin/qmk
2021-06-14 16:51:58 -07:00
8d0a610f6e
Merge remote-tracking branch 'origin/master' into develop
2021-06-14 06:32:22 +00:00
ae45faca26
[Docs] Update Japanese newbs_learn_more_resources.md ( #12839 )
...
* Update Japanese newbs_learn_more_resources.md document.
* Slightly modded
2021-06-14 15:31:50 +09:00
6dc94019e4
Merge remote-tracking branch 'origin/master' into develop
2021-06-14 03:20:48 +00:00
449b4b8d86
[Docs] Update feature_split_keyboard.md ( #13205 )
2021-06-13 20:20:19 -07:00
fda4149cc3
Fix LED mapping for GMMK Pro ( #13189 )
2021-06-14 12:38:20 +10:00
836b8f7d64
Merge remote-tracking branch 'origin/master' into develop
2021-06-14 00:53:06 +00:00
3d62e1dfbf
vscode: specify yapf as the formatting provider ( #13206 )
2021-06-13 17:52:31 -07:00
52028ceea1
Merge remote-tracking branch 'origin/master' into develop
2021-06-12 19:15:34 +00:00
a08486597d
[Docs] update Japanese translation of feature_pointing_device.md ( #12753 )
...
* update feature_pointing_device.md translation
* update based on comment
2021-06-13 04:15:08 +09:00
f8acb1ee10
Merge remote-tracking branch 'origin/master' into develop
2021-06-12 19:12:28 +00:00
f48bd8cde3
[Docs] Update Japanese newbs_flashing.md ( #12837 )
...
* Update Japanese newbs_flashing.md document.
* Slightly modded
* Apply suggestions from code review
2021-06-13 04:11:56 +09:00
dc17180f84
Merge remote-tracking branch 'origin/master' into develop
2021-06-12 19:10:49 +00:00
c16b7d63e7
Update Japanese newbs.md document. ( #12835 )
2021-06-13 04:10:23 +09:00
421fd75541
Merge remote-tracking branch 'origin/master' into develop
2021-06-12 19:09:03 +00:00
db36e2be9f
[Docs] Japanese translation of docs/data_driven_config.md ( #12066 )
...
* add docs/ja/data_driven_config.md
* Update docs/ja/data_driven_config.md
Co-authored-by: s-show <s1shimz@gmail.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: s-show <s1shimz@gmail.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: s-show <s1shimz@gmail.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: s-show <s1shimz@gmail.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
* Update docs/ja/data_driven_config.md
Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: s-show <s1shimz@gmail.com>
Co-authored-by: shela <shelaf@users.noreply.github.com>
2021-06-13 04:08:32 +09:00
0f226a30be
Merge remote-tracking branch 'origin/master' into develop
2021-06-11 10:35:43 +00:00
0ef145db15
Add Matrix 8XV1.2 OG rev1 PCB ( #11614 )
...
* add v1 12og pcb
* update
* matrix changes for testing
* Update matrix.c
* finalized files
* rename board versions
* update readmes
* typo in readme
* fix board filenames
* Update keyboards/matrix/m12og/rev1/rev1.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* change function
* update halconf and chconf
* merge master
* Update readme.md
* Update readme.md
* Update readme.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-11 20:35:13 +10:00
641141c519
Merge remote-tracking branch 'origin/master' into develop
2021-06-10 21:50:54 +00:00
2e90ef0536
[Keyboard] Add Loop, Nano and Work boards from Work Louder ( #12756 )
2021-06-10 14:50:24 -07:00
6fe3943ad3
Migrate keyboards using uGFX to LED_MATRIX ( #9657 )
2021-06-10 17:46:09 +10:00
b2fdd48744
Add ST7565 LCD driver ( #13089 )
...
Co-authored-by: Joakim Tufvegren <jocke@barbanet.com>
2021-06-10 17:16:09 +10:00
QMK Bot
R
Michael Stapelberg
kb-elmo
Purdea Andrei
AlisGraveNil
John Graham
Albert Y
Simon Arlott
Leon Anavi
Fidel Coria
Thomas Museus Dabay
Andy Freeland
James
Brandon Claveria
Dustin Bosveld
Zach White
shela
Markus Knutsson
Gigahawk
umi
Takeshi ISHII
Drashna Jaelre
Joakim Tufvegren
Ryan