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

481 commits

Author SHA1 Message Date
QMK Bot 0e7acb777a Merge remote-tracking branch 'origin/master' into develop 2023-04-04 05:10:36 +00:00
Nick Brassel 687883cf7d
Resolve keyboard names for qmk mass-compile. (#20335) 2023-04-04 15:09:55 +10:00
QMK Bot 66f19518b4 Merge remote-tracking branch 'origin/master' into develop 2023-03-29 12:01:55 +00:00
Joel Challis f56580404d
Minify content published to API (#20285) 2023-03-29 13:01:16 +01:00
QMK Bot 2026165d8c Merge remote-tracking branch 'origin/master' into develop 2023-03-29 10:26:46 +00:00
Nick Brassel 5bb8f7ae84
Add ability for qmk mass-compile to build specified targets (#20294) 2023-03-29 21:26:05 +11:00
Joel Challis 79b0f9168e
Custom keycodes in JSON (#19925) 2023-03-27 20:01:07 +01:00
Joel Challis e35bb8ebfa
Add force support to 'qmk git-submodule' (#19705) 2023-03-27 19:15:25 +01:00
Joel Challis fa4dfb542f
Strip API specific output from qmk info (#20234) 2023-03-23 11:19:30 +00:00
QMK Bot 79ae14ae0a Merge remote-tracking branch 'origin/master' into develop 2023-03-16 20:36:32 +00:00
Nick Brassel 1b3f7fcf7d
Add qmk find command, reuse logic for qmk mass-compile. (#20139) 2023-03-16 20:35:49 +00:00
QMK Bot 291834b162 Merge remote-tracking branch 'origin/master' into develop 2023-03-14 21:31:50 +00:00
Nick Brassel e62fc866db
Let's use workflows to parallelise the builds. (#20120) 
* Let's use workflows to parallelise the builds.

* Nofail if files aren't present.

* Formatting.
 2023-03-15 08:31:10 +11:00
Joel Challis c3c40dfda8
Remove some use of keymap.h (#19980) 2023-03-03 11:26:53 +00:00
Nick Brassel 1283863c0e
Add mass-compile ability to filter by key existence. (#19885) 2023-02-18 18:04:50 -08:00
Joel Challis 6ceff1367d
Tidy up use of keycode range helpers (#19813) 2023-02-12 17:09:34 +00:00
Jouke Witteveen 3137883956
Typographic updates to source generation (#19160) 2023-02-10 22:39:13 +00:00
Joel Challis 1d0b4c8d38
Tidy up use of keycode range helpers (#19756) 2023-02-10 21:10:14 +00:00
Pablo Martínez d55b07696b
Add commit info to version.h (#19542) 
* Initial commit

* Fix import order

* Fix deleted code instead of debug print line

* Format

* Update lib/python/qmk/cli/generate/version_h.py

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

* Renaming

* Update lib/python/qmk/cli/generate/version_h.py

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

* Update lib/python/qmk/git.py

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

---------

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2023-02-02 18:23:27 +00:00
fauxpark ef6505ad75 Merge remote-tracking branch 'upstream/master' into develop 2023-01-30 18:55:36 +11:00
Ryan 2c878b1b16
Clean up qmk generate-autocorrect-data (#19710) 2023-01-30 03:37:02 +00:00
QMK Bot d14863c00b Merge remote-tracking branch 'origin/master' into develop 2023-01-24 14:20:10 +00:00
Natan-P b24fa2f9db
escaped stray backslash in bux.py (#19667) 2023-01-24 14:19:34 +00:00
Joel Challis fe6502f12e
Publish keymap.json to API (#19167) 2023-01-20 03:38:19 +00:00
Joel Challis 4973950ddc
Print distro in doctor output (#19633) 2023-01-19 10:25:47 +00:00
QMK Bot 3723c0e3d5 Merge remote-tracking branch 'origin/master' into develop 2023-01-19 01:06:08 +00:00
Nick Brassel 327f7ee9a7
Fixup ChibiOS header inclusion search ordering. (#19623) 
* Add STM32F446-Nucleo onekey. 

* Fixup onekey build for F446, all keymaps.

* Fixup board inclusion search ordering.
 2023-01-19 01:05:29 +00:00
Joel Challis a1f253cbef
qmk compile/qmk flash - Validate keymap argument (#19530) 2023-01-19 00:24:13 +00:00
Nick Brassel 4723f308ad
Remove CLI commands: multibuild, cformat, fileformat, pyformat. (#19629) 2023-01-19 10:56:15 +11:00
Joel Challis 88ec588ae7
Remove make all-<platform> build targets (#19496) 2023-01-19 10:44:41 +11:00
QMK Bot 364a910b92 Merge remote-tracking branch 'origin/master' into develop 2023-01-18 22:37:06 +00:00
Nick Brassel 17c9388af5
Allow for wildcard filtering in qmk mass-compile (#19625) 2023-01-18 22:36:32 +00:00
Joel Challis 20474ae232
Fix CLI community detection (#19562) 2023-01-11 12:38:35 +11:00
Joel Challis b57714f793
qmk doctor - Handle timeouts while checking binaries (#19549) 2023-01-09 09:27:41 +00:00
Joel Challis 1b045b1e60
Handle doctor permission issues while checking udev (#19548) 2023-01-09 08:21:21 +00:00
Joel Challis 5c730d971e
Migrate submodule dirty check to CLI (#19488) 2023-01-06 04:16:52 +00:00
QMK Bot b2384f1809 Merge remote-tracking branch 'origin/master' into develop 2023-01-05 23:41:28 +00:00
Sergey Vlasov 4a7d65b9d7
Fix MATRIX_COLS and MATRIX_ROWS generation for custom matrix (#19508) 
The code which generated the MATRIX_COLS and MATRIX_ROWS defines from
the JSON information was checking the presence of the `matrix_pins` key,
which may not exist if a custom matrix is used.  Check the presence of
`matrix_size` instead.
 2023-01-05 23:40:53 +00:00
zvecr 115c241f21 Merge remote-tracking branch 'origin/master' into develop 2023-01-04 04:17:58 +00:00
Nick Brassel 691668340c
Add qmk mass-compile, which intends to supercede qmk multibuild whilst providing support for filtering as per data-driven definitions. (#18971) 2023-01-04 04:10:18 +00:00
Joel Challis c345278101
Replace list_keyboards.sh with CLI calls (#19485) 2023-01-03 14:15:29 +11:00
Joel Challis b297531dbf
Migrate 'make git-submodule' to CLI command (#19479) 2023-01-03 09:11:57 +11:00
Joel Challis 3a5a4c708f
Report submodule status when not valid work-tree (#19474) 2023-01-03 09:00:29 +11:00
Joel Challis e4cfbd2532
Allow CLI to flash .uf2 files (#19462) 2023-01-01 15:51:29 +11:00
jack 003cee0098
Validate keyboard name before accepting further input (#19394) 2022-12-23 18:18:57 +00:00
QMK Bot 8f506b5bc2 Merge remote-tracking branch 'origin/master' into develop 2022-12-23 11:12:33 +00:00
Joel Challis ab1898e660
Minor alignment of rgb_breathe_table generator (#19403) 2022-12-23 11:11:56 +00:00
Joel Challis e5721bbd37
Remaining DD keymap_extras migration (#19110) 
* Parse headers to data

* Regen headers from data
 2022-12-21 23:35:23 +00:00
Stefan Kerkmann 962e4c0e18
[Test] Reset timer for every unit test and provide timestamps for log messages (#17028) 2022-12-15 02:31:08 +11:00
Joel Challis 9bc7e9afbd
Initial uk+us DD keymap_extras migration (#19031) 2022-12-09 00:54:52 +00:00
QMK Bot 5a2ed77a08 Merge remote-tracking branch 'origin/master' into develop 2022-12-08 16:31:37 +00:00
Joel Challis 6e6039995b
Add lint check for keyboard/keymap license header (#19215) 2022-12-09 03:31:02 +11:00
Joel Challis 32dabd5320
Align new-keymap with new-keyboard (#19229) 2022-12-03 12:04:06 +00:00
Joel Challis 3e59bbd731
Automate "Data Driven" migrations (#17820) 2022-11-30 20:08:54 +00:00
Joel Challis dfa53900dc
Publish constants metadata to API (#19143) 
* Publish metadata

* Ensure content is sorted
 2022-11-23 18:01:07 +00:00
Drashna Jaelre 1a3f2130d5
Revert "Add pointing device support to data driven config (#18215)" (#19063) 2022-11-15 17:44:09 +11:00
Drashna Jaelre d3073ef494
Add pointing device support to data driven config (#18215) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2022-11-14 03:05:46 +11:00
Nick Brassel 9daf77b593
Add raw output option for QGF/QFF files. (#18998) 2022-11-08 15:47:07 +00:00
Joel Challis 7666c966d5
Publish hjson files as json (#18996) 2022-11-08 03:03:02 +00:00
Ryan 479d8de622
Format DD mappings and schemas (#18924) 2022-11-08 01:05:08 +00:00
Joel Challis a69ab05dd6
Initial DD keycode migration (#18643) 
* Initial DD keycode migration

* Sort magic keycodes
 2022-11-05 10:30:09 +00:00
Joel Challis 345f19a5d7
Add converter support to keymap.json (#18776) 2022-10-20 18:21:17 -07:00
Joel Challis 0b41c13509
[CLI] Ensure consistent clean behaviour (#18781) 2022-10-20 14:35:27 +01:00
Joel Challis aa8e0a3e7a
Build correctly when out of tree (#18775) 2022-10-19 17:43:25 +01:00
Ryan 675d91b813
Generate DD RGBLight/LED/RGB Matrix animation defines (#18459) 2022-09-26 01:04:21 +01:00
Ryan 2f48d300f4
Normalise info_config.h define generation (#18439) 
* Normalise info_config.h define generation

* format

* Fix tests

* Update lib/python/qmk/cli/generate/config_h.py

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

Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-09-21 18:31:57 +01:00
Joel Challis 20f142a772
Tidy up LAYOUT macro generation (#18262) 2022-09-19 01:35:46 +01:00
Drashna Jaelre fb29c0ae53
[Core] Add getreuer's Autocorrect feature to core (#15699) 
Co-authored-by: Albert Y <76888457+filterpaper@users.noreply.github.com>
 2022-09-17 17:50:54 +10:00
QMK Bot cf0494e458 Merge remote-tracking branch 'origin/master' into develop 2022-09-16 08:19:51 +00:00
Nick Brassel cf88d95613
Add ability to remove temporary files during multibuild. (#18381) 2022-09-16 09:19:10 +01:00
Ryan bc0756f294
Disconnect usb.device_ver (#18259) 2022-09-16 12:05:25 +10:00
QMK Bot ba7030d216 Merge remote-tracking branch 'origin/master' into develop 2022-08-31 05:20:33 +00:00
Ryan 6f804f76b4
qmk lint: fix TypeError (#18226) 2022-08-31 15:20:00 +10:00
Ryan 3adaf6a46a
Handle escaping of manufacturer/product strings (#18194) 2022-08-28 19:35:17 +01:00
Ryan 24720400a8
Update LUFA submodule (#18168) 2022-08-26 12:19:34 +10:00
QMK Bot 129c60946c Merge remote-tracking branch 'origin/master' into develop 2022-08-24 19:26:18 +00:00
Joel Challis 3d8c624698
Update invalid pip install flag (#18146) 2022-08-24 20:25:16 +01:00
Erovia 5e2ffe7d8f
CLI: Teaching the CLI to flash binaries (#16584) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-08-20 15:39:19 +10:00
Joel Challis 897403c4a7
Publish data as part of API generation (#17020) 2022-08-06 16:14:29 +10:00
QMK Bot 61da9286a1 Merge remote-tracking branch 'origin/master' into develop 2022-07-26 16:38:06 +00:00
Nick Brassel d1434b6d75
Make qmk doctor print out the last log entry for upstream/{master,develop}, including dates (#17713) 2022-07-26 17:37:28 +01:00
Joel Challis 35d78aa8a4
More DD encoder fixes (#17615) 2022-07-11 10:51:39 +01:00
QMK Bot 39e1e27ea9 Merge remote-tracking branch 'origin/master' into develop 2022-07-09 12:33:33 +00:00
Nick Brassel 561c5e1d7a
Add line to multibuild output log showing the actual build target. (#17606) 2022-07-09 22:32:43 +10:00
Joel Challis 81d317aa87
Fix rgbkb/sol/rev2 build issues (#17601) 2022-07-08 22:48:48 +01:00
Joel Challis 59e28b8958
Add cli command to import keyboard|keymap|kbfirmware (#16668) 2022-07-02 21:50:09 +10:00
QMK Bot fb05b491e7 Merge remote-tracking branch 'origin/master' into develop 2022-06-29 23:34:39 +00:00
Joel Challis 7326a0051b
Allow module check to error out when piped to /dev/null (#17505) 2022-06-30 00:33:59 +01:00
QMK Bot 33b62b6867 Merge remote-tracking branch 'origin/master' into develop 2022-06-26 22:59:06 +00:00
Joel Challis fa3dd373b4
Fix error message in generated code (#17484) 2022-06-27 08:58:31 +10:00
Joel Challis 1a400d8644
Allow encoder config from info.json (#17295) 2022-06-20 20:15:06 -07:00
Joel Challis 17ec1650fd
Additional schema fixes (#17414) 2022-06-18 15:30:46 +10:00
QMK Bot 589bdedc47 Merge remote-tracking branch 'origin/master' into develop 2022-06-15 21:44:32 +00:00
Joel Challis d3dfa83b40
Fix clean arg handling (#17392) 2022-06-15 22:43:54 +01:00
QMK Bot 4cde5c243b Merge remote-tracking branch 'origin/master' into develop 2022-06-14 13:55:32 +00:00
Joel Challis f37de9a212
Perform stricter lint checks (#17348) 2022-06-14 14:54:46 +01:00
Ryan af6435d44d
qmk doctor: show arch for macOS (#17356) 2022-06-11 19:10:09 +01:00
QMK Bot 6b838785b7 Merge remote-tracking branch 'origin/master' into develop 2022-06-10 10:45:24 +00:00
Joel Challis 92665aef33
Promote 'layouts require matrix data' to api error (#17349) 2022-06-10 11:44:48 +01:00
Dasky 2de70e6f2d
Add uf2-split-* make targets. (#17257) 2022-05-31 08:04:50 +10:00
Joel Challis 608fa5154c
Data driven g_led_config (#16728) 2022-05-16 07:39:29 +10:00
Nick Brassel be9fa68785
Also format *.hpp files. (#16997) 2022-05-04 05:48:41 +10:00
Joel Challis 92a61aa0cd
Implement XAP 'secure' core requirements (#16843) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Stefan Kerkmann <karlk90@pm.me>
 2022-04-16 11:13:05 -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
Joel Challis 2cfbc1445c
Allow new-keyboard to use development_board presets (#16785) 2022-04-08 20:12:32 +01:00
QMK Bot d75ae52fe6 Merge remote-tracking branch 'origin/master' into develop 2022-03-30 20:55:16 +00:00
Ryan 64974a7f8f
yapf: disable arithmetic predecence indication (#16749) 2022-03-30 21:54:13 +01:00
QMK Bot 03f9b8db15 Merge remote-tracking branch 'origin/master' into develop 2022-03-27 20:29:09 +00:00
Erovia 8c0198334c
CLI: Lint non-data driven macros in info.json (#16739) 
* CLI: Lint non-data driven macros in info.json

Macros in info.json should either have the "matrix" key with the matrix
data or should should be also present in <keyboard>.h

* Add verification of matrix data

* Use generic '<keyboard>.h' in output

* Add keyboard name to output

* Make C layout macro finding more robust

The old code missed C macros if they had whitespace between '#' and
'define' or had whitespace before '#'.
 2022-03-27 21:28:36 +01: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
Joel Challis 4f8cc32cf5
Extend 'qmk info' to handle keymap level overrides (#16702) 2022-03-21 11:57:41 +01:00
QMK Bot 3a08deb7fe Merge remote-tracking branch 'origin/master' into develop 2022-03-18 16:02:57 +00:00
Joel Challis ed773ab73c
Relocate CLI git interactions (#16682) 2022-03-18 16:02:24 +00:00
zvecr bffb209eee Merge remote-tracking branch 'origin/master' into develop 2022-03-18 01:15:23 +00:00
Joel Challis e5823b5650
[CLI] Add common util for dumping generated content (#16674) 2022-03-18 01:09:29 +00:00
QMK Bot 31eb82c911 Merge remote-tracking branch 'origin/master' into develop 2022-03-10 21:34:11 +00:00
Erovia b75f6691a1
CLI: Fix 'cd' subcommand on Windows (#16610) 
The 'cd' subcommand was failing as the current shell's Windows path was
mangled while milc processed it.
Using 'subprocess' directly avoids this issue and an extra layer of
subshell.
 2022-03-10 21:33:41 +00:00
Nick Brassel 8d5eacb7dd
Add support for encoder mapping. (#13286) 2022-03-09 19:29:00 +11:00
Ryan 75544d9127
Move Doxygen docs to subdirectory (#16561) 2022-03-07 11:22:22 +00: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
QMK Bot 36e47cb3aa Merge remote-tracking branch 'origin/master' into develop 2022-02-28 20:03:22 +00:00
Erovia fbfd5312b9
CLI: Validate JSON keymap input (#16261) 
* Fix schema validator

It should use the passed schema.

* Add required attributes to keymap schema

* Rework subcommands to validate the JSON keymaps

The 'compile', 'flash' and 'json2c' subcommands were reworked to add
JSON keymap validation so error is reported for non-JSON and
non-compliant-JSON inputs.

* Fix required fields in keymap schema

* Add tests

* Fix compiling keymaps directly from keymap directory

* Schema should not require version for now.
 2022-02-28 20:02:39 +00:00
QMK Bot 3c7c9bdd86 Merge remote-tracking branch 'origin/master' into develop 2022-02-27 12:40:01 +00:00
Joel Challis 779c7debcf
Fix issues with data driven split keyboards (#16457) 2022-02-27 13:39:24 +01:00
Joel Challis e4a6afa369
Rework generate-api CLI command to use .build directory (#16441) 2022-02-27 12:28:51 +01: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
QMK Bot bd01e1cee8 Merge remote-tracking branch 'origin/master' into develop 2022-02-22 18:32:43 +00:00
QMK Bot 8aec20c0da
Format code according to conventions (#16435) 2022-02-22 18:29:47 +00:00
fauxpark a44abeb99a Merge remote-tracking branch 'upstream/master' into develop 2022-02-22 03:04:41 +11:00
Ryan f30f963a0b
Internal docs generation updates (#16411) 2022-02-21 15:47:44 +00:00
Joel Challis b0621223bc
Various fixes for new-keyboard (#16358) 2022-02-15 01:42:58 +00:00
Erovia 23c238a180
CLI: Minor additions #12795 (#16276) 2022-02-14 12:02:35 +01:00
Joel Challis f7e7671f69
Migrate more makefile utilities to builddefs sub-directory (#16002) 2022-02-10 09:45:51 -08: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
Nick Brassel 8fd8b2dc92
Skip categorisation of PR if it's only for code formatting. (#16215) 2022-02-05 07:36:57 +11:00
Nick Brassel db43e45077
Ensure version.h is recreated each build. (#16188) 2022-02-04 07:36:02 +11:00
QMK Bot 7d38aec3ac Merge remote-tracking branch 'origin/master' into develop 2022-02-02 04:31:44 +00:00
Ryan c9f88d7c67
qmk doctor: display qmk_firmware version tag (#16155) 2022-02-01 20:31:42 -08:00
Nick Brassel 6e2b03cf69
Fixup multibuild filegen (#16166) 
* Add env variable support to multibuild.

* Generate version.h in build-specific location.
 2022-02-02 15:30:22 +11: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 c089541938 Merge remote-tracking branch 'origin/master' into develop 2022-01-03 22:42:47 +00:00
Joel Challis 550c9a315f
Refix "No C files in filelist: None" (#15728) 2022-01-03 22:42:15 +00:00
QMK Bot 73e372d920 Merge remote-tracking branch 'origin/master' into develop 2022-01-03 21:55:23 +00:00
Joel Challis aea7155423
Fix "No C files in filelist: None" (#15560) 
* Fix "No C files in filelist: None"

* Align other commands

* force absolute paths
 2022-01-03 21:54:46 +00:00
QMK Bot dde5cd1c54 Merge remote-tracking branch 'origin/master' into develop 2021-12-29 21:36:08 +00:00
Joel Challis 1a8a842cfb
Fix compilation-database command under MSYS (#15652) 
* Fix compilation-database command under MSYS

* Add comment
 2021-12-30 08:35:35 +11:00
Nick Brassel 7b018f097d
Use the PR title rather than parsing the commit message. (#15537) 2021-12-22 05:44:47 +11: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
Joel Challis 285afa3a8a
Fix 'format-c --core-only' matching keyboard level folders (#15337) 2021-11-29 15:08:39 +00:00