varl/qmk_firmware
1
0
Fork 0
forked from forks/qmk_firmware
Code Pull requests Activity
20162 commits 2 branches 1545 tags 870 MiB
Commit graph

11654 commits

Author SHA1 Message Date
Kyle McCreery 0be7345640
[Keyboard] BDE Rev2 (#15877) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-03-04 10:10:32 -08:00
Ryan aab2ac22c5
Melody96 refactor (#16455) 2022-03-04 14:52:15 +11:00
Takeshi ISHII 4a66bdf294
Fix helix/rev2 not working properly when using split_common. (#16512) 
When helix/rev2 was using split_common, it didn't work properly and I couldn't type on the right hand side.

The cause is that the following code, added in 0.16.0 to `quantum/keyboard.c`, does not include `quantum/split_common/split_util.h` but instead includes `keyboards/helix/rev2/split_util.h`. Therefore, `split_pre_init()/split_post_init()` in `quantum/split_common/split_util.c` was not called.

```c
  #ifdef SPLIT_KEYBOARD
  #    include "split_util.h"
  #endif
```
 2022-03-03 20:23:49 +00:00
Takeshi ISHII 75b40dc7a5
Fix mistakes in the include path in helix/rev2/local_features.mk. (#16507) 
```diff
  --- a/keyboards/helix/rev2/local_features.mk
  +++ b/keyboards/helix/rev2/local_features.mk
  @@ -6,7 +6,7 @@
   #

   KEYBOARD_LOCAL_FEATURES_MK :=
  --include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File ded  icated to maintenance
  +-include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
  ```
 2022-03-03 14:27:21 +00:00
Takeshi ISHII e73f8e942c
Change 'helix/rev2:default' setting to use split_common (#16432) 
* add licenses message to helix/rev2 files

* Minimize the processing of helix/rev2/local_features.mk

* Changed helix/rev2 default setting to use split_common

* fix helix/rev2:edvorakjp build error

* Remove unnecessary '#include' from keymap.c

* helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz

* Revert "fix helix/rev2:edvorakjp build error"

This reverts commit 731dbbe151.
Separated into a single PR #16433.

* Revert "Changed helix/rev2 default setting to use split_common"

This reverts commit e76dbd7762.

* add 'SPLIT_*_STATE_ENABLE' into helix/rev2/config.h

* Revert "helix keymaps Workaround for build errors. five_rows_jis, fraanrosi, froggy, froggy_106, yshrsmz"

This reverts commit 9b316c1c6a.

* change helix:default to use split_common

* change helix:five_rows to use split_common

* add comment into helix/rev2/rules.mk

* change helix:led_test to use split_common
 2022-03-02 20:15:10 +09:00
xiao 09a43b12cb
Revert "handwired/3dortho14u: refactor layout data (#16475)" (#16485) 
This reverts commit 3ac769b6ab.
 2022-03-01 15:48:38 -08:00
James Young 325c634101
atlas_65 Layout Macro Refactor (#16483) 
* atlas_65.h: add matrix diagram

* atlas_65.h: apply linting

- convert tabs to spaces
  - four-space indent
- align backslashes in layout macro

* atlas_65.h: adjust layout macro alignment

Visually separates each side. White-space-only change.

* physically arrange layout macro

Move the matrix position identifiers in the layout macro to resemble the assembled keyboard's layout.

- move `k46` (right side B) to the fourth (Shift) row
- move each of `k1E`, `k2E` and `k3E` (right side navigation keys) up one row
- update keymaps to match

* update maintainer data

Update the maintainer data in `info.json` and `readme.md`.
 2022-03-01 14:52:25 -08:00
Joel Challis 369575ad13
Remove invalid keyboard_folder from gk6 (#16480) 2022-03-01 02:12:01 +00:00
James Young 36635c2203
Ellora65: remove dead space from Configurator rendering (#16478) 2022-03-01 01:53:53 +00:00
Joel Challis c9d9e70ac7
Move projectcain encoder logic to keyboard level (#16479) 2022-03-01 01:52:01 +00:00
James Young f293e6b4da
Glacier: Community Layout support (#16474) 
* Glacier: Community Layout support

Enables the Glacier to use QMK's `tkl_f13_ansi_tsangan` community layout.

- rename `LAYOUT` to `LAYOUT_tkl_f13_ansi_tsangan`
- add `LAYOUTS` rule to `rules.mk`

* info.json: correct maintainer value

Use the maintainer's GitHub username.
 2022-02-28 23:33:55 +00:00
James Young 3ac769b6ab
handwired/3dortho14u: refactor layout data (#16475) 
Remove nonextant matrix positions from the layout data.
 2022-02-28 23:33:21 +00:00
James Young d1068b23ad
snatchpad: update layout data (#16476) 
Fixes key overlaps in QMK Configurator.
 2022-02-28 23:32:33 +00:00
Takeshi ISHII e884414e1e
fix helix/rev2:edvorakjp build error (#16433) 
'helix/rev2/keymaps/edvorakjp' was no longer buildable due to changes made by #14864.
The reason is that the prototype of `oled_task_user()` was changed in keymaps/edvorakjp/oled.c, but keymaps/edvorakjp/oled.h was not changed.
Therefore, I modified the prototype in keymaps/edvorakjp/oled.h.
 2022-02-27 20:30:00 +09:00
James Young a7a3f72235
Wolf Sabre: fix Configurator layout data (#16465) 
* apply friendly formatting to info.json

* rebuild Configurator layout data

KLE Rotation leads to incorrect layout data when converted to `info.json` format.

* add matrix diagram to sabre.h
 2022-02-27 10:08:10 +00:00
James Young 57601d3cfe
Wren: fix QMK Configurator key sequence (#16462) 
* Wren: fix QMK Configurator key sequence

* info.json: update maintainer field
 2022-02-27 00:38:51 -08:00
James Young c1e008b052
[Keyboard] add YMDK YMD21 v2 (#16442) 
* [Keyboard] add YMDK YMD21 v2

* remove trailing whitespace from default keymap
 2022-02-26 17:36:30 -08:00
Dari d94b5d0b82
[Handwired] Support for Adafruit lemon keypad (#16395) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: zvecr <git@zvecr.com>
 2022-02-26 17:18:51 -08:00
peepeetee 3057e5f8ca
[Keyboard] ada1800mini (#16386) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-02-26 17:06:48 -08:00
Joel Challis 83a32b2574
Remove 1k USB_POLLING_INTERVAL_MS config from keyboards and default-ish keymaps (#16448) 
* Remove 1k USB_POLLING_INTERVAL_MS config from keyboard level

* Remove 1k USB_POLLING_INTERVAL_MS config from default|via keymaps
 2022-02-26 03:20:57 +00:00
QMK Bot 3039186dd9 Merge remote-tracking branch 'origin/master' into develop 2022-02-22 14:10:20 +00:00
Ryan 7646e567bd
handwired/frankie_macropad: disable some features to reduce size (#16431) 2022-02-22 14:09:45 +00:00
QMK Bot c2ea26745d Merge remote-tracking branch 'origin/master' into develop 2022-02-21 19:23:59 +00:00
Fernando Rodrigues e0342fec18
[Keyboard] Fixed default keymap and add VIA for Baredev rev1 (#15818) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-02-21 11:23:29 -08:00
QMK Bot 6b94d8e1c9 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 19:22:55 +00:00
xiao ffe9c22032
[Keyboard] Add keyboard 3dortho14u (#16329) 
Co-authored-by: xia0 <xiao@morgan.net.au>
 2022-02-21 11:22:25 -08:00
QMK Bot 82a670135f Merge remote-tracking branch 'origin/master' into develop 2022-02-21 19:22:24 +00:00
Alexander 239fed2ef1
[Keyboard] Move rgb animation defines for KAPL keyboard (#16341) 2022-02-21 11:21:54 -08:00
fauxpark 145dca0e49 Merge remote-tracking branch 'upstream/master' into develop 2022-02-22 05:21:40 +11:00
jack 31f5900666
fix layout macro (#16414) 
Co-authored-by: jack <{ID}+{username}@users.noreply.github.com>
 2022-02-21 18:04:14 +00:00
Danny 302ed624ac
Add encoder defaults for Keebio boards (#16398) 
* Add BDN9 encoder defaults

* Add DSP40 encoder default

* Add FoldKB encoder defaults

* Add Iris encoder defaults

* Update Iris Rev. 6 encoder orientation

* Add KBO-5000 encoder defaults

* Add Quefrency encoder defaults

* Add Sinc encoder defaults

* Add Stick encoder defaults

* Remove encoder settings from VIA keymaps
 2022-02-21 18:02:30 +00:00
jack 6ad86042fe
Fix kikoslab/ellora65 (#16415) 2022-02-22 04:57:13 +11:00
Adam Lickel a5901a6c0d
[Keymap] BDN9 keymap (#15924) 2022-02-21 09:35:23 -08:00
peepeetee 3290377918
[Keyboard] infinity81 (#16387) 2022-02-21 09:12:18 -08:00
yiancar 83b9483045
[keyboard] DC01 i2c timeout fix (#16392) 2022-02-21 09:11:49 -08:00
evanmcook 0b21fbc37b
[Keyboard] add evancookaudio sleepingdinosaur (#16320) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2022-02-21 09:11:23 -08:00
takashicompany 7e4f74d689
[Keyboard] Update Heavy Left (#16354) 2022-02-21 09:11:00 -08:00
peepeetee 59f671744b
[Keyboard] ID75 v2 (#16351) 2022-02-21 09:10:19 -08:00
Wolf Van Herreweghe 7fb22706fd
[Keyboard] Add sabre (#15964) 
Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
 2022-02-21 09:10:06 -08:00
66f9e4eae 249eb87102
[Keyboard] [redox_w] add dvorak layout and white led support (#16259) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-02-21 09:09:19 -08:00
Takeshi ISHII c204c735af
Helix/pico move to split_common (#16418) 2022-02-21 08:30:49 -08:00
QMK Bot 69a6772074 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 09:04:17 +00:00
jackytrabbit ae5f43072f
Update the support for lazydesigners/dimple (#14797) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-21 10:03:18 +01:00
QMK Bot 0f962af691 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 08:55:44 +00:00
QMK Bot f252287b0e
Format code according to conventions (#16412) 2022-02-21 00:55:23 -08:00
Brandon Claveria 67b9a722c0
[Keyboard] Add Ellora65 (#14754) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: swiftrax <swiftrax@github.com>
 2022-02-21 00:55:05 -08:00
QMK Bot 7d153b9a66 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 08:40:46 +00:00
xiao 18490537a5
[Keyboard] Add Snatchpad keyboard (#16330) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: xia0 <xiao@morgan.net.au>
 2022-02-21 00:40:11 -08:00
QMK Bot 8dc7cae7c7 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 08:39:42 +00:00
federicoweber 2d1f2810a4
[Keyboard] add Gizmo Engineering GK6 keyboard (#13907) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-02-21 00:38:53 -08:00
QMK Bot f01caa2a5a Merge remote-tracking branch 'origin/master' into develop 2022-02-21 08:29:26 +00:00
hunter 019dddcfa3
[Keyboard] Add foundation (#16289) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-02-21 00:28:49 -08:00
QMK Bot 99099c4173 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 07:53:37 +00:00
Tim Liu deb0fe4bcc
[Keyboard] Add glacier in creatkeebs folder (#16079) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-20 23:52:39 -08:00
QMK Bot 09b44d2e73 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 07:44:26 +00:00
holtenc 2e31f542dc
[Keyboard] Add Obro (#15884) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-20 23:43:55 -08:00
QMK Bot 63b8959413 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 06:33:42 +00:00
L. K. Post 14fb3cc8b0
[Keyboard] Add Kyria rev. 2 (#16178) 2022-02-20 22:33:00 -08:00
QMK Bot 37feb4fcb4 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 06:17:00 +00:00
Ivan Gromov 9bf25d1cd5
[Keyboard] Add Monoflex 60 keyboard (#16234) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-02-20 22:16:23 -08:00
QMK Bot 6a90e13224 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 06:05:20 +00:00
jack 2d1d44edb7
[Keyboard] Fix Hineybush/h08_ocelot and Hineybush/h65(_hotswap) (#16405) 2022-02-20 22:04:43 -08:00
QMK Bot b21a803ec6 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 06:02:11 +00:00
TW59420 f7b5d67a7b
[Keyboard] Add MW75R2 PCB (#15042) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2022-02-20 22:01:31 -08:00
QMK Bot 21a4f42957 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 05:57:49 +00:00
jack 65af7272f3
[Keyboard] Fix mwstudio/mw65_rgb errors (#16410) 2022-02-20 21:57:11 -08:00
QMK Bot 31ee13a5d7 Merge remote-tracking branch 'origin/master' into develop 2022-02-21 01:19:42 +00:00
HorrorTroll 3bc8afbb81
Update fix for MW65_rgb and added personal keymap (#15279) 
* Update fix for MW65 and added personal keymap

* Resolve fix

* Resolved fix, again

* Added missing GPLv2 license headers

* Resolved issue
 2022-02-20 17:18:35 -08:00
QMK Bot f6d8dd972e Merge remote-tracking branch 'origin/master' into develop 2022-02-20 18:37:05 +00:00
Ryan d175ee1d9b
rart67m: move OLED and WPM code to default keymap (#16403) 
* rart67m: move OLED and WPM code to default keymap

* Apply suggestions from code review

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

Co-authored-by: Joel Challis <git@zvecr.com>
 2022-02-20 18:36:15 +00:00
QMK Bot 4d3ce3cdf8 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:57:38 +00:00
Ryan 60f22831cb
clueboard/card: disable Command to reduce size (#16404) 2022-02-20 13:57:03 +00:00
QMK Bot f787114fe9 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 08:21:51 +00:00
Josh Hinnebusch 38e3be4c74
Add h08_ocelot and h65 PCBs (#14054) 
* add h65 start

* add h65 base files

* add ocelot base files

* add via keymap

* Update keyboards/hineybush/h08_ocelot/config.h

* Update keyboards/hineybush/h65/config.h

* add base files for h65 hotswap

* changes made per PR

* finally made updates per PR

* update readmes

* Update keyboards/hineybush/h65_hotswap/config.h

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65_hotswap/readme.md

* Update keyboards/hineybush/h65_hotswap/info.json

* Update keyboards/hineybush/h65/rules.mk

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/h65_hotswap.h

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65/rules.mk

* Update keyboards/hineybush/h65/readme.md

* Update keyboards/hineybush/h08_ocelot/h08_ocelot.h

* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/default/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c

* Update keyboards/hineybush/h08_ocelot/keymaps/via/keymap.c

* Update keyboards/hineybush/h08_ocelot/readme.md

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h65/h65.h

* Update keyboards/hineybush/h08_ocelot/info.json

* Update keyboards/hineybush/h65/info.json

* Update keyboards/hineybush/h65/keymaps/default/keymap.c

* Apply suggestions from code review

* update jsons for default qmk config layout

* Update keyboards/hineybush/h08_ocelot/rules.mk

* Update keyboards/hineybush/h65/h65.h

* Update keyboards/hineybush/h65/info.json

* Update keyboards/hineybush/h65/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/default/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/keymaps/via/keymap.c

* Update keyboards/hineybush/h65_hotswap/rules.mk

* Update keyboards/hineybush/h65/config.h
 2022-02-20 00:21:18 -08:00
QMK Bot 1d9808606a Merge remote-tracking branch 'origin/master' into develop 2022-02-20 07:10:44 +00:00
Benjamin Chausse 60e28544b2
Bliss Hotdox keymaps (#13160) 
* Bliss Hotdox keymaps

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Add GPL License to keymap.c file
Changes to be committed:
	modified:   keymap.c

* make changes requested by fauxpark

* Update keyboards/hotdox/keymaps/bliss/readme.md

* Update keyboards/hotdox/keymaps/bliss/keymap.c

* Update keyboards/hotdox/keymaps/bliss/readme.md
 2022-02-19 23:10:15 -08:00
QMK Bot e2691c22c1 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 05:52:47 +00:00
Matthew Dias 73657a7d58
Add kikkou keyboard (#15291) 
* Add kikkou keyboard

* Apply suggestions from code review

* Update keyboards/kikkou/rules.mk

* Apply suggestions from code review1
 2022-02-19 21:52:11 -08:00
fauxpark 5b688a09ec Merge remote-tracking branch 'upstream/master' into develop 2022-02-19 04:27:09 +11:00
Ryan 4666d26008
Fix a couple of boards being wrongly identified as AVR (#16377) 2022-02-19 02:53:36 +11:00
Simon 2d12eacb4b
[Keyboard] Renamed Frooastboard to Frooastboard Nano (#16373) 2022-02-17 08:59:12 -08:00
Drashna Jael're da280739ef
Merge remote-tracking branch 'origin/master' into develop 2022-02-17 08:44:30 -08:00
Ryan 548a463fe9
mokey/xox70: clean up layouts (#16375) 2022-02-17 08:43:03 -08:00
Takeshi ISHII 7e00fcd7bc
[Keyboard] Remove Helix/rev1 (#16389) 2022-02-17 08:18:16 -08:00
Joel Challis 5ff823d35f
Bodge for helix build failures (#16376) 2022-02-16 17:46:48 +00:00
QMK Bot 08ebf1523b Merge remote-tracking branch 'origin/master' into develop 2022-02-15 17:48:14 +00:00
Dan Nixon da68083fdf
Update USB VID and PID for Aya (#16363) 2022-02-15 18:47:35 +01:00
QMK Bot 6a8df58887 Merge remote-tracking branch 'origin/master' into develop 2022-02-15 07:02:33 +00:00
Ryan 92eb067a63
Add extra braces for trackball keymaps (#16361) 2022-02-15 18:01:54 +11:00
QMK Bot c9f192bae8 Merge remote-tracking branch 'origin/master' into develop 2022-02-15 01:16:27 +00:00
Ryan ac8bee7091
Fix multiple definition errors for trackball "boards" with no keys (#16350) 2022-02-15 01:15:53 +00:00
QMK Bot 1980e48e0d Merge remote-tracking branch 'origin/master' into develop 2022-02-14 06:25:23 +00:00
James Young 485cf920b4
Xenon: correct QMK Configurator key sequence (#16332) 2022-02-13 22:24:52 -08:00
QMK Bot 61ed2e2b3c Merge remote-tracking branch 'origin/master' into develop 2022-02-14 06:24:45 +00:00
James Young 6b01657a86
Mode M75S Layout Additions, Configurator Data and Code Touch-Up (#16327) 
* m75s.h: correct matrix position identifier

`K5C` is actually on row 4, so it should be `K4C`.

* m75s.h: add matrix diagram

* add QMK Configurator data

* polish whitespace

- convert tabs to spaces
- update indent to four spaces
- remove trailing whitespace

* update readme

Didn't seem to be fully updated after being copied from the M65S codebase.

* add LAYOUT_ansi with keymap

ANSI layout with 2u Backspace.

* add LAYOUT_iso with keymap

ISO layout with 2u Backspace.

* add LAYOUT_ansi_tsangan with keymap

ANSI layout with 2u Backspace and 7u Spacebar.

* add LAYOUT_iso_tsangan with keymap

ISO layout with 2u Backspace and 7u Spacebar.

* add LAYOUT_ansi_split_bs with keymap

ANSI layout with Split Backspace.

* add LAYOUT_iso_split_bs with keymap

ISO layout with Split Backspace.

* add LAYOUT_ansi_tsangan_split_bs with keymap

ANSI layout with Split Backspace and 7u Spacebar.

* add LAYOUT_iso_tsangan_split_bs with keymap

ISO layout with Split Backspace and 7u Spacebar.
 2022-02-13 22:24:11 -08:00
QMK Bot f77e569e9f Merge remote-tracking branch 'origin/master' into develop 2022-02-14 02:02:16 +00:00
Ryan b6b7e12029
Digicarp65: fix layouts (#16328) 2022-02-14 13:01:39 +11:00
QMK Bot 9f506e64ba Merge remote-tracking branch 'origin/master' into develop 2022-02-12 07:01:58 +00:00
Max Rumpf 773205cd1f
[Keyboard] Convert Maxr1998/Phoebe to use info.json where possible (#16309) 2022-02-11 23:01:25 -08:00
QMK Bot aefe6ee9f5 Merge remote-tracking branch 'origin/master' into develop 2022-02-12 04:03:02 +00:00