Commit Graph

16705 Commits

Author SHA1 Message Date
James Young
47dc471bd4
KPRepublic JJ40 rev1 Refactor (#23299)
* Move `kprepublic/jj40` to `kprepublic/jj40/rev1`

[chore]

* Friendly-format `info.json`

[style]

* Add layout/matrix diagram

[docs]

* Refactor keymaps

- use four-space indent
- grid-align keycodes
- refactor to use `LAYOUT_ortho_4x12` macro

[refactor]

* Rename `LAYOUT_planck_mit` to `LAYOUT_ortho_4x12_1x2u_c`

[refactor]

* Rename `LAYOUT_planck_1x2uR` to `LAYOUT_ortho_4x12_1x2u_r`

[refactor]

* Re-sort `layouts` object

Places `LAYOUT_ortho_4x12` (the `LAYOUT_all` equivalent) first in
sequence.

[refactor]

* Add `LAYOUT_ortho_4x12_1x2u_l`

[enhancement]

* Add `LAYOUT_ortho_4x12_2x2u`

[enhancement]

* Convert `rules.mk` to data driven

[chore]

* Remove `console` and `command` settings from keyboard level

[chore]

* Rename `info.json` to `keyboard.json`

[chore]
[enhancement]

* Remove `audio` setting from keyboard level

[chore]
2024-03-17 07:03:58 +00:00
James Young
164065682e
Swift65 Hotswap Layout Name Standardization (#23288)
* Rename `LAYOUT_7u_space` to `LAYOUT_ansi_blocker_tsangan`

[refactor]

* Refactor keymaps

Updates the keycode grid alignment to better resemble the assembled
board.

[style]
2024-03-16 03:38:01 +00:00
James Young
7e39635c0a
Swift65 Solder Layout Name Standardization (#23289)
* Rename `LAYOUT_625u_space` to `LAYOUT_ansi_blocker`

[refactor]

* Rename `LAYOUT_625u_space_split_bs` to `LAYOUT_ansi_blocker_split_bs`

[refactor]

* Rename `LAYOUT_7u_space` to `LAYOUT_ansi_blocker_tsangan`

[refactor]

* Rename `LAYOUT_7u_space_split_bs` to `LAYOUT_ansi_blocker_tsangan_split_bs`

[refactor]

* Rename `LAYOUT_iso_625u_space` to `LAYOUT_iso_blocker`

[refactor]

* Rename `LAYOUT_iso_625u_space_split_bs` to `LAYOUT_iso_blocker_split_bs`

[refactor]

* Rename `LAYOUT_iso_7u_space` to `LAYOUT_iso_blocker_tsangan`

[refactor]

* Rename `LAYOUT_iso_7u_space_split_bs` to `LAYOUT_iso_blocker_tsangan_split_bs`

[refactor]

* Refactor keymaps

Updates the keycode grid alignment to better resemble the assembled
board.

[style]
2024-03-16 03:37:40 +00:00
James Young
bbe0c515f8
KPRepublic JJ50 rev1 Refactor (#23294)
* Move `kprepublic/jj50` to `kprepublic/jj50/rev1`

[chore]

* Add layout/matrix diagram

[docs]

* Add `LAYOUT_ortho_5x12_1x2u_c`

[enhancement]

* Add `LAYOUT_ortho_5x12_1x2u_l`

[enhancement]

* Add `LAYOUT_ortho_5x12_1x2u_r`

[enhancement]

* Add `LAYOUT_ortho_5x12_2x2u`

[enhancement]

* Convert `rules.mk` to data driven

[chore]

* Remove `console` and `command` from keyboard level

[chore]

* Rename `info.json` to `keyboard.json`

Also deletes `rules.mk` as it's no longer needed.

[chore]
[enhancement]
2024-03-16 00:30:16 +00:00
James Young
1f8f0f70a2
Linworks FAve 87H Keymap Refactor/Bugfix (#23292)
* Refactor keymaps

- use QMK-native keycode aliases
- grid-align keycodes

[refactor]

* Correct key sequence

Moves the keycode representing the right half of a split Backspace to
the number row, after the left half/2u Backspace keycode.

Updates the keycode grid alignment to maintain readability.

[bugfix]
2024-03-15 22:36:23 +00:00
Joel Challis
14990ca5a2
Migrate features from rules.mk to data driven - ST (#23286) 2024-03-15 22:24:10 +00:00
Joel Challis
1a90337284
Migrate features from rules.mk to data driven - OPQR (#23285) 2024-03-15 22:24:00 +00:00
Joel Challis
24d824aae4
Migrate features from rules.mk to data driven - UVWXYZ (#23287) 2024-03-15 22:23:40 +00:00
Drashna Jaelre
68e8d74188
[Keyboard] Overhaul ploopyco devices (#22967) 2024-03-14 22:15:44 -07:00
QMK Bot
359cec14fa Merge remote-tracking branch 'origin/master' into develop 2024-03-15 05:10:50 +00:00
Wilba
c5f544cd96
Added WT65-H3 (HIBI HIBIKI) (#22886) 2024-03-14 22:10:17 -07:00
QMK Bot
020481b258 Merge remote-tracking branch 'origin/master' into develop 2024-03-15 05:09:50 +00:00
Wilba
cba2b5645f
Added WT65-G3 (HIBI HIBIKI) (#22888) 2024-03-14 22:09:20 -07:00
Joe Scotto
add7c13d61
Update ScottoAlp handwired keyboard to 12 column layout (#22962)
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-03-14 22:03:23 -07:00
Joel Challis
01473075f8
Migrate features from rules.mk to data driven - EFGH (#23248) 2024-03-15 01:42:55 +00:00
Joel Challis
80b72487ce
Migrate features from rules.mk to data drive - LMN (#23277) 2024-03-15 01:42:33 +00:00
Joel Challis
539fa21bf8
Migrate features from rules.mk to data driven - IJK (#23276) 2024-03-15 01:42:15 +00:00
QMK Bot
16ad09299c Merge remote-tracking branch 'origin/master' into develop 2024-03-15 01:32:49 +00:00
James Young
7d417b78eb
AMJKeyboard AMJ96 Layout Additions (#23267) 2024-03-14 18:32:17 -07:00
QMK Bot
c43f48f6a9 Merge remote-tracking branch 'origin/master' into develop 2024-03-14 17:53:03 +00:00
Nick Brassel
67df06eb44
Fixup cipulot eeprom. (#23280) 2024-03-14 17:52:30 +00:00
Joel Challis
aea414fd82
Migrate content where only parent info.json exists (#22895) 2024-03-14 21:21:33 +11:00
Joel Challis
f1a279810f
Migrate features from rules.mk to DD (#23202) 2024-03-14 03:57:48 +00:00
Joel Challis
8e5cd981e1
Migrate features from rules.mk to DD (#23247) 2024-03-14 03:56:42 +00:00
QMK Bot
6c95ec0c09 Merge remote-tracking branch 'origin/master' into develop 2024-03-13 07:24:52 +00:00
galile0
aa73362674
[Keyboard] add glyphkbd_v2 (#23131)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-03-13 00:24:21 -07:00
QMK Bot
0b6e1f1932 Merge remote-tracking branch 'origin/master' into develop 2024-03-13 07:24:01 +00:00
elmo
8c9dea0d0a
Add support new kb_elmo PCBs (#23138)
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-03-13 00:23:30 -07:00
QMK Bot
8449ad0fc3 Merge remote-tracking branch 'origin/master' into develop 2024-03-13 03:21:16 +00:00
era
be9fcbd503
Add SIRIND Brick65 (#23245) 2024-03-13 03:21:06 +00:00
wind
49596b0692
Add KM113 keyboard (#22669) 2024-03-13 03:20:46 +00:00
QMK Bot
1ea9f2e92b Merge remote-tracking branch 'origin/master' into develop 2024-03-12 22:52:11 +00:00
LLLKST
6788a5eb27
[Keyboard] Add PetruziaMini (#23201)
* Uploading the PetruziaMini

My first try on uploading somethings on github. Hoping it works, this is my handwired PetruziaMini. I don't know if it will be visible on qmk configurator now

* 36 key hhbk inspired kb

* Required changes done

I compiled it locally and works

* Last changes requested

Added a imgur image (first time using, hoping i did it right) and summarized the description as requeste

* Fixed imegur link

* Ops, i've lost this. Here it comes

Thanks for helping! I'll take notes for next time :)
2024-03-12 16:51:42 -06:00
jack
aa33d8ba8e
Fixup work_board (#23266)
* initial

* Update keyboards/work_louder/work_board/keymaps/default/keymap.c

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

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-03-12 16:31:51 -06:00
QMK Bot
df397a3bba Merge remote-tracking branch 'origin/master' into develop 2024-03-12 22:18:56 +00:00
James Young
3a3b4d155e
Ares Layout Additions (#23254) 2024-03-12 15:18:19 -07:00
QMK Bot
1f26ce7a9e Merge remote-tracking branch 'origin/master' into develop 2024-03-12 22:16:54 +00:00
James Young
2121931e34
Aero 75 Hotswap: correct layout data (#23253) 2024-03-12 15:16:22 -07:00
QMK Bot
9b5eff5b01 Merge remote-tracking branch 'origin/master' into develop 2024-03-12 22:14:09 +00:00
James Young
7cbbcdc5d4
KBDfans KBD75 Layout Additions (#23234) 2024-03-12 15:13:37 -07:00
QMK Bot
a0e8e26a21 Merge remote-tracking branch 'origin/master' into develop 2024-03-12 17:28:51 +00:00
Allie
654dc267db
Fix Magicforce MF17 RGB matrix (#23263) 2024-03-12 11:28:20 -06:00
QMK Bot
eb1304b16c Merge remote-tracking branch 'origin/master' into develop 2024-03-10 17:40:39 +00:00
James Young
abf6504903
kb-elmo AEK II USB: correct Configurator data (#23252)
Correct the QMK Configurator / `qmk info -m` data.

[chore]
2024-03-10 17:40:11 +00:00
QMK Bot
95de18792f Merge remote-tracking branch 'origin/master' into develop 2024-03-10 07:04:27 +00:00
James Young
be42ea306b
KBDfans KBD19x Layout Additions (#23230)
* Add layout/matrix diagram

[docs]

* Re-sort JSON `layouts` object

Moves the `LAYOUT_all` object to be first in sequence.

[refactor]

* Add `LAYOUT_ansi_split_bs`

[enhancement]

* Add `LAYOUT_iso_split_bs`

[enhancement]

* Add `LAYOUT_ansi_wkl_split_bs`

[enhancement]

* Add `LAYOUT_ansi_wkl`

[enhancement]

* Add `LAYOUT_iso_wkl_split_bs`

[enhancement]

* Add `LAYOUT_iso_wkl`

[enhancement]
2024-03-09 23:04:00 -08:00
Joel Challis
9f4a9d5826
Enable 'keyboard.json' as a build target (#22891) 2024-03-10 16:20:25 +11:00
Thibaut CHARLES
729520f302
Fix keychron q1v1 led config for iso layout (#23222) 2024-03-10 00:06:58 +00:00
jotix
461eaed7aa
[Keyboard] update Jotanck config(#23228) 2024-03-09 06:52:49 -08:00
Danny
1db7ff7f18
Update BAMFK-1 (#23236)
* Bump version number so VIA doesn't choke due to reconfiguration of keys/encoders

* Move rules.mk stuff into info.json, convert RGBLIGHT TO RGB_MATRIX

* Run format-json on info.json
2024-03-09 07:39:08 +00:00
Joel Challis
bb691bed96
Fixes for idobao vendor keymaps (#23246) 2024-03-09 04:12:44 +00:00
Joel Challis
58c38175e6
Remove redundant disabling of features (#22926) 2024-03-09 03:05:07 +00:00
QMK Bot
5dfe2bc37a Merge remote-tracking branch 'origin/master' into develop 2024-03-09 01:27:01 +00:00
James Young
fec2323089
Orthograph: correct layout data (#23213)
* correct layout data

Correct the key sizes and positions in the layout data.

[chore]

* remove layout offset

Remove the dead space from the layout data.

[chore]
2024-03-09 01:26:33 +00:00
QMK Bot
42c048e08a Merge remote-tracking branch 'origin/master' into develop 2024-03-09 01:24:59 +00:00
James Young
a8991722bc
Xiudi XD96 Layout Bugfixes and Touch-Up (#23242)
* Correct AliExpress Hardware Availability link in readme

Previous URL linked to a Cospad listing.

[chore]
[docs]

* Convert `info.json` to four-space indent

[style]

* Correct `LAYOUT_all` matrix data

The right half of split Backspace is actually located at [5, 9], not
[5, 3].

[bugfix]

* Correct `LAYOUT_96_iso` matrix data

Corrects the matrix positions of the ISO Hash/Tilde and ISO Enter keys
to [3, 12] and [3, 13], respectively.

[bugfix]

* Add layout/matrix diagram

[docs]

* Refactor keymaps

- remove "inline block" comments
- grid-align keycodes
- use four-space indent

[style]
2024-03-09 01:24:31 +00:00
peepeetee
acfbfe0dae
Change default RGB effect for momokai keypads to solid white (#23217) 2024-03-08 13:44:26 -07:00
QMK Bot
fc0b3eec53 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 19:45:01 +00:00
strayfade
62e2cb9286
[Keyboard] Add sf2040 (#23211)
Co-authored-by: jack <0x6a73@protonmail.com>
2024-03-08 11:44:32 -08:00
QMK Bot
d247c24e99 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 15:41:09 +00:00
David Hoelscher
113d3d6001
[Keyboard] Add CMK11 (#23239)
* adding cmk11

* correcting default keymap

* removing rules.mk

* removing unnecessary comment
2024-03-08 08:40:32 -07:00
jack
bd1f1068f7
Fixup annepro2 (#23206)
Co-authored-by: Joel Challis <git@zvecr.com>
2024-03-08 08:27:40 -07:00
QMK Bot
7278b01775 Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:52:08 +00:00
takashicompany
0a03fc512c
[Keyboard] Add Ejectix (#23204)
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-03-08 02:51:37 -08:00
QMK Bot
3ac9b80e2e Merge remote-tracking branch 'origin/master' into develop 2024-03-08 10:51:31 +00:00
Cipulot
30b0600ea2
[Keyboard] Add 60XT (#23210)
Co-authored-by: jack <0x6a73@protonmail.com>
2024-03-08 02:51:00 -08:00
Joel Challis
c48f372c87
Migrate annepro2 away from custom matrix (#23221)
* Migrate annepro2 away from custom matrix

* LTO
2024-03-06 17:02:52 +00:00
Drashna Jaelre
83e6ddbbb4
[Audio] Add support for audio shutdown pin (#22731)
Co-authored-by: Ryan <fauxpark@gmail.com>
2024-03-06 22:02:37 +11:00
QMK Bot
d048de70db Merge remote-tracking branch 'origin/master' into develop 2024-03-04 19:43:31 +00:00
James Young
9ae4d01e33
Iron180 V2 H: correct key sizes (#23214) 2024-03-04 19:42:37 +00:00
QMK Bot
2cace5a7e9 Merge remote-tracking branch 'origin/master' into develop 2024-03-04 19:42:24 +00:00
James Young
73bddf0ea6
mntre_v3: correct layout data (#23216) 2024-03-04 19:41:55 +00:00
QMK Bot
000c1c1475 Merge remote-tracking branch 'origin/master' into develop 2024-03-04 19:40:46 +00:00
James Young
1919644934
Iron180 V2 S: correct ANSI Enter key sizes (#23215) 2024-03-04 19:40:16 +00:00
Markus Knutsson
fcf906657b
[Keyboard] Add rp2040_ce option to lotus58 (#23185)
* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Update keymap

Corrected OLED orientation, added autoshift status on OLED.

* Added make target to bottom folder

With default folder

* Update keyboards/tweetydabird/lotus58/keymaps/default/keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Reformatted files

* Update keymap.c

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>

* Updated name

* Added rp2040ce

* Update info.json

* Update info.json

* Added rp2040ce

* Small fix

* Update info.json

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Update info.json

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Fixed stray char

* Apply suggestions from code review

Co-authored-by: jack <0x6a73@protonmail.com>

* Update info.json

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

* Update info.json

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

* Moved LTO

---------

Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2024-03-03 10:37:35 -07:00
Ryan
569b0c70be
WS2812 PWM: prefix for DMA defines (#23111)
* WS2812 PWM: prefix for DMA defines

* Add backward compatibility defines
2024-03-02 17:16:47 +00:00
Nick Brassel
d5ac75385b
Fix up scanning for Djinn, post-asyncUSB. (#23188) 2024-03-02 08:45:11 +11:00
QMK Bot
7dd57f16c3 Merge remote-tracking branch 'origin/master' into develop 2024-03-01 18:04:23 +00:00
blindassassin111
3b76a3a323
Fixing typos for OSAv2 and OSAv2_Topre (#23161)
Correcting tilde to grave, fixing a typo in ec.c, and removing some comments that were accidentally left in.
2024-03-01 18:03:56 +00:00
QMK Bot
f983b2de14 Merge remote-tracking branch 'origin/master' into develop 2024-03-01 16:18:49 +00:00
Moritz Plattner
012b101b2e
geistmaschine/geist: enable mousekey, fix issues in default/via keymap (#23187) 2024-03-01 09:18:19 -07:00
jack
4e953f1169
Fixup mechlovin/octagon (#23179)
* initial

* replace led count
2024-02-28 19:13:04 -07:00
jack
b35389317e
Fixup qk100 (firmware size) (#23169)
* initial

* further size reduction

and more...

remove rgb matrix effects
2024-02-28 11:50:04 -07:00
Joel Challis
b3462157dc
Satisfaction75 post merge updates (#23158) 2024-02-27 12:48:11 +00:00
Nick Brassel
bafbca3604
Ensmallification of helix/rev3_5rows:via. (#23159) 2024-02-27 12:45:46 +11:00
Andrew Kannan
490641307a
Cleanup Satisfaction75 Firmware and add new revisions (#22082)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2024-02-27 09:16:00 +11:00
Cipulot
0f701c7dbe
cipulot/common: Fix for multiple AMUX usage (#23155) 2024-02-26 13:38:52 +00:00
Cipulot
ed791972e1
Cipulot refactoring (#22368)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2024-02-26 13:05:10 +11:00
Ryan
65a04ead32
LED drivers: update keyboard LED configs (#23073)
* IS31FL3733: update keyboard LED config

* IS31FL3736: update keyboard LED config

* IS31FL3737: update keyboard LED config

* IS31FL3741: update keyboard LED config

* IS31FL3743A: update keyboard LED config

* AW20216S: update keyboard LED config

* SNLED27351: update keyboard LED config
2024-02-25 21:29:37 +00:00
Ryan
14d1d9639c
Add LED/RGB Matrix drivers to info.json schema (#23127) 2024-02-25 21:29:25 +00:00
Ryan
c6668b9cd9
Migrate RGBLED_NUM -> RGBLIGHT_LED_COUNT in remaining non-user keymaps (#23128) 2024-02-22 10:10:16 +00:00
QMK Bot
b25d4f62c1 Merge remote-tracking branch 'origin/master' into develop 2024-02-21 22:36:08 +00:00
Logan Foster
4e04da397e
[Keyboard] Add the Compensator (#23103)
* Pushed up compensator start

* Addressed Firmware Changes

* Fixed some keybind issues

* Updated readMe

* Added keymap

* Adjustments for PR

* adjusted on-state

* Applied sugguested changes

* Addressed PR changes

* Addressed macro comments

* Addressed layer comments
2024-02-21 15:35:39 -07:00
Joel Challis
b26e5c585b
Manual user keymap removal (#23119) 2024-02-20 22:22:00 +00:00
jack
b7b00d58b8
Fixup inett_studio/sq80 (#23121) 2024-02-20 17:04:04 +00:00
Stefan Kerkmann
61fa6949fb
[Core] Allow ChibiOS SIO driver for UART driver (#22839)
* onekey: stm32f3_disco: add usart pins and activate peripheral

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* chibios: uart: change SD1 prefix to UART

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>

* chibios: uart: add SIO driver and RP2040 compatibility

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update platforms/chibios/drivers/uart.h

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

---------

Signed-off-by: Stefan Kerkmann <karlk90@pm.me>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
2024-02-20 11:34:24 +01:00
Ryan
865a8f42a6
WS2812 bitbang: prefix for NOP_FUDGE define (#23110) 2024-02-20 21:13:18 +11:00
QMK Bot
6efb71d401 Merge remote-tracking branch 'origin/master' into develop 2024-02-19 21:51:32 +00:00
VertorWang
672986a078
[Keyboard] Add moky88 (#22954)
* Update

* 代码对齐

* 修改键盘名称

* 增加Readme

* Add copyright notice

* Update keyboards/moky/moky88/info.json

Delete solid_color

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

* Update keyboards/moky/moky88/info.json

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

* Update keyboards/moky/moky88/moky88.c

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

* Update keyboards/moky/moky88/info.json

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

* Update keyboards/moky/moky88/info.json

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

* Update keyboards/moky/moky88/config.h

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

* Update keyboards/moky/moky88/keymaps/via/keymap.c

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

* Update keyboards/moky/moky88/keymaps/default/keymap.c

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

* Update keyboards/moky/moky88/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/moky/moky88/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/moky/moky88/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/moky/moky88/config.h

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

* Add a key to enter the bootloader, and add instructions to the readme documentation

* delete maintainer

* add default/rules.mk

* Update readme.md

* Update readme.md

---------

Co-authored-by: vertor <zhen.wang@westberrytech.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
2024-02-19 14:51:04 -07:00
QMK Bot
b06ade9284 Merge remote-tracking branch 'origin/master' into develop 2024-02-19 21:48:48 +00:00