Alexander Dergachev
9971caa632
Add a custom keymap for Torn keyboard ( #11017 )
2020-12-05 22:14:50 +11:00
QMK Bot
15200bd8f5
Merge remote-tracking branch 'origin/master' into develop
2020-12-05 10:14:47 +00:00
Ryan
15faffacf4
Omit serial number if not defined ( #11104 )
2020-12-05 21:14:19 +11:00
Nick Brassel
f1fef16e4d
ChibiOS upgrade: keyboard conf migrations (phase 1) ( #10418 )
...
* ChibiOS conf upgrade for acheron/arctic
acheron/arctic - 8d3d233f15bf5d396e29abb94f943a89b0b828d1
* ChibiOS conf upgrade for acheron/austin
acheron/austin - beabc6204533de80704684de9ff7790895f319e1
* ChibiOS conf upgrade for acheron/keebspcb
acheron/keebspcb - e14a96e99aab54aefebc1d3d24d64b0082db7842
* ChibiOS conf upgrade for aeboards/ext65/rev2
aeboards/ext65/rev2 - 0b97daef994903585be2768b6aaffc4da97ec617
* ChibiOS conf upgrade for ai03/vega
ai03/vega - 7e5f208278309681fd1db8b2629890b813fdf938
* ChibiOS conf upgrade for at_at/660m
at_at/660m - e30393b6546454f9939c1187aa9c6539f1ef76c1
* ChibiOS conf upgrade for bt66tech/bt66tech60
bt66tech/bt66tech60 - a7f4e8a224132830447d12c92d146997f9b56b7d
* ChibiOS conf upgrade for cannonkeys/an_c
cannonkeys/an_c - e7320dc09377fdad749e382b3986f2241633214b
* ChibiOS conf upgrade for cannonkeys/atlas
cannonkeys/atlas - 063a8eaea7e68607b725ad06777c49d34686b433
* ChibiOS conf upgrade for cannonkeys/chimera65
cannonkeys/chimera65 - 01ce66c862a5cd98183b10e992939a55038779bc
* ChibiOS conf upgrade for cannonkeys/db60
cannonkeys/db60 - 45636d0b3cf951cef51a5b19678e2da549efd14f
* ChibiOS conf upgrade for cannonkeys/devastatingtkl
cannonkeys/devastatingtkl - 709e0155c421991fad283d38c28f850320ed4730
* ChibiOS conf upgrade for cannonkeys/instant60
cannonkeys/instant60 - 7e530e10794183d684a328f01b9b0743907440c7
* ChibiOS conf upgrade for cannonkeys/instant65
cannonkeys/instant65 - c8de288708d0586337cb7137ae54d97e1ddc90a6
* ChibiOS conf upgrade for cannonkeys/iron165
cannonkeys/iron165 - 3a3c0273e227fd15ab3527e4aa557b94d0b69248
* ChibiOS conf upgrade for cannonkeys/obliterated75
cannonkeys/obliterated75 - cdf834802ae77b1bbd4876eb8c34c19a83ad95cd
* ChibiOS conf upgrade for cannonkeys/ortho48
cannonkeys/ortho48 - 3432ff13c83a6358eca44b37f72b18882eeda699
* ChibiOS conf upgrade for cannonkeys/ortho60
cannonkeys/ortho60 - 95be42a23798cc8f9b04175d4892b712d871a52d
* ChibiOS conf upgrade for cannonkeys/ortho75
cannonkeys/ortho75 - e1149893fd01e853124808b45d521b61a7638eb9
* ChibiOS conf upgrade for cannonkeys/practice60
cannonkeys/practice60 - 6e4da87f0a766cf2665e9b4aa8e3ab33017cf745
* ChibiOS conf upgrade for cannonkeys/practice65
cannonkeys/practice65 - c436c06829123503073b3a9c5a1c0acfc2dbe2e5
* ChibiOS conf upgrade for cannonkeys/rekt1800
cannonkeys/rekt1800 - 43e8e21b62531534afeaa241f4c683fbdb60a8e0
* ChibiOS conf upgrade for cannonkeys/satisfaction75
cannonkeys/satisfaction75 - 28ff9a8a11ad1de9d09ec85fab2af906b7c27d6a
* ChibiOS conf upgrade for cannonkeys/savage65
cannonkeys/savage65 - 53eaefae56020b536d4934686506d5d1fe51b6e0
* ChibiOS conf upgrade for cannonkeys/tmov2
cannonkeys/tmov2 - 8b1ced8ff7dc368afa268104cd5192bb1bfc8a1c
* ChibiOS conf upgrade for chavdai40
chavdai40/rev1 - b166af66b084077764b705c9428725cde0b0ce51
chavdai40/rev2 - 0048c8ec8c28f1dfa5d1a37348524899595d8325
* ChibiOS conf upgrade for cheshire/curiosity
cheshire/curiosity - f1636e53638ce2e798070e6e622fd88a08982d5a
* ChibiOS conf upgrade for clueboard/60
clueboard/60 - bb5057d4a2976b6530fe2e345a4153de2f7c042d
* ChibiOS conf upgrade for clueboard/66_hotswap/gen1
clueboard/66_hotswap/gen1 - 03fe10f4de7b67e5f1cf0a7d576f82676adf4261
* ChibiOS conf upgrade for clueboard/66/rev4
clueboard/66/rev4 - 878e38a34f97b32d9d109a6d98f98bc385d84864
* ChibiOS conf upgrade for coarse/cordillera
coarse/cordillera - 5cae5c643e96d03bddcbb73e76e225ea5f82fef3
* ChibiOS conf upgrade for converter/siemens_tastatur
converter/siemens_tastatur - 48f82cd227836878967dfa0fe0411f7d877a124c
* ChibiOS conf upgrade for ergodox_infinity
ergodox_infinity - 8df21d6129eef47d7a5ced92715e5bdbfb0151e5
* ChibiOS conf upgrade for function96
function96 - deecdcdca34c88058f820f0e2bc9f112458c85c5
* ChibiOS conf upgrade for generic_panda/panda65_01
generic_panda/panda65_01 - 8522d8107edcf71758f3be7298c0bc18fa7f6706
* ChibiOS conf upgrade for hadron/ver3
hadron/ver3 - 632af7727b767720c699abdff770edc9682928ee
* ChibiOS conf upgrade for handwired/ck4x4
handwired/ck4x4 - a4cb9b5b8c3a162083677b14b105edbc1bca2baf
* ChibiOS conf upgrade for handwired/co60/rev6
handwired/co60/rev6 - be1688eeabd83a7f576d9e4e23e24d56b8dc251b
* ChibiOS conf upgrade for handwired/co60/rev7
handwired/co60/rev7 - d196c5772859ddee695bda5b0e9f0944a0f350f8
* ChibiOS conf upgrade for handwired/onekey/blackpill_f401
handwired/onekey/blackpill_f401 - 8387bfd56888fc1605d293dc0071b4ec94b23991
* ChibiOS conf upgrade for handwired/onekey/blackpill_f411
handwired/onekey/blackpill_f411 - 855efdb2f60c384edf64773c0f4ff4b7ea8ae4c9
* ChibiOS conf upgrade for handwired/onekey/bluepill
handwired/onekey/bluepill - 60d8555b174dbdabae196a4cc5eccfee4bdd9529
* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco
handwired/onekey/stm32f0_disco - 9bc12e29f5a4e4b9ec0f34987559e5e11de4bb48
* ChibiOS conf upgrade for handwired/onekey/teensy_32
handwired/onekey/teensy_32 - 17459dd8e71b3a33270037878bdbd04151af196b
* ChibiOS conf upgrade for handwired/onekey/teensy_lc
handwired/onekey/teensy_lc - 3a9aed4681c287176efe31c988340ca43ad27a9d
* ChibiOS conf upgrade for handwired/pill60/blackpill_f401
handwired/pill60/blackpill_f401 - 5b652354ae957e86e211dcef29f8f27320b31180
* ChibiOS conf upgrade for handwired/pill60/blackpill_f411
handwired/pill60/blackpill_f411 - 580255c171e95b5bca53b14a13ae018a73d18414
* ChibiOS conf upgrade for handwired/pill60/bluepill
handwired/pill60/bluepill - 29109b54137ea94ac266c604991cff87516689ff
* ChibiOS conf upgrade for handwired/riblee_f401
handwired/riblee_f401 - dc68c31d7ca8ae0fad7e7ad8bdd63406155ff363
* ChibiOS conf upgrade for handwired/riblee_f411
handwired/riblee_f411 - cf0fadff4c98d41cf9bdddbe1ead15c79be941b9
* ChibiOS conf upgrade for handwired/steamvan/rev1
handwired/steamvan/rev1 - 743b395ac87b918b6be4614c9e120e80a9f049d4
* ChibiOS conf upgrade for handwired/t111
handwired/t111 - 99b61ae5692ee4b2101673d1a896cd7a5831bcfa
* ChibiOS conf upgrade for handwired/twadlee/tp69
handwired/twadlee/tp69 - 3ab2753c40e947a726ece6c825493ebc87ecf20e
* ChibiOS conf upgrade for handwired/z150
handwired/z150 - 78808b0c8671e2386b9ba65dbd647d613d92f253
* ChibiOS conf upgrade for hs60/v2
hs60/v2/ansi - 7bcd152c269803de8f96416ba26e939c0420ceae
hs60/v2/hhkb - d77f393d2811bd104b05c4530bf1083d75856b7a
hs60/v2/iso - 5d3d20de919fca3b64cb7548cad46e8d35d7cc04
* ChibiOS conf upgrade for infinity60
infinity60 - dbcbb2f58ee499252b0879d68d9beec08a8433bc
* ChibiOS conf upgrade for k_type
k_type - 492f476177da95495442d1e173391e3c17324a70
* ChibiOS conf upgrade for keebio/bdn9/rev2
keebio/bdn9/rev2 - 4dbb5d606b3d9060ad01a437978220fe0f1fc5b2
* ChibiOS conf upgrade for keebio/choconum
keebio/choconum - 1521e634088a30114cd12b7b6bbd2cca5331c822
* ChibiOS conf upgrade for keebwerk/mega
keebwerk/mega/ansi - 10e32718c7bfff2f6bd8dd2159a15bef0f4acbf9
* ChibiOS conf upgrade for misterknife/knife66
misterknife/knife66 - cf2f3d26103036d79bf7fcec204e13899e33fbe3
* ChibiOS conf upgrade for nack
nack - ba7f421d5670e672c5c14fd5f80c0f86447c1468
* ChibiOS conf upgrade for nebula12
nebula12 - aedb11fa894dc19513462f054a9fa00f5c195adc
* ChibiOS conf upgrade for nebula68
nebula68 - 6bed6afb2fd84ef9069b757f1d1e87fc1cbe290c
* ChibiOS conf upgrade for nemui
nemui - 86ed80ea8565d7d0f39512a9032cc5e1b306fcff
* ChibiOS conf upgrade for nk65
nk65 - 75b2484741a96dcbff14e94c44443bb33ad73dce
* ChibiOS conf upgrade for nk87
nk87 - f719a739a3d2c0969c79c1ace5fe9a7d6f05cc22
* ChibiOS conf upgrade for peiorisboards/ixora
peiorisboards/ixora - b5adf1090fb4c6278d8990ce9132727a13ca3cd7
* ChibiOS conf upgrade for phoenix
phoenix - 21bfb14c52451899dadf545b78a8e88b22a420f0
* ChibiOS conf upgrade for polilla
polilla - 3ba5f326b268362c9aba570b1510e1c61009ba96
* ChibiOS conf upgrade for primekb/meridian
primekb/meridian - df266e25c682a8ed3318faa186805683014ccec4
* ChibiOS conf upgrade for projectkb/alice
projectkb/alice - eee7210f618588b2c5c6367c8a0318427d09da52
* ChibiOS conf upgrade for projectkb/signature87
projectkb/signature87 - 617430e601981f0bb5fbcce42eee53107d5161b8
* ChibiOS conf upgrade for ramonimbao/squishy65
ramonimbao/squishy65 - 88e4cd3db8db61ccf9daed5405cf5eeb32f8043e
* ChibiOS conf upgrade for ramonimbao/wete
ramonimbao/wete - f0e90d943d8749e802b6bba619ce943b568a7f65
* ChibiOS conf upgrade for rart/rartlice
rart/rartlice - f7a6b58e6cadd4102fcf5f89d054d1fbdc5809d0
* ChibiOS conf upgrade for retro_75
retro_75 - 34c7b291fb2443bf8cb69fb9ee676190c736bf00
* ChibiOS conf upgrade for rocketboard_16
rocketboard_16 - 24e6503a7a5259934a80dd96dd37d3281b4240d3
* ChibiOS conf upgrade for satt/vision
satt/vision - c926d6433d8b2dc1d74623184255016bdd36ae22
* ChibiOS conf upgrade for tkc/candybar
tkc/candybar/lefty - 2f269cbed5dcec61bb0c7904a46436f110dc0ae1
tkc/candybar/righty - 9b1448b2ccbcf8a4d1e5ad74d8ad5933003ee9a2
* ChibiOS conf upgrade for tkc/godspeed75
tkc/godspeed75 - 2cfed58d44a7eef8f341ff24e0136511e03aa78d
* ChibiOS conf upgrade for tkw/stoutgat/v2/f411
tkw/stoutgat/v2/f411 - b094651ec61c79099de3e6e4991319816ac464c1
* ChibiOS conf upgrade for viktus/styrka
viktus/styrka - f3f678ea55126c9965f24da6fffc9bbbd8b24aa9
* ChibiOS conf upgrade for vinta
vinta - e5403dc6bbf47f35a53cf43b1b1d130f05552f16
* ChibiOS conf upgrade for westfoxtrot/prophet
westfoxtrot/prophet - 0e4d6987ffa6430720804e7bc1502ab6c3dcb879
* ChibiOS conf upgrade for whitefox
whitefox - 5ca6de6fb09d8c2cfa996b65732fcd55391053ff
* ChibiOS conf upgrade for wolfmarkclub/wm1
wolfmarkclub/wm1 - 2d8294e29b08f5af5406988a284483d1694ed36c
* ChibiOS conf upgrade for xelus/kangaroo
xelus/kangaroo - f9697ba27d4e6c36a1cfd9e2657eac35dfa3be99
* ChibiOS conf upgrade for xelus/trinityxttkl
xelus/trinityxttkl - a457601b446ea9b4e9e28d2ba304a4bcdb934257
* ChibiOS conf upgrade for xelus/valor_frl_tkl
xelus/valor_frl_tkl - 27ec14b9ee0e5cb2d026af500d16b17d4c2885e2
* ChibiOS conf upgrade for zoo/wampus
zoo/wampus - 926487c1f50c1c5eb0608ca7dc1184881d54d35e
* ChibiOS conf upgrade for zvecr/split_blackpill
zvecr/split_blackpill - 02f4393d01e0a70c94af48fa979ff0229732e8ca
* ChibiOS conf upgrade for zvecr/zv48/f401
zvecr/zv48/f401 - 8b1766a24f943b9b0ba756c6fe340ba69d5e14e3
* ChibiOS conf upgrade for zvecr/zv48/f411
zvecr/zv48/f411 - 09ba645092eb7f3d41da0d5e6727f2f4f97033c0
2020-12-05 21:13:58 +11:00
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