Drashna Jaelre
f973cb3ce4
[Keyboard] Fix ws2812 pin for phantagom boards ( #20670 )
2023-05-02 18:16:37 +10:00
QMK Bot
ac6615786c
Merge remote-tracking branch 'origin/master' into develop
2023-05-02 03:28:42 +00:00
Dennis Kruyt
9b41e8168d
[Keyboard] add phantagom/baragon marcopad ( #20543 )
...
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Tom Barnes <barnestom@me.com>
2023-05-01 20:28:05 -07:00
QMK Bot
e3a6dfcdd2
Merge remote-tracking branch 'origin/master' into develop
2023-05-02 03:20:41 +00:00
Dennis Kruyt
e206a1684e
[Keyboard] add phantagom/varan rgb numpad ( #20587 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-05-01 20:20:02 -07:00
QMK Bot
b244259fdf
Merge remote-tracking branch 'origin/master' into develop
2023-05-02 02:40:13 +00:00
Robert Mills
62a90945c7
[Keymap] Small changes to fix failing karn keyboard build ( #20618 )
2023-05-01 19:39:30 -07:00
Ryan
4b1ec081d4
LFK87 refactor ( #20635 )
2023-05-02 10:10:55 +10:00
Albert Y
50a8287f34
Vertex/angle65 WS2812 pin fix ( #20653 )
2023-05-01 17:26:46 -06:00
James Young
9d4edcdfeb
Koalafications Handwired Layout Macro Additions ( #20662 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_ansi_split_bs
* add LAYOUT_ansi
* add LAYOUT_ansi_rwkl_split_bs
* add LAYOUT_ansi_rwkl
2023-05-02 08:32:22 +10:00
Ryan
79aa319946
info.json
whitespace cleanups (#20651 )
2023-05-02 08:25:15 +10:00
James Young
1ab355802f
Bebol Handwired Layout Macro Additions ( #20660 )
2023-05-01 15:01:40 -07:00
James Young
f839d25135
split_65 Handwired Layout Macro Addition and Touch-Up ( #20659 )
2023-05-01 15:01:21 -07:00
James Young
3e4f64147c
Glacier Handwired Layout Macro Addition and Touch-Up ( #20661 )
2023-05-01 14:56:43 -07:00
James Young
23423830a9
The Galleon Handwired Layout Macro Additions ( #20663 )
2023-05-01 14:56:23 -07:00
James Young
bb85574630
Cyberstar Handwired Layout Macro Additions ( #20658 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_625u_space_split_bs
* add LAYOUT_625u_space
* rename LAYOUT_all to LAYOUT_split_space_split_bs
* add LAYOUT_split_space
2023-05-01 14:53:02 -07:00
James Young
6daf32b510
Hand88 Layout Macro Additions ( #20657 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* enable Community Layout support
2023-05-01 13:08:15 -07:00
Ryan
2944e93870
Move USB_MAX_POWER_CONSUMPTION
to data driven ( #20648 )
2023-05-01 17:37:12 +10:00
Ryan
12d42cedd2
Move FORCE_NKRO
to data driven ( #20604 )
2023-05-01 13:33:10 +10:00
James Young
3bc4aeac6c
GrayStudio Aero 75 Refactor and Touch-Up ( #20640 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_ansi_blocker
Existing codebase only supports the Hotswap version, but there is a Soldered version that supports additional layouts.
* refactor keymaps
- use four-space indent
- update grid-alignment of keycodes
- remove trailing spaces
* flesh-out keyboard readme
2023-04-30 13:50:18 -07:00
QMK Bot
dedacb079f
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 19:00:24 +00:00
Christopher Hoage
0b62a4ef72
Repair Spleeb i2c config and chrishoage keymap ( #20644 )
2023-04-30 11:59:45 -07:00
James Young
8d34c99c30
FJLabs Solanis Layout Macro Additions ( #20639 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_f13_ansi_split_bs_rshift
* add LAYOUT_tkl_f13_ansi
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_ansi_split_bs_rshift
* add LAYOUT_tkl_ansi
* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_ansi_tsangan
* enable Community Layout support
* edit listed maintainer (reference GitHub username)
2023-04-30 08:47:24 -07:00
QMK Bot
d08f08a02a
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 09:02:14 +00:00
Jesse Estes
c55c7fed83
Adding my keymap ( #20345 )
2023-04-30 19:01:25 +10:00
Ryan
a42d6426d9
Remove use of layout macros for music_map
( #20634 )
2023-04-30 18:58:06 +10:00
James Young
6c38fbbb73
Fox Lab Time80 Layout Macro Additions ( #20636 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_ansi_split_bs_rshift
* add LAYOUT_tkl_ansi
* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_ansi_tsangan
* add LAYOUT_tkl_iso_split_bs_rshift
* add LAYOUT_tkl_iso
* add LAYOUT_tkl_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_iso_tsangan
* enable Community Layout support
* Apply suggestions from code review
2023-04-30 01:26:39 -07:00
James Young
2f17ef3a0d
FJLabs Sinanju WK Layout Additions and Touch-Up ( #20628 )
...
* add matrix_diagram.md
* refactor keymaps
* fix Configurator implementation
The original C-based code had an off-by-one error in the key sequence, that was then converted in data-driven configurator without being corrected.
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_ansi_wkl_split_bs_rshift
* add LAYOUT_60_ansi_wkl
* enable Community Layout support
* edit listed maintainer (reference GitHub username)
2023-04-29 23:23:25 -07:00
James Young
1de01151e3
FJLabs Avalon Layout Additions and Touch-Up ( #20620 )
...
* add matrix_diagram.md
* info.json: correct key sequence
Fixes an off-by-one error between Right Split Backspace and Enter.
* refactor and unify keymaps
Edit the `default` and `via` keymaps for consistency layer-to-layer, to each other, and to the `info.json` layout data.
* info.json: apply friendly formatting
* add LAYOUT_ansi_blocker_split_bs
* add LAYOUT_ansi_blocker
* add LAYOUT_ansi_blocker_tsangan_split_bs
* add LAYOUT_ansi_blocker_tsangan
* add LAYOUT_iso_blocker_split_bs
* add LAYOUT_iso_blocker
* add LAYOUT_iso_blocker_tsangan_split_bs
* add LAYOUT_iso_blocker_tsangan
* add layout reference keymaps
* info.json: remove extra line breaks
* edit maintainer value
2023-04-29 22:52:30 -07:00
QMK Bot
0d9e37d638
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 02:33:40 +00:00
Felix Jen
a68b620112
Added Velvet Hotswap and Solder PCBs ( #20510 )
2023-04-30 12:33:01 +10:00
QMK Bot
f043a2d902
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 02:32:44 +00:00
mechlovin
aa7628641c
[Keyboard] Add the Aster Ergo PCB ( #20513 )
2023-04-30 12:32:08 +10:00
QMK Bot
3984b06c8b
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 02:32:00 +00:00
Vertex-kb
ea4136bc2b
vertex/angle65 - Implement RGBlight ( #20514 )
2023-04-30 12:31:22 +10:00
QMK Bot
4e4d79aecf
Merge remote-tracking branch 'origin/master' into develop
2023-04-30 01:59:55 +00:00
Lui Wolff
cdf640578b
[Keymap update] Keymap & docs update ( #20298 )
...
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-30 11:59:17 +10:00
QMK Bot
a415d2203c
Merge remote-tracking branch 'origin/master' into develop
2023-04-29 19:06:10 +00:00
Sergey Vlasov
ccb37b155c
ez_maker/directpins/promicro: Fix bootloader mismatch ( #20627 )
...
Setting the bootloader for something with `promicro` in the name to
`atmel-dfu` was really confusing.
2023-04-29 20:05:24 +01:00
James Young
d5d1f16165
FJLabs Polaris Layout Additions and Touch-Up ( #20622 )
...
* add matrix_diagram.md
* refactor keymaps
* fix Configurator implementation
The original C-based code had an off-by-one error in the key sequence, that was then converted in data-driven configurator without being corrected.
* info.json: apply friendly formatting
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* enable Community Layout support
* edit keyboard maintainer
2023-04-29 10:44:07 -07:00
James Young
32f0f5b262
FJLabs Midway60 Layout Macro Additions ( #20621 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* enable Community Layout support
* info.json: remove extra line breaks
* edit maintainer value
2023-04-29 09:46:14 -07:00
James Young
66ecb97067
FJLabs AD65 Layout Macro Additions ( #20619 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* enable Community Layout support
* info.json: remove extra line breaks
* edit maintainer value
2023-04-29 09:17:08 -07:00
Ryan
998a4d744e
Remove FLIP_HALF
layouts and move to data driven ( #20588 )
2023-04-30 01:51:45 +10:00
James Young
03328ea7a8
EvyD13 MX5160 Layout Macro Additions ( #20614 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* touch-up default keymap
- use four-space indent
- grid-align keycodes
- use enum statement for layer names
* add LAYOUT_ansi_wkl_split_bs_rshift
* add LAYOUT_ansi_wkl
* add LAYOUT_iso_wkl_split_bs_rshift
* add LAYOUT_iso_wkl
* Apply suggestions from code review
2023-04-29 00:40:34 -07:00
James Young
82a725636d
Emery65 Layout Macro Additions ( #20613 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* enable Community Layout support
* Apply suggestions from code review
2023-04-28 23:47:56 -07:00
James Young
8ee863a7fe
E88 Layout Macro Additions ( #20612 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor keymaps
- use four-space indent
- grid-align keycodes
- use QMK-native alias for `KC_TRNS`
* add LAYOUT_tkl_f13_ansi
* add LAYOUT_tkl_f13_ansi_split_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_ansi_tsangan_split_rshift
* add LAYOUT_tkl_f13_iso
* add LAYOUT_tkl_f13_iso_split_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* add LAYOUT_tkl_f13_iso_tsangan_split_rshift
* enable Community Layout support
* Apply suggestions from code review
2023-04-28 22:50:13 -07:00
James Young
45a474d07e
DZTech Bocc Layout Macro Additions ( #20611 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor keymaps
- number layer indices
- use four-space indent
- grid-align keycodes
* add LAYOUT_65_xt_ansi_blocker_split_bs
* add LAYOUT_65_xt_ansi_blocker
* add LAYOUT_65_xt_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_xt_ansi_blocker_tsangan
* Apply suggestions from code review
2023-04-28 22:16:34 -07:00
James Young
3c139b1507
dyz Synthesis60 Layout Macro Addition ( #20610 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor keymaps
- use four-space indent
- grid-align keycodes
- use QMK-native keycodes alias for `KC_RIGHT`
* add key positions for arrow keys to LAYOUT_all
* add LAYOUT_arrow with reference keymap
* info.json: unify key legends
2023-04-28 21:48:35 -07:00
James Young
1ead4b5595
cest73 TKM Layout Macro Additions ( #20583 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs with reference keymap
* add LAYOUT_iso_split_bs with reference keymap
2023-04-28 09:34:34 -07:00
James Young
c760cbf410
Ducky One 2 SF 1967ST Layout Macro Additions ( #20600 )
2023-04-27 22:45:26 -07:00
James Young
db9a33ed3c
Demiurge Layout Macro Touch-Up ( #20599 )
2023-04-27 22:44:55 -07:00
James Young
5470ddf2d2
CX60 Community Layout Support ( #20598 )
2023-04-27 22:44:36 -07:00
James Young
a09453f7bf
CherryB Studio CB87v2 Layout Macro Additions ( #20597 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_ansi_split_bs_rshift
* add LAYOUT_tkl_ansi
* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_ansi_tsangan
* add LAYOUT_tkl_iso_split_bs_rshift
* add LAYOUT_tkl_iso
* add LAYOUT_tkl_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_iso_tsangan
* enable Community Layout support
* correct listed maintainer
Maintainer has changed their GitHub username.
2023-04-27 21:23:14 -07:00
James Young
79f21b4eba
CheckerBoards G_IDB60 Layout Macro Edits ( #20596 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* enable Community Layout support
* info.json: correct maintainer value
Reference the maintainer's GitHub username.
2023-04-27 20:44:49 -07:00
James Young
a08e4b5055
CherryB Studio CB87RGB Layout Macro Additions ( #20595 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_f13_ansi_split_bs_rshift
* add LAYOUT_tkl_f13_ansi
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_iso_split_bs_rshift
* add LAYOUT_tkl_f13_iso
* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* enable Community Layout support
* correct listed maintainer
Maintainer has changed their GitHub username.
2023-04-27 18:11:36 -07:00
James Young
16874bba95
CherryB Studio CB65 Layout Macro Additions ( #20594 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* enable Community Layout support
2023-04-27 17:10:51 -07:00
James Young
0c9c2fea54
CherryB Studio CB1800 Layout Macro Additions ( #20593 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_1800_f13_ansi_split_numenter
* add LAYOUT_1800_f13_ansi_split_bs_numenter
* add LAYOUT_1800_f13_ansi_wkl_split_numenter
* add LAYOUT_1800_f13_ansi_wkl_split_bs_numenter
* add LAYOUT_1800_f13_iso_split_bs_numenter
* add LAYOUT_1800_f13_iso_split_numenter
* add LAYOUT_1800_f13_iso_wkl_split_numenter
* add LAYOUT_1800_f13_iso_wkl_split_bs_numenter
* correct listed maintainer
Maintainer has changed their GitHub username.
2023-04-27 15:47:20 -07:00
James Young
a831b50d97
Charue Sunsetter R2 Layout Macro Additions ( #20586 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs
* add LAYOUT_ansi
* add LAYOUT_iso_split_bs
* add LAYOUT_iso
* info.json: correct maintainer field
Reference the maintainer's GitHub username.
2023-04-27 15:15:16 -07:00
James Young
ed91c845a4
Charue Charon Layout Macro Additions ( #20585 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_blocker_tsangan_split_bs
* add LAYOUT_ansi_blocker_tsangan
* add LAYOUT_iso_blocker_tsangan_split_bs
* add LAYOUT_iso_blocker_tsangan
* info.json: correct maintainer field
Reference the maintainer's GitHub username.
2023-04-27 13:57:14 -07:00
QMK Bot
33e926b856
Merge remote-tracking branch 'origin/master' into develop
2023-04-27 18:18:05 +00:00
adophoxia
64b84385cd
Fix up positioning of keys for Keychron Q10/V10 and Q6/V6 ( #20582 )
2023-04-27 19:17:21 +01:00
James Young
78bf1f601a
Carbo65 Community Layout support ( #20580 )
...
* rename LAYOUT_all to LAYOUT_65_ansi_blocker
* info.json: apply friendly formatting
* enable Community Layout support
2023-04-26 20:51:44 -07:00
James Young
6d89034d12
CannonKeys Vector Layout Macro Additions ( #20571 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan
* enable Community Layout support
2023-04-26 20:25:53 -07:00
James Young
68da1e7ed4
CannonKeys Serenity Layout Macro Additions ( #20570 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* info.json: correct layout data
* add LAYOUT_tkl_f13_iso_split_bs_rshift
* add LAYOUT_tkl_f13_iso
* add LAYOUT_tkl_f13_ansi_split_bs_rshift
* add LAYOUT_tkl_f13_ansi
* enable Community Layout support
2023-04-26 19:58:35 -07:00
James Young
78b893e7fd
CannonKeys Rekt1800 Layout Macro Additions ( #20569 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi
* add LAYOUT_ansi_split_bs
* add LAYOUT_iso
* add LAYOUT_iso_split_bs
2023-04-26 19:37:59 -07:00
Ryan
fbbc54f523
Move DZ60 and MJ6XY layouts to data driven ( #20478 )
2023-04-27 07:53:38 +10:00
Ryan
4d8dd55bf9
Move 60% layouts to data driven ( #20477 )
2023-04-27 07:49:03 +10:00
Ryan
4871f651c5
Move remaining LAYOUT_all
s to data driven ( #20463 )
2023-04-27 07:45:43 +10:00
James Young
67e18c0d6b
CannonKeys Onyx Layout Macro Additions ( #20568 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* add LAYOUT_ansi_tsangan_split_bs_rshift
* add LAYOUT_ansi_tsangan
* add LAYOUT_iso_split_bs_rshift
* add LAYOUT_iso
* add LAYOUT_iso_tsangan_split_bs_rshift
* add LAYOUT_iso_tsangan
2023-04-26 14:10:46 -07:00
QMK Bot
3b5bd988a3
Merge remote-tracking branch 'origin/master' into develop
2023-04-26 20:45:46 +00:00
John Stegeman
e90d9fcfff
[Keymap] Add johnstegeman iris colemak keymap ( #20575 )
2023-04-26 14:45:03 -06:00
James Young
292db9c0c2
cannonkeys/ellipse_hs: correct layout macro references ( #20577 )
2023-04-26 13:07:38 -07:00
James Young
553d62672a
CannonKeys Obliterated75 Layout Macro Additions ( #20567 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_blocker
* add LAYOUT_ansi_blocker_split_bs
* add LAYOUT_iso_blocker
* add LAYOUT_iso_blocker_split_bs
2023-04-26 12:36:50 -07:00
James Young
ea25d17da6
CannonKeys Nearfield Layout Macro Addition ( #20566 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_3u_space
2023-04-26 12:15:09 -07:00
James Young
63ce1e282b
CannonKeys Moment Hotswap Touch-Up ( #20565 )
...
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* refactor keymaps
- use four-space indent
- grid-align keycodes
* copy via keymap to default
The default keymap had some keycodes that aren't appropriate for this board, and the function layer was wonky.
* enable Community Layout support
2023-04-26 11:55:43 -07:00
James Young
d8c54eb187
CannonKeys Moment Layout Macro Additions ( #20564 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor keymaps
- use four-space indent
- grid-align keycodes
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_tsangan_hhkb_iso
* enable Community Layout support
2023-04-26 11:37:07 -07:00
James Young
c99012da57
CannonKeys HoodrowG Layout Macro Additions ( #20563 )
...
* add matrix_diagram.md
* refactor keymaps
- use four-space indent
- grid-align keycodes
* info.json: apply friendly formatting
* add LAYOUT_tkl_ansi_tsangan
* add LAYOUT_tkl_iso_tsangan
* enable Community Layout support
2023-04-26 11:16:17 -07:00
James Young
a11d8f6e71
CannonKeys Gentoo Hotswap Touch-Up ( #20562 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_default to LAYOUT_65_ansi_rwkl
* refactor default and via keymaps
- use four-space indent
- grid-align keycodes
* remove RGB keycodes from via keymap
RGB lighting isn't supported.
2023-04-26 10:57:08 -07:00
James Young
51343bfd3a
CannonKeys Gentoo Layout Macro Additions ( #20561 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi
* add LAYOUT_65_ansi_split_bs
* add LAYOUT_65_ansi_wkl
* add LAYOUT_65_ansi_wkl_split_bs
* add LAYOUT_65_iso
* add LAYOUT_65_iso_split_bs
* add LAYOUT_65_iso_wkl
* add LAYOUT_65_iso_wkl_split_bs
* enable Community Layout support
* add LAYOUT_65_ansi_rwkl
* add LAYOUT_65_ansi_rwkl_split_bs
* add LAYOUT_65_iso_rwkl
* add LAYOUT_65_iso_rwkl_split_bs
2023-04-26 09:58:26 -07:00
James Young
4e749f0bf4
CannonKeys Ellipse Hotswap Layout Macro Addition & Touch-Up ( #20560 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_ansi_tsangan_split_rshift
* refactor default and via keymaps
- use four-space indent
- grid-align keycodes
* copy via keymap to default
The default keymap didn't make sense to me - it included keycodes for features that aren't supported, and the arrow key alignment on the function layer was wonky.
* enable Community Layout support
2023-04-26 03:04:49 -07:00
Drashna Jael're
e08f572673
Merge remote-tracking branch 'origin/master' into develop
2023-04-26 02:15:24 -07:00
James Young
cc1d8ba54c
CannonKeys Ellipse Layout Macro Additions ( #20558 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_ansi
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi_tsangan
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_iso
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso_tsangan
* add LAYOUT_60_iso_tsangan_split_bs_rshift
* enable Community Layout support
2023-04-25 23:04:26 -07:00
Alex Paulescu
d61a5f4343
[Keyboard] Add Manibus VIA support ( #20497 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-04-25 20:57:36 -07:00
James Young
40c5620003
CannonKeys DevastatingTKL Layout Macro Additions ( #20555 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor default and via keymaps
- use four-space indent
- grid-align keycodes
* add LAYOUT_tkl_f13_ansi
* add LAYOUT_tkl_f13_ansi_split_bs_rshift
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_iso
* add LAYOUT_tkl_f13_iso_split_bs_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
* enable Community Layout support
2023-04-25 12:36:04 -07:00
James Young
212ceaaea7
CannonKeys Crin Layout Macro Additions ( #20554 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_nofrow_ansi
* add LAYOUT_tkl_nofrow_ansi_split_bs_rshift
* add LAYOUT_tkl_nofrow_iso
* add LAYOUT_tkl_nofrow_iso_split_bs_rshift
* add LAYOUT_tkl_nofrow_ansi_tsangan
* add LAYOUT_tkl_nofrow_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_nofrow_iso_tsangan
* add LAYOUT_tkl_nofrow_iso_tsangan_split_bs_rshift
* enable Community Layout support
2023-04-25 12:07:04 -07:00
James Young
a11b8d0608
CannonKeys Cloudline Layout Macro Additions ( #20553 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_f13_ansi_tsangan
* add LAYOUT_tkl_f13_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_f13_iso_tsangan
* add LAYOUT_tkl_f13_iso_tsangan_split_bs_rshift
* enable Community Layout support
2023-04-25 11:51:27 -07:00
James Young
96b37a998a
CannonKeys Brutal v2 65 Layout Macro Additions ( #20552 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* enable Community Layout support
2023-04-25 11:24:23 -07:00
James Young
9a5e3c6565
CannonKeys Brutal v2 1800 Layout Macro Additions ( #20549 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* refactor default and via keymaps
- use four-space indent
- grid-align keycodes
* info.json: correct key positioning
Move the arrow keys down by 0.25u.
* add LAYOUT_ansi_rwkl_split_bs
* add LAYOUT_ansi_rwkl
* add LAYOUT_ansi_wkl_split_bs
* add LAYOUT_ansi_wkl
* add LAYOUT_iso_rwkl_split_bs
* add LAYOUT_iso_rwkl
* add LAYOUT_iso_wkl_split_bs
* add LAYOUT_iso_wkl
2023-04-25 11:04:51 -07:00
James Young
72c66cdd22
CannonKeys Balance Layout Macro Additions and Touch-Up ( #20548 )
...
* add matrix_diagram.md
* refactor default and via keymaps
- use four-space indent
- grid-align keycodes
* info.json: apply friendly formatting
* standardize default and via keymaps
Place the `KC_NUHS` and `KC_NUBS` keycodes on the correct keys.
* add LAYOUT_ansi with reference keymap
* add LAYOUT_ansi_split_bs with reference keymap
* add LAYOUT_iso with reference keymap
* add LAYOUT_iso_split_bs with reference keymap
2023-04-25 10:40:31 -07:00
James Young
051fae984d
CannonKeys Aella Layout Macro Additions ( #20547 )
...
* info.json: apply friendly formatting
* add matrix_diagram.md
* add LAYOUT_ansi with reference keymap
* add LAYOUT_iso with reference keymap
* correct url value in info.json
The URL didn't load for me with the `www.` included. *shrug*
2023-04-25 10:21:15 -07:00
James Young
b23bce0edb
CannonKeys Adelie Layout Macro Additions ( #20546 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_rwkl with reference keymap
* add LAYOUT_wkl with reference keymap
2023-04-25 09:55:12 -07:00
Ryan
f111bea3cd
Move miscellaneous layouts to data driven ( #20516 )
2023-04-25 02:38:35 +10:00
James Young
72d2be24f9
Caffeinated Studios Serpent65 Layout Macro Additions ( #20519 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi with reference keymap
* add LAYOUT_ansi_split_bs with reference keymap
* add LAYOUT_iso with reference keymap
* add LAYOUT_iso_split_bs with reference keymap
2023-04-23 22:03:10 -07:00
James Young
a95984745b
Cable Car Designs Cypher rev6 Layout Additions and Touch-Up ( #20518 )
...
* add matrix_diagram.md
* refactor default keymap
- use four-space indent
- grid-align keycodes
- use QMK-native keycode alias for `RGB_MODE_RGBTEST`
* refactor default_iso keymap
- use four-space indent
- grid-align keycodes
* refactor via keymap
- use four-space indent
- grid-align keycodes
- use QMK-native keycode alias for `KC_TRNS`
* info.json: apply friendly formatting
* add maintainer and url keys to info.json
* add LAYOUT_ansi with reference keymap
* add LAYOUT_iso; refactor default_iso keymap
* standardize default and via keymaps
- use `QK_GESC` at top left
- use `KC_DEL` for right half of Split Backspace
- use `KC_NUHS` for Non-US Hash position
- use `KC_NUBS` for Non-Us Backslash position
- use `KC_RGUI` for middle right mod
* add RGB Underglow keycodes to all keymap Function layers
2023-04-23 17:18:11 -07:00
QMK Bot
e0d55ea66b
Merge remote-tracking branch 'origin/master' into develop
2023-04-23 19:08:18 +00:00
adophoxia
713427c086
Add KBDCraft Adam64 Lego board ( #20503 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
2023-04-23 13:07:35 -06:00
James Young
3e33ef0474
Potato65S Layout Macro Additions ( #20508 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* enable Community Layout support
2023-04-23 08:25:10 -07:00
James Young
f03c44f4a7
Boston Layout Macro Additions ( #20504 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi with reference keymap
* add LAYOUT_iso with reference keymap
2023-04-22 23:23:40 -07:00
James Young
c15f2790ce
BIOI S65 Layout Macro Additions ( #20500 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_nofrow_ansi
* add LAYOUT_tkl_nofrow_ansi_split_rshift
* add LAYOUT_tkl_nofrow_ansi_tsangan
* add LAYOUT_tkl_nofrow_ansi_tsangan_split_rshift
* add LAYOUT_tkl_nofrow_isoenter
* add LAYOUT_tkl_nofrow_isoenter_split_rshift
* add LAYOUT_tkl_nofrow_isoenter_tsangan
* add LAYOUT_tkl_nofrow_isoenter_tsangan_split_rshift
* enable Community Layout support
2023-04-22 21:35:04 -07:00
James Young
6a40c403b4
BIOI Morgan65 Layout Macro Additions ( #20499 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* grid align keycodes in keymaps
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* enable Community Layout support
2023-04-22 20:21:46 -07:00
James Young
a6e2435b12
BIOI G60 Layout Macro Additions ( #20498 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* grid align keycodes in keymaps
* physically arrange layout macro
The switch positions available for matrix position [3, 13] are both to the left of the only position present for matrix position [4, 7]. This commit switches the two locations physically and in the keymaps.
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_ansi_arrow
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_iso_split_bs_rshift
* add LAYOUT_60_iso_arrow
* add LAYOUT_60_tsangan_hhkb_iso
2023-04-22 19:04:45 -07:00
James Young
32e2875813
Alf X2 Layout Macro Additions ( #20495 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs_rshift
* add LAYOUT_ansi
* refactor hhkb_60 keymap
Refactor the `hhkb_60` keymap to use the `LAYOUT_ansi_split_bs_rshift` macro.
2023-04-22 17:24:06 -07:00
James Young
8cdf8ee40f
Alf DC60 Layout Macro Additions ( #20494 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_ansi
* add LAYOUT_60_ansi_arrow
* add LAYOUT_64_ansi
* add LAYOUT_60_iso
* add LAYOUT_60_iso_arrow
* add LAYOUT_64_iso
* enable Community Layout support
2023-04-22 16:07:12 -07:00
James Young
2f74cc8928
AKB Vero Layout Macro Additions ( #20491 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_60_true_hhkb_split_space with reference keymap
* add LAYOUT_60_true_hhkb with reference keymap
* add LAYOUT_60_true_hhkb_iso_split_space with reference keymap
* add LAYOUT_60_true_hhkb_iso with reference keymap
* add matrix position [2, 12] to LAYOUT_all
* assign position [2, 12] to `KC_NUHS` in `default`/`via` keymaps
2023-04-22 12:50:04 -07:00
James Young
72c07e2629
AKB OGR Layout Macro Additions ( #20490 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_xt_ansi_blocker_split_bs with reference keymap
* add LAYOUT_65_xt_ansi_blocker with reference keymap
* add LAYOUT_65_xt_ansi_blocker_wkl_split_bs with reference keymap
* add LAYOUT_65_xt_ansi_blocker_wkl with reference keymap
* add LAYOUT_65_xt_iso_blocker_split_bs with reference keymap
* add LAYOUT_65_xt_iso_blocker with reference keymap
* add LAYOUT_65_xt_iso_blocker_wkl_split_bs with reference keymap
* add LAYOUT_65_xt_iso_blocker_wkl with reference keymap
2023-04-22 09:36:07 -07:00
Drashna Jaelre
ff6855ca4c
[Keyboard] Fix nk plus ws2812 config ( #20524 )
2023-04-21 20:54:46 +01:00
QMK Bot
e0d633e8cf
Merge remote-tracking branch 'origin/master' into develop
2023-04-21 13:56:40 +00:00
yiancar
ab4013a69e
NK Plus ( #20392 )
2023-04-21 14:55:54 +01:00
QMK Bot
967ff75115
Merge remote-tracking branch 'origin/master' into develop
2023-04-20 06:58:53 +00:00
Sleepdealer
6d8a1aa676
Add QuadrumLabs Delta ( #20409 )
2023-04-20 07:58:12 +01:00
Danny
9f492f6dfa
Add encoder map for Iris Rev. 5 VIA ( #20412 )
2023-04-19 11:21:47 -04:00
jack
d766e20196
Cleanup ekow/akira
( #20474 )
2023-04-19 04:44:01 +01:00
James Young
fa10d5fda2
Koolertron AMAG23 Touch-Up ( #20496 )
...
* Update Product Links for AMAG23
* info.json: apply friendly formatting
* rename LAYOUT_all to LAYOUT
2023-04-18 14:12:25 -07:00
James Young
9e79b4c40b
AI03 Vega Layout Macro Additions ( #20489 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_65_ansi_blocker_split_bs
* add LAYOUT_65_ansi_blocker
* add LAYOUT_65_ansi_blocker_tsangan_split_bs
* add LAYOUT_65_ansi_blocker_tsangan
* add LAYOUT_65_iso_blocker_split_bs
* add LAYOUT_65_iso_blocker
* add LAYOUT_65_iso_blocker_tsangan_split_bs
* add LAYOUT_65_iso_blocker_tsangan
* enable Community Layout support
2023-04-18 11:31:03 -07:00
James Young
19ddee803e
AI03 Equinox Layout Macro Additions ( #20488 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_space with reference keymap
* add LAYOUT_iso_split_space with reference keymap
2023-04-18 10:18:00 -07:00
James Young
b05f8c5e69
AEBoards Constellation Layout Macro Updates ( #20487 )
...
* add matrix diagrams
* rename LAYOUT_all to LAYOUT_65_ansi_rwkl_split_bs
* add LAYOUT_65_ansi_rwkl with reference keymap
2023-04-18 08:55:47 -07:00
QMK Bot
f554c668b8
Merge remote-tracking branch 'origin/master' into develop
2023-04-17 12:12:00 +00:00
Albert Y
e0a09ff728
GMMK 2 volume up/down Fn keys are backwards in default mapping ( #20476 )
2023-04-17 13:11:22 +01:00
jack
c98cb17ce1
Fixup missing include in mxss via keymap ( #20475 )
2023-04-17 13:08:41 +01:00
jack
73f7778a25
Fixup dymium65 RGB Pin ( #20473 )
2023-04-17 13:07:50 +01:00
James Young
ce4205b91f
Acheron Austin Layout Macro Conversion and Additions ( #20443 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_ansi_split_bs
* add LAYOUT_ansi
* add LAYOUT_ansi_wkl_split_bs
* add LAYOUT_ansi_wkl
* add LAYOUT_iso_split_bs
* add LAYOUT_iso
* add LAYOUT_iso_wkl_split_bs
* add LAYOUT_iso_wkl
* add reference keymaps
2023-04-16 18:08:39 -07:00
James Young
8a4867e23a
AEBoards Satellite Rev1 Layout Macro Conversion ( #20442 )
...
* add matrix_diagram.md
* rename LAYOUT_all to LAYOUT_65_ansi_rwkl
* info.json: apply friendly formatting
2023-04-16 16:20:17 -07:00
James Young
50ce19462a
4pplet/yakiimo Layout Macro Conversion and Additions ( #20436 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* add LAYOUT_tkl_ansi_tsangan_split_bs_rshift
* add LAYOUT_tkl_ansi_tsangan
* add LAYOUT_tkl_iso_tsangan_split_bs_rshift
* add LAYOUT_tkl_iso_tsangan
* enable Community Layout support
2023-04-16 15:33:59 -07:00
Drashna Jaelre
a6842d36c6
[Keyboard] Update lotus58 RGB config ( #20468 )
2023-04-16 13:27:21 -06:00
Ryan
798cbfe6a3
Fix info.json LTO and format encoder definitions ( #20456 )
2023-04-15 23:37:24 -06:00
Christian Brauner
1e3d2f2c1e
[Keymap] Update brauner preonic layout ( #20439 )
2023-04-15 23:33:54 -06:00
QMK Bot
6a0a59475d
Merge remote-tracking branch 'origin/master' into develop
2023-04-16 05:32:28 +00:00
Zykrah
697f53a154
[Keyboard] Add Kalakos Bahrnob65 ( #20424 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2023-04-15 23:31:51 -06:00
QMK Bot
7cdeb63ddf
Merge remote-tracking branch 'origin/master' into develop
2023-04-16 05:22:36 +00:00
Joel Challis
cefef18ceb
Tidy up stray RGB_DISABLE_TIMEOUT references ( #20460 )
2023-04-15 23:21:58 -06:00
QMK Bot
f2e3dbf6aa
Merge remote-tracking branch 'origin/master' into develop
2023-04-16 05:15:31 +00:00
spbgzh
6e5ff018e3
[Keyboard] Add zoom75 wired ( #20396 )
2023-04-15 23:14:51 -06:00
QMK Bot
976d950bb5
Merge remote-tracking branch 'origin/master' into develop
2023-04-15 20:37:06 +00:00
Wycer
75b7140cbd
[Keyboard] Add dymium65 ( #20257 )
...
Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Co-authored-by: Wycer <wycers@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: linyer-qwq <990842844@qq.com>
Co-authored-by: Linyer-qwq <32816392+Linyer-qwq@users.noreply.github.com>
2023-04-15 14:36:17 -06:00
James Young
3569f39485
Merge remote-tracking branch 'upstream/master' into develop
2023-04-15 12:28:32 -07:00
Markus Knutsson
28c11ed348
Lotus58 glow ( #20386 )
...
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Pablo Martínez <58857054+elpekenin@users.noreply.github.com>
2023-04-15 19:34:09 +01:00
James Young
d732b0b849
ADPenrose Obi Layout Macro Conversion and Addition ( #20445 )
...
* add matrix_diagram.md
* info.json: apply friendly formatting
* move matrix data to info.json
* add LAYOUT_625u_space with reference keymap
2023-04-15 10:36:11 -07:00
Nick Brassel
c9f619124d
Encodermap direction define. ( #20454 )
2023-04-15 16:18:44 +01:00
Ryan
0ddb7d7863
Move single 60_ansi
, 60_hhkb
and 60_iso
layouts to data driven ( #20438 )
2023-04-15 21:09:08 +10:00
Ryan
172a40686b
Move single LAYOUT_all
s to data driven ( #20430 )
2023-04-15 21:08:15 +10:00
Ryan
a84528f853
Move remaining LAYOUT
s to data driven ( #20422 )
2023-04-15 21:07:32 +10:00
Ryan
54634e9263
Fix some missing QMK_KEYBOARD_H includes in user keymaps ( #20417 )
2023-04-14 19:42:50 +10:00
QMK Bot
572f86349e
Merge remote-tracking branch 'origin/master' into develop
2023-04-13 04:04:42 +00:00
Albert Y
6d965d486c
Add hardware information momokai keyboards ( #20434 )
2023-04-12 22:04:02 -06:00
Drashna Jaelre
d11c37925b
[Keyboard] Update ymdk/id75 config ( #20432 )
2023-04-12 17:59:07 -07:00
Drashna Jael're
a41f6a3e07
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 14:36:45 -07:00
James Young
ce417226b2
4pplet/eagle_viper_rep/rev_a Layout Macro Conversion and Additions ( #20414 )
...
* info.json: apply friendly formatting
* add matrix_diagram.md
* move matrix data to info.json
* add LAYOUT_60_ansi_split_bs_rshift
* add LAYOUT_60_tsangan_hhkb
* add LAYOUT_60_hhkb
2023-04-12 14:29:29 -07:00
QMK Bot
4a58db949c
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 19:29:26 +00:00
Paulo Pereira
0382a25e35
[Keymap] Add paulomp90 lily58 keymap ( #20327 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2023-04-12 13:28:26 -06:00
QMK Bot
614a682d3f
Merge remote-tracking branch 'origin/master' into develop
2023-04-12 17:32:34 +00:00