fc29068986
Merge remote-tracking branch 'origin/master' into develop
2021-04-29 18:26:09 +00:00
8190a795ed
DracuLad: add Configurator data and rework layout macro ( #12727 )
...
* add info.json file
* refactor keymaps for readability
* rework layout macro
Arranges the layout macro and keycodes to resemble the physical layout.
* readme touch-up
Corrections to capitalization and spelling, and removal of extra white space.
2021-04-29 11:25:30 -07:00
c05fef752e
Merge remote-tracking branch 'origin/master' into develop
2021-04-29 16:55:32 +00:00
d3963a61cb
Add firmware for CozyKeys Bloomer keyboard ( #12639 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
2021-04-29 18:55:01 +02:00
9d5cd52284
Merge remote-tracking branch 'origin/master' into develop
2021-04-29 16:49:03 +00:00
4abc3ceb4b
Align drivers.txt with toolbox ( #12741 )
2021-04-30 02:48:34 +10:00
b481f554a0
Merge remote-tracking branch 'origin/master' into develop
2021-04-29 10:39:51 +00:00
05ee0afd54
Fix F13 LED issue for WT75-B, WT75-C ( #12729 )
2021-04-29 03:39:14 -07:00
39bc8163d0
[CI] Format code according to conventions ( #12731 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-29 13:36:47 +10:00
d8167779cd
Change RGB/LED Matrix to use a simple define for USB suspend ( #12697 )
2021-04-29 12:39:54 +10:00
7409f03cbf
Merge remote-tracking branch 'origin/master' into develop
2021-04-28 10:46:45 +00:00
54e8dd0885
Fix up bad keycode in #12405 . ( #12722 )
2021-04-28 11:46:13 +01:00
0a8e37509b
Fix bad PR merge for #6580 . ( #12721 )
2021-04-28 11:42:53 +01:00
cd6168ee64
Merge remote-tracking branch 'origin/master' into develop
2021-04-28 01:39:39 +00:00
63cdf80885
add default folder to standard ( #12712 )
2021-04-28 11:39:14 +10:00
d89d341541
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 20:55:11 +00:00
2af86cec3d
YMDK Wings: Update config.h ( #12718 )
...
Adds Caps Lock LED indicator configuration.
2021-04-27 13:54:34 -07:00
e95c76aaed
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 19:37:23 +00:00
e5cde191e1
Add flashing instructions to GMMK Pro readme ( #12719 )
2021-04-27 12:36:53 -07:00
eea33df1f9
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 18:37:47 +00:00
7be4047df0
GMMK Pro: Fixed Bootmagic Lite support; personal keymap; VIA support ( #12554 )
...
* Added WholesomeDucky keymap for GMMK Pro
* Finalized keymap & added 1000hz polling for GMMK Pro
* Corrected for RAlt and Fn being swapped
* Fixed RAlt and Fn being swapped in the layout definition. Updated personal keymap to reflect fixed layout.
* Removed an old comment from personal keymap for GMMK Pro
* added VIA support
* Defined bootmagic row and column for GMMK Pro Esc key
* Update keyboards/gmmk/pro/config.h
* Update keyboards/gmmk/pro/keymaps/via/keymap.c
* Update keyboards/gmmk/pro/keymaps/via/keymap.c
2021-04-27 11:37:11 -07:00
3e43a7f044
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 17:42:03 +00:00
3fe356e65c
Add Draculad keyboard ( #12604 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: mangoiv <mangoiv@outlook.com>
2021-04-27 19:41:11 +02:00
f30637ee11
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 17:24:11 +00:00
b95231c1e3
GMMK Pro: add RESET binding, fix layout macro bug ( #12684 )
...
* add RESET binding, fix layout mod key bug (fixes #12683 )
* remove underscore #define and use core's instead
2021-04-27 10:23:41 -07:00
86ab4fcb71
Merge remote-tracking branch 'origin/master' into develop
2021-04-27 06:45:17 +00:00
f9fb52951d
Update noroadsleft userspace and keymaps (2021-04-26) ( #12711 )
...
* Update noroadsleft userspace and keymaps (2021-04-26)
- add Discipline keymap
- move Emulated Non-US Backslash, Numeric Keypad and F13-F24 code fully to userspace
- re-add some custom keycode handling I accidentally deleted
- update VRSN keycode
- update KC60 and userspace readmes
* remove Git readme from kc60 keymap
* update kc60:noroadsleft readme
Concatenates this readme into one file, and updates the image links.
2021-04-26 23:44:45 -07:00
a8c0954db5
Merge remote-tracking branch 'origin/master' into develop
2021-04-26 19:18:51 +00:00
b5419bd574
Add python-version to gitignore ( #12678 )
2021-04-26 21:18:17 +02:00
171f3e840b
Merge remote-tracking branch 'origin/master' into develop
2021-04-26 17:24:58 +00:00
8f660ca1e6
[Keyboard] fix planck light via endpoints ( #12701 )
2021-04-26 10:24:19 -07:00
54c1548247
Updated Function96 with V2 files and removed chconf.h and halconf.h ( #12613 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: JuanTapMan <68515848+JuanTapMan@users.noreply.github.com>
2021-04-26 10:38:13 +02:00
9cf82fae95
Add STM32L433 and L443 support ( #12063 )
...
* initial L433 commit
* change to XC
* fix L433
* disable all peripherals
* update system and peripheral clocks
* 433 change
* use its own board files
* revert its own board files
* l433 specific change
* fix stm32l432xx define
* remove duplicate #define
* fix bootloader jump
* move to L443xx and add i2c2, spi2, usart3 to mcuconf.h
* move to L443
* move to L443
* fix sdmmc in mcuconf.h
* include STM32L443
* add L443
* Include L443 in compatible microcontrollers
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Include L443 in compatible microcontrollers
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update config bootloader jump description
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update ChibiOS define reasoning
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update quantum/mcu_selection.mk
Co-authored-by: Nick Brassel <nick@tzarc.org>
* fix git conflict
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-04-26 13:07:15 +10:00
5168af9a9b
Merge remote-tracking branch 'origin/master' into develop
2021-04-26 02:52:29 +00:00
2f47bafd6a
fix configs ( #12631 )
2021-04-26 12:52:00 +10:00
61a1915cce
Merge remote-tracking branch 'origin/master' into develop
2021-04-25 20:46:54 +00:00
417a07c22d
[Config] Add VSCode workspace files to .gitignore ( #12469 )
2021-04-26 06:46:28 +10:00
03db48af75
Format code according to conventions ( #12687 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-25 19:01:49 +10:00
8c12fa2e59
Format code according to conventions ( #12682 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-25 19:00:22 +10:00
3f7350732c
Add support for MCU = STM32F446 ( #12619 )
...
* Add support for MCU = STM32F446
* Update platforms/chibios/GENERIC_STM32_F446XE/configs/config.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Restore mcuconf.h to the one used by RT-STM32F446RE-NUCLEO64
* stm32f446: update mcuconf.h and board.h for 16MHz operation, with USB enabled, and other peripherals disabled.
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-04-25 18:59:25 +10:00
5b1c3e360a
Merge remote-tracking branch 'origin/master' into develop
2021-04-25 08:57:56 +00:00
412e7a03e4
eeprom driver: Refactor where eeprom driver initialisation (and EEPROM emulation initialisation) occurs to make it non-target-specific. ( #12671 )
2021-04-25 18:57:49 +10:00
611cd80861
[Keyboard] Ninjin ( #12496 )
...
* ninjin init
* put in gpl thing
* underglow
* update to latest chibios
* fix gpl headers
* remove other files
* fix header
* Update keyboards/xelus/ninjin/readme.md
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/xelus/ninjin/mcuconf.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
* Update keyboards/xelus/ninjin/halconf.h
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-04-25 18:57:22 +10:00
23e70fa857
Merge remote-tracking branch 'origin/master' into develop
2021-04-25 04:03:14 +00:00
89bd04b9eb
peepeetee's *very janky* hub16 keymap ( #12506 )
...
* peepeetee's bodged hub16 keymap
* add layer 3 lighting
* actually adds layer 3 lighting
* fixes layer 0; behavior is that layor 0 is unaltered from base pattern, while other states have distinct solid colors
2021-04-25 14:02:42 +10:00
ee26e3df60
Merge remote-tracking branch 'origin/master' into develop
2021-04-25 04:00:00 +00:00
5b394e82c9
Update checking board master function ( #12493 )
...
changed is_master to is_keyboard_master()
2021-04-25 13:59:37 +10:00
ab6d07b585
Merge remote-tracking branch 'origin/master' into develop
2021-04-25 03:42:04 +00:00
da6e888a32
Do not leak weak mods from tap dance to the interrupting keypress ( #12471 )
...
Tap dance callbacks may register weak mods; one case when it happens
is when a tap dance registers a key with modifiers. When the tap
dance is interrupted by pressing another key, these weak mods could
affect the interrupting key (normally any stale weak mods are cleared
at the start of action_exec() when handling a keypress event, but the
tap dance interrupt check code is called later, and the weak mods left
by that code were not cleared). Add another clear_weak_mods() call to
preprocess_tap_dance() to make sure that the interrupting keypress is
not affected by unrelated weak mods from the previous tap dance.
Fixes #12445 .
2021-04-25 13:41:37 +10:00
891d18d356
Add initial support for tinyuf2 bootloader (when hosted on F411 blackpill) ( #12600 )
...
* Add support for jumping to tinyuf2 bootloader. Adds blackpill UF2 example.
* Update flashing.md
* Update chconf.h
* Update config.h
* Update halconf.h
* Update mcuconf.h
2021-04-25 13:40:56 +10:00
QMK Bot
James Young
Paul Ewing
Joel Challis
Wilba
github-actions[bot]
Drashna Jaelre
Nick Brassel
Xelus22
alittlepeace
W. Ducky
Mango The Fourth
Ryan Mitchell
Andrew Kannan
JTM
Luis Moreno
Purdea Andrei
peepeetee
calebchongc
Sergey Vlasov