1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

15237 commits

Author SHA1 Message Date
QMK Bot 684773f2d4 Merge remote-tracking branch 'origin/master' into develop 2020-12-05 06:01:27 +00:00
Sergey Omelchenko e3888281f4
Fix missing define to map rgb_matrix function set to rgblight. (#11084) 2020-12-05 17:00:58 +11:00
QMK Bot e1ced62836 Merge remote-tracking branch 'origin/master' into develop 2020-12-05 05:46:31 +00:00
Evy Dekkers 1e7661651c
add nt750 (#11091) 2020-12-05 16:45:59 +11:00
QMK Bot fac5e3b540 Merge remote-tracking branch 'origin/master' into develop 2020-12-04 11:03:51 +00:00
Nick Brassel f05b1b54a9
Add default early-init bootloader to F042/F072. (#11120) 2020-12-04 22:03:16 +11:00
QMK Bot 64b395cb3a Merge remote-tracking branch 'origin/master' into develop 2020-12-04 05:00:10 +00:00
Borja López Jiménez 59832e7654
[Keyboard] Added taleguers75 rev1 keyboard (#11052)
* Added taleguers75 rev1 keyboard

* Apply suggestions from code review

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

* Fixed VIA keymap

Co-authored-by: Joel Challis <git@zvecr.com>
2020-12-03 20:59:41 -08:00
QMK Bot dc1eebb566 Merge remote-tracking branch 'origin/master' into develop 2020-12-04 02:22:34 +00:00
Andrew Kannan 0f086df89f
Allow APM32 MCUs on certain CannonKeys PCBs (#10899)
* Allow APM32 MCUs on certain CannonKeys PCBs

* another one

* Update DFU suffix args

* missed one

* Apply suggestions from code review

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

Co-authored-by: Joel Challis <git@zvecr.com>
2020-12-03 18:22:05 -08:00
QMK Bot 024b3bd0dd Merge remote-tracking branch 'origin/master' into develop 2020-12-04 02:17:51 +00:00
James Young 6ab0a6e796
Hotfix for #11106 (#11118)
* Hotfix for #11106: Rework LAYOUT_alice support; add LAYOUT_alice_split_bs

Accidentally missed backwards compatibility on the sneakbox/aliceclone in #11106, which broke stanrc85's Community Layout keymap.

* sneakbox/aliceclone: move 2u Backspace to column 6
2020-12-03 18:17:15 -08:00
QMK Bot 7a6e7d87cc Merge remote-tracking branch 'origin/master' into develop 2020-12-04 02:09:45 +00:00
bbrfkr c1dc676d28
[Keyboard] add scatter42 by bbrfkr (#10893)
* add new keyboard scatter42 by bbrfkr

* mod info.json to work

* mod info.json

* mod readme

* Update keyboards/scatter42/keymaps/default/keymap.c

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

* Update keyboards/scatter42/keymaps/default/keymap.c

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

* Update keyboards/scatter42/scatter42.h

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

* Update keyboards/scatter42/config.h

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

Co-authored-by: Ryan <fauxpark@gmail.com>
2020-12-03 18:08:56 -08:00
Nick Brassel 4444f3cc55
Disable almost all ChibiOS subsystems in default configs (#11111)
* Disable almost all ChibiOS subsystems.

* Modify ChibiOS config updater script to fixup mcuconf include, use develop as base instead of master.

* Add default early-init bootloader to F042/F072.

* Back to 100k freq.
2020-12-04 10:45:39 +11:00
James Young 138c3e7042
Rework LAYOUT_alice support; add LAYOUT_alice_split_bs (#11106)
* Add LAYOUT_alice support: fallacy

* Add LAYOUT_alice support: kb_elmo/sesame

* Add LAYOUT_alice support: cheshire/curiosity

* Add LAYOUT_alice support: evyd13/wonderland

* Add LAYOUT_alice support: mechlovin/adelais

* Update LAYOUT_alice support: projectkb/alice

The PR that added Alice community layout support for the projectkb/alice/rev2 simultaneously broke support for every other keyboard that supported LAYOUT_alice.

This commit partially reverts the offending PR. `LAYOUT_alice` for the projectkb/alice has been renamed to `LAYOUT_alice_split_bs`, and a correct 65-key `LAYOUT_alice` has been added.

Additionally, the `LAYOUTS` rule has been moved to keyboard level as the layout macros are shared between rev1 and rev2 boards, which means the layout options are the same for both revisions.

* Update ramonimbao/aelith info.json

Keyboard source was already correct to support LAYOUT_alice, but the layout tree was missing from info.json.

* Fork `alice` Community Layout...

... into Standard and Split Backspace versions

Also updates stanrc85's layout keymap to use 65 keys instead of the Split Backspace 66-key version.

* Update LAYOUT_alice support: sneakbox/aliceclone

Rework the sneakbox/aliceclone to use the Split Backspace Alice layout.

* Update LAYOUT_alice support: zoo/wampus

The layout macro that was `LAYOUT_alice` was 66 keys. This layout macro has been renamed to `LAYOUT_alice_split_bs`, and a 65-key `LAYOUT_alice` has been added.

Additionally, the 66-key macro has been rearranged to accept its keycodes in the intended order for Community Layout support.

* Update keyboards for `LAYOUT_alice_split_bs` support

* LAYOUT_alice_split_bs support: ergosaurus

* LAYOUT_alice_split_bs support: handwired/colorlice

* LAYOUT_alice(_split_bs) support: handwired/owlet60

* LAYOUT_alice_split_bs support: nightly_boards/alter/rev1

* LAYOUT_alice(_split_bs) support: sck/osa

* LAYOUT_alice_split_bs support: tgr/alice

* LAYOUT_alice(_split_bs) support: tkc/osav2

* LAYOUT_alice_split_bs support: xelus/valor/rev1
2020-12-03 14:07:41 -08:00
QMK Bot 7e2ba2784e Merge remote-tracking branch 'origin/master' into develop 2020-12-03 20:03:01 +00:00
npspears a5a65fb1e2
Add Via support to Plexus75 PCB (#11027)
* Add Via keymap

* Via Enable in Rules.mk

* Update config.h

added nasp before Plexus75 in PRODUCT to better follow Via naming convention

* Update keymap.c

changed KC_CTRL to KC_LCTL

* Update config.h

took out the manu repeat

* Update rules.mk

* Create rules.mk

changed location of rules.mk for supporting Via

* Apply suggestions from code review

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

* Update keyboards/plexus75/keymaps/via/rules.mk

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

* Apply suggestions from code review

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

Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-12-03 15:02:21 -05:00
QMK Bot ed2bb46658 Merge remote-tracking branch 'origin/master' into develop 2020-12-03 19:39:14 +00:00
a_p_u_r_o fc85ebecd4
[Keyboard] Fixed inconsistent MATRIX_COLS and MATRIX_COL_PINS: facew (#8115) 2020-12-04 06:38:26 +11:00
Nick Brassel 87291437bd
Add board specific to Proton-C, with usual defaults turned on. (#10976)
- Set all other ChibiOS defaults to 'off', when not targeting Proton-C
- Modified all existing F303 boards to point at the QMK_PROTON_C to ensure repeatable binary output
- Modified version.h generation so that SKIP_VERSION=yes generates the same output
2020-12-03 13:04:28 +11:00
QMK Bot 777a30cb42 Merge remote-tracking branch 'origin/master' into develop 2020-12-02 19:24:26 +00:00
TerryMathews 2989f9ce2b
TKC TKL_A/B87: Initial support (#10943)
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-12-02 19:23:45 +00:00
QMK Bot de44fdbaf2 Merge remote-tracking branch 'origin/master' into develop 2020-12-02 02:01:06 +00:00
Dustin Bosveld bcab02b654
[Keyboard] Fix issue with Kyria and RGB Light (#11070)
Add recommendation to default firmware https://docs.splitkb.com/hc/en-us/articles/360017633199-The-keyboard-behaves-erratically-after-changing-the-RGB-settings
2020-12-01 18:00:27 -08:00
QMK Bot b5adf4d9e9 Merge remote-tracking branch 'origin/master' into develop 2020-12-01 22:28:42 +00:00
Xelus22 3aae5300e2
Fix Valor default underglow (#11093) 2020-12-02 09:28:08 +11:00
QMK Bot 0892741b10 Merge remote-tracking branch 'origin/master' into develop 2020-12-01 20:41:13 +00:00
Drashna Jaelre 41347cdcec
[Keyboard] Fix compiler issues for handwired/6macro (#11098) 2020-12-01 19:55:32 +00:00
XScorpion2 a8d0ec0749
[Split] Sync Timer feature (#10997)
A timer that is kept in sync between the halves of a split keyboard
2020-12-01 10:04:42 -08:00
David Dai 33802ab5cd
Add support for Drop + Ryloo Studio "Hello" M0110. (#11050) 2020-12-01 17:37:33 +00:00
QMK Bot 9c03a89596 Merge remote-tracking branch 'origin/master' into develop 2020-12-01 11:49:57 +00:00
Brandon Claveria eaa8c18174
fix handwired/swiftrax/beegboy keymaps (#11071)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2020-12-01 22:49:52 +11:00
Brandon Claveria 3a77ef5fa3
fix handwired/swiftrax/bebol keymaps (#11072)
Co-authored-by: Swiftrax <swiftrax@gmail.com>
2020-12-01 22:49:20 +11:00
QMK Bot a4da9c47c8 Merge remote-tracking branch 'origin/master' into develop 2020-12-01 11:37:38 +00:00
Felix Jen 1124e51b11
Moved default LALT and LWIN for BKS65 (#11087) 2020-12-01 22:37:02 +11:00
QMK Bot 58a5193a2b Merge remote-tracking branch 'origin/master' into develop 2020-12-01 11:25:08 +00:00
4pplet c7dab4bb25
Adding bootleg and waffling60 rev b (#10846)
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>
2020-12-01 22:23:58 +11:00
QMK Bot 0abf4647e3 Merge remote-tracking branch 'origin/master' into develop 2020-11-30 21:03:46 +00:00
André Silva cc08e3082e
nix-shell: add milc dependency (#11086) 2020-11-30 21:03:03 +00:00
QMK Bot 9a0a2dce41 Merge remote-tracking branch 'origin/master' into develop 2020-11-30 20:19:59 +00:00
Desp-Key 02fb0de59b
Added VIA keymap to YMDK bface keyboard (#11002)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-11-30 20:19:21 +00:00
QMK Bot 4a5388a2b6 Merge remote-tracking branch 'origin/master' into develop 2020-11-30 19:20:22 +00:00
Zach White 8724a70c4c
Reduce travis load by replacing an exclusive grep with an inclusive grep (#10964)
* add -n to avoid compiling

* switch to an include rather than exclude strategy
2020-11-30 11:19:44 -08:00
James Young 3cc7d22732
Branch point for 2021 Feb 27 Breaking Change 2020-11-30 03:29:39 -08:00
XScorpion2 990d5189d1
Configurable serial usart timeout (#11057) 2020-11-30 03:29:35 -08:00
XScorpion2 485e4524f4
Fix int wrapping for timer_expired macros and use MAX defines for consistency and clarity (#10996) 2020-11-30 21:18:19 +11:00
ojthetiny ce91dd4bf3
[Keyboard] Add edc40 keyboard (#11021)
* Re-adding edc40 keyboard branch/files

* Update keymap.c

* add default keymap for edc40

* removed redundant keymap

* added custom keymap for edc40

* fixed false update to settings.json

* fixed false update to settings.json

* added newline to info.json

* Update keyboards/edc40/config.h

* Update keyboards/edc40/readme.md

* Update keyboards/edc40/rules.mk

* Update rules.mk

* Update keyboards/edc40/info.json

* Update info.json

* Update info.json

* Update keyboards/edc40/config.h

* Update keyboards/edc40/info.json

* Update keyboards/edc40/readme.md

* Update keyboards/edc40/keymaps/default/keymap.c
2020-11-30 02:00:55 -08:00
MechMerlin 5909c243d4
KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039) 2020-11-30 05:05:46 +11:00
Anand Babu (AB) Periasamy 67976da039
map reset key to the correct location (#11037)
Co-authored-by: Anand Babu (AB) Periasamy <twitter.com/abperiasamy>
2020-11-30 05:04:52 +11:00