02654ad2d7
Merge remote-tracking branch 'origin/master' into develop
2021-02-12 00:56:39 +00:00
068e11f7e2
[Keyboard] Support MJ65 - a 65% RGB Hotswap keyboard ( #11764 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-11 16:56:07 -08:00
055cd47ba0
Merge remote-tracking branch 'origin/master' into develop
2021-02-11 18:54:29 +00:00
6a5f29208e
[Docs] Update feature_haptic_feedback.md ( #11859 )
...
Arduino playground link to wiring diagram no longer works. Changed the link to point to the correct Adafruit hosted diagram pdf.
2021-02-11 10:53:55 -08:00
986dc7f0e9
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 19:18:29 +00:00
5a73558a21
[Keymap] add noroadsleft userspace; add and update keymaps ( #11686 )
2021-02-10 20:17:42 +01:00
7ff713f35f
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 19:06:05 +00:00
4b2ab84c71
[Keymap] Added german_gaming keymap for hidtech/bastyl ( #11446 )
...
* Added german_gaming keymap for hidtech/bastyl
* Apply suggestions from code review
* Added missing brace
2021-02-10 11:05:20 -08:00
8d06a230c2
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 14:22:21 +00:00
7ef4aba52c
Userspace updates ( #11841 )
...
* enable LTO for smaller firmware size
* delete since this was added to userspace rules.mk
* readme updates and new images
* Add -j to compile and flash commands in userpsace
* Enable NKRO
* Enable NKRO, VIA, LTO by default
* Stanrc85-ansi readme update
* Stanrc85-alice readme
* quick RGB layer indicator fix in keymap
2021-02-10 09:21:46 -05:00
0cd00b6c09
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 05:19:52 +00:00
0aed8746be
[Keyboard] Add keyboard yun65 ( #11714 )
2021-02-09 21:18:53 -08:00
527cf2f3cf
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 04:46:39 +00:00
872f656c3b
[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl ( #11589 )
2021-02-09 20:45:42 -08:00
ded7b215be
Merge remote-tracking branch 'origin/master' into develop
2021-02-10 02:00:17 +00:00
fb9f619d89
Play Keyboard Helen 80: fix matrix mapping ( #11585 )
2021-02-09 17:58:59 -08:00
36c7c66831
Merge remote-tracking branch 'origin/master' into develop
2021-02-09 22:40:48 +00:00
955eb58af5
Fix VENDOR_ID for ymd67 ( #11838 )
2021-02-10 09:40:16 +11:00
7161d65070
Remove FAUXCLICKY feature (deprecated) ( #11829 )
2021-02-09 09:49:05 -08:00
738bd263c1
Merge remote-tracking branch 'origin/master' into develop
2021-02-09 17:11:54 +00:00
7d5902752e
[Keyboard] Add Splitty keyboard ( #11613 )
2021-02-09 09:10:54 -08:00
9aed856d78
Merge remote-tracking branch 'origin/master' into develop
2021-02-09 14:59:41 +00:00
4107856b70
Simplify NIBBLE encoder code and clean up keymaps ( #11808 )
...
* Simplify encoder code and clean up keymaps.
-Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps.
-Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build.
-Move layer names to enum
* Change encoder_update_kb to encoder_update_user per PR feedback
2021-02-09 14:50:16 +00:00
39ed48f7a7
Merge remote-tracking branch 'origin/master' into develop
2021-02-08 21:33:45 +00:00
627ceebef3
ws2812: Fix number of nops for AVR at 8 MHz ( #9559 )
...
* ws2812: Fix number of nops for AVR at 8 MHz
When trying to calculate the number of nops for AVR running at 8 MHz,
the value of `w3` is expected to be negative; however, because `F_CPU`
is defined in tmk_core/avr.mk with the `UL` suffix, the preprocessor
performs its calculations using `unsigned long`, getting a very large
positive number instead of the expected negative number; this then
results in generating code with a huge number of nops. Fix the broken
calculations by performing a comparison before subtraction, so that the
unsigned number wraparound does not occur.
The keyboard which triggers the problem is `handwired/promethium`; the
buggy code silently compiles, but the resulting timings would be
completely wrong.
* ws2812: Clean up the code after the 8 MHz fix
Remove old code which was unsuccessfully trying to clamp negative w1, w2
and w3 values to 0, and set w1_nops, w2_nops and w3_nops directly.
2021-02-09 08:33:04 +11:00
448cc1acd5
remove deprecated qmk json-keymap ( #11823 )
2021-02-08 11:03:08 +00:00
248413489f
Merge remote-tracking branch 'origin/master' into develop
2021-02-08 09:13:10 +00:00
d2f204c1e3
Fix RGBLIGHT_LIMIT_VAL typo ( #11826 )
2021-02-08 20:12:33 +11:00
3a98bd75c8
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 23:16:47 +00:00
99bffc2a21
Migrate some tmk_core files to quantum ( #11791 )
...
* Migrate some tmk_core files to quantum
* Fix build errors
2021-02-07 23:16:15 +00:00
b8031a1613
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 22:52:50 +00:00
7e82879553
via support for bat43 ( #11729 )
...
* via support for bat43
* add adjust layer for via
2021-02-07 22:52:19 +00:00
51d40e0ef0
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 22:35:56 +00:00
4d8161cff5
[Update] Allow APM32 on TrinityXTtkl ( #11715 )
...
* amp32 initial change
* fix spacing
2021-02-07 22:35:20 +00:00
d9dea7c4ec
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 21:03:27 +00:00
ccc9c43161
Allow flash/compile to accept relative json paths ( #11767 )
...
* Allow flash/compile to accept relative paths
* Review suggestions
* Review comments
* Put back exists check otherwise stdin fails
* fix lint
2021-02-07 21:02:51 +00:00
0e59827023
Merge remote-tracking branch 'upstream/master' into develop
2021-02-08 07:57:09 +11:00
fc29c7a589
Add DSP40 ( #11579 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-07 15:49:16 -05:00
5d5cbb877d
Rework I2C driver docs ( #11658 )
2021-02-08 07:45:59 +11:00
10c88cdcd5
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 18:57:18 +00:00
0355cd0f72
[Keyboard] Add The Stick keyboard ( #11745 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-07 10:56:43 -08:00
6233c6ac7b
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 18:49:08 +00:00
9d1d875a95
[Docs] Update isp_flashing_guide.md ( #11777 )
...
Added wiring for USBasp and changed the order of the documentation accordingly
2021-02-07 10:48:34 -08:00
5007cdac72
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 17:58:56 +00:00
13c562e154
[Keymap] Update keymap for keebio/nyquist ( #11734 )
2021-02-07 09:58:23 -08:00
a08c7c68cc
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 17:45:42 +00:00
c1aeec9635
[Keymap] Shadyproject/bfo9000 ( #11753 )
2021-02-07 09:44:59 -08:00
adf32da655
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 17:42:59 +00:00
a4368da849
[Keymap] Update community ortholinear 4x12 keymap: junonum ( #11757 )
2021-02-07 09:42:25 -08:00
7122adc4b8
Merge remote-tracking branch 'origin/master' into develop
2021-02-07 17:27:11 +00:00
QMK Bot
MelGeek
Kyle McCreery
James Young
Joschua Gandert
stanrc85
Spaceman
Mike Tsao
LSChyi
Konstantin Shpits
Drashna Jaelre
Nicolas Schodet
Jay Greco
Sergey Vlasov
Zach White
Ryan
Joel Challis
yfuku
Xelus22
Danny
moritz-john
George Petri
Chris M
Juno Nguyen