Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update master from QMK master #2

Merged
merged 517 commits into from
Jul 15, 2021
Merged

Update master from QMK master #2

merged 517 commits into from
Jul 15, 2021

Conversation

scottywei
Copy link
Owner

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

drashna and others added 30 commits June 9, 2021 05:06
@drashna
Fix Bug with (RGB|LED)_DISABLE_WHEN_USB_SUSPENDED define (#13060)
9975e17
@zvecr
Migrate preonic/rev3 to pwm ws2812 driver (#13142)
4dda716
@tzarc
Allow limiting the multibuild based on keymap name. (#13066)
21aa789
@Xelus22
update via keymap (#13145)
5073dc3
@jackytrabbit @Erovia @drashna
Add support for LAZYDESIGNERS/THE60/rev2 (#13015)
39c8ed3 
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
@tzarc
Slightly more prominent LUFA Mass-storage bootloader warning. (#13163)
d684b8c
@drashna
[Keyboard] Add Loop, Nano and Work boards from Work Louder (#12756)
2e90ef0
@str-dst @drashna
Add Matrix 8XV1.2 OG rev1 PCB (#11614)
0ef145d 
* 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>
@mtei @s-show @shelaf
[Docs] Japanese translation of docs/data_driven_config.md (#12066)
db36e2b 
* 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>
@shelaf
Update Japanese newbs.md document. (#12835)
c16b7d6
@shelaf
[Docs] Update Japanese newbs_flashing.md (#12837)
f48bd8c 
* Update Japanese newbs_flashing.md document.

* Slightly modded

* Apply suggestions from code review
@umi-umi
[Docs] update Japanese translation of feature_pointing_device.md (#12753
a084865 
)

* update feature_pointing_device.md translation

* update based on comment
@skullydazed
vscode: specify yapf as the formatting provider (#13206)
3d62e1d
@TweetyDaBird
[Docs] Update feature_split_keyboard.md (#13205)
449b4b8
@shelaf
[Docs] Update Japanese newbs_learn_more_resources.md (#12839)
ae45fac 
* Update Japanese newbs_learn_more_resources.md document.

* Slightly modded
@skullydazed
Ensure that safe_commands always run (#13199)
0713797 
* ensure that safe_commands always run

* import the config subcommand in bin/qmk
@violet-fish
[Keymap] Update readme for ploopy nano keymap (#12733)
a9525d8 
The readme from the Ploopy Mini was accidentally put as the Ploopy
Nano readme. The Ploopy Nano does not ship with VIA by default.
@swiftrax
add tender/macrowo_pad (#12786)
3d546c0 
* add tender/macrowo_pad

* add another layer for via keymap

Co-authored-by: Swiftrax <swiftrax@gmail.com>
@rouge8
[Keyboard] Add 'LAYOUT_65_ansi_split_bs_2_right_mods' support to KBDf…
d0a3506 
…ans KBD67 rev2 (#12053)
@thomas-m-d
[Docs] Update one_shot_keys.md (#12291)
c00a993
@fauxpark
[Keymap] add new keymap for pteron (#12474)
9cf4148 
Co-authored-by: Ryan <fauxpark@gmail.com>
@leon-anavi
[Keymap] ANAVI Macro Pad 2 add Skype keymap (#12664)
09e22b9 
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>
@penmoid
[Keyboard] Add via support for the Leopold FC980C (#12860)
3966599
@AlisGraveNil
[Keyboard] hatchback (#12958)
96c8afe
@AlisGraveNil
[Keyboard] suv (#12957)
22cd151
@purdeaandrei
Make atmel-dfu and chibios-dfu flashing behave more like caterina fla…
ed0451b 
…shing. (#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.
@str-dst @drashna
Change Lufa-MS size (#13183)
4720aa4 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@compilation-error @drashna
[Keymap] Keebio Iris rev4 - keymap with dual encoder support (#13063)
311cf86 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@brianlow
Top level heading for common config (RGB Matrix) (#13120)
968e4f9 
* Top level heading for common config

Prior to this, the some of the common config looks like a detail of the APA102 driver

* Change heading to Common Config (RGB Matrix)
@brianlow
Top level heading for common config (LED Matrix) (#13153)
875bb48
mtei and others added 19 commits July 13, 2021 18:14
@mtei @fauxpark @tzarc
[Keyboard] Update Symmetric70 keyboard prototype (#12707)
b89abc4 
* 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>
@noroadsleft
AMJ60 Refactor (#13530)
bf70db4 
* 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
@BB-66 @drashna
[Keyboard] fixes and additions to the Marauder keyboard (#13462)
64e6ba0 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@mehoron @drashna @ALowery
[Keyboard] Montex add VIA support and keymap. (#13488)
3cd6cb6 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
@noroadsleft
Ergoarrows info.json touch-up (#13537)
555a449 
* 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.
@noroadsleft
4pplet AEKISO60 keymap/macro touch-up (#13528)
a3d6046 
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.
@noroadsleft
Ortho 5x14 handwired info.json correction (#13538)
d439917 
* ortho5x14 handwired: correct info.json data

Last key was incorrectly positioned.

* fix readme typo
[Keyboard} Add ISO support for the GMMK Pro (#13532)
2fd4595 
* 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
@ianklug @fauxpark
[Keyboard] Add ianklug grooveboard (#13536)
6cdba3a 
Co-authored-by: Ryan <fauxpark@gmail.com>
@zvecr
Refactor Drop boards to custom matrix lite (#13468)
ef8267d
@filterpaper
RGB Matrix support for Scylla (#13415)
b29179d 
Co-authored-by: filterpaper <filterpaper@localhost>
@noroadsleft
Lucid Phantom soldered: layout macro touch-up (#13540)
70efc82
@noroadsleft
Traveller handwired layout macro refactor (#13539)
dd5ead6
@mj-bomb @fauxpark
[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (
9c4916e 
#13494)

Co-authored-by: Ryan <fauxpark@gmail.com>
@mechlovin
correct data info.json (#13544)
1c9af23 
rouge87 and rogue87
@skullydazed
switch to qmk-dotty-dict (#13460)
ffdfe37
@fauxpark
Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509)
99f637e
@Koobaczech @Erovia
@fauxpark @jetpacktuxedo
[Keyboard] Tidying up my projects and subprojects (#13289)
867d60b 
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ethan Madden <maddene@madden.ninja>
@mechlovin @fauxpark
[Keyboard] Add Serratus PCB (#13281)
18c6e1d 
Co-authored-by: Ryan <fauxpark@gmail.com>
@scottywei scottywei merged commit 3eb0721 into scottywei:master Jul 15, 2021
scottywei pushed a commit that referenced this pull request Mar 28, 2023
@filterpaper @KarlK90
[Core] Replace Tapping Force Hold feature with Quick Tap Term (qmk#17007
cbabc8d 
)

* Replace Tapping Force Hold feature with Quick Tap Term

* Replace keyboard level TAPPING_FORCE_HOLD with QUICK_TAP_TERM 0

* Deprecate force hold in info_config.json

* Before and after quick tap term unit tests

* Quick tap unit tests iteration

* Keymap config.h correction

* Remove TAPPING_FORCE_HOLD_PER_KEY macros that were missed

* Add two more test cases for quick tap

* Replace TAPPING_FORCE_HOLD with QUICK_TAP_TERM in configs #2

* Replace TAPPING_FORCE_HOLD_PER_KEY with QUICK_TAP_TERM_PER_KEY in configs #2

* Add function declaration for get_quick_tap_term

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
CI cli core documentation Improvements or additions to documentation keyboard keymap python translation via
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.