Commit Graph

9050 Commits

Author SHA1 Message Date
QMK Bot
a39c445c26 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 15:18:57 +00:00
Faehriss
bec74aec1b
[Keyboard] Added LAYOUT_60_iso_split_rshift to ok60 (#12902)
added lines to support split right shift ISO in QMK configurator.
2021-07-03 08:18:21 -07:00
QMK Bot
c82e0d64a2 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 15:14:07 +00:00
Jonavin
002d90b357
[Keymap] Jonavin merc additional encoder functionality (#13039)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
2021-07-03 08:13:41 -07:00
QMK Bot
19daf3da23 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 15:03:31 +00:00
Xelus22
4b6af0a507
[Bug] Pachi RGB - fix rgb placement (#13428) 2021-07-03 08:02:54 -07:00
QMK Bot
4459f91dc2 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 08:37:05 +00:00
Jonavin
d068b7c097
[Keymap] gmmk pro keymap with numpad, enhanced encoder functionality and Win key lock (#13406)
Co-authored-by: Jonavin <=>
2021-07-03 01:36:38 -07:00
QMK Bot
4f0a7e4364 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 08:16:45 +00:00
Jonavin
5878e86c8a
[Keymap] Jonavin quefrency keymap add encoder functionality + 2tap Shift CAPSLOCK (#13376)
Co-authored-by: Jonavin <=>
2021-07-03 01:16:16 -07:00
QMK Bot
b45b9ed536 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 08:01:00 +00:00
Nick Abe
2ccca64514
[Keymap] 2Moons-JP Keymap Update (#13279)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-03 01:00:34 -07:00
QMK Bot
4ba56d7219 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 07:59:58 +00:00
rate
0339467814
[Keyboard] Added pistachio rev2 (#13248)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-03 00:59:52 -07:00
Nic Lake
7f41c5147b
[Keymap] niclake - Keymap updates - Boardwalk updates & DZ60 create (#13245) 2021-07-03 00:59:30 -07:00
QMK Bot
15bcae710e Merge remote-tracking branch 'origin/master' into develop 2021-07-03 07:58:41 +00:00
Rob Owens
c55bb3d478
[Keyboard] Add support for Idobao Montex (#13214)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-03 00:58:13 -07:00
QMK Bot
3824651f3b Merge remote-tracking branch 'origin/master' into develop 2021-07-03 07:57:54 +00:00
Koichi Katano
9d61043363
[Keyboard] Add Bakeneko65 V3 and revision folders (#13228) 2021-07-03 00:57:50 -07:00
X-Bows Tech
2af5d493e3
[Keyboard] Add X-Bows Knight_Plus Keyboard (#13221)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-03 00:57:27 -07:00
SergioPoverony
ca4536e492
[Keyboard] Add Creator Pro by SergioPoverony (#13154)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-03 00:55:39 -07:00
QMK Bot
eea89cc636 Merge remote-tracking branch 'origin/master' into develop 2021-07-03 07:51:01 +00:00
Manassarn "Noom" Manoonchai
45dec4911c
[Keymap] Add narze lily58 keymap & update my other keymaps (#13110)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-03 00:50:32 -07:00
fauxpark
03807c2c6e Merge remote-tracking branch 'upstream/master' into develop 2021-07-03 16:38:05 +10:00
Qiaowei Tang (Joel)
2ce8d26418
[Keymap] Think6.5v2 keymap with working caps-lock indicator (#12709)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-02 23:31:32 -07:00
David Rambo
170de06475
[Keymap] Update personal keymaps, add Corne keymap, and update non-kc LAYOUT for Iris (#12273)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-02 22:30:32 -07:00
team0110
7629b7f52a
[Keyboard] Relocalize and Update p1800fl (#12425)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: marhalloweenvt <marhalloweenvt@gmail.com>
Co-authored-by: Drashna Jael're <drashna@live.com>
2021-07-02 21:46:28 -07:00
Dino Fizzotti
f51d929bd9
[Keyboard] Add FnRow v1 keyboard by dinofizz (#11817)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Dino Fizzotti <dinofizz@pop-os.localdomain>
2021-07-02 20:56:23 -07:00
William Ehman
ad30218701
[Keyboard] manyboard macro (#11896)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-02 20:53:13 -07:00
Conor Burns
8bba77db0d
added 0xCB Static (#13047)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-07-02 19:38:53 +01:00
James Young
11a406f046
correct info.json data (#13409) 2021-07-02 14:12:05 +01:00
James Young
73dedb96f2
add maintainer value to info.json (#13411)
Configurator isn't using the data in this file, and I think this may be why...
2021-07-02 14:09:24 +01:00
QMK Bot
638373a16c Merge remote-tracking branch 'origin/master' into develop 2021-07-02 13:01:28 +00:00
Joel Challis
9f49ec51a1
Fix up recent checkerboards additions (#13414) 2021-07-02 14:00:55 +01:00
QMK Bot
abe8b080bf Merge remote-tracking branch 'origin/master' into develop 2021-07-02 06:21:57 +00:00
Xelus22
a8f6a36e1e
[Bug] fix Dystopia.h comma (#13413) 2021-07-02 16:21:27 +10:00
QMK Bot
371d3bfbdd Merge remote-tracking branch 'origin/master' into develop 2021-07-02 06:09:01 +00:00
Ryan
5046883531
Cleanup gitignore (#13390) 2021-07-02 16:08:34 +10:00
QMK Bot
348750294b Merge remote-tracking branch 'origin/master' into develop 2021-07-02 00:46:10 +00:00
npspears
6db4b49fec
add support for Axon40 and G_IDB60 (#13075)
* add support for Axon40

* add support for G_IDB60

* added bootloader reset instructions

* added bootloader reset instructions
2021-07-02 10:45:31 +10:00
QMK Bot
47b12470e7 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 19:39:55 +00:00
Danny
db7fd6c3a1
Add missing Quefrency layouts for QMK Configurator (#13384)
* Reformat info.json using Prettier

* Add missing layouts needed for QMK Configurators
2021-07-01 12:39:16 -07:00
QMK Bot
8f018c2863 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 19:17:58 +00:00
AfterThought
79a46708f8
[Keyboard] Adding Via support to the GON NerD60 (#13395) 2021-07-01 12:17:28 -07:00
QMK Bot
0b7936c4e8 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 17:12:52 +00:00
Jakob Hærvig
bef73f44aa
[Keymap] Add haervig userspace and keymaps (#13362) 2021-07-01 10:12:19 -07:00
Drashna Jaelre
0bde920817
Convert Dip Switch callbacks to boolean functions (#13399) 2021-07-01 08:22:21 -07:00
QMK Bot
8f78be076d Merge remote-tracking branch 'origin/master' into develop 2021-07-01 10:48:20 +00:00
Caleb Lightfoot
c275828ac2
Changed Yeehaw Default Keymap (#13341) 2021-07-01 20:47:43 +10:00
QMK Bot
5ca893bd55 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 08:24:38 +00:00
James Young
e322462cd4
Illusion Rosa: correct layout macro names (#13387) 2021-07-01 01:24:06 -07:00
QMK Bot
70b1d7e459 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 08:23:37 +00:00
James Young
a001df5e80
FJLabs Midway60: physically arrange layout macro and fix info.json data (#13386) 2021-07-01 01:23:33 -07:00
James Young
1e809e28b7
Sanctified Dystopia: physically arrange layout macro (#13385)
Arranges the layout macro and keycodes to resemble the assembled keyboard.
2021-07-01 01:23:00 -07:00
QMK Bot
dddefa2fd7 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 08:22:19 +00:00
Stefano Pace
c1813717a7
Updates for keymap: ut472/stefanopace (#13370) 2021-07-01 01:21:42 -07:00
QMK Bot
7fdb95af36 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 08:08:12 +00:00
Michael Stapelberg
2b8ad391ae
[Keyboard] update debounce time on kint boards (#13351)
related to https://github.com/kinx-project/kint/issues/39
related to https://github.com/qmk/qmk_firmware/pull/12626
2021-07-01 01:07:37 -07:00
QMK Bot
af13b7bf05 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 08:06:43 +00:00
stanrc85
fb405c27ad
[Keymap] RGB Timeout added to userspace (#13339) 2021-07-01 01:06:06 -07:00
QMK Bot
896f11b2bd Merge remote-tracking branch 'origin/master' into develop 2021-07-01 07:54:37 +00:00
kb-elmo
13533508e2
[Keyboard][Bug] Fix LED indicators on Skeletn87 (#13335) 2021-07-01 00:53:35 -07:00
QMK Bot
425c0dad01 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 07:45:16 +00:00
Harshit Goel
4168e10c49
[Keyboard] Pteron36, open source 3x5_3 supporting layout (#13313) 2021-07-01 00:44:38 -07:00
QMK Bot
29228e5b78 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 07:42:50 +00:00
Drashna Jaelre
b7cf9a888a
Drashna's split updates (#13350)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-01 00:42:32 -07:00
Jesper Nellemann Jakobsen
54f429edd8
[Keymap] Create bingocaller keymap for DZ60RGB-ANSI (#13311)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-01 00:42:10 -07:00
QMK Bot
bbe45185e3 Merge remote-tracking branch 'origin/master' into develop 2021-07-01 07:30:05 +00:00
Shandon Anderson
d8c491954e
[Keyboard] Added flygone60 rev3 (#13280)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
2021-07-01 00:29:30 -07:00
QMK Bot
2b7172cbff Merge remote-tracking branch 'origin/master' into develop 2021-07-01 07:13:28 +00:00
melonbred
cd68fd7e8d
[Keyboard] mb44 - Update info.json and encoder (#13244) 2021-07-01 00:12:53 -07:00
Ryan
44260c3414
Remove API_SYSEX_ENABLEs from rules.mk (#13389) 2021-06-30 23:30:42 -07:00
QMK Bot
8596504361 Merge remote-tracking branch 'origin/master' into develop 2021-06-29 23:31:17 +00:00
James Young
27d1e2909f
Ergocheap handwired Layout Macro refactor (#13348)
* physically arrange layout macro

Arranges the layout macro and keycodes to resemble the assembled keyboard.

* update info.json data
2021-06-29 16:30:48 -07:00
Michael Stapelberg
f533d9e033
add kinT kinesis keyboard controller (kint41 variant) (#13333)
fixes https://github.com/kinx-project/kint/issues/5
2021-06-30 08:54:45 +10:00
QMK Bot
76ed98c51d Merge remote-tracking branch 'origin/master' into develop 2021-06-29 22:37:42 +00:00
jackytrabbit
2a07a87a7c
Update lazydesigners/the40/the40.h (#13354)
Fix error in the40.h
2021-06-30 08:37:08 +10:00
QMK Bot
1e2378fe7f Merge remote-tracking branch 'origin/master' into develop 2021-06-29 17:19:42 +00:00
nopunin10did
93e3e777d6
Jabberwocky quick fixes (#13369)
* cleaning up

* deleting to undelete

* Stub out defaults

* Jabberwocky firmware WIP

* Stubbing out keymap spacing

* Default keymap and layout updates

* start stubbing out JSON for configurator

* more WIP

* Update jabberwocky.h

* Add Readme

* Apply suggestions from code review

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

* Fix layout capitalization

* Updates to personal and default keymaps

* Add instructions for jumping the bootloader

* Update keyboards/nopunin10did/jabberwocky/rules.mk

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

* Add easier ctrl-alt-del to my keymap

* Undo changes from other master

* Add back DYNAMIC_KEYMAP_LAYER_COUNT constant

* Fix readme markup to use list items

* Give my layout VIA compatibility

Co-authored-by: Rossman360 <rmontsinger@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-29 18:19:02 +01:00
QMK Bot
888cec0290 Merge remote-tracking branch 'origin/master' into develop 2021-06-29 03:39:53 +00:00
Danny
5538bffb8e
[Keyboard] Add Quefrency Rev. 4 (#13368) 2021-06-28 20:38:59 -07:00
QMK Bot
8b919aa5d6 Merge remote-tracking branch 'origin/master' into develop 2021-06-29 03:31:16 +00:00
Xelus22
de8939aa5e
[Keyboard] fix encoder void to bool (#13334) 2021-06-28 20:30:39 -07:00
QMK Bot
3f813f87cd Merge remote-tracking branch 'origin/master' into develop 2021-06-29 03:25:00 +00:00
James Young
2b2e8bfdb7
Swiftrax Nodu handwired: layout macro sequence fix (#13329) 2021-06-28 20:24:26 -07:00
QMK Bot
8080bc17d0 Merge remote-tracking branch 'origin/master' into develop 2021-06-29 01:55:05 +00:00
Xelus22
e475c5bf38
[Bug] Missing empty line at the end of file (#13374) 2021-06-29 11:54:32 +10:00
QMK Bot
2665b4e487 Merge remote-tracking branch 'origin/master' into develop 2021-06-28 17:32:05 +00:00
James Young
f7faa7bfd0
FJLabs BKS65 Solder Layout Macro Refactor (#13347)
* grid align layout macro and keymaps

* physically arrange layout macro, phase 1

* physically arrange layout macro, phase 2

* replace KC_PAUSE with KC_PAUS

Makes the grid alignment nice. :)

* rename LAYOUT_65_ansi to LAYOUT_all

The included layout macro isn't actually correct for QMK's 65% ANSI community layout.

* add an actual LAYOUT_65_ansi

This is a semi-educated guess as to this macro; it may be wrong.
2021-06-28 10:30:52 -07:00
Ryan
cb23fe9fc1
Move RGBLight code into its own folder (#13312) 2021-06-28 15:15:24 +10:00
QMK Bot
023b85db96 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 19:08:13 +00:00
Ryan
cbe761ea16
Exent cleanup (#13353) 2021-06-27 05:07:44 +10:00
Zach White
546f5f2c4f
Error log cleanup (#13349)
* error log cleanup: 40percentclub/25

40percentclub/25: Claims to support a community layout that does not exist: ortho_5x5

* error log cleanup: 40percentclub/4x4

☒ 40percentclub/4x4: Claims to support a community layout that does not exist: ortho_4x8
☒ 40percentclub/4x4: Claims to support a community layout that does not exist: ortho_4x16

* error log cleanup: 40percentclub/5x5

☒ 40percentclub/5x5: Claims to support a community layout that does not exist: ortho_5x5

* error log cleanup: 40percentclub/nori

☒ 40percentclub/nori: Claims to support a community layout that does not exist: ortho_4x8

* error log cleanup: barracuda

☒ barracuda: Claims to support a community layout that does not exist: ortho_3x11

* error log cleanup: bpiphany/frosty_flake

☒ keyboards/bpiphany/frosty_flake/frosty_flake.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available!

* error log cleanup: bpiphany/pegasushoof/2013

☒ keyboards/bpiphany/pegasushoof/2013/2013.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available!

* error cleanup: bpiphany/pegasushoof/2015

☒ keyboards/bpiphany/pegasushoof/2015/2015.h: LAYOUT_tkl_ansi: Nested layout macro detected. Matrix data not available!
☒ keyboards/bpiphany/pegasushoof/2015/2015.h: LAYOUT_tkl_iso: Nested layout macro detected. Matrix data not available!

* error log cleanup: 40percentclub

☒ 40percentclub/25: Claims to support a community layout that does not exist: ortho_5x10
☒ 40percentclub/5x5: Claims to support a community layout that does not exist: ortho_5x10

* error cleanup: converter/usb_usb

☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_ansi: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_iso: Nested layout macro detected. Matrix data not available!
☒ keyboards/converter/usb_usb/usb_usb.h: LAYOUT_jis: Nested layout macro detected. Matrix data not available!

* error cleanup: ergo42

☒ ergo42/rev1: Claims to support a community layout that does not exist: ortho_4x14

* error cleanup: handwired/412_64

☒ handwired/412_64: Claims to support a community layout that does not exist: ortho_4x16

* error log cleanup: handwired/tritium_numpad
☒ handwired/tritium_numpad: Claims to support a community layout that does not exist: nontra_6x4

* error log cleanup: handwired/xealous/rev1
☒ handwired/xealous/rev1: Claims to support a community layout that does not exist: split60

* error log cleanup: kbdfans/kbd67/rev2

⚠ kbdfans/kbd67/rev2: info.json uses alias name LAYOUT_65_ansi_blocker_splitbs instead of LAYOUT_65_ansi_blocker_split_bs

* error cleanup: keebio/nyquist

☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available!
☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available!
☒ keyboards/keebio/nyquist/nyquist.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available!

* error cleanup: kindakeyboards/conone65

☒ kindakeyboards/conone65: Claims to support a community layout that does not exist: 65_iso_split_bs

* error cleanup: latinpadble

☒ latinpadble: Claims to support a community layout that does not exist: pad

* error cleanup: masterworks/classy_tkl/rev_a

☒ masterworks/classy_tkl/rev_a: Claims to support a community layout that does not exist: tkl_ansi_wkl

* error cleanup: meira

⚠ meira/featherble: info.json uses alias name LAYOUT_ortho_4x12 instead of LAYOUT
⚠ meira/promicro: info.json uses alias name LAYOUT_ortho_4x12 instead of LAYOUT

* error cleanup: nopunin10did/jabberwocky

⚠ nopunin10did/jabberwocky: MANUFACTURER in config.h is overwriting manufacturer in info.json

* error cleanup: ok60

☒ ok60: Claims to support a community layout that does not exist: 60_ansi_split_bksp_rshift

* error cleanup: ok60

☒ ok60: Claims to support a community layout that does not exist: 60_ansi_split_bksp_rshift

* error cleanup: planck

☒ keyboards/planck/ez/ez.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available!
☒ keyboards/planck/ez/ez.h: LAYOUT_ortho_4x12: Nested layout macro detected. Matrix data not available!
⚠ planck/thk: DEBOUNCE in config.h is overwriting debounce in info.json
⚠ planck/thk: DEVICE_VER in config.h is overwriting usb.device_ver in info.json
⚠ planck/thk: DIODE_DIRECTION in config.h is overwriting diode_direction in info.json
⚠ planck/thk: MANUFACTURER in config.h is overwriting manufacturer in info.json
⚠ planck/thk: PRODUCT_ID in config.h is overwriting usb.pid in info.json
⚠ planck/thk: VENDOR_ID in config.h is overwriting usb.vid in info.json
⚠ planck/thk: QMK_ESC_OUTPUT in config.h is overwriting qmk_lufa_bootloader.esc_output in info.json
⚠ planck/thk: QMK_ESC_INPUT in config.h is overwriting qmk_lufa_bootloader.esc_input in info.json
⚠ planck/thk: QMK_LED in config.h is overwriting qmk_lufa_bootloader.led in info.json
⚠ planck/thk: QMK_SPEAKER in config.h is overwriting qmk_lufa_bootloader.speaker in info.json
⚠ planck/thk: Matrix pins are specified in both info.json and config.h, the config.h values win.
⚠ planck/thk: LAYOUTS in rules.mk is overwriting community_layouts in info.json
⚠ planck/thk: Feature mousekey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature extrakey is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature console is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature command is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature sleep_led is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature nkro is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature backlight is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature rgblight is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature bluetooth is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature audio is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature encoder is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature dip_switch is specified in both info.json and rules.mk, the rules.mk value wins.
⚠ planck/thk: Feature bootmagic_lite is specified in both info.json and rules.mk, the rules.mk value wins.

* error cleanup: primekb/prime_m

☒ primekb/prime_m: Claims to support a community layout that does not exist: ortho_5x6

* error cleanup: rgbkb/sol/rev2

⚠ rgbkb/sol/rev2: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: '(BACKLIGHT_LEDS + FULLHAND_LEDS)'

* error log cleanup: shk9

☒ shk9: Claims to support a community layout that does not exist: ortho_3x3

* error log cleanup: sowbug

⚠ sowbug/68keys: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: 'DRIVER_LED_TOTAL'
⚠ sowbug/ansi_tkl: RGBLED_NUM->rgblight.led_count: invalid literal for int() with base 10: '(DRIVER_LED_TOTAL)'

* error log cleanup: torn

☒ torn: Claims to support a community layout that does not exist: split_3x6_4

* error cleanup: ymdk/np24/u4rgb6

☒ ymdk/np24/u4rgb6: Claims to support a community layout that does not exist: ortho_4x6

* error cleanup: masterworks/classy_tkl/rev_a

☒ masterworks/classy_tkl/rev_a: Claims to support a community layout that does not exist: tkl_iso_wkl
2021-06-26 08:38:14 -07:00
XScorpion2
8b059088ba
Keyboards/RGBKB/Mün (#13239) 2021-06-25 22:00:21 -07:00
QMK Bot
f8c01a8e5a Merge remote-tracking branch 'origin/master' into develop 2021-06-26 04:42:38 +00:00
yiancar
ad3169f500
[Keyboard] Add NK1 (#13212)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: yiancar <yiancar@gmail.com>
2021-06-25 21:42:09 -07:00
QMK Bot
580999661f Merge remote-tracking branch 'origin/master' into develop 2021-06-26 04:28:08 +00:00
James Young
b1ea4842e3
FFKeebs Siris Configurator Layout Correction (#13328)
* physically arrange layout macro

Arranges the layout macro and keycodes to resemble the assembled keyboard.

* correct info.json data

Corrects the key sequence and positioning in info.json.
2021-06-25 21:27:37 -07:00
QMK Bot
363c11622e Merge remote-tracking branch 'origin/master' into develop 2021-06-26 04:13:03 +00:00
Gvalch-ca
234c129f1e
[Keyboard] Add Gvalchca GA15.0 (#13114)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-25 21:12:36 -07:00
QMK Bot
c19a221719 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 04:07:05 +00:00
Xelus22
8783d0c73d
[Keyboard] Enable RGB Matrix VIA side for Pachi RGB (#13308) 2021-06-25 21:06:36 -07:00
QMK Bot
e64705d2f4 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 03:58:15 +00:00
Drashna Jaelre
79cc6ce2d0
[Keyboard] Bugfixes and Readme additions for PloopyCo devices (#13043) 2021-06-25 20:57:48 -07:00
QMK Bot
d6592d8988 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 03:57:18 +00:00
James Young
6ef0419bb0
SENDYYeah Bevi: correct Configurator layout data (#13327) 2021-06-25 20:56:46 -07:00
QMK Bot
259b8d355e Merge remote-tracking branch 'origin/master' into develop 2021-06-26 03:31:19 +00:00
James Young
7770a491f6
Nix Studio Oxalys80 Configurator Layout Data Correction (#13326)
* apply human-friendly formatting to info.json

* correct LAYOUT_all data

Corrects the layout data for the LAYOUT_all macro.
2021-06-25 20:30:48 -07:00
QMK Bot
5adb288bb3 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 03:25:18 +00:00
James Young
03791ed92a
Draytronics Daisy Configurator Refactor (#13325)
* correct layout data

* use LAYOUT as layout macro name

The defined LAYOUT_daisy is functional, but Configurator expects LAYOUT through the info.json file. As the board only supports one layout according to the open-source PCB files, use LAYOUT as the defined macro per QMK guidelines.

* add layout macro alias
2021-06-25 20:24:42 -07:00
QMK Bot
5ba9f43590 Merge remote-tracking branch 'origin/master' into develop 2021-06-26 01:53:46 +00:00
James Young
39b1dc7672
GON Nerd60 Refactor (#13343) 2021-06-26 11:53:16 +10:00
QMK Bot
0ef0c03a46 Merge remote-tracking branch 'origin/master' into develop 2021-06-25 03:52:10 +00:00
Ryan
92a9fba353
Cleanup junk chars, part 2 (#13284) 2021-06-25 13:51:44 +10:00
Zach White
b908275354
Optimize our jsonschema by using refs (#13271)
* fix some broken info.json files

* optimize our jsonschema using refs

* fix formatting after vscode broke it

* make flake8 happy

* cleanup

* make our schema validation more compact and flexible
2021-06-24 20:48:53 -07:00
QMK Bot
0412c92b68 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 23:15:36 +00:00
Nathan_Blais
61ec0023c4
Bop added via & unicode support (#13122)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-25 09:15:04 +10:00
QMK Bot
6418c1fde9 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 04:34:20 +00:00
James Young
36d8d7df5a
SAM SG81M Layout Macro Rework (#13291)
* grid-align layout macro and keymaps

* physically align layout macro and keycodes

Arrange the layout macro and keycodes to resemble the assembled keyboard.

* update info.json data

Updates the info.json data to be correct to the new layout macro.
2021-06-23 21:33:47 -07:00
QMK Bot
9b65154e58 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:55:14 +00:00
Will Wolff-Myren
2d60444df1
[Keymap] gmmk/pro: willwm (#12952)
* Create willwm keymap:
Modified GMMK Pro Default + VIA + Space-Cadet Unicode

* Temporarily remove unicode map calls; try using UNICODE_ENABLE instead

* RGBLIGHT_ENABLE = yes

* ...on second thought, don't enable RGBLIGHT =P

* Move Del to PrtSc, add Home, move PrtSc to Fn+Home

* willwm: Add keymap.json and readme.md

* willwm: Add layer0/layer1 images

* willwm: Update readme.md with info from PR #12952

* willwm: Update to better match template
(https://docs.qmk.fm/#/documentation_templates)
2021-06-24 12:54:44 +10:00
Michael Stapelberg
143ded332d
kint36: set correct EEPROM size (#12946)
The Teensy 3.6 comes with 4096 bytes of EEPROM.

This is commit 1 of 2 to make the EEPROM work.
The next commit changes the core code to wire up the EEPROM.
2021-06-24 12:54:18 +10:00
QMK Bot
c6d5049fb1 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:54:06 +00:00
Ramon Imbao
02fcb1069a
Add the SquishyTKL and SquishyFRL (#12764)
* Add SquishyTKL

* Add SquishyTKL-FRL

* Adjust readme.md and info.json

* Add JIS support for SquishyTKL

* Fix JIS layout macro

* Fix via layout and keymap

* Migrate SquishyTKL to STM32duino bootloader

* Make chibios conf files generic

* Change TKL via keymap to match number of layers

* Apply chibios changes to FRL as well

* Adjust README regarding flashing with dfu-util

* Add license and header guard
2021-06-24 12:53:38 +10:00
QMK Bot
08b62c5f5a Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:51:44 +00:00
obosob
3cc037d8d8
Add "steal this keyboard" keybaord (#12898) 2021-06-24 12:51:15 +10:00
QMK Bot
a7b54d288f Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:49:19 +00:00
kb-elmo
543dca0d89
Added Skeletn87 PCBs (#12922)
* add Skeletn87

* update skeletn87 files

* update skeletn87 soldered

* update readme image

* update readme (again)
2021-06-24 12:48:43 +10:00
QMK Bot
635f32b219 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:46:37 +00:00
18438880
fc06c143b1
Latin6rgb use IS31FL3731 IC (#11819)
* Create config.h

* Add files via upload

* Create keymap.c

* Create keymap.c

* Create rules.mk

* Update readme.md

* Update keyboards/latin6rgb/rules.mk

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

* Update keyboards/latin6rgb/rules.mk

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

* Update keymap.c

* Update keymap.c

* Update config.h

* Update config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-24 12:46:03 +10:00
QMK Bot
8024f2683b Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:28:59 +00:00
James Larkby-Lahet
b354ce94fe
enable mouse keys in handwired/dactyl keymaps that use them (#12586) 2021-06-24 12:28:33 +10:00
QMK Bot
ba3c5ec84e Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:27:43 +00:00
James Young
fb78447ad6
Monstargear XO87 Solderable Configurator Refactor (#13317) 2021-06-24 12:27:21 +10:00
QMK Bot
53ca79b922 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:27:20 +00:00
sendmmsg
d45a24a954
bug if macro definition and not integer is used to identify layers (#12648) 2021-06-24 12:27:10 +10:00
QMK Bot
7313fee181 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:26:58 +00:00
James Young
480b7e595e
Studio Kestra Nue: fix info.json layout macro reference (#13318)
Corrected the info.json file to reference LAYOUT_all instead of LAYOUT.
2021-06-24 12:26:55 +10:00
gtips
8030f73f44
[Keymap]Add Keymap reviung34rgb (#12656)
* [Keyboard] Add keyboard Reviung41

* Modified files

* deleted keyboards/reviung41/keymaps/default/config.h

* modified keyboards/rebiung41/keymaps/default/keymap.c

* modified keyboards/reviung41/readme.md

* modified keyboards/reviung41/readme.md

* modified keyboards/reviung41/readme.md

* Update readme.md

Change the image photo of readme.md.

* [Keyboard] Add reviung61

* Update readme.md

* fix keyboards/reviung61/ and add keymap default_rgb

* fix keyboards/reviung61/info.json

* fix keyboards/reviung61/info.json

* remove keyboards/reviung61/keymaps/default/config.h

* [keyboard] Fixed readme.md for reviung39 and 61.

* add keymap keyboards/reviung34/keymaps/default_rgb/ ,default_rgb2u
2021-06-24 12:26:31 +10:00
QMK Bot
054f1ccbdf Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:25:25 +00:00
Suryan Isaac
563de365a7
Added a custom keymap for XD60 (#12736)
* Added custom Keymap

* Added Images to README

* Added Layer 1 Keys for RGB control

* Added GPL2+ License to keymap.c

* Removed extra json files and added a few lines to README
2021-06-24 12:24:56 +10:00
QMK Bot
54abf60e04 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:24:38 +00:00
Antoine R. Dumont
f5cecffab2
keymap/ardumont: Fix substitute keycode reset step (#12675)
It so happens that when releasing the control key prior to the main key (C-h, C-i, C-n,
...), the substituted keycode was continuously sent in a loop after that (even when
releasing said key). The workaround so far was to type any other key to stop the loop.

This commit fixes such behavior by resetting the substitution keycode sent when the ctrl
released situation conditional is detected (and that the substitution keycode was on).
2021-06-24 12:24:31 +10:00
Jose Luis Adelantado Torres
5e86a11a8d
[keymap] Added new oled_status keymap to nullbitsco/nibble keyboard (#12824)
* Added new oled_status keymap to nullbitsco/nibble keyboard

* rm: Removed font from src imports
2021-06-24 12:24:11 +10:00
QMK Bot
303132fa8d Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:24:08 +00:00
Robert Verst
3099630a11
[Keymap] Feature/extend keymap (#12778)
* Add F13-F24

* Add nvim macros

* Add debug switch

* Switch mode every time, add debug print
2021-06-24 12:23:43 +10:00
QMK Bot
7e7e6d1a02 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:23:10 +00:00
T.Shinohara
dee50c9cc8
[Keymap] fix key code. numpad to numkey (#12808)
* add keyboard new macro pad "Kuro"

* change main readme.md

* remove not used code from default/keymap.c

* Remove unnecessary code

* Supports info.json

* removed back slash and not used functions.

* update at product link. add japanese messages.

* Merge All

* [Shiro]Add MacKeymap

* Change key code. Numpad→Numkey
2021-06-24 12:23:00 +10:00
Jay Greco
0ec6d6daf7
Update oled_bongocat to match VIA keymap (#12875)
* Update to match VIA keymap

* Update with feedback from PR
2021-06-24 12:22:42 +10:00
QMK Bot
b69fa51ec3 Merge remote-tracking branch 'origin/master' into develop 2021-06-24 02:22:11 +00:00
Mike Tsao
909d9c228f
Switch default layout to standard TKL; add custom (#12818) 2021-06-24 12:22:07 +10:00
Tyler Thrailkill
4a15eb593d
snowe keymap/userspace and Ocean Dream animation (#12477)
* Add snowe keymap/userspace & Ocean Dream animation

* Add snowe userspace with keymap wrappers and two animations
* Add crkbd keymap
* Add Ocean Dream animation, a cool full screen animation with:
* * twinkling stars
* * meteor showers
* * ocean waves
* * island with palm tree
* * moon with phases

* Disable Luna so travis build succeeds.

* Add more copyrights

* Add pragma once to keycode_aliases.h

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-24 12:21:40 +10:00
QMK Bot
c742d0bde4 Merge remote-tracking branch 'origin/master' into develop 2021-06-23 03:31:18 +00:00
Xelus22
ced7e9a0ce
[Keyboard][Bug] Makrosu VIA compile fix encoder and formatting (#13306)
* fix encoder and formatting

* remove redundant breaks

* Update keyboards/makrosu/keymaps/default/keymap.c

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

* Update keyboards/makrosu/keymaps/via/keymap.c

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-22 20:30:42 -07:00
QMK Bot
540d95125c Merge remote-tracking branch 'origin/master' into develop 2021-06-22 23:34:48 +00:00
Muhammad Rivaldi
4ef2b0f818
adding my custom keypad to qmk repository (#12150)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-06-23 09:34:17 +10:00
QMK Bot
010715877f Merge remote-tracking branch 'origin/master' into develop 2021-06-22 23:33:12 +00:00
James Young
0c5c39c18a
Technika: add sample info.json data (#13292)
Adds a placeholder file with sample data, as the layout hasn't been published yet.
2021-06-23 09:32:37 +10:00
QMK Bot
a89eaceb59 Merge remote-tracking branch 'origin/master' into develop 2021-06-21 22:09:45 +00:00
4pplet
d7f352de98
Adding "Eagle Viper Rep", open sourced Eagle/Viper V2/V3 PCB (#13020)
* adding revision A

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.h

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c

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

* Update readme.md

Adding instruction on how to enter bootloader

* adding instruction on how to enter bootloader (DFU)

adding instruction on how to enter bootloader (DFU)

* updated description

* Update keyboards/4pplet/eagle_viper_rep/rev_a/halconf.h

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/rev_a.c

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/config.h

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h

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

* Update keyboards/4pplet/eagle_viper_rep/rev_a/chconf.h

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

* Update keyboards/4pplet/eagle_viper_rep/keymaps/default/keymap.c

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

* Restoring palSetLineMode for working underglow

I was experiencing the same issue as this: https://github.com/qmk/qmk_firmware/issues/12655#issuecomment-844104659

sigprof helped me resolve this issue.

* Update rev_a.c

removing palSetLineMode again, works great after rebase. Thanks!

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-06-22 08:09:16 +10:00
QMK Bot
40e80455c9 Merge remote-tracking branch 'origin/master' into develop 2021-06-21 20:48:18 +00:00
James Young
19990a21a9
Geminate60 Codebase Touch-up (#13275)
* grid-align keycodes in keymaps

* rename LAYOUT to LAYOUT_all

* update LAYOUT_all macro

- use 3-character K<row><column> notation
- fix malformed electrical mapping

* update info.json

- correct maintainer
- update label fields
- remove meta key

* update readme

- update board description
- update keyboard maintainer
2021-06-21 13:47:47 -07:00
QMK Bot
96ea3c1a03 Merge remote-tracking branch 'origin/master' into develop 2021-06-21 20:33:28 +00:00
James Young
3f292ec723
Swiftrax Nodu handwired: Layout Macro rename and Community Layout support (#13276)
* rename LAYOUT to LAYOUT_60_ansi_split_bs_rshift

* enable Community Layout support
2021-06-21 13:32:51 -07:00
QMK Bot
e28d7ab58c Merge remote-tracking branch 'origin/master' into develop 2021-06-21 20:00:32 +00:00
Drashna Jaelre
6901411bca
Move optical sensor code to drivers folder (#13044) 2021-06-21 21:00:11 +01:00
ploopyco
eba3d68394
Fixes for Ploopy devices (#13144)
Co-authored-by: Drashna Jael're <drashna@live.com>
2021-06-21 20:59:56 +01:00
QMK Bot
b491c7994a Merge remote-tracking branch 'origin/master' into develop 2021-06-21 16:25:33 +00:00
James Young
224dcac08f
ID80: fix LAYOUT_iso data (#13274) 2021-06-21 09:25:02 -07:00
QMK Bot
26357ddca8 Merge remote-tracking branch 'origin/master' into develop 2021-06-21 16:23:38 +00:00
James Young
36f3dba195
mech.studio Dawn: correct key sizes and positioning (#13277) 2021-06-21 09:23:04 -07:00
QMK Bot
c6fb96fb9f Merge remote-tracking branch 'origin/master' into develop 2021-06-21 16:04:56 +00:00
Nathan
c0dd142d9f
[Keyboard] le_chiffre.c conditional led_config (#13285)
disabling RGB_MATRIX_ENABLE causes led_config to fail during compile. Setting this conditional allows you to turn off RGB
2021-06-21 09:04:18 -07:00
fauxpark
eaba4d327f Merge remote-tracking branch 'upstream/master' into develop 2021-06-21 21:17:26 +10:00
Ryan
59c572eaf0
Cleanup junk characters, part 1 (#13282) 2021-06-21 11:29:15 +01:00
QMK Bot
c234341cf6 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 15:30:49 +00:00
Erovia
29df3ce83b
Fix/keyboard/dz65rgbv3 (#13268)
With the 'lufa-ms' bootloader LTO is needed so the keyboard can be built
with Configurator.
2021-06-20 16:30:23 +01:00
QMK Bot
8f36af8409 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 08:01:01 +00:00
James Young
50a312b635
rect44: add LAYOUT_all data (#13260) 2021-06-20 09:00:10 +01:00
QMK Bot
25f1c242f8 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 07:50:19 +00:00
stanrc85
873658a76d
Adding my Bear65 keymap (#12962) 2021-06-20 08:49:49 +01:00
QMK Bot
f80ee5639e Merge remote-tracking branch 'origin/master' into develop 2021-06-20 07:37:50 +00:00
Xelus22
745f5f6532
[Keyboard] Add Constellation Rev2 (#13103) 2021-06-20 08:36:54 +01:00
QMK Bot
085db5ec8d Merge remote-tracking branch 'origin/master' into develop 2021-06-20 07:17:15 +00:00
Xelus22
eb2886369d
[Bug] Pachi keymap compile fix (#13261) 2021-06-20 00:16:50 -07:00
QMK Bot
8f1eccc59b Merge remote-tracking branch 'origin/master' into develop 2021-06-20 07:15:10 +00:00
Xelus22
438eee96e8
[Bug] Pachi RGB: fix RGB modifiers (#13262) 2021-06-20 00:14:44 -07:00
QMK Bot
2cb4301656 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 07:14:00 +00:00
James Young
0624698d33
MisonoWorks Karina Layout Macro Rework (#13259) 2021-06-20 00:13:34 -07:00
QMK Bot
f6ac5abd95 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 02:21:53 +00:00
peepeetee
dc39d90270
[Keyboard] Add LED matrix and 2 layouts to hub20 (#12505)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-06-19 19:21:24 -07:00
QMK Bot
18f6ded5fa Merge remote-tracking branch 'origin/master' into develop 2021-06-20 02:21:20 +00:00
nopjmp
050457818c
[Keymap] Fix Preonic rev3 default keymap (#12698)
The rev3 boards use RGBLIGHT_ENABLE now instead of BACKLIGHT_ENABLE.

This resolves the issue of flashing and losing functionality with the default keymap.
2021-06-19 19:20:50 -07:00
QMK Bot
67af692c97 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 02:19:07 +00:00
alittlepeace
1f4e20cfda
[Keyboard] YMDK Wings: enable Backlight (#12714) 2021-06-19 19:18:40 -07:00
QMK Bot
fc749b40e6 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 02:14:49 +00:00
Nick Abe
c835d2e71d
[Keyboard] Add PLX Keyboard (#12954)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-06-19 19:14:40 -07:00
QMK Bot
76e856d052 Merge remote-tracking branch 'origin/master' into develop 2021-06-20 02:13:09 +00:00
stanrc85
d456963177
[Keymap] Add stanrc85 Abasic keymap (#13180) 2021-06-19 19:12:39 -07:00
fauxpark
e3030bff5e Merge remote-tracking branch 'upstream/master' into develop 2021-06-20 12:10:59 +10:00