mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-28 19:58:48 +06:00
Code Issues Packages Projects Releases Wiki Activity
23,921 Commits 9 Branches 1,419 Tags 336 MiB
11d49d00e7
Commit Graph

2279 Commits

Author SHA1 Message Date
QMK Bot
84d3575fdb Merge remote-tracking branch 'origin/master' into develop 2022-06-14 10:13:29 +00:00
Tom Barnes
026d0e8bf1
Update feature_midi.md (#17390) 
Add caveat about usb endpoints.
 2022-06-14 11:12:52 +01:00
Jouke Witteveen
1706da9054
tap-dance: Restructure code and document in more detail (#16394) 2022-06-13 22:12:55 +02:00
Drashna Jaelre
0ab51ee29d
Add support for large Mouse Reports (#16371) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-06-08 18:39:16 -07:00
QMK Bot
8a6fd0dc7e Merge remote-tracking branch 'origin/master' into develop 2022-06-08 01:48:42 +00:00
JunZuloo
5f72d54299
Update other_vscode.md (#17317) 
Bracket pair colorizer has been deprecated since it is now a native feature, and VIM Keymap no longer exists, so I removed those 2 links.
 2022-06-08 02:47:57 +01:00
QMK Bot
6f82647e8d Merge remote-tracking branch 'origin/master' into develop 2022-06-06 22:30:38 +00:00
Travis Rigg
b85c224b7c
docs: reflect systemd's change in language (#17322) 
Like much of our field, systemd has renamed their `master` branch to `main`
 2022-06-06 23:29:59 +01:00
Xelus22
af84772a5f
initial 24lc32a (#16990) 2022-06-04 01:53:24 +01:00
QMK Bot
38839a9105 Merge remote-tracking branch 'origin/master' into develop 2022-05-31 11:32:26 +00:00
Forrest Cahoon
8153b55e07
Add trailing parens to get_oneshot_mods in feature_advanced_keycodes.md (#17211) 2022-05-31 21:31:47 +10:00
Thomas Preisner
bbab8eb993
Make bootloader_jump for dualbank STM32 respect STM32_BOOTLOADER_DUAL_BANK_DELAY (#17178) 2022-05-30 23:20:10 -07:00
Nick Brassel
8545473307
Removes terminal from QMK. (#17258) 2022-05-30 22:38:08 -07:00
trwnh
9e2fe4eff6
Make SPI Mode configurable and change default mode to 3 (#17263) 2022-05-31 15:28:55 +10:00
QMK Bot
6e4e50d5aa Merge remote-tracking branch 'origin/master' into develop 2022-05-30 22:06:28 +00:00
Dasky
25ec68c408
Fix docs typo (#17254) 2022-05-30 23:05:57 +01:00
Dasky
2de70e6f2d
Add uf2-split-* make targets. (#17257) 2022-05-31 08:04:50 +10:00
Nick Brassel
89a5d5aea0
Fixup command sequencing for master/develop. (#17227) 2022-05-29 09:07:11 +10:00
Nick Brassel
d0af56da33
Breaking changes for 2022q2. (#17221) 2022-05-29 07:50:21 +10:00
zvecr
de6360feca stub changelog 2022-05-24 01:55:34 +01:00
Joy Lee
1c7e8b9a9d
Added support for Wb32fq95 (#16871) 2022-05-23 15:57:24 +10:00
QMK Bot
b5725c05bd Merge remote-tracking branch 'origin/master' into develop 2022-05-20 17:10:54 +00:00
James Young
2a544710d7
Small Markdown Patch for docs/feature_rgb_matrix.md (#17171) 2022-05-20 10:10:17 -07:00
QMK Bot
9fa106f76e Merge remote-tracking branch 'origin/master' into develop 2022-05-20 16:15:13 +00:00
jpe230
f296e1d1e2
[Docs] Align LED Matrix docs with RGB matrix docs (#17140) 2022-05-20 09:13:40 -07:00
QMK Bot
f155db37d4 Merge remote-tracking branch 'origin/master' into develop 2022-05-20 16:09:04 +00:00
Kyle McCreery
d5aab127d2
[Docs] Update Steno Keycode Table (#17155) 2022-05-20 09:09:00 -07:00
Joel Challis
40e33d03a8
Recommend pillow as part of manual MSYS install (#17133) 2022-05-17 21:50:48 +01:00
QMK Bot
37eee020ed Merge remote-tracking branch 'origin/master' into develop 2022-05-17 18:49:34 +00:00
Ryan
d241e80533
Keymap FAQ updates (#17130) 2022-05-18 04:48:59 +10:00
QMK Bot
8b79f30cd5 Merge remote-tracking branch 'origin/master' into develop 2022-05-17 13:20:51 +00:00
durken1
dba5b730a3
Update pr_checklist.md (#17122) 2022-05-17 14:20:13 +01:00
Ryan
4a8bd7b9a5
Rename keymap_extras headers for consistency (#16939) 2022-05-15 21:27:01 +10:00
Drashna Jaelre
f090881aeb
[Feature] Add support for multiple switchs/solenoids to Haptic Feedback engine (#15657) 2022-05-15 21:24:35 +10:00
QMK Bot
a899c097ce Merge remote-tracking branch 'origin/master' into develop 2022-05-14 22:09:12 +00:00
Mateusz Ż
94755308e0
Fix anchors with <code> in table of content (#15169) 2022-05-14 23:08:32 +01:00
Pascal Getreuer
68b16bba68
[Core] Add Caps Word feature to core (#16588) 
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-05-14 16:00:32 +10:00
Drashna Jaelre
787a68948f
[Core] Add Reboot keycode to core (#15990) 2022-05-14 13:35:49 +10:00
QMK Bot
fc52a30780 Merge remote-tracking branch 'origin/master' into develop 2022-04-27 23:12:15 +00:00
Ryan
e99d6d582c
Add Ukrainian keymap header (#16947) 
* Add Ukrainian keymap header

* Docs
 2022-04-28 00:11:41 +01:00
Stefan Kerkmann
b1681fb6a1
[Core] Allow usage of AVRs minimal printf library (#16266) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2022-04-22 18:13:31 +10:00
QMK Bot
05ab7453ec Merge remote-tracking branch 'origin/master' into develop 2022-04-22 07:38:00 +00:00
IskandarMa
83ce70c821
[Docs] zh-cn document translate: git parts (#15576) 
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-04-22 17:37:29 +10:00
QMK Bot
12d1eb0415 Merge remote-tracking branch 'origin/master' into develop 2022-04-20 17:11:12 +00:00
jpe230
81be7bb7b5
Fix i2c driver doc: Incorrect name (#16898) 2022-04-20 18:10:20 +01:00
uqs
690dc4bdaf
Add support for multiple sensors to pmw3360 (#15996) 2022-04-19 20:29:17 +10:00
QMK Bot
d958329258 Merge remote-tracking branch 'origin/master' into develop 2022-04-17 00:37:07 +00:00
Albert Y
a5a4597311
Refine LED indicator documentation (#16304) 2022-04-16 17:36:07 -07:00
Simon Arlott
5841c755ae
rgblight: Add functions to stop blinking one or all but one layer (#16859) 2022-04-17 00:02:32 +02:00
Albert Y
e5918cf968
Heatmap incorrect matrix effect workaround (#16315) 2022-04-16 11:34:07 -07:00
Jouke Witteveen
8f585153c4
Add GET_TAPPING_TERM macro to reduce duplicate code (#16681) 
* Add GET_TAPPING_TERM macro to reduce duplicate code

The macro gives the right tapping term depending on whether per-key
tapping terms and/or dynamic tapping terms are enabled. Unnecessary
function calls and variable resolution are avoided.

Fixes #16472.

* Use GET_TAPPING_TERM for Cirque trackpads

Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
 2022-04-16 11:24:09 -07:00
Nick Brassel
1f2b1dedcc
Quantum Painter (#10174) 
* Install dependencies before executing unit tests.

* Split out UTF-8 decoder.

* Fixup python formatting rules.

* Add documentation for QGF/QFF and the RLE format used.

* Add CLI commands for converting images and fonts.

* Add stub rules.mk for QP.

* Add stream type.

* Add base driver and comms interfaces.

* Add support for SPI, SPI+D/C comms drivers.

* Include <qp.h> when enabled.

* Add base support for SPI+D/C+RST panels, as well as concrete implementation of ST7789.

* Add support for GC9A01.

* Add support for ILI9341.

* Add support for ILI9163.

* Add support for SSD1351.

* Implement qp_setpixel, including pixdata buffer management.

* Implement qp_line.

* Implement qp_rect.

* Implement qp_circle.

* Implement qp_ellipse.

* Implement palette interpolation.

* Allow for streams to work with either flash or RAM.

* Image loading.

* Font loading.

* QGF palette loading.

* Progressive decoder of pixel data supporting Raw+RLE, 1-,2-,4-,8-bpp monochrome and palette-based images.

* Image drawing.

* Animations.

* Font rendering.

* Check against 256 colours, dump out the loaded palette if debugging enabled.

* Fix build.

* AVR is not the intended audience.

* `qmk format-c`

* Generation fix.

* First batch of docs.

* More docs and examples.

* Review comments.

* Public API documentation.
 2022-04-13 18:00:18 +10:00
Ryan
c05e8afe45
Joystick feature updates (#16732) 
* Joystick feature updates

* Move new functions to joystick.h

* Docs
 2022-03-26 18:38:09 +00:00
QMK Bot
2957f60dc1 Merge remote-tracking branch 'origin/master' into develop 2022-03-24 20:14:36 +00:00
Erovia
efc9c525b1
CLI: Add 'via2json' subcommand (#16468) 2022-03-24 21:13:40 +01:00
Simon
dc9eb21332
add the ability to change the pwm frequency for the IS31FL3737B (#16718) 2022-03-24 18:08:22 +00:00
QMK Bot
5dcee0199e Merge remote-tracking branch 'origin/master' into develop 2022-03-19 16:38:09 +00:00
leviport
3502bbbd16
Fix typo in docs/ref_functions.md (#16690) 2022-03-19 16:37:35 +00:00
Ryan
9ee2effe8e
HD44780 driver rework (#16370) 2022-03-19 17:57:22 +11:00
Drashna Jaelre
02655690f4
[Core] Add compile/make macro to core (#15959) 
* [Core] Add KC_MAKE keycode to core

fix linting

fix testing error

work around test idiocyncracies

fix more lint

something something stupid tests

add doc

* updates based on feedback

* Add bad names

* Fixup docs

* semantics but cleaner

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>

* Hide oneshot checks behind preprocessors

* Move no-compile option around

* Fix formatting

* make shift optional

* Make opt in

* fix formatting

* update send string function name

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2022-03-17 21:19:34 +00:00
QMK Bot
037c5b5496 Merge remote-tracking branch 'origin/master' into develop 2022-03-15 08:31:53 +00:00
Albert Y
9aaf4a5a9b
Add split keyboard example for Bootmagic Lite (#16349) 
* Add split keyboard example for bootmagic lite

* Add handedness link

* Edit sentence structure

* Apply suggested language correction
 2022-03-15 01:31:17 -07:00
QMK Bot
9e39b99a0e Merge remote-tracking branch 'origin/master' into develop 2022-03-14 22:21:34 +00:00
ethsol
a939adb55c
Sentence correction (#16650) 2022-03-14 22:20:50 +00:00
QMK Bot
cc9a2aef0f Merge remote-tracking branch 'origin/master' into develop 2022-03-13 23:56:16 +00:00
Ryan
dde4120a1e
ISP flashing guide: add instructions for flashing STM32duino bootloader (#16568) 2022-03-13 23:55:47 +00:00
QMK Bot
4281beb1de Merge remote-tracking branch 'origin/master' into develop 2022-03-12 12:42:55 +00:00
Thomas Kriechbaumer
86b123141b
docs: fix code sample (#16623) 2022-03-12 12:42:25 +00:00
QMK Bot
54658a3687 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 20:49:07 +00:00
WJH
6c40b6856b
[Docs] Include ASCII diagram to explain tap-hold modes (#15873) 
* [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
 2022-03-10 12:48:33 -08:00
Nick Brassel
8d5eacb7dd
Add support for encoder mapping. (#13286) 2022-03-09 19:29:00 +11:00
Nick Brassel
2f6751e48a
Asymmetric encoders, encoder tests. (#16068) 2022-03-08 16:58:05 +11:00
QMK Bot
e71f8f89d2 Merge remote-tracking branch 'origin/master' into develop 2022-03-08 04:17:05 +00:00
ZiTe
0880850b15
[Bug] Rename has_mouse_report_changed parameters (#16417) 
Fixes compilation issues when bluetooth is enabled, due to issues 
with cpp used by bluetooth code. 

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-03-07 20:16:35 -08:00
QMK Bot
7bc8046f9a Merge remote-tracking branch 'origin/master' into develop 2022-03-08 02:50:36 +00:00
peepeetee
8014fb14b6
Fix in-page links in reference_info_json.md (#16487) 2022-03-07 18:50:03 -08:00
Stefan Kerkmann
2bface8f89
Add flash target for UF2 bootloaders (#16525) 2022-03-07 08:59:06 -08:00
Ryan
75544d9127
Move Doxygen docs to subdirectory (#16561) 2022-03-07 11:22:22 +00:00
QMK Bot
ab76e6ab59 Merge remote-tracking branch 'origin/master' into develop 2022-03-05 04:59:18 +00:00
kiilerix
da6d6ce2e1
Some docs improvements (#15845) 
* docs: clarify in "Keymap Overview" what LAYOUT is and isn't

It is not strictly necessary to use LAYOUT macros in keyboard.c, but it
is a convenient abstraction of hardware internals, allowing focus on the
physical keyboard layout.

From the C source point of view LAYOUT is macro with a parameter list,
which expands to a array of rows that each is an array with a keyboard
scancode for each column. A macro parameter list is not an array, and
even less a single array.

Perhaps no big deal, but also no reason to give incorrect hints.

* docs: update "Understanding QMK's Code" to current code structure introduced in 96e2b13d1d

This part of the documentation was no longer correct. I tried updating
it, mainly copy editing and using github links to latest release.

This is not trying to fix all problems, but just trying to fix some
problems while reusing much of the old phrases and structure.

* Update docs to use "qmk format-python"
 2022-03-05 15:58:50 +11:00
Ryan
ace0603f4f
Change data driven "str" type to represent a quoted string literal (#16516) 
* Change data driven "str" type to represent a quoted string literal

* Update docs
 2022-03-04 13:25:24 +00:00
Ryan
f634fddd34
Remove send_unicode_hex_string() (#16518) 2022-03-04 11:04:45 +00:00
jels
61ba8efa3e
Update pr_checklist.md (#16484) 
Update readme.md template link from https://github.com/qmk/qmk_firmware/blob/master/data/templates/avr/readme.md to https://github.com/qmk/qmk_firmware/blob/master/data/templates/keyboard/readme.md
 2022-03-04 12:49:14 +11:00
jels
e01307f265
Typo in squeezing_avr.md (#16506) 
Fixed typo in squeezing_avr docs.
 2022-03-03 15:38:24 -08:00
Jake VanderVaate
96b6ddf4bf
fixed typo in docs/newbs_getting_started.md (#16501) 2022-03-03 09:53:40 +00:00
Albert Y
29ab430f1f
[Docs] Anchor link correction in rgb matrix docs (#16460) 2022-02-26 18:38:46 -08:00
Dasky
259cf76966
Link WS2812 driver page from rgb feature docs (#16366) 2022-02-27 01:50:44 +00:00
Ryan
97d0e7cb2d
[Docs] Add commands to flashing docs (#16456) 2022-02-26 17:35:10 -08:00
Joel Challis
cf31355f08
Changelog 2022q1 (#16380) 
* Initial changelog pass

* update generate-develop-pr-list content

* Fix bad word-ness

* Fix generate-develop-pr-list ignores

* Update docs/ChangeLog/20220226.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2022-02-23 17:33:08 +00:00
fauxpark
145dca0e49 Merge remote-tracking branch 'upstream/master' into develop 2022-02-22 05:21:40 +11:00
Michal Petrik
b1f8622513
[Docs] Update feature_leader_key.md (#16344) 
Co-authored-by: zvecr <git@zvecr.com>
 2022-02-21 09:08:36 -08:00
Michal Petrik
d3584be431
[Docs] Update newbs_building_firmware.md (#16333) 2022-02-21 09:08:07 -08:00
Joel Challis
0d9a0d5d97
Align new-keyboard with recent schema updates (#16378) 2022-02-16 20:58:40 +00:00
Joel Challis
16767312db
Align docs to new-keyboard behaviour (#16357) 2022-02-15 15:45:32 +11:00
Joy Lee
71c0b97bce
Added external spi flash driver. (#15419) 2022-02-11 20:26:16 +00:00
QMK Bot
815d2bae81 Merge remote-tracking branch 'origin/master' into develop 2022-02-10 16:17:00 +00:00
Albert Y
f662939037
Sentence structure update (#16306) 2022-02-10 16:16:01 +00:00
QMK Bot
0930c60553 Merge remote-tracking branch 'origin/master' into develop 2022-02-10 07:13:21 +00:00
Albert Y
3e5cb1da0f
Improve description of LED state data sync option (#16302) 2022-02-10 18:12:42 +11:00
QMK Bot
9e293e7f9c Merge remote-tracking branch 'origin/master' into develop 2022-02-09 05:13:10 +00:00
IskandarMa
04020da48c
[Docs] pr checklist: update doc hyperlinks to relative ones and use IDs (#16263) 2022-02-08 21:12:39 -08:00
Nick Brassel
a2ffdb4abd Merge remote-tracking branch 'upstream/master' into develop 2022-02-09 16:00:09 +11:00
Nick Brassel
efdaa7f972
Add support for driving unselected row/col. (#16278) 2022-02-09 15:50:13 +11:00
Joel Challis
2e279f1b88
Initial pass at data driven new-keyboard subcommand (#12795) 
* Initial pass at a data driven keyboard subcommand

* format

* lint

* Handle bootloader now its mandatory
 2022-02-09 06:03:30 +11:00
QMK Bot
41bbb34287 Merge remote-tracking branch 'origin/master' into develop 2022-02-06 17:38:30 +00:00
Takeshi ISHII
87199eb2f5
add 'info_config.h' into docs/hardware_keyboard_guidelines.md (#16247) 
Added info_config.h added in #10817 to the include order description of config.h.
 2022-02-06 17:37:59 +00:00
QMK Bot
65a4ad1177 Merge remote-tracking branch 'origin/master' into develop 2022-02-06 17:37:11 +00:00
Jouke Witteveen
14f886d03b
[Docs] Address some typos (also in moonlander matrix.c) (#16248) 
* [Docs] Fix repeated words

* [Keyboard] Fix moonlander output

The left/right orientation differs from Ergodox EZ.
 2022-02-06 17:36:44 +00:00
MasterSpoon
0452ad9479
Add RGB matrix & LED Matrix support for IS31FL3742A, IS31FL3743A, IS31FL3745, IS31FL3746A (#14989) 
Co-authored-by: Xelus22 <17491233+Xelus22@users.noreply.github.com>
 2022-02-06 09:04:43 -08:00
QMK Bot
1aa9328200 Merge remote-tracking branch 'origin/master' into develop 2022-02-06 05:17:07 +00:00
Albert Y
7a0b07f84b
[Docs] RGB documentation formatting corrections (#15826) 2022-02-05 21:16:36 -08:00
Dasky
b1debfb12f
Remove default pointing device driver. (#16190) 
* remove custom as default

* add missing pointing_device_driver to rules.mk

* Update docs
 2022-02-05 14:29:15 +00:00
QMK Bot
80dbdb2a61 Merge remote-tracking branch 'origin/master' into develop 2022-02-05 11:45:18 +00:00
IskandarMa
10fda3ec8e
[Docs] feature: mouse keys, fix misused wording (#16226) 2022-02-05 11:44:48 +00:00
Adam Lickel
eb8ace0855
RGB Matrix: Reload from EEPROM (#15923) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2022-02-04 19:08:48 -08:00
QMK Bot
a72f4346ce Merge remote-tracking branch 'origin/master' into develop 2022-02-04 21:15:50 +00:00
IskandarMa
f52cc210b8
[Docs] feature_macro.md: minor formatting fix (#16205) 2022-02-05 08:15:21 +11:00
Albert Y
6a35788b63 [Core] Add Pixel Flow RGB matrix effect (#15829) 
* Initial PIXEL FLOW matrix effect commit

* Commit suggested use of rgb_matrix_check_finished_leds

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Code change support for split RGB

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2022-02-05 05:58:16 +11:00
QMK Bot
578d3f6951 Merge remote-tracking branch 'origin/master' into develop 2022-02-04 18:57:58 +00:00
Nick Brassel
1fffcbc298
Revert "[Core] Add Pixel Flow RGB matrix effect (#15829)" (#16209) 
This reverts commit e8fa329073.
 2022-02-05 05:57:21 +11:00
QMK Bot
f2384d062b Merge remote-tracking branch 'origin/master' into develop 2022-02-04 18:56:47 +00:00
Albert Y
e8fa329073
[Core] Add Pixel Flow RGB matrix effect (#15829) 
* Initial PIXEL FLOW matrix effect commit

* Commit suggested use of rgb_matrix_check_finished_leds

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Code change support for split RGB

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2022-02-05 05:55:51 +11:00
QMK Bot
249280cac2 Merge remote-tracking branch 'origin/master' into develop 2022-02-04 03:45:30 +00:00
Nick Brassel
3403f5813c
Point out that deferred execution needs to be enabled in rules.mk (#16196) 2022-02-04 03:44:51 +00:00
QMK Bot
97ee1c0aee Merge remote-tracking branch 'origin/master' into develop 2022-02-01 02:06:00 +00:00
Albert Y
a2ef11bb00
[Docs] Add reference to data sync options for RGB (#16144) 2022-01-31 18:05:09 -08:00
QMK Bot
b4f124c78c Merge remote-tracking branch 'origin/master' into develop 2022-01-30 19:06:54 +00:00
Sergey Vlasov
03b1d9ef1f
Add a warning about USBtinyISP limitations to the ISP flashing guide (#15898) 2022-01-30 11:06:19 -08:00
Ryan
7d685956cc
Rename AdafruitBLE to BluefruitLE (#16127) 2022-01-30 17:29:42 +00:00
QMK Bot
d6abdda34f Merge remote-tracking branch 'origin/master' into develop 2022-01-29 16:06:50 +00:00
IskandarMa
d48bff8342
[Docs] zh-cn documentation translate: hand-wire (#15666) 
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-29 16:06:19 +00:00
QMK Bot
d0faaa9c7c Merge remote-tracking branch 'origin/master' into develop 2022-01-29 14:28:24 +00:00
IskandarMa
9e79f27547
[Docs] zh-cn document translate: IDE configuration (#15575) 
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-29 14:27:57 +00:00
QMK Bot
720ccf9559 Merge remote-tracking branch 'origin/master' into develop 2022-01-29 03:27:16 +00:00
Monksoffunk
b2fcc923cb
[Docs] Update Encoder docs about multiple encoders (#16036) 2022-01-28 19:26:42 -08:00
QMK Bot
99478417ac Merge remote-tracking branch 'origin/master' into develop 2022-01-27 15:57:01 +00:00
Albert Y
0f0e90971b
[Docs] OLED documentation edits (#15977) 
* Clarify OLED_TIMEOUT

* Add a section on logo file location
 2022-01-27 15:56:20 +00:00
Dasky
7b31fc54df
Enable a default task throttle for split pointing. (#15925) 2022-01-26 19:24:29 +00:00
Ryan
1d11ae3087
Rip out old macro and action_function system (#16025) 
* Rip out old macro and action_function system

* Update quantum/action_util.c

Co-authored-by: Joel Challis <git@zvecr.com>
 2022-01-24 21:22:20 +00:00
QMK Bot
95321fbc2c Merge remote-tracking branch 'origin/master' into develop 2022-01-23 22:15:53 +00:00
Nick Brassel
7d6e15423b
Add some clarity regarding new board definitions (#16018) 2022-01-23 22:15:09 +00:00
Nick Brassel
77062e9a36
Add L432, L442. (#16016) 2022-01-24 08:49:36 +11:00
Albert Y
fed36fc5f8
Adjust mouse key defaults (#15883) 2022-01-21 22:09:44 -08:00
Ryan
b45a037c7e
Rename some Quantum keycodes (#15968) 
* Rename some Quantum keycodes

* Tweak EEPROM clear and debug keycode short aliases
 2022-01-22 03:34:15 +00:00
QMK Bot
c7f477bc59 Merge remote-tracking branch 'origin/master' into develop 2022-01-21 15:49:13 +00:00
Albert Y
8901c9eca1
Add Atom editor suggestion (#15969) 2022-01-22 02:48:35 +11:00
QMK Bot
2f5c70e834 Merge remote-tracking branch 'origin/master' into develop 2022-01-21 14:18:11 +00:00
Gigahawk
ad09160b03
docs: fix typo in led matrix docs (#15972) 2022-01-21 14:17:19 +00:00
QMK Bot
ecfa4172d0 Merge remote-tracking branch 'origin/master' into develop 2022-01-20 23:20:58 +00:00
Gigahawk
2baca55cda
docs: fix typo in rgblight docs (#15960) 2022-01-20 23:20:56 +00:00
Petr Viktorin
be06ef6af5
[Docs] Fix typo in ADNS 9800 sensor name (#15956) 2022-01-20 12:14:09 -08:00
Drashna Jaelre
6ebb44f17e
[Bug][Core] Fix optical sensor firmware upload (#15919) 2022-01-20 09:23:16 -08:00
Ryan
dcb0c4e51e
Add example implementations for compatible MCUs list (#15935) 
* Add example implementations for compatible MCUs list

* Update docs/compatible_microcontrollers.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-01-19 20:34:59 +11:00
QMK Bot
b825af0728 Merge remote-tracking branch 'origin/master' into develop 2022-01-18 18:25:03 +00:00
IskandarMa
f6a7f4d4ac
update the Chinese translation based on the latest English version (#14924) 
Co-authored-by: peepeetee <43021794+peepeetee@users.noreply.github.com>
Co-authored-by: Joy Lee <chang.li@westberrytech.com>
Co-authored-by: LitoMore <LitoMore@users.noreply.github.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-18 18:24:02 +00:00
Ryan
c72ed7c024
CLI: Parse USB device version BCD (#14580) 
* CLI: Parse USB device version BCD

* Apply suggestions
 2022-01-17 08:44:34 +11:00
QMK Bot
71a9384f49 Merge remote-tracking branch 'origin/master' into develop 2022-01-14 14:48:10 +00:00
Ryan
9e92d8a905
Make note of upper limit for UC() (#15870) 2022-01-14 14:47:36 +00:00
QMK Bot
15d385a862 Merge remote-tracking branch 'origin/master' into develop 2022-01-13 21:56:21 +00:00
Tuk Bredsdorff
8fe320baa6
Fix keymap.json macro example (#15567) 2022-01-13 21:55:48 +00:00
Alabastard-64
a8482a4424
PMW3389 Revert Firmware load during Initilization (#15859) 2022-01-13 02:51:05 +00:00
QMK Bot
69e4c18153 Merge remote-tracking branch 'origin/master' into develop 2022-01-13 02:29:55 +00:00
Albert Y
362a65510a
[Docs] Move QMK newbs build environment guide to next section (#15386) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-13 02:29:13 +00:00
QMK Bot
43d18321e3 Merge remote-tracking branch 'origin/master' into develop 2022-01-12 22:06:23 +00:00
Albert Y
c4b0a06c79
[Docs] Improve Handedness by EEPROM documentation (#15615) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2022-01-12 14:05:45 -08:00
QMK Bot
58769a40de Merge remote-tracking branch 'origin/master' into develop 2022-01-12 01:08:02 +00:00
JayceFayne
93e55605d9
[Docs] fix typo and remove trailing whitespace (#15842) 2022-01-11 17:07:24 -08:00
Alabastard-64
2842ab4052
Add PMW3389 optical sensor Support (Updated) (#15740) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-01-11 14:33:13 -08:00
QMK Bot
db608aae51 Merge remote-tracking branch 'origin/master' into develop 2022-01-11 00:54:24 +00:00
adlainewson
069ef7eb9e
[Docs] newbs_flashing.md: add link to build environment section (#15654) 2022-01-10 16:54:22 -08:00
Drashna Jaelre
ec7c3ac12d
Optimize initialization of PMW3360 Sensor (#15821) 2022-01-10 14:57:36 -08:00
QMK Bot
05b6fbb1f5 Merge remote-tracking branch 'origin/master' into develop 2022-01-10 16:23:47 +00:00
Albert Y
8a4fae3b32
[Docs] Recommend the use of RGB matrix functions for code (#15744) 
* Recommend the use of functions instead of keycodes

* Commit suggested review

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-01-11 03:23:28 +11:00
Albert Y
63d3ad155a
[Docs] Recommend the use of RGB light functions for code (#15745) 
* Recommend the use of functions instead of keycodes

* Commit suggested revision

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-01-11 03:23:07 +11:00
Pete Sevander
21958a9343
New combo configuration options (#15083) 
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
 2022-01-09 12:02:25 -08:00
QMK Bot
98078f769d Merge remote-tracking branch 'origin/master' into develop 2022-01-09 03:27:15 +00:00
Tate
0acc0924db
[Docs] Update feature_tap_dance.md (#14931) 2022-01-08 19:26:44 -08:00
Drashna Jael're
ac466c1571
Merge remote-tracking branch 'origin/master' into develop 2022-01-06 02:01:04 -08:00
Drashna Jaelre
2669b0bee8
[Docs] Add drag scrolling example to Pointing device docs page (#15715) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2022-01-06 00:30:22 -08:00
Ryan
5fb93934d0
Fixes for bootloader refactor build failures (#15638) 2022-01-06 06:55:46 +11:00
QMK Bot
99e11f4823 Merge remote-tracking branch 'origin/master' into develop 2022-01-05 02:11:57 +00:00
Joel Challis
1c1e6fa47d
Remove stale docs translations (#15737) 2022-01-04 18:11:24 -08:00
QMK Bot
1f1d2ffd29 Merge remote-tracking branch 'origin/master' into develop 2022-01-03 17:08:10 +00:00
Albert Y
a88dc08643
[Docs] Note the order of enumerated custom keycodes (#15706) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2022-01-03 09:07:58 -08:00
QMK Bot
668e6b8e92 Merge remote-tracking branch 'origin/master' into develop 2022-01-02 08:07:51 +00:00
Albert Y
6f043c5497
Volume as default encoder documentation example (#15678) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2022-01-02 00:07:22 -08:00
QMK Bot
db38fb1a60 Merge remote-tracking branch 'origin/master' into develop 2021-12-28 21:01:23 +00:00
Albert Y
3dee6e28dd
[Docs] Clarify placement and usage of RGB matrix effect inc files (#15572) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-12-28 13:00:49 -08:00
QMK Bot
c929b7aadf Merge remote-tracking branch 'origin/master' into develop 2021-12-27 10:16:53 +00:00
Albert Y
067d94f0b6
Add layer condition example to encoder callback function (#15490) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-12-27 21:16:19 +11:00
QMK Bot
111ee6cb91 Merge remote-tracking branch 'origin/master' into develop 2021-12-27 03:16:22 +00:00
Albert Y
e3073be488
RGB Matrix layer key indicator (#14626) 
* Add layer key indicator example

* Update description

* Deobfuscate with index variable

* Add missing layer variable

* Correct color name and indicator function

* Function typo

* Place layer variable outside loops to save firmware space

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-12-27 14:16:18 +11:00
QMK Bot
ca5bd0aa2c Merge remote-tracking branch 'origin/master' into develop 2021-12-27 03:07:03 +00:00
Albert Y
b384599663
Link Macro example for COMBO_ACTION documentation (#15164) 
* Link Macro example for COMBO_ACTION documentation

* Restructure

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-12-27 14:07:00 +11:00
QMK Bot
dfe5fe7181 Merge remote-tracking branch 'origin/master' into develop 2021-12-27 02:57:38 +00:00
Buttenup
db358d171d
Update feature_macros.md (#15026) 
* Update feature_macros.md

Added a link to the usage of SAFE_RANGE as this wasn't clear to me when I visited this page in isolation.

* Fix typo

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-12-27 13:57:09 +11:00
Chad Austin
25713dc222
Add sym_defer_pr debouncer type (#14948) 2021-12-27 13:44:56 +11:00
Dasky
7f7364c559
[Core] Split support for pointing devices. (#15304) 
* Draft implementation

* formatting

* fix combined buttons

* remove pimoroni throttle

* sync pointing on a throttle loop with checksum

* no longer used

* doh

Co-authored-by: Drashna Jaelre <drashna@live.com>

* switch pimoroni to a cpi equivalent

* add cpi support

* allow user modification of seperate mouse reports

* a little tidy up

* add *_RIGHT defines.

* docs

* doxygen comments

* basic changelog

* clean up pimoroni

* small doc fixes

* Update docs/feature_pointing_device.md

Co-authored-by: Drashna Jaelre <drashna@live.com>

* performance tweak if side has usb

* Don't run init funtions on wrong side

* renamed some variables for consistency

* fix pimoroni typos

* Clamp instead of OR

* Promote combined values to uint16_t

* Update pointing_device.c

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-12-27 12:05:51 +11:00
vectorstorm
0391801267
Fixes potential wpm sampling overflow, along with code comment fixes (#15277) 
Co-authored-by: Trevor Powell <trevor@vectorstorm.com.au>
 2021-12-27 11:52:56 +11:00
Nick Brassel
6e40dfa022
Add open-drain GPIO support. (#15282) 
* Add open-drain GPIO support.

* `qmk format-c`

* Wording.

* Remove port GPIO implementations as the only board that uses it has its own internal defs anyway. Will wait for first-class handling of ports in core before reimplementing.
 2021-12-27 11:52:10 +11:00
uqs
859e2aa86b
Fix some typos, especially the sensor name. (#15557) 2021-12-24 17:46:49 -08:00
QMK Bot
e0490a24f2 Merge remote-tracking branch 'origin/master' into develop 2021-12-25 01:13:07 +00:00
Scott Chow
1e28667ef8
[Docs] Fixed keycode reference for swirl effect (#15564) 2021-12-24 17:12:33 -08:00
QMK Bot
e24fe0832b Merge remote-tracking branch 'origin/master' into develop 2021-12-24 20:10:51 +00:00
Ian C
435fa2c391
fix typo (#15569) 2021-12-24 20:10:12 +00:00
QMK Bot
df7fe3e2ac Merge remote-tracking branch 'origin/master' into develop 2021-12-22 14:27:56 +00:00
Thomas Lorblanchès
3f1f60cbf9
doc/faq_debug: qmk cli can also be used to print debug messages (#15528) 2021-12-22 06:27:25 -08:00
SmollChungus
e95156d4d8
Documentation Typo fix (#15538) 2021-12-22 12:47:01 +00:00
QMK Bot
757b42f2fb Merge remote-tracking branch 'origin/master' into develop 2021-12-14 04:56:33 +00:00
Hassan Williamson
8d604e707b
[Docs] Updated typo on feature_bluetooth.md (#15466) 2021-12-13 20:55:53 -08:00
Drashna Jael're
f92d153532
Merge remote-tracking branch 'origin/master' into develop 2021-12-11 10:28:29 -08:00
Xelus22
b09c44ced7
[Core] Add configuration of PMW3360 lift off distance (#15424) 
* sensor code add

* update documentation

* add default #define

* Update drivers/sensors/pmw3360.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-12-08 23:52:07 -08:00
QMK Bot
31bce31c74 Merge remote-tracking branch 'origin/master' into develop 2021-12-09 06:45:59 +00:00
peepeetee
b2576dcf12
Change "Chinese" to "Simplified Chinese" in langs.md (#15441) 2021-12-09 17:45:24 +11:00
QMK Bot
6ef36482a2 Merge remote-tracking branch 'origin/master' into develop 2021-12-09 06:42:44 +00:00
Joel Challis
aecb387692
Add test filter to 'qmk pytest' (#15432) 
* Add test filter to 'qmk pytest'

* Bodge for some test filters not resolving qmk

* Update docs
 2021-12-09 17:42:11 +11:00
QMK Bot
ef847f8ef6 Merge remote-tracking branch 'origin/master' into develop 2021-12-09 03:49:44 +00:00
Drashna Jaelre
0df93ec2f9
[Docs] Fix Header formatting in compatible mcu doc (#15438) 2021-12-09 14:49:10 +11:00
Drashna Jael're
af936c6ae6
Merge remote-tracking branch 'origin/master' into develop 2021-12-08 08:17:55 -08:00
Drashna Jaelre
26febb7c24
Expand rotational range for PMW3360 Optical Sensor (#15431) 2021-12-08 07:38:09 -08:00
Andrew-Fahmy
755731f0ba
Fix RESET not working for keyboards with Kiibohd bootloader (#15430) 2021-12-07 20:36:39 -08:00
Joel Challis
2726856cde
Implement MAGIC_TOGGLE_CONTROL_CAPSLOCK (#15368) 2021-11-30 17:34:08 -08:00
QMK Bot
0e5fc86c68 Merge remote-tracking branch 'origin/master' into develop 2021-11-30 19:24:58 +00:00
thesecretmaster
c2e0b283c3
[Docs] Reorder functions in Understanding QMK (#15357) 2021-11-30 11:24:21 -08:00
QMK Bot
7ac9d1abe4 Merge remote-tracking branch 'origin/master' into develop 2021-11-29 08:23:43 +00:00
Albert Y
d8324e8a9c
Document swap-hands tap-toggle feature (#15229) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-29 00:23:37 -08:00
wheredoesyourmindgo
7f67504993
Added cancel_key_lock function (#15321) 2021-11-29 00:17:07 -08:00
Charly Delay
99ec5e39cf
Fix last merge date (#15327) 2021-11-28 12:59:48 +11:00
Nick Brassel
88fe5c16a5
Changelog 2021q4 (#15325) 
* Changelog.

* Remove the asymmetric encoder PR from listing due to revert.

* More docs

* More docs

* More docs

* Links to changelog, updated schedule, slotted in 2 weeks of testing at the end so that there's no ambiguity with PR merge dates.

* Clarify keyboard moves.

* Fix dates

* Sidebar

* Fixup dates.

* Fixup dates.

* Wording.
 2021-11-28 10:41:48 +11:00
Drashna Jaelre
4d0dd1eab7
[Bug] Revert Assymmetrical Split Encoder support (#12090) (#15311) 
* Revert "fix broken macro in transport.h (#15239)"

This reverts commit 06f18e22d9.

* Revert "Rework encoders to enable asymmetric split keyboards (#12090)"

This reverts commit 32215d5bff.
 2021-11-27 14:40:09 +11:00
Joy Lee
68838bb700
Westberrytech pr (#14422) 
* Added support for WB32 MCU

* Modified eeprom_wb32.c

* Remove the eeprom_wb32-related code
 2021-11-27 09:28:18 +11:00
Álvaro A. Volpato
f889e26ed7
Documentation typo fix (#15298) 
* Fix WS2812 driver docs typo
 2021-11-25 20:13:16 +00:00
precondition
4bac5f53d8
New feature: DYNAMIC_TAPPING_TERM_ENABLE (#11036) 
* New feature: `DYNAMIC_TAPPING_TERM_ENABLE`

3 new quantum keys to configure the tapping term on the fly.

* Replace sprintf call in tapping_term_report by get_u16_str

* Replace tab with 4 spaces
 2021-11-26 07:06:50 +11:00
Joel Challis
5e9c29da0d
Tidy up adjustable ws2812 timing (#15299) 2021-11-25 19:35:06 +00:00
Jordan Banasik
3d00620711
Add ifndef to WS2812 timing constraints (#14678) 
* Add ifndef to WS2812 timing constraints

Due to the way that the PrimeKB Meridian PCB was designed, this change
is needed in order to properly adjust the LEDs.

Testing:
* Compiled primekb/meridian:default successfully
* Compiled random board (walletburner/neuron:default) successfully

* Fix linting errors

Missed some spacing

* More linting fixes

Spacing on the comments... really?

* Rename WS2812 timing parameters for clarity; add comments

* Add docs update for the WS2812 timing macros

* Fix typo on comment

* Add ifndef for WS2812_RES

* Update double backticks and table with parameters

* Move timing adjustments documentation to ws2812_drivers

* Move timings adjustment discussion to bitbang section

* Update T0H and T1H definitions in subtractions

* format

Co-authored-by: Gondolindrim <alvaro.volpato@usp.br>
Co-authored-by: zvecr <git@zvecr.com>
 2021-11-25 16:55:46 +00:00
Isaac Elenbaas
d9393b8684
Add Retro Shift (Auto Shift for Tap Hold via Retro Tapping) and Custom Auto Shifts (#11059) 
* Add Retro Shift and Custom Auto Shifts

* Fix compilation errors with no RETRO_SHIFT value
 2021-11-25 23:12:14 +11:00
Joel Challis
282e916d86
Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
Drashna Jaelre
f4966a19d6
[Docs] Squeezing space out of AVR (#15243) 
* [Docs] Squeezing space out of AVR

* Add more info

* Apply suggestions from code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Add oled section

* Apply suggestions from code review

Co-authored-by: Nick Brassel <nick@tzarc.org>

* Update layers and intro wording

* Rename doc file

* add get_u8_str support

* oled clarifications

Co-authored-by: Nick Brassel <nick@tzarc.org>

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-23 08:14:00 +11:00
QMK Bot
3fd6ae93ad Merge remote-tracking branch 'origin/master' into develop 2021-11-22 20:02:13 +00:00
precondition
97a32eedf1
layer_combo → sd_combo (#15266) 2021-11-23 07:01:39 +11:00
Zach White
08ce0142ba
Macros in JSON keymaps (#14374) 
* macros in json keymaps

* add advanced macro support to json

* add a note about escaping macro strings

* add simple examples

* format json

* add support for language specific keymap extras

* switch to dictionaries instead of inline text for macros

* use SS_TAP on the innermost tap keycode

* add the new macro format to the schema

* document the macro limit

* add the json keyword for syntax highlighting

* fix format that vscode screwed up

* Update feature_macros.md

* add tests for macros

* change ding to beep

* add json support for SENDSTRING_BELL

* update doc based on feedback from sigprof

* document host_layout

* remove unused var

* improve carriage return handling

* support tab characters as well

* Update docs/feature_macros.md

Co-authored-by: Nick Brassel <nick@tzarc.org>

* escape backslash characters

* format

* flake8

* Update quantum/quantum_keycodes.h

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-22 11:11:35 -08:00
Balz Guenat
32215d5bff
Rework encoders to enable asymmetric split keyboards (#12090) 
Co-authored-by: Balz Guenat <balz.guenat@siemens.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-20 09:06:08 -08:00
Joel Challis
2728603fe6
Move tmk_core/common/<plat> (#13918) 2021-11-19 10:41:02 -08:00
Henré Botha
a5155b98fb
[Docs] Clarify "nested" and "rolling" key sequences (#14655) 2021-11-18 20:34:22 -08:00
QMK Bot
aa712b5e28 Merge remote-tracking branch 'origin/master' into develop 2021-11-17 22:31:15 +00:00
Alexis Jeandeau
b5d24f9efb
Call steno_set_mode inside eeconfig_init_user in the doc (#15176) 2021-11-17 22:30:42 +00:00
Albert Y
557e5ddf99
Rename RGB fractal (#15174) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-16 11:14:57 -08:00
Drashna Jaelre
160b0558f5
Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
vectorstorm
c9fd698711
Reimplements WPM feature to be smaller & precise (#13902) 
* Reimplements WPM feature.

 - Now calculates exact WPM over the last up to three seconds of typing.
 - WPM_SMOOTHING removed, as it's no longer needed.
 - WPM_SAMPLE_SECONDS added, to specify how long a period to average WPM
   over, set to 5 seconds by default.
 - WPM_SAMPLE_PERIODS added, to specify how many sampling buffers we'll
   use.  Each one uses one extra byte of space.  Having more will lead
   to smoother decay of WPM values.  Defaults to 50 (we're saving so
   many bytes of firmware space I felt like being extravagent, and this
   change is still a big size saving overall)
 - WPM_UNFILTERED option added (defaults to unset), which disables all
   filtering within the WPM feature.  This saves some space in the
   firmware and also reduces latency between typing and the WPM
   calculation measuring it.  (saves 70 bytes in my tests)
 - WPM_LAUNCH_CONTROL added (defaults to unset).  When typing begins
   while the current displayed WPM value is zero, the WPM calculation
   only considers the time elapsed since typing began, not the whole
   WPM_SAMPLE_SECONDS buffer.  The result of this is that the displayed
   WPM value much more rapidly reaches an accurate WPM value, even when
   results are being filtered. (costs 22 bytes in my tests)
 - Updates documentation to reflect changed options.

Saves about 900 bytes, in my tests, compared against the previous implementation,
with default settings.

* Apply suggestions from code review

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

Co-authored-by: Trevor Powell <trevor@vectorstorm.org>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2021-11-16 05:40:52 +11:00
Nick Brassel
36d123e9c5
Add support for deferred executors. (#14859) 
* Add support for deferred executors.

* More docs.

* Include from quantum.h

* Cleanup.

* Parameter checks

* Comments.

* qmk format-c

* I accidentally a few words.

* API name change.

* Apply suggestions from code review

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Review comments.

* qmk format-c

* Review comments.

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2021-11-15 18:21:09 +00:00
Drashna Jaelre
56e3f06a26
Rework and expand Pointing Device support (#14343) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2021-11-14 22:03:24 -08:00
Ryan
04b51e381e
Update UART driver API (#14839) 
* Add uart_puts() and uart_gets()

* Add some docs

* Rework API

* Formatting

* Update docs/uart_driver.md

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Simplify a uart_write() loop

* Update platforms/avr/drivers/uart.c

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2021-11-13 18:23:14 +00:00
Drashna Jael're
7e86c37962
Merge remote-tracking branch 'origin/master' into develop 2021-11-13 09:32:14 -08:00
peepeetee
0ee9c41cc6
Fix hebrew emoji in langs.md (#15140) 2021-11-13 17:18:02 +00:00
QMK Bot
4ceb5947f9 Merge remote-tracking branch 'origin/master' into develop 2021-11-12 22:15:05 +00:00
Albert Y
57f63e43d8
[Docs] Correct logic of tap hold statement (#14992) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-12 14:14:28 -08:00
QMK Bot
058308cc74 Merge remote-tracking branch 'origin/master' into develop 2021-11-12 07:33:52 +00:00
Drashna Jaelre
7c2b2c81b5
[Docs] Codify not using code from other keyboards in PRs (#15128) 
* [Docs] Codify not using code from other keyboards in PRs

* add additional comments
 2021-11-12 18:33:16 +11:00
QMK Bot
c8a4c0da0a Merge remote-tracking branch 'origin/master' into develop 2021-11-05 08:12:19 +00:00
Albert Y
a63c2c5f50
Add example for turning off RGB colors and retaining indicator function (#14997) 
* Add init function for solid effect with colors off

* Restructure sentence

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-05 19:11:45 +11:00
QMK Bot
2ebf587ebf Merge remote-tracking branch 'origin/master' into develop 2021-11-05 03:42:36 +00:00
Ryan
cc5a38e787
Rework ISP flashing guide (#14938) 
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
 2021-11-05 14:42:08 +11:00
Nick Brassel
92e9bbd9b9 Merge remote-tracking branch 'upstream/master' into develop 2021-11-05 08:55:55 +11:00
Erovia
c8b09d0d4a
CLI: Add 'cd' subcommand (#12584) 
* CLI: Add 'cd' subcommand

Go to your qmk_firmware dir with ease.

* Fix for Windows and do not run if already under QMK Home

* Make flake8 happy

* Fix prompt for Windows

* Make flake8 happy once again

* I'll get it right eventually

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add subcommand to __init__.py and fixup after rebase

* Update Windows code to use milc's run

* Unify the subshell starting with os.execl

* Exit with error msg when output is redirected to non-TTY.

* Revert Windows-specific code

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-05 08:21:09 +11:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002) 
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
 2021-11-05 08:18:09 +11:00
QMK Bot
4b6db33a1d Merge remote-tracking branch 'origin/master' into develop 2021-11-04 21:15:20 +00:00
Mikkel Jeppesen
fefd7fdc51
Refactor new-keyboard to be python3.7 compatible (#14707) 
* Use copy_tree from distutils for python 3.7 support

* Bump python version in docs

* Changed new-keyboard to use printf-style format strings

* Use username for manunfacturer / maintainer

* Update lib/python/qmk/cli/new/keyboard.py

Co-authored-by: Zach White <skullydazed@drpepper.org>

Co-authored-by: Zach White <skullydazed@drpepper.org>
 2021-11-05 08:14:43 +11:00
QMK Bot
45a8176e32 Merge remote-tracking branch 'origin/master' into develop 2021-11-04 21:03:11 +00:00
Ryan
6437045166
qmk docs: Run docsify serve if available (#15056) 2021-11-05 08:02:27 +11:00
Ryan
f529580860
Basic keycode overhaul (#14726) 2021-11-03 22:22:17 -07:00
Nick Brassel
5da04fb45b
Update to ChibiOS 20.3.4, support builds against trunk (#14208) 
* Add support for building against ChibiOS svn/trunk.

* Swap to 21.6.x

* Update to latest branch revision as released version is broken.

* Updated configs.

* Conf updates.

* Updated ChibiOS

* Convert STM32L422 to actual L422 ChibiOS platform.

* Downgrade to 20.3.4 as ChibiOS 21.6.x is being aborted.

* Rollback L422-based boards.
 2021-11-03 08:26:40 +11:00
QMK Bot
464d67c68f Merge remote-tracking branch 'origin/master' into develop 2021-11-02 06:19:36 +00:00
Albert Y
2761b17b98
Clarify placement of configuration options (#15015) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-02 17:19:01 +11:00
Purdea Andrei
76fb54403c
haptic: Feature to disable it when usb port is not configured or suspended. (#12692) 
This also add support for specifying a LED pin to indicate haptic status,
and also adds support for a haptic-enable pin, which is useful to turn off
the boost converter on the solenoid driver.
 2021-11-02 16:54:29 +11:00
Albert Y
2173b5373c
Add Pixel Rain RGB Matrix effect (#14155) 
* Add Pixel animation header file

* Add Pixel animation to documentation

* Add Pixel animation to core include file

* Remove unintended spaces

* Remove seeding of PRNG

* Increase frequency of lit keys

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-11-02 10:40:25 +11:00
donicrosby
0c72501763
Enable de-ghosting for RGB/LED matrix on all ISSI LED drivers (#14508) 
* Initial work for de-ghost enable

* Dumb mistake with the redefine

* Added Copywrite stuff on source files

* Fixed whitespace errors

* Added support for all ISSI LED drivers

* Updated docs for support for ISSI LED driver pull-up pull-down

* Applied clang format

* Added 'boolean' flag to enable de-ghosting for the is31fl3731 IC

* Fixed some of the grammer in the docs

* Fixed comment placement and grammer of comment

* Fixed whitespace errors from lint

Co-authored-by: donicrosby <donicrosby1995@gmail.com>
 2021-11-02 10:40:01 +11:00
Drashna Jaelre
9d235d4fc5
[Core] Change OLED task function to be boolean (#14864) 
* [Core] Add kb level callbacks to OLED driver

* Update keyboards and keymaps

* Update docs

* Update userspace configs

* Add fix for my keymap ...

* update lefty
 2021-11-02 09:42:50 +11:00
Vlad K
a29ca1e7f1
Add support for ISSI drivers on both sides of a split keyboard (#13842) 
* Gets RGB working on a split keyboard with IS31FL3733. Currently needs small tweak to re-enable WS2812

* Added helper function

* Trying to integrate the function

* Moved functionality into a macro

* Swapped conditional for a macro everywhere

* Tidying up

* More code cleanup

* Documentation updates

* Fixed formatting via linter

* Switching to a function from a macro

* Fixed compile error

* Fixing WS2812 behavior. UNTESTED.

* Updated documentation about the driver addresses.

* Fixed code for WS2812

* Trying to add in LED_MATRIX support

* Updated effects for LED matrix

* Updated third-party effect defines.

* Ran format-c on modified files

* Apply suggestions from code review

Co-authored-by: Ryan <fauxpark@gmail.com>

* Move to static inline. Avoids issues with gcc v8+

* Move helper function for LED_matrix to static inline to avoid issues with gcc v8+

Co-authored-by: Vlad Kvitnevskiy <vladkvit@outlook.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-11-02 09:04:37 +11:00
Albert Y
4bf7ce2298
Add Fractal RGB matrix effects (#12670) 
* Squashed fractal effect commit for easier rebase

* Update documentation

* Squashed fractal effect commit for easier rebase

* Update documentation

* Update doc spacing

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update feature_rgb_matrix.md

Co-authored-by: filterpaper <filterpaper@localhost>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-11-02 04:30:07 +11:00
Joel Challis
fb739a67c9
Enable configuration of PWM frequency for IS31FL3733B (#14983) 
* Enable PWM frequency for IS31FL3733B

* Document config option

* clang
 2021-10-30 15:13:40 +01:00
QMK Bot
31f4c7022f Merge remote-tracking branch 'origin/master' into develop 2021-10-27 15:03:34 +00:00
Albert Y
9b912416b4
[Docs] Add instructions to create keymap before proceeding (#14945) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-27 08:03:00 -07:00
Chad Austin
ee23aae87f
Optimize matrix scanning by removing variable shifts (#14947) 2021-10-26 20:01:57 -07:00
QMK Bot
3bda490550 Merge remote-tracking branch 'origin/master' into develop 2021-10-27 00:09:46 +00:00
Albert Y
c0c7c4692b
Add MAGIC_TOGGLE_GUI line to main keycode documentation (#14959) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-27 01:09:12 +01:00
QMK Bot
a2f3d050f4 Merge remote-tracking branch 'origin/master' into develop 2021-10-26 23:55:39 +00:00
JayceFayne
312b1b95a8
Document MAGIC feature (#14301) 2021-10-26 16:55:04 -07:00
QMK Bot
81fbb886e2 Merge remote-tracking branch 'origin/master' into develop 2021-10-24 22:33:14 +00:00
coliss86
0002acd4a3
Fix Typo in documentation (#14942) 2021-10-24 23:32:42 +01:00
QMK Bot
4110b3f60e Merge remote-tracking branch 'origin/master' into develop 2021-10-23 06:45:40 +00:00
ForsakenRei
ff39890620
[Docs] Add default case to tap dance example 5. (#14893) 2021-10-22 23:45:07 -07:00
Joel Challis
84d5198ef9
Align PS/2 GPIO defines (#14745) 
* Align PS/2 GPIO

* Align PS/2 GPIO

* refactor more keyboards

* Remove more defines

* Put back avr/chibios split

* format
 2021-10-20 20:07:40 +01:00
QMK Bot
7cb6d0f3bd Merge remote-tracking branch 'origin/master' into develop 2021-10-19 14:27:43 +00:00
precondition
5fbcbc6af8
[DOCS] Fix the STENO_COMBINEDMAP table (#14883) 2021-10-20 01:26:59 +11:00
Joel Challis
01b702bece
Split out HAPTIC_ENABLE to have separate DRIVER option (#14854) 
* DRIVER -> ENABLE

* Update generic_features.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update common_features.mk

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-18 12:55:44 +01:00
Stefan Kerkmann
e50867d52d
[Core] Add support for RISC-V builds and GD32VF103 MCU (#12508) 
* Add support for RISC-V builds and GD32VF103 MCU

* Add toolchain selection in chibios.mk based on the mcu selected in
mcu_selection.mk
* Reorder and added comments to chibios.mk to have a streamlined makefile
* Add GD32VF103 mcu to possible targets for QMK.
* Add STM32 compatibility for GD32VF103 MCU, this is hacky but more efficent
  then rewriting every driver.
* Add GigaDevice DFU bootloader as flash target, please note that
  dfu-util of at least version 0.10 is needed.
* Add analog driver compatibility
* Add apa102 bitbang driver compatibility
* Add ws2812 bitbang driver compatibility
* Add eeprom in flash emulation compatibility
* Allow faster re-builds with ccache

* Add SiPeed Longan Nano to platform files

* Add SiPeed Longan Nano Onekeys

* Make quine compatible with other bootloaders

* Support builds with picolibc

* Add risc-v toolchain to arch and debian/ubuntu scripts
 2021-10-18 16:23:20 +11:00
QMK Bot
82bff2d80c Merge remote-tracking branch 'origin/master' into develop 2021-10-16 08:31:35 +00:00
Takeshi ISHII
eddb206369
add docs/ja/ja_doc_status.sh (#14402) 2021-10-16 17:31:09 +09:00
QMK Bot
5c6a8f599f Merge remote-tracking branch 'origin/master' into develop 2021-10-16 00:43:42 +00:00
Aaron Paterson
c8b00b2e91
Update documentation because GPIO functions are no longer in quantum.h (#14826) 
* GPIO functions are no longer in quantum.h

* Update docs/internals_gpio_control.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-16 01:43:03 +01:00
Joel Challis
40bc5a8192
Enable CLI flashing via mdloader (#14729) 
* Enable CLI flashing via mdloader

* remove flag

* Update qmk flash help
 2021-10-15 22:07:33 +01:00
Drashna Jael're
d7f69dc620
Merge remote-tracking branch 'origin/master' into develop 2021-10-14 21:26:49 -07:00
Ryan
b7a346600c
[Docs] Clean up reference_info_json.md (#14806) 2021-10-15 12:45:33 +11:00
QMK Bot
9a20bc1f8f Merge remote-tracking branch 'origin/master' into develop 2021-10-09 20:04:35 +00:00
shela
f216c20fc7
Update Japanese document (#14766) 2021-10-09 21:04:00 +01:00
QMK Bot
713c32fa5e Merge remote-tracking branch 'origin/master' into develop 2021-10-09 20:03:20 +00:00
shela
5aca3f613c
Update Japanese document (#14767) 2021-10-09 21:03:17 +01:00
shela
969596bd67
Update Japanese document (#14769) 2021-10-09 21:02:55 +01:00
Ryan
db41a3426c
Improve Adafruit BLE configuration defines (#14749) 
* Improve Adafruit BLE configuration defines

* Formatting
 2021-10-08 16:15:20 +01:00
QMK Bot
7c5233e097 Merge remote-tracking branch 'origin/master' into develop 2021-10-08 10:28:42 +00:00
s-show
7205b70e84
Translate keycodes us ansi shifted (#13820) 
* copy "keycodes_us_ansi_shifted.md" to docs/ja.

* Add japanese translation "docs/keycodes_us_ansi_shifted.md".

* Apply suggestions from code review

Co-authored-by: shela <shelaf@users.noreply.github.com>

* Update docs/ja/keycodes_us_ansi_shifted.md

Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>

Co-authored-by: shela <shelaf@users.noreply.github.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
 2021-10-08 19:28:00 +09:00
QMK Bot
8cc0f896ce Merge remote-tracking branch 'origin/master' into develop 2021-10-07 20:04:00 +00:00
precondition
13f3e30e86
Fix link from feature_tap_dance.md to tapping term settings (#14741) 2021-10-07 21:03:21 +01:00
Joel Challis
1c0347b8b8
Remove SERIAL_LINK feature (#14727) 
* Remove SERIAL_LINK

* more stale paths in doxygen-todo

* Fix

* More refs

* Update testing docs

* Update doxygen-todo

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-10-07 12:32:05 +11:00
Nick Brassel
b2a186cf92
Purge uGFX. (#14720) 
* Purge uGFX.

* Remove remnants of visualizer.

* Remove remnants of uGFX.
 2021-10-07 10:57:48 +11:00
Ryan
bc1f5ef381
i2c_master: Add support for reading/writing to 16-bit registers (#14289) 2021-10-07 10:29:35 +11:00
Ryan
d8f0c8783a
Remove sysex API (#14723) 2021-10-06 19:34:46 +11:00
QMK Bot
e6311cf2ec Merge remote-tracking branch 'origin/master' into develop 2021-10-05 19:47:11 +00:00
Nick Brassel
4676a14596
More PR checklist updates (#14705) 
* Wording, clarification.

* Apply suggestions from code review

Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>

Co-authored-by: Mikkel Jeppesen <2756925+Duckle29@users.noreply.github.com>
 2021-10-06 06:46:36 +11:00
QMK Bot
a4417345f1 Merge remote-tracking branch 'origin/master' into develop 2021-10-05 09:30:24 +00:00
Nick Brassel
7a49e5d207
Add clarification for licensing. (#14704) 
* Add clarification for licensing.

* Errr, v2.
 2021-10-05 20:29:52 +11:00
QMK Bot
2d71d14191 Merge remote-tracking branch 'origin/master' into develop 2021-10-04 23:21:33 +00:00
Albert Y
27d9579fd5
Document examples on intercepting Mod-Tap (#14502) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-10-04 16:21:02 -07:00
Purdea Andrei
eb5b24f97c
Add LM() keys to the list of keys disabled by NO_HAPTIC_MOD (#14181) 2021-10-03 12:02:05 -07:00
QMK Bot
de4a7131df Merge remote-tracking branch 'origin/master' into develop 2021-10-01 08:25:24 +00:00
umi
e54a57d32a
[Docs] update Japanese translation of mod_tap.md (#13981) 
* update mod_tap.md translation

* add id on config_options.md and update text based on comments
 2021-10-01 17:24:53 +09:00
Ryan
1a9e7b95ab
Change MK66F18 -> MK66FX1M0 (#14659) 2021-09-30 23:14:37 +01:00
QMK Bot
85b3f5a406 Merge remote-tracking branch 'origin/master' into develop 2021-09-30 21:24:52 +00:00
Purdea Andrei
52cb19713b
Fix documentation for NO_HAPTIC_MOD and NO_HAPTIC_FN features. (#14180) 2021-10-01 07:24:19 +10:00
QMK Bot
be3d7063a0 Merge remote-tracking branch 'origin/master' into develop 2021-09-29 18:37:46 +00:00
Drashna Jaelre
02ab7b1888
[Core] Fix "6kro enable" and clarify naming (#14563) 
* Fix USB_6KRO_ENABLE compilation errors

* Add info to docs

* Rename define to be more accurate

* Remove unused rule

* Refixe docs
 2021-09-29 11:37:11 -07:00
Joel Challis
3a2a39e5ec
Initial pass of F405 support (#14584) 
* Initial pass of F405 support

* remove some conf files

* docs

* clang
 2021-09-25 00:19:41 +01:00
Drashna Jael're
675c5a5e12
Merge remote-tracking branch 'origin/master' into develop 2021-09-24 12:21:32 -07:00
clickclackwho
4f37084677
[Docs] Broken FAQ hyperlink (#14578) 2021-09-24 08:43:05 -07:00
umi
30140f48d0
[Docs] update Japanese translation of pr_checklist.md (#13693) 
* update pr_checklist.md translation

* update file based on comments

* add id on feature_led_indicators.md and update text based on comments

* update file based on comments

* update file based on comment
 2021-09-24 14:51:34 +09:00
QMK Bot
399d26c990 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 04:03:00 +00:00
umi
0fc15f4d30
[Docs] update Japanese translation of feature_backlight.md (#14403) 
* update feature_backlight.md translation

* update file based on comments
 2021-09-23 13:02:32 +09:00
QMK Bot
125d4c413f Merge remote-tracking branch 'origin/master' into develop 2021-09-23 04:02:12 +00:00
umi
7f0c397c72
[Docs] update Japanese translation of feature_advanced_keycodes.md (#14309) 
* update feature_advanced_keycodes.md translation

* update file based on comments
 2021-09-23 13:01:42 +09:00
QMK Bot
3edd4bc48f Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:59:22 +00:00
umi
5347577346
[Docs] update Japanese translation of isp_flashing_guide.md (#13700) 
* update isp_flashing_guide.md translation

* update isp_flashing_guide.md translation

* correct url

* trim remaining merge identifier
 2021-09-23 12:58:56 +09:00
QMK Bot
787cce1415 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:55:47 +00:00
umi
7bfc6083b7
[Docs] update Japanese translation of feature_leader_key.md (#13669) 
* update feature_leader_key.md translation

* update file based on comments

* update text based on comments
 2021-09-23 12:55:19 +09:00
QMK Bot
e41f1e9460 Merge remote-tracking branch 'origin/master' into develop 2021-09-23 03:53:29 +00:00
umi
618a28c6ae
[Docs] update Japanese translation of one_shot_keys.md (#13656) 
* update one_shot_keys.md translation

* update one_shot_keys.md translation

* correct paramter for function

* add change of #13754
 2021-09-23 12:52:53 +09:00
QMK Bot
8670a3c86c Merge remote-tracking branch 'origin/master' into develop 2021-09-21 23:40:56 +00:00
Dasky
45f88af4a1
[Docs] update suspend_*_user examples (#14542) 2021-09-21 16:40:19 -07:00
QMK Bot
e3c010e179 Merge remote-tracking branch 'origin/master' into develop 2021-09-21 14:53:35 +00:00
Dasky
19e33b685f
[Docs] Modify encoder_update_user example to return false (#14541) 2021-09-21 07:52:57 -07:00
fauxpark
c38a730805 Merge remote-tracking branch 'upstream/master' into develop 2021-09-20 16:58:29 +10:00