Commit graph

564 commits

Author SHA1 Message Date
Ryan
74223c34a9
Remove legacy keycodes, part 6 (#18740)
* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`
2022-10-16 14:14:40 +01:00
Ryan
5e4b076af3
Remove legacy keycodes, part 5 (#18710)
* `KC_SLCK` -> `KC_SCRL`
* `KC_NLCK` -> `KC_NUM`
2022-10-15 22:29:43 +01:00
Drashna Jaelre
ad8630bd72
Remove RGBLIGHT_ANIMATION and clean up effect defines for layouts+users (#18729) 2022-10-15 09:59:31 -07:00
Ryan
5629ba1807
Remove legacy keycodes, part 4 (#18683)
* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
2022-10-13 18:28:14 +01:00
Joel Challis
14b522bb34
Remove keymaps that still reference legacy macros (#18690) 2022-10-13 02:22:16 +01:00
Joel Challis
fb2c7da2fd
Remove some .gitignore files (#18689) 2022-10-13 08:36:51 +11:00
Ryan
e96d829724
Remove legacy keycodes, part 3 (#18669)
* `KC__VOLDOWN` -> `KC_VOLD`

* `KC__VOLUP` -> `KC_VOLU`

* `KC__MUTE` -> `KC_MUTE`

* `KC_POWER` -> `KC_PWR`
2022-10-11 14:21:47 +01:00
Ryan
c6f1b594a2
Remove legacy keycodes, part 2 (#18660)
* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`
2022-10-10 20:06:26 +01:00
Ryan
4b2d71de52
Remove legacy international keycodes (#18588) 2022-10-09 14:51:09 +11:00
Ryan
d1b6b06202
Remove legacy locking caps/num/scroll keycodes (#18601) 2022-10-05 16:21:40 +01:00
Drashna Jaelre
64b1ed4550
Fix Per Key LED Indicator Callbacks (#18450)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-10-04 15:24:22 -07:00
Johannes Löthberg
d412dc61ee
Remove remaining use of terminal keys and related comment labels (#18402) 2022-09-29 20:42:42 -07:00
Ryan
ea2819b2c2
Change {LED,RGB}_DISABLE_TIMEOUT to {LED,RGB}_MATRIX_TIMEOUT (#18415) 2022-09-26 14:40:15 +10:00
Ryan
36c410592d
Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399) 2022-09-23 22:46:23 +10:00
Joshua Diamond
a26f1ddafa
Chromeos keycodes (#18212) 2022-09-17 15:48:09 +10:00
QMK Bot
e591b94544 Merge remote-tracking branch 'origin/master' into develop 2022-09-14 00:21:20 +00:00
Reibl János Dániel
6984c6d3b3
fix: Remove TERM_ON/TERM_OFF from my keymap (#18354) 2022-09-14 01:20:34 +01:00
QMK Bot
03f6954c3a Merge remote-tracking branch 'origin/master' into develop 2022-09-07 10:39:35 +00:00
ddeklerk
a082fcc933
Delete my keymaps (#18302) 2022-09-07 20:38:54 +10:00
Dasky
dc4af81e0b
Remove legacy USE_SERIAL define (#18292)
* Remove legacy USE_SERIAL define

* tidy up missed comments
2022-09-06 18:46:34 +01:00
QMK Bot
6a13ae9fd7 Merge remote-tracking branch 'origin/master' into develop 2022-08-29 01:35:17 +00:00
Juno Nguyen
1cc0b1e371
Update junonum keymap: add AG_NORM recovery (#18170) 2022-08-29 02:34:47 +01:00
QMK Bot
d2cc8d5060 Merge remote-tracking branch 'origin/master' into develop 2022-08-28 17:11:07 +00:00
Joshua Diamond
37a85e1f9b
More spidey3 userspace cleanup (#18049) 2022-08-28 10:10:28 -07:00
Ryan
d983251c10
Switch over MANUFACTURER and PRODUCT to string literals (#18183) 2022-08-28 09:59:40 -07:00
Joel Challis
bbc3bc55f2
RESET -> QK_BOOT user keymaps (#17940) 2022-08-21 23:55:30 +01:00
QMK Bot
f9abecda3f Merge remote-tracking branch 'origin/master' into develop 2022-08-17 14:11:59 +00:00
Juno Nguyen
45845ea07f
Replace CG_SWAP in junonum (#18086)
Co-authored-by: Minh-tri Nguyen <mtngx@PigeonMac.local>
2022-08-17 15:11:00 +01:00
QMK Bot
cfab3e2d6e Merge remote-tracking branch 'origin/master' into develop 2022-08-17 02:37:10 +00:00
jotix
8230b4c49d
[Keymap] jotix's community/ortho4x12 change (#18069) 2022-08-16 19:36:30 -07:00
Joshua Diamond
5408334083
Update ginkgo65hot to allow use of community layouts (#17911) 2022-08-06 13:29:06 -07:00
Stefan Kerkmann
f27b617f36
[Core] Process all changed keys in one scan loop, deprecate QMK_KEYS_PER_SCAN (#15292) 2022-08-06 20:51:13 +10:00
QMK Bot
671e211930 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 10:33:16 +00:00
jotix
4ec2626b43
jotix's community ortho_4x12 layout change (#17891) 2022-08-03 11:32:23 +01:00
Joshua Diamond
baf34989f1
Default rgblight (#17855)
* better rgb bindings; improve default

* trim firmware size
2022-07-30 18:31:31 -04:00
Joshua Diamond
f02e355380
More glyph transformations for spidey3 userspace (#17854)
* add bold and blackboard bold glyph transformations

* trim firmware size; cformat

* fix typo in macro

* trim firmware size a bit more
2022-07-30 18:21:54 -04:00
QMK Bot
5cad58dfa9 Merge remote-tracking branch 'origin/master' into develop 2022-07-04 20:49:23 +00:00
James Young
75bc9e6496
TKL Community Layout Additions (#17563) 2022-07-04 13:48:44 -07:00
QMK Bot
4d243e94fa Merge remote-tracking branch 'origin/master' into develop 2022-07-02 23:12:20 +00:00
James Young
71f9a07b0f
65% Community Layout Updates (#17476)
* update 65_ansi community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker_split_bs community layout keymap

- add license header
- add function layer

* update 65_ansi_blocker_tsangan community layout keymap

- add license header
- add function layer
- remove trailing spaces in keymap readme

* add 65_ansi_blocker_tsangan_split_bs community layout keymap

* update 65_ansi_split_bs community layout keymap

- add license header
- add function layer

* update 65_iso community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* update 65_iso_blocker community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* update 65_iso_blocker_split_bs community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme

* add 65_iso_blocker_tsangan community layout keymap

* add 65_iso_blocker_tsangan_split_bs community layout keymap

* update 65_iso_split_bs community layout keymap

- add license header
- add function layer
- fix layout box drawing on Community Layout readme
2022-07-03 00:12:02 +01:00
QMK Bot
a949d32072 Merge remote-tracking branch 'origin/master' into develop 2022-07-02 11:26:57 +00:00
Manna Harbour
3842b15cf1
[Keymap] Update Miryoku (#16482) 2022-07-02 21:26:23 +10:00
Nick Brassel
a9af4c928e Merge remote-tracking branch 'upstream/master' into develop 2022-07-02 21:13:06 +10:00
Batuhan Baserdem
fd44341cbf
Userspace and keymap update for user bbaserdem. (#14484) 2022-07-02 21:09:04 +10:00
precondition
3b9e186019
Do not enable PERMISSIVE_HOLD when TAPPING_TERM exceeds 500ms (#15674) 2022-06-24 12:40:09 +02:00
Drashna Jaelre
0da6562c4d
Make default layer size 16-bit (#15286)
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2022-06-19 07:37:51 +10:00
Drashna Jaelre
cda343acbe
[Keymap] Drashna update for post Q2 merge (#17241) 2022-05-30 22:02:55 -07:00
Juno Nguyen
15a86d5c53
[Keymap] Updates to layouts/community/ortho_4x12/junonum (#17249) 2022-05-30 11:28:35 -07:00
Joel Challis
b7771ec25b
RESET -> QK_BOOT default keymaps (#17037) 2022-05-15 20:26:27 +01:00
Ryan
4a8bd7b9a5
Rename keymap_extras headers for consistency (#16939) 2022-05-15 21:27:01 +10:00
James Young
2f9197cfcd
F13 TKL with Split Backspace and Split Right Shift Community Layouts (#17082)
* add tkl_f13_ansi_split_bs_rshift Community Layout

* add tkl_f13_ansi_tsangan_split_bs_rshift Community Layout

* add tkl_f13_iso_split_bs_rshift Community Layout

* add tkl_f13_iso_tsangan_split_bs_rshift Community Layout
2022-05-14 09:14:19 -07:00
James Young
58c37c0814
65_iso_split_bs Community Layout keymap bugfix (#17072)
Fix the layout macro reference in the `keymap.c` file, which caused this keymap to not be able to be compiled.
2022-05-12 21:11:02 +01:00
Nathan Johnson
980a1b0562
[Keymap] ergodox: updating osx_whiskey_tango_foxtrot_capslock to use process_record_user (#16715) 2022-03-23 22:24:02 -07:00
Drashna Jaelre
ff6c70415c
[Keymap] Drashna Mouse keys and oled updates (#16556) 2022-03-06 22:12:17 -08:00
Ryan
63c310f6fd
Add 65_iso_split_bs default layout (#16283) 2022-02-11 11:19:18 +11:00
Olli
c30bdcbca8
[Keymap] Remove Ergodox community layout “coderkun_neo2” (#16011) 2022-01-23 12:38:02 -08:00
Drashna Jaelre
b090ff03ed
[Keymap] Drashna's OLED rewrite (#15981) 2022-01-21 19:36:52 -08:00
Reibl János Dániel
a3af4b09b0
[Keymap] Misc userspace and keymap improvements (#15844) 2022-01-13 09:16:03 -08:00
Alan Pocklington
dce611bc9f
[Keymap] AJP10304 layout, add Colemak-DHm layer (#15582) 2022-01-10 16:57:41 -08:00
James Young
590ec4ae04
add ortho_4x16 Community Layout (#15776) 2022-01-10 15:05:29 -08:00
Albert Y
cfabc3b028
Add layout for split 3x5_2 (#15800) 2022-01-10 15:01:44 -08:00
Drashna Jaelre
c4551d7ef1
[Keymap] Reorganization, cleanup and readmes for drashna code (#15617) 2021-12-29 20:17:34 -08:00
Jonathan Rascher
93bc737a8f
[Keymap] Update bcat's keymaps/userspace to share logic, add OLED functionality, and set up one of my macropads for WFH (#14702)
* Add script to build all bcat keymaps at once

* Move userspace RGB to separate source file

* Move layer handling logic into userspace

* Move keycap aliases into userspace

* Add OLED userspace library and Lily58 OLED setup

* Add Luna keyboard pet, generic OLED pet framework

Luna artwork and original implementation by HellSingCoder, licensed
under GPL v2.0.

See also: 6dfe915e26/keyboards/sofle/keymaps/helltm/keymap.c

* Use OLED on bcat's Crkbd

I had to turn off a few unused features to address firmware size limits.

* Remove vestigial NK_TOGG keybindings

* Add post-render hook to OLED pet API

This enables OLED pets to draw custom widgets (e.g., LED indicator
status) on top of their animation frames.

* Add Isda keyboard pet

For future use on my Unicorne keyboard. Unicorn artwork by sparrow666,
licensed under GPL v2.0.

See also: https://opengameart.org/content/unicorn-2

* Replace OLED timeout implementation with custom

The default implementation never lets the OLED turn off if a continuous
animation is in progress. The custom one does.

* Move keyboard state for OLED functions into struct

No change in firmware size, but makes keymaps read a little nicer and
enables more functionality in OLED pets.

* Enable continuously running OLED pet (for Luna)

* Sync OLED state; enable Bootmagic only when needed

The new extensible split transport for Split Common finally allows OLED
on/off status to be synced between halves of the keyboard. :)

Unfortunately, this required disabling Bootmagic Lite to keep my Crkbd
under the firmware size limit. (I now after 28 bytes free on avr-gcc
version 8.5.0.) So now I'll enable Bootmagic only on keyboards that
actually require it, i.e., ones lacking an accessible reset button.

* Update 9-Key macropad keymap for working from home

* Remove includes redundant with quantum.h

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

* Simplify BCAT_OLED_PET makefile logic

* Swap some keys on my 9-Key macropad around

* Inline spurious variable in OLED code

* Remove max brightness that's now set by default

The default max brightness is only 120 rather than 150, but that might
actually fix some weirdness I've seen with bright white LED settings.

* Enable specific RGBLIGHT modes instead of default

The general trend these days seems to be enabling only the modes you
want, so I'm manually expanding the ones currently enabled by
RGBLIGHT_ANIMATIONS.

I'd like to try out the TWINKLE mode too, but it seems not to work at
all on ARM right now, and all my usable RGBLIGHT keebs are ARM boards.

* Reenable RGB_MATRIX animations after #15018

My Crkbd still has a reasonable amount of free space with these:
27974/28672 (97%, 698 bytes free). The RGB_MATRIX_KEYPRESSES effects
would put it over the firmware size limit, but I really don't ever use
those anyway.

* Use new get_u8_str function for WPM display

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-12-27 14:46:00 +11:00
BifbofII
8fd957b69b
Add personal handwired Planck clone (#13299)
* Add personal handwired Planck clone

* remove references to planck

* requested changes

- small changes to defines
- licence headers

* Clean up rules.mk

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

* Change function return type to bool

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-12-27 14:09:56 +11:00
Drashna Jaelre
3fa592a402
[Keymap] Unicode and Pointing Device and Autocorect for drashna keymaps (#15415) 2021-12-14 20:53:36 -08:00
James Young
554cc86aeb
Extended Community Layout Support (#15371)
* add tkl_f13_ansi Community Layout

* add tkl_f13_ansi_tsangan Community Layout

* add tkl_f13_iso Community Layout

* add tkl_f13_iso_tsangan Community Layout

* add missing layout diagrams to readme.md

* fix layout macro references in info.json files

* add tkl_nofrow_iso Community Layout

* enable Community Layout support: dyz/dyz_tkl

* enable Community Layout support: kopibeng/mnk88

* enable Community Layout support: mechlovin/infinity88

* enable Community Layout support: tgr/jane/v2ce

* tgr/jane/v2ce: rename/add layouts

The ANSI Tsangan and ISO Tsangan layout macros did not note that Split Right Shift was supported. This commit notes the Split Right Shift in the macro name, and adds Tsangan layouts without Split Right Shift for ANSI and ISO, which fixes the Community Layout support.
2021-12-06 22:36:02 -08:00
Drashna Jaelre
5b5b36421a
[Keymap] Unicode and cursor sync - drashna keymap (#15328) 2021-11-28 23:41:59 -08:00
Drashna Jaelre
160b0558f5
Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
Drashna Jaelre
56e3f06a26
Rework and expand Pointing Device support (#14343)
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
2021-11-14 22:03:24 -08:00
QMK Bot
b4c5c56f58 Merge remote-tracking branch 'origin/master' into develop 2021-11-05 18:28:07 +00:00
kototama
827115a4f6
[Keymap] Revamp the ergodox french_hacker layout (#15064) 2021-11-05 11:27:48 -07:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002)
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
2021-11-05 08:18:09 +11:00
Ryan
f529580860
Basic keycode overhaul (#14726) 2021-11-03 22:22:17 -07:00
Ryan
928d9f90ec
Remove complex fn_actions macros (#14662)
* Remove complex `fn_actions` macros

* Remove additional `KC_FN*` instances
2021-11-01 09:27:54 +11:00
QMK Bot
aab394505f Merge remote-tracking branch 'origin/master' into develop 2021-10-31 08:17:52 +00:00
MechMerlin
ba69c47bb8
Add new default community layout for no f-row TKLs (#14812)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-31 01:17:23 -07:00
QMK Bot
5851ac1934 Merge remote-tracking branch 'origin/master' into develop 2021-10-29 23:30:51 +00:00
Alan Pocklington
28120c1a63
[Keymap] ajp10304: add mouse scroll keys (#14953) 2021-10-29 16:30:23 -07:00
QMK Bot
4721b0eda2 Merge remote-tracking branch 'origin/master' into develop 2021-10-23 06:31:24 +00:00
Reibl János Dániel
a167a95bd0
[Keymap] Simplify unicode input mode change and CTRL and GUI swapping (#14874) 2021-10-22 23:30:43 -07:00
Joel Challis
1816006121
Tidy up LCD_ENABLE/visualizer references (#14855)
* Tidy up LCD_ENABLE/visualizer references

* Fix up my (333fred) ergodox keymap with new LCD driver

Co-authored-by: Fredric Silberberg <fred@silberberg.xyz>
2021-10-20 21:27:46 +01:00
Joel Challis
01b702bece
Split out HAPTIC_ENABLE to have separate DRIVER option (#14854)
* DRIVER -> ENABLE

* Update generic_features.mk

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

* Update common_features.mk

Co-authored-by: Ryan <fauxpark@gmail.com>
2021-10-18 12:55:44 +01:00
QMK Bot
ede6122ac6 Merge remote-tracking branch 'origin/master' into develop 2021-10-16 05:34:23 +00:00
Manna Harbour
6b299fab6e
[Keymap] Update Miryoku (#14827) 2021-10-15 22:33:45 -07:00
Drashna Jael're
e5662aa53d
Merge remote-tracking branch 'origin/master' into develop 2021-10-15 22:32:41 -07:00
Drashna Jaelre
9a0addc77e
[Keymap] Drashna Keymap Updates (#14842)
* Fix issues with user split transport code
* Improve OLED (More font stuff, improved keylogger, etc)
* Add `KEYLOCK` macro to disable USB, borrowed from command feature.
* Convert Kyria fully to proton C (no more AVR kyria)
* Add Work Louder Work Board keymap
2021-10-15 22:30:23 -07:00
QMK Bot
eca31e7dc0 Merge remote-tracking branch 'origin/master' into develop 2021-10-12 02:27:24 +00:00
Reibl János Dániel
4b2866dd96
[Keymap] Add workman layout (#14792) 2021-10-11 19:26:47 -07:00
Ryan
d8f0c8783a
Remove sysex API (#14723) 2021-10-06 19:34:46 +11:00
MechMerlin
e8db309613
[Keymap] Some updates to mechmerlin userspace and keymaps (#14711) 2021-10-05 16:49:50 -07:00
Drashna Jaelre
1e54796f0c
[Keymap] Update to Drashna Code (#14644) 2021-09-29 11:16:11 -07:00
Zach White
fce9cb9338
Cleanup issues identified by lgtm (#14459)
* cleanup issues identified by lgtm

* fix the git_status check
2021-09-27 10:02:54 -07:00
Ryan
4791cfae1a
Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
Trent Hoh
f87cd8e8a0
[Keyboard] Corrected layout for np24 by YMDK (#14096)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-29 04:09:43 -07:00
Drashna Jaelre
bc239cd520
[Keymap] Drashna keymap fixups (#14140) 2021-08-24 01:37:14 -07:00
Xelus22
4e1c5887c5
[Core] Refactor OLED to allow easy addition of other types (#13454)
* add docs

* core changes

* update keyboards to new OLED

* updated users to new OLED

* update layouts to new OLED

* fixup docs

* drashna's suggestion

* fix up docs

* new keyboards with oled

* core split changes

* remaining keyboard files

* Fix The Helix keyboards oled options

* reflect develop

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
2021-08-24 16:28:26 +10:00
Drashna Jaelre
58a5030661
[Keymap] Drashna's Improve OLEDs and custom Split code (#14063)
* Fill the oleds with right mods

* Enable double mods on x32 oleds

* Disable forced NKRO

* Make oleds fancy only on good MCUs

* Overhaul oled display

* Further enhance oled, with kitty!

* Final oled form

* Not working transport

* Transport id of woring

* Add acceleration

* fix button placement for accel macro

* Fix accelartion location and behavior

* Remove OLED sync code

* Fix alignment issue

* Remove audio hack

* Fix up zima keymap

* Add matrix slave scan function and cleanup drashna.h

* Clean up user space

* Allow userspace sync to be disable-able

* Fix weird issue with audio

* Fix alignment issue with user split sync

* Disable second rgb matrix task

* Disable additional animations

* Change dynamic keymap settings

* Hacky fix for borked corne

* Add Blackpill (F411) support to tractyl manuform

* remove manual via eeprom reset

* Remove all references to rgblight twinkle

* Fix issues with config processing
2021-08-21 13:34:44 -07:00
James Young
4279b14adf
Merge remote-tracking branch 'upstream/master' into develop
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
2021-08-19 11:32:23 -07:00
Alan Pocklington
3b4c35da6b
[Keymap] Quark AJP10304 layout (#13290) 2021-08-19 10:36:20 -07:00
QMK Bot
a85126b79e Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:41:46 +00:00