Commit graph

14841 commits

Author SHA1 Message Date
QMK Bot
0cd00b6c09 Merge remote-tracking branch 'origin/master' into develop 2021-02-10 05:19:52 +00:00
Spaceman
0aed8746be
[Keyboard] Add keyboard yun65 (#11714) 2021-02-09 21:18:53 -08:00
QMK Bot
527cf2f3cf Merge remote-tracking branch 'origin/master' into develop 2021-02-10 04:46:39 +00:00
Mike Tsao
872f656c3b
[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589) 2021-02-09 20:45:42 -08:00
QMK Bot
ded7b215be Merge remote-tracking branch 'origin/master' into develop 2021-02-10 02:00:17 +00:00
LSChyi
fb9f619d89
Play Keyboard Helen 80: fix matrix mapping (#11585) 2021-02-09 17:58:59 -08:00
QMK Bot
36c7c66831 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 22:40:48 +00:00
Konstantin Shpits
955eb58af5
Fix VENDOR_ID for ymd67 (#11838) 2021-02-10 09:40:16 +11:00
Drashna Jaelre
7161d65070
Remove FAUXCLICKY feature (deprecated) (#11829) 2021-02-09 09:49:05 -08:00
QMK Bot
738bd263c1 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 17:11:54 +00:00
Nicolas Schodet
7d5902752e
[Keyboard] Add Splitty keyboard (#11613) 2021-02-09 09:10:54 -08:00
QMK Bot
9aed856d78 Merge remote-tracking branch 'origin/master' into develop 2021-02-09 14:59:41 +00:00
Jay Greco
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
QMK Bot
39ed48f7a7 Merge remote-tracking branch 'origin/master' into develop 2021-02-08 21:33:45 +00:00
Sergey Vlasov
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
Zach White
448cc1acd5
remove deprecated qmk json-keymap (#11823) 2021-02-08 11:03:08 +00:00
QMK Bot
248413489f Merge remote-tracking branch 'origin/master' into develop 2021-02-08 09:13:10 +00:00
Ryan
d2f204c1e3
Fix RGBLIGHT_LIMIT_VAL typo (#11826) 2021-02-08 20:12:33 +11:00
QMK Bot
3a98bd75c8 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 23:16:47 +00:00
Joel Challis
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
QMK Bot
b8031a1613 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 22:52:50 +00:00
yfuku
7e82879553
via support for bat43 (#11729)
* via support for bat43

* add adjust layer for via
2021-02-07 22:52:19 +00:00
QMK Bot
51d40e0ef0 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 22:35:56 +00:00
Xelus22
4d8161cff5
[Update] Allow APM32 on TrinityXTtkl (#11715)
* amp32  initial change

* fix spacing
2021-02-07 22:35:20 +00:00
QMK Bot
d9dea7c4ec Merge remote-tracking branch 'origin/master' into develop 2021-02-07 21:03:27 +00:00
Joel Challis
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
fauxpark
0e59827023 Merge remote-tracking branch 'upstream/master' into develop 2021-02-08 07:57:09 +11:00
Danny
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
Ryan
5d5cbb877d
Rework I2C driver docs (#11658) 2021-02-08 07:45:59 +11:00
QMK Bot
10c88cdcd5 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 18:57:18 +00:00
Danny
0355cd0f72
[Keyboard] Add The Stick keyboard (#11745)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-07 10:56:43 -08:00
QMK Bot
6233c6ac7b Merge remote-tracking branch 'origin/master' into develop 2021-02-07 18:49:08 +00:00
moritz-john
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
QMK Bot
5007cdac72 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:58:56 +00:00
George Petri
13c562e154
[Keymap] Update keymap for keebio/nyquist (#11734) 2021-02-07 09:58:23 -08:00
QMK Bot
a08c7c68cc Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:45:42 +00:00
Chris M
c1aeec9635
[Keymap] Shadyproject/bfo9000 (#11753) 2021-02-07 09:44:59 -08:00
QMK Bot
adf32da655 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:42:59 +00:00
Juno Nguyen
a4368da849
[Keymap] Update community ortholinear 4x12 keymap: junonum (#11757) 2021-02-07 09:42:25 -08:00
QMK Bot
7122adc4b8 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:27:11 +00:00
stanrc85
65db45c475
[Keyboard] Add my keymap for Mark65 (#11717) 2021-02-07 09:26:39 -08:00
QMK Bot
ffd768dfbc Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:09:55 +00:00
Salicylic-acid3
74145dc7ae
[Keyboard] Add nknl7jp keyboard (#11591)
* Add nknl7jp keyboard

A 73 keys JIS Layout split keyboard.
Salicylic-acid3

* Keymap Update

Fixed default keymap.

* Update keyboards/nknl7jp/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7jp/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7jp/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7jp/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07 09:09:24 -08:00
QMK Bot
380e1a28c9 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:07:42 +00:00
Salicylic-acid3
60d76d6733
[Keyboard] Add nknl7en keyboard (#11590)
* Add nknl7en keyboard

A 70 keys ANSI Layout split keyboard.
Salicylic-acid3

* Update readme.md

The name, photo, and link were wrong, so they have been corrected.

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/nknl7en/keymaps/salicylic/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07 09:06:59 -08:00
QMK Bot
2a7584ecf0 Merge remote-tracking branch 'origin/master' into develop 2021-02-07 17:05:04 +00:00
Salicylic-acid3
72b0f494e7
[Keyboard] Add ergoarrows keyboard (#11592)
A 76 keys Ergo Layout split keyboard.
Salicylic-acid3
2021-02-07 09:04:29 -08:00
QMK Bot
fe7e736c6b Merge remote-tracking branch 'origin/master' into develop 2021-02-07 16:59:45 +00:00
Matteo Bonora
2e6bd97585
[Keyboard] Add Hi-Tek AIM-65 keyboard (#11623)
* Add Hi-Tek AIM-65 keyboard

* Add bootloader selection

* Update keyboards/handwired/aim65/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/handwired/aim65/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboard image

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

* Update keyboards/handwired/aim65/rules.mk

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

* Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/aim65/keymaps/default/keymap.c

Fix indentation

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/aim65/keymaps/default/keymap.c

Fix indentation

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c

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

* Update keyboards/handwired/aim65/readme.md

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/aim65/keymaps/default/keymap.c

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/handwired/aim65/config.h

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-07 08:59:15 -08:00
QMK Bot
d33191830b Merge remote-tracking branch 'origin/master' into develop 2021-02-07 16:56:55 +00:00