967d7c47dc
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 14:33:32 +00:00
c5b0b6ff32
Remove more cruft from Lily58 default keymap ( #12078 )
...
* Remove more cruft from lily58 default keymap
* Update keyboards/lily58/keymaps/default/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update config.h
Remove extra newline
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-02 14:32:44 +00:00
4c04c848b5
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 14:32:29 +00:00
ab3986a684
Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled ( #12081 )
2021-03-02 14:31:23 +00:00
27d2fb88ca
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 05:29:53 +00:00
d0108869ee
[Docs] MATRIX_MASKED docs for SPLIT_HAND_MATRIX_GRID ( #11974 )
2021-03-01 21:29:11 -08:00
de585e3109
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 04:34:43 +00:00
58d043b0d0
[Keyboard] Update eggman info.json ( #12074 )
...
attempting to fix qmk configurator issues
2021-03-01 20:34:13 -08:00
e662de94f6
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 03:10:19 +00:00
d918d571cc
Fix the typo in ergodone 80 layout ( #12075 )
2021-03-02 14:09:35 +11:00
4fedf6efbd
Merge remote-tracking branch 'origin/master' into develop
2021-03-02 01:18:42 +00:00
75ab48958c
Revert "Fixing K-type RGB lighting ( #11551 )" ( #12065 )
...
This reverts commit e6f7da4036
2021-03-02 12:18:07 +11:00
1beb6b686a
Merge remote-tracking branch 'origin/master' into develop
2021-03-01 19:57:19 +00:00
3200007a69
Fixing adjust layer issue with the lily58 default keymap ( #12052 )
...
* Fix triggering of adjust layer in default lily58 keymap
* Remove unused extern
* Swap raise/lower in update_tri_layer_state call to match recommendation in PR checklist
2021-03-01 19:56:42 +00:00
50290c78b6
Format code according to conventions ( #12076 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-03-01 18:08:18 +00:00
0e984b6e7e
Add ability to toggle One Shot functionality ( #4198 )
...
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-01 08:57:02 -08:00
86f6f68274
Merge remote-tracking branch 'origin/master' into develop
2021-03-01 05:04:27 +00:00
7132526dd2
Bastardkb added keyboard and renaming ( #11887 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-01 16:03:55 +11:00
93a1d4f156
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 21:25:41 +00:00
f8266a228c
Migrate make_dfu_header to CLI ( #12061 )
...
* Migrate make_dfu_header to CLI
* lint fixes
* Update lib/python/qmk/cli/generate/dfu_header.py
Co-authored-by: Ryan <fauxpark@gmail.com>
* Rename object
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-28 21:25:09 +00:00
80e8e20a89
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 20:19:42 +00:00
59c7deab09
Fix generated file output while target exists ( #12062 )
2021-02-28 20:19:07 +00:00
0efafdd408
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 20:12:15 +00:00
1a7f2c8f45
Extract sendstring into its own compilation unit ( #12060 )
...
* Extract sendstring into its own compilation unit
* License headers?
* Put this include in the header
2021-03-01 07:11:39 +11:00
3718f5149a
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 16:16:16 +00:00
e6905805bb
Remove unused keymap_config from ctrl keymaps ( #12058 )
2021-02-28 16:15:41 +00:00
3b8ca5f343
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 16:01:51 +00:00
90c7ae70c6
Modified tmk_core/rules.mk to avoid linking errors ( #10728 )
...
* Modified tmk_core/rules.mk to avoid linking errors
Added -fcommon flag to avoid linking errors due to multiple variable definitions. Though this is neither a definitive nor good solution, proper changes and use of extern keyword to avoid those multiple definitions must be made
* Comment updated
2021-02-28 08:01:16 -08:00
b2f5bd7c60
Format code according to conventions ( #12056 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-02-28 15:53:54 +00:00
5ba4391cf2
Refactor of USB code within split_common ( #11890 )
...
* Initial refactor of usb code within split_common
* Add headers
* Correct disable condition
* Format
* Align func name
2021-02-28 15:52:58 +00:00
415a8bc249
ARM - Refactor SLEEP_LED to support more platforms ( #8403 )
...
* Initial refactor of ARM SLEEP_LED to enable more platforms
* fix build issues
* Disable SLEEP_LED for boards with no caps lock code
* Enable GPT14 for boards with caps lock code and SLEEP_LED enabled
* Enable GPT for boards with caps lock code and SLEEP_LED enabled
2021-02-28 15:52:43 +00:00
a3cbc8a004
Overhaul bootmagic logic to have single entrypoint ( #8532 )
...
* Relocate bootmagic logic to have single entrypoint
* Align init of layer state
2021-02-28 15:50:15 +00:00
02dc3b6722
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:16:09 +00:00
ef49a9243b
Implement PLOOPY_DRAGSCROLL_INVERT option, which inverts the ploopy trackball's DRAG_SCROLL's vertical scroll direction. ( #12032 )
2021-02-28 17:16:04 +11:00
db7c8562ed
Add RGB Matrix support for Preonic rev3 ( #12008 )
...
* Add g_led_config for RGB Matrix support
* Corrected indentation
* Undo indentation on existing rev3.c code
Co-authored-by: filterpaper <filterpaper@localhost>
2021-02-28 17:15:38 +11:00
0f084751b4
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:13:59 +00:00
51eac99ce4
Kiko's Lab KL-90: Configurator bugfix ( #11993 )
...
* human-friendly formatting
* correct key order
* correct layout macro name
2021-02-28 17:13:29 +11:00
d57b44153e
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:13:24 +00:00
c3f83b6761
Keycapsss Kimiko rev1: Configurator bugfix ( #11992 )
...
* human-friendly formatting
* fix key positioning and order
2021-02-28 17:12:51 +11:00
fcf1ec132f
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:12:24 +00:00
ce75f48acb
[Keyboard] Update spiderisland/split78 ( #11990 )
...
* [Keyboard] spiderisland/split78: add MCP23018 reset code
Now, communication with the right side gets re-established
after unplugging it and plugging it back in.
* [Keyboard] spiderisland/split78: configure debouncing
I've been experiencing particularly bad bounce on the 'A' key.
Also, update maintainer github username
2021-02-28 17:11:52 +11:00
4a31d0a9c9
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:11:35 +00:00
9fd5c6f619
Update lazydesigners/the40 ( #11989 )
...
* Update the40.h
Update the40.h to fix keymap
* Add VIA support for lazydesigners/the40
Add VIA support for lazydesigners/the40
* Update keymap.c
2021-02-28 17:11:06 +11:00
656c39909a
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:10:56 +00:00
f41e5ec928
Compilation fixes for handwired/concertina/64key ( #11987 )
...
* concatenate config.h to 64key directory
* move rules.mk to 64key directory
This commit makes the firmware actually compile.
* insert complete rules.mk contents
Conforms the file to QMK's template.
* move info.json to 64key directory
* remove concertina.h
This file no longer serves a purpose now that everything is in the 64key directory.
* complete 64key readme.md
Conforms the file more to QMK's template.
2021-02-28 17:10:26 +11:00
70bdf25284
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:10:13 +00:00
cd12fe86d3
New Variants of Console Keyboard ( #11973 )
...
* initial push of console keyboard variants
* update readme
* fixed compilation issue
* update Readme
* added 18 and 27 key variants
* missed commas
* update info.json
* added readme
* correct info.json
* correct info.json
* info.json again
* fixed keymap.c
2021-02-28 17:09:41 +11:00
15af423d86
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:08:29 +00:00
d6fb8f12c6
[Keymap] Initial commit for keyboardio/atreus/dshields keymap. ( #11946 )
...
Incorporating changes suggested during pull request review.
Co-authored-by: Daniel Shields <dshields@cboe.com>
2021-02-28 17:07:55 +11:00
8428dee47e
Merge remote-tracking branch 'origin/master' into develop
2021-02-28 06:07:06 +00:00
QMK Bot
Dan Carroll
Drashna Jaelre
Trevor Elliott
qpockets
Mega Mind
Nick Brassel
github-actions[bot]
Quentin
Joel Challis
Ryan
Fabián González Martín
Anomalocaridid
Albert Y
James Young
unrelentingtech
jackytrabbit
gazeddy
Daniel Shields