QMK Bot
5b8f2eccbf
Merge remote-tracking branch 'origin/master' into develop
2021-08-10 09:15:00 +00:00
Stefan Subich
aeff347a07
Update feature_wpm.md ( #13936 )
...
Fix example markdown code formatting
2021-08-10 10:14:14 +01:00
QMK Bot
75a58c3cef
Merge remote-tracking branch 'origin/master' into develop
2021-08-10 08:03:36 +00:00
Ryan
d3932a104c
Add padding to LUFA-MS .BIN files ( #13922 )
2021-08-10 18:03:04 +10:00
QMK Bot
85090b77af
Merge remote-tracking branch 'origin/master' into develop
2021-08-10 05:24:08 +00:00
rate
076c8cc45f
[Keyboard] Added pistachio_pro ( #13466 )
...
* Added pistachio_pro
* Apply suggestions from code review
* Apply suggestions from code review
2021-08-09 22:23:25 -07:00
QMK Bot
3e0517f1ef
Merge remote-tracking branch 'origin/master' into develop
2021-08-10 04:07:54 +00:00
Ryuki
8ef58e3291
adding my keymap "vayashiko" ( #13049 )
...
* adding my keymap
* changed some bugs
* removed include keymap.h
2021-08-09 21:07:14 -07:00
QMK Bot
f0a2641cf1
Merge remote-tracking branch 'origin/master' into develop
2021-08-09 21:15:07 +00:00
Brandon Lewis
760caaa9af
Ristretto - Update bootloader ( #13933 )
...
* updated bootloader for 32u4 mcu
Should be atmel-dfu instead of caterina as the mcu is integrated instead of on a pro-micro/elite-c
2021-08-09 14:14:33 -07:00
Dasky
bb2986c115
Fix compliation for ferris 0.2 bling ( #13937 )
...
* Fix include
2021-08-09 14:04:40 -07:00
James Young
7bec943043
Merge remote-tracking branch 'upstream/master' into develop
...
Fixes merge conflicts in:
- keyboards/bm40hsrgb/config.h
- Conflict from PR 13132:
- RGB_DISABLE_WHEN_USB_SUSPENDED signature updated in develop branch, unmodified in master branch
- updated file with changes from master branch
- keyboards/keebio/iris/keymaps/nstickney/keymap.c
- Conflict from PR 11456:
- layer_state_set_user() updated in develop branch, removed in master branch
- updated file with changes from master branch
2021-08-09 12:14:22 -07:00
Joel Challis
c0628c2820
Remove backwards compatibility of debounce names ( #13877 )
...
* Remove backwards compatibility of debounce names
* Update docs
* Update keyboards/keymaps
2021-08-09 19:46:18 +01:00
Joel Challis
7c691d82bf
Remove ONEHAND_ENABLE ( #13920 )
2021-08-09 19:46:03 +01:00
Daniil Yastremskiy
26ea090190
Limit RGB max brightness on KPrepublic BM-series keyboards ( #13132 )
2021-08-09 11:32:35 -07:00
Drashna Jaelre
2617ac6041
Fixup rgb matrix config for KBD67 mkII boards ( #13931 )
2021-08-09 19:26:02 +01:00
Pierre Chevalier
23becac3a6
Support all the 0.2 Ferris variants ( #12653 )
...
* Support all the 0.2 Ferris variants
For the Compact, the High and the Mini, create a new directory so each
keyboard may have the correct USB descriptor and a readme with more
specific information about it.
For the Bling, also add support for the underglow functionality.
Change the "MANUFACTURER" string to "Cuddly Keyboards Ltd.", the
name of the company I incorporated to sell keyboards, and change the
default descriptor from "Ferris the keeb" to "Ferris 0.2" which is more
descriptive.
I didn't update the 0.1 variants as I don't intend to sell these kits
with "Cuddly Keyboards". The firmware is mostly there to support
existing users.
Update the "hardware availability" to point to my new website:
cuddlykeyboards.com.
* Add RGB mode toggle to my keymap and to the default keymap
* Improve wording in the readme
2021-08-09 11:23:15 -07:00
Stick
5a59363e28
[User] changes to nstickney's keymaps ( #11456 )
...
0) Built a Bastyl, gave away the ErgoDoxEZ
1) UNICODEMAP
2) Iris left is now Elite-C
3) New QMK flashing instructions
2021-08-09 10:34:36 -07:00
QMK Bot
8d19f4f187
Merge remote-tracking branch 'origin/master' into develop
2021-08-09 17:06:58 +00:00
Edvard Sire
8936d0ae4b
[Keymap] new keymap for nui_mini ( #13924 )
2021-08-09 10:06:25 -07:00
QMK Bot
ed7f06bd7b
Merge remote-tracking branch 'origin/master' into develop
2021-08-09 17:05:08 +00:00
Andre Brait
dbee96098d
Make default keymap for GMMK Pro reflect stock ( #13850 )
2021-08-09 10:04:58 -07:00
Pascal Pfeil
9a1a35f681
[Keymap] Add kbd67 mkiirgb keymap ( #13884 )
...
Co-authored-by: Spaceman <rionlion100@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-09 10:04:40 -07:00
QMK Bot
f3cede7299
Merge remote-tracking branch 'origin/master' into develop
2021-08-09 17:04:30 +00:00
Michele Ferri
be72a64cf6
[Keyboard] Add TouhouPad ( #13915 )
...
* Touhoupad rev 2
* cleanup for PR
* fixes after review
2021-08-09 10:04:00 -07:00
Zach White
12681bacc4
Merge remote-tracking branch 'origin/master' into develop
...
Conflicts:
keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c
2021-08-09 08:34:14 -07:00
Zach White
e6c171bdd6
Fix generate api ( #13930 )
...
* Add missing returncode to exit()
* fix the aozora/hotswap vendor id
2021-08-09 08:28:51 -07:00
Zach White
5eb0e406fd
make json imports more robust ( #13928 )
2021-08-09 08:27:02 -07:00
Chris
79d5b27993
[Keymap] rootiest for planck/rev6/ ( #13294 )
...
* squashed commits to master
* Fix in case of missing user_song_list
Substitutes missing songs with safe versions
Also updated and added detail to keymap readme
* Adjust Readme to match qmk contrib conventions
* Update keyboards/planck/keymaps/rootiest/config.h
* Update keyboards/planck/keymaps/rootiest/keymap.c
* Update keyboards/planck/keymaps/rootiest/keymap.c
* Update keyboards/planck/keymaps/rootiest/keymap.c
* Update keyboards/planck/keymaps/rootiest/keymap.c
* Fixed license header to GPLv2+
* Fix Volume key delay
Use a static number instead of removed MEDIA_KEY_DELAY
* Use TAP_CODE_DELAY
* added license to config.h
* Clean up formatting
- Fixed markdown in readme
- Removed extra commented line from config.h
* Update keyboards/planck/keymaps/rootiest/config.h
2021-08-09 02:25:43 -07:00
jfescobar18
59b5c884ff
[Keyboard] Undead 60M ( #13735 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-08 23:17:46 -07:00
Phooood
7c2f48e55d
[Keyboard] Add Aozora (hotswap) keyboard ( #13919 )
...
* Initial Commit
* added header to hotswap.c
* added keymap-specific reamdme.md
* minor adjustments
* Requested corrections to readme's
2021-08-08 20:31:33 -07:00
Nick Brassel
65e3760853
Fix compilation issue. ( #13926 )
2021-08-09 13:20:15 +10:00
thpoll83
b43c6bc176
Add support for STM32F407x MCUs. ( #13718 )
...
* Add support for STM32F407x MCUs.
* Removing STMF407 MCU variation
* Update quantum/mcu_selection.mk
Remove options for dfu flashing
Co-authored-by: Ryan <fauxpark@gmail.com>
* DISABLE STM32_USB_USE_OTG1
* Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update platforms/chibios/GENERIC_STM32_F407XE/configs/mcuconf.h
Co-authored-by: thomas.pollak <thomas.pollak@dynatrace.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2021-08-09 06:52:13 +10:00
datafx
ac2090bf4e
[Keyboard] Add kbdfans kbd67 mkii rgb v3 ( #13714 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:45:43 -07:00
QMK Bot
ac92ded0cc
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 04:42:36 +00:00
Spaceman
bfa7449041
[Keyboard] Add Pancake v2 ( #13839 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:42:04 -07:00
QMK Bot
8e5213ca6c
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 04:41:43 +00:00
Ananya Kirti
b046bffcb8
[Keyboard] Added CapsLED and ScrollLock LEDs ( #13837 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-07 21:41:15 -07:00
Drashna Jaelre
b9dcd5ac38
[Keymap] Drashna split transport improvement ( #13905 )
...
* Fix up split stuff
* Fix Split perf issues
* Allow LTO to be disabled
* Fixup WPM and encoders
* Fixup qmk keys per scan
* Add bootloader info
* Change encoder pins
* Fixup corne oled code
* Expand transport sync
* Improve user transport
* Cleanup mouse processing at keymap level
* Improve layer checking for mouse layering
2021-08-07 21:40:48 -07:00
QMK Bot
100333818f
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 04:15:54 +00:00
8bits4ever
bc2b73f997
[Keyboard] a1200 converter minor changes ( #13848 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:15:23 -07:00
QMK Bot
21b71932f7
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 04:13:48 +00:00
jpuerto96
41d854048c
[Keyboard] Gorthage Truck - New PCB ( #13909 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-07 21:12:55 -07:00
QMK Bot
6c5ef3ce30
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 03:38:09 +00:00
Pascal Pfeil
27d0844efb
[Keyboard] Clean up lfkpad and add keymap ( #13881 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-07 20:37:13 -07:00
QMK Bot
d0f1a4c48a
Merge remote-tracking branch 'origin/master' into develop
2021-08-08 03:24:59 +00:00
peott-fr
34689e348f
[Keyboard] Adding my Nyquist keymap ( #13858 )
2021-08-07 20:24:24 -07:00
Drashna Jaelre
d06f50a31a
[Keyboard] Fix matrix_output_unselect_delay for handwired/xealousbrown ( #13913 )
2021-08-08 01:36:38 +10:00
QMK Bot
243e75659c
Merge remote-tracking branch 'origin/master' into develop
2021-08-07 14:57:43 +00:00
kb-elmo
07e2c11e55
[Keyboard] fixes for KBD67 rev2 ( #13906 )
2021-08-07 07:57:14 -07:00