Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity
26,279 commits 2 branches 1 tag 294 MiB
Commit graph

1,197 commits

Author SHA1 Message Date
Michael Stapelberg
e95a4f4f52
 		core: add pin_defs for MK66F18 (#12419) 
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
 2021-03-30 21:11:40 +11:00
Ryan
2ae38e9c43
 		LED Matrix: Config functions (#12361) 2021-03-28 17:59:44 +11:00
QMK Bot
25f1a3d759 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:20:42 +00:00
github-actions[bot]
0a056cfd81
 		Format code according to conventions (#12380) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-03-25 23:18:59 +11:00
QMK Bot
5a0be4c6d8 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 12:14:17 +00:00
purple-rw
5c1442766c
 		fix permissive hold when both PERMISSIVE_HOLD_PER_KEY and TAPPING_TERM_PER_KEY are defined (#12125) 
Co-authored-by: checyr <32964049+checyr@users.noreply.github.com>
 2021-03-25 23:13:41 +11:00
QMK Bot
8086837f69 Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:34:28 +00:00
Joel Challis
1bb6d8de6f
 		Fix USER_PRINT on avr/atsam (#12269) 
* Fix USER_PRINT on avr/atsam

* Update tmk_core/common/arm_atsam/_print.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-03-25 22:33:53 +11:00
QMK Bot
2f6236d1ea Merge remote-tracking branch 'origin/master' into develop 2021-03-25 11:31:17 +00:00
Ryan
eae7343741
 		Move API_SYSEX_MAX_SIZE out of config_common.h (#12302) 2021-03-25 22:30:42 +11:00
QMK Bot
af5c10ef0c Merge remote-tracking branch 'origin/master' into develop 2021-03-18 01:29:25 +00:00
github-actions[bot]
9807225f90
 		[CI] Format code according to conventions (#12277) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-03-18 12:28:50 +11:00
QMK Bot
4aa57e9e46 Merge remote-tracking branch 'origin/master' into develop 2021-03-18 00:48:52 +00:00
Ryan
9331c22620
 		XT converter cleanup (#12264) 2021-03-18 11:48:09 +11:00
Michael Stapelberg
1d341ffbb0
 		core: add support for MK66F18 (Teensy 3.6) micro controller (#12258) 
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
 2021-03-17 06:45:21 +11:00
QMK Bot
2f59e1c1d9 Merge remote-tracking branch 'origin/master' into develop 2021-03-15 01:21:48 +00:00
github-actions[bot]
a18e1305b3
 		Format code according to conventions (#12244) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-03-15 12:21:14 +11:00
QMK Bot
998c58e89b Merge remote-tracking branch 'origin/master' into develop 2021-03-15 01:19:36 +00:00
xyzz
0779c34db8
 		Fix keycode mappings for via and ensure they don't change within protocol (#12130) 
* Fix keycode mappings for via and ensure they don't change within protocol

* Update keycodes

* Fix broken keyboards

* added the missing keycodes found in via

* Remove invalid keycodes

Co-authored-by: David Hoelscher <infinityis@users.noreply.github.com>
 2021-03-15 12:19:01 +11:00
Joel Challis
40c7ecfdea
 		Move gpio wait logic to wait.h (#12067) 2021-03-10 22:47:36 +00:00
Ryan
9155b59e1a
 		LED Matrix: decouple from Backlight (#12054) 2021-03-08 16:55:00 +11:00
QMK Bot
37d1fa53e0 Merge remote-tracking branch 'origin/master' into develop 2021-03-07 06:40:08 +00:00
Ryan
8556068534
 		Require BOOTLOADER = qmk-dfu for :bootloader target (#12136) 2021-03-07 17:39:35 +11:00
XScorpion2
cde2859a65
 		Split RGB Matrix (#11055) 
* Split RGB Matrix

* Suspend State sync for rgb matrix
 2021-03-03 07:32:15 +11:00
QMK Bot
4c04c848b5 Merge remote-tracking branch 'origin/master' into develop 2021-03-02 14:32:29 +00:00
Drashna Jaelre
ab3986a684
 		Set default for USB_SUSPEND_WAKEUP_DELAY to 0/disabled (#12081) 2021-03-02 14:31:23 +00:00
Drashna Jaelre
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
QMK Bot
93a1d4f156 Merge remote-tracking branch 'origin/master' into develop 2021-02-28 21:25:41 +00:00
Joel Challis
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
QMK Bot
3b8ca5f343 Merge remote-tracking branch 'origin/master' into develop 2021-02-28 16:01:51 +00:00
Fabián González Martín
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
Joel Challis
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
Joel Challis
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
Joel Challis
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
Isaac Elenbaas
765d8a33dd
 		Fixes #4072, #6214. Revision of #156 to clear before AS/TD. (#9941) 2021-02-28 15:48:19 +11:00
github-actions[bot]
deaabff752
 		Format code according to conventions (#12046) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-27 22:35:41 +00:00
Nick Brassel
6623744172
 		Fix build for attiny85-based boards. (#12044) 2021-02-28 09:33:33 +11:00
github-actions[bot]
d99e330548
 		Format code according to conventions (#12024) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-26 17:47:22 +11:00
Nick Brassel
abe189377c
 		[BUG] Massdrop develop rgb fix (#12022) 
* Allow for disabling RGB_MATRIX on Massdrop boards.

* Fixup init sequence.

* Make some functions static as they've got very generic names.
 2021-02-26 17:07:05 +11:00
fauxpark
23fd1aee00 Merge remote-tracking branch 'upstream/master' into develop 2021-02-25 16:04:53 +11:00
Ryan
39694d5eb0
 		V-USB suspend refactor (#11891) 2021-02-25 15:54:25 +11:00
Liyang HU
c4bd6af837
 		tmk_core/common/action.c: refactor for code size; merge multiple cases into one (#11943) 
* tmk_core/common/report.h: define `enum mouse_buttons` in terms of `#define MOUSE_BTN_MASK()`

* tmk_core/common/action.c: collapse multiple `case KC_MS_BTN[1-8]:` into single `MOUSE_BTN_MASK(action.key.code - KC_MS_BTN1)`

We all love tapping on our keyboards but this is taking the piss.

This saves ~134 bytes on my ATmega32.
 2021-02-20 14:53:53 -05:00
Ryan
7ab9f6a101
 		Output selection: Remove "USB and BT" option (#11940) 2021-02-20 18:11:02 +11:00
github-actions[bot]
a5f63dbf93
 		Format code according to conventions (#11936) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-17 17:30:16 +11:00
Ryan
be70f466fe
 		Fix compilation error for tap_code_delay() (#11938) 2021-02-17 17:26:57 +11:00
Ryan
3345ce2686
 		Add tap_code_delay(code, delay) (#11913) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-02-17 07:26:52 +11:00
github-actions[bot]
b0e161e33d
 		Format code according to conventions (#11928) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-16 11:33:03 +11:00
XScorpion2
d1806a26e4
 		Split transport mirror (#11046) 
* Split transport mirror support

* Updated RGB Matrix to respond to electrical events instead of key events

* split matrix slave fix
 2021-02-16 11:30:33 +11:00
Joshua Diamond
f1a3ce49cc Merge branch 'master' into develop 2021-02-14 19:59:26 -05:00
github-actions[bot]
c27a778281
 		Format code according to conventions (#11905) 
Co-authored-by: QMK Bot <hello@qmk.fm>
 2021-02-15 06:55:43 +11:00