37ebbe8d9e
Merge remote-tracking branch 'origin/master' into develop
2021-01-22 02:27:36 +00:00
c16a3dcb54
Isometria 75: Configurator/CLI fixes ( #11612 )
...
* info.json: human-friendly formatting
* info.json: update key object labels
Some of the characters in the original file don't play nicely with `qmk info -l` on Windows.
* info.json: correct key object order
2021-01-21 18:27:05 -08:00
e4ff5eb3eb
Merge remote-tracking branch 'origin/master' into develop
2021-01-21 22:23:58 +00:00
71d8e72b80
Add 3rd encoder to VIA keymap ( #11580 )
2021-01-21 17:23:27 -05:00
aa73ba7a67
Merge remote-tracking branch 'origin/master' into develop
2021-01-21 21:05:55 +00:00
c03ad0f802
Remove rules.mk in leafcutterlabs/bigknob:default ( #11652 )
2021-01-21 21:05:19 +00:00
344f61f247
Merge remote-tracking branch 'origin/master' into develop
2021-01-21 15:35:05 +00:00
b79ee92a12
update CI list about helix keyboards
...
* exclude 'helix/rev3_4rows' from CI
Since helix/rev3_4rows is almost the same as helix/rev3_5rows, there is no point in checking with travis-ci.
* include 'helix/pico/back' to CI
helix pico and helix rev2 are still available. I would like to check both by travis-ci, but here I will add a check only for helix pico.
2021-01-21 07:34:00 -08:00
1108210f1b
Keep track of encoder activity ( #11595 )
...
* Keep track of encoder activity, provide API for either matrix/encoder.
* Fixup build when no RGBLIGHT or Backlight enabled.
2021-01-21 22:24:07 +11:00
bdb757e189
ChibiOS conf migrations... take 11 ( #11646 )
...
* Allow forcing re-migration.
* ChibiOS conf upgrade for acheron/arctic
acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368
* ChibiOS conf upgrade for acheron/austin
acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7
* ChibiOS conf upgrade for acheron/keebspcb
acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4
* ChibiOS conf upgrade for acheron/lasgweloth
acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581
* ChibiOS conf upgrade for aeboards/ext65/rev2
aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87
* ChibiOS conf upgrade for ai03/vega
ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80
* ChibiOS conf upgrade for akegata_denki/device_one
akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7
* ChibiOS conf upgrade for at_at/660m
at_at/660m - 9999583e8bec2772046132a22818482d24e18c84
* ChibiOS conf upgrade for box75
box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e
* ChibiOS conf upgrade for bt66tech/bt66tech60
bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454
* ChibiOS conf upgrade for cannonkeys/an_c
cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f
* ChibiOS conf upgrade for cannonkeys/atlas
cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743
* ChibiOS conf upgrade for cannonkeys/chimera65
cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5
* ChibiOS conf upgrade for cannonkeys/db60
cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09
* ChibiOS conf upgrade for cannonkeys/devastatingtkl
cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2
* ChibiOS conf upgrade for cannonkeys/instant60
cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4
* ChibiOS conf upgrade for cannonkeys/instant65
cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda
* ChibiOS conf upgrade for cannonkeys/iron165
cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03
* ChibiOS conf upgrade for cannonkeys/obliterated75
cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc
* ChibiOS conf upgrade for cannonkeys/onyx
cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e
* ChibiOS conf upgrade for cannonkeys/ortho48
cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1
* ChibiOS conf upgrade for cannonkeys/ortho60
cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc
* ChibiOS conf upgrade for cannonkeys/ortho75
cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647
* ChibiOS conf upgrade for cannonkeys/practice60
cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5
* ChibiOS conf upgrade for cannonkeys/practice65
cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c
* ChibiOS conf upgrade for cannonkeys/rekt1800
cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf
* ChibiOS conf upgrade for cannonkeys/sagittarius
cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9
* ChibiOS conf upgrade for cannonkeys/satisfaction75
cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a
* ChibiOS conf upgrade for cannonkeys/savage65
cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4
* ChibiOS conf upgrade for cannonkeys/tmov2
cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778
* ChibiOS conf upgrade for cannonkeys/tsukuyomi
cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d
* ChibiOS conf upgrade for cheshire/curiosity
cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a
* ChibiOS conf upgrade for coarse/cordillera
coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093
* ChibiOS conf upgrade for converter/siemens_tastatur
converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4
* ChibiOS conf upgrade for cutie_club/borsdorf
cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7
* ChibiOS conf upgrade for dekunukem/duckypad
dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2
* ChibiOS conf upgrade for ebastler/isometria_75/rev1
ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0
* ChibiOS conf upgrade for ergodox_infinity
ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf
* ChibiOS conf upgrade for ergodox_stm32
ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964
* ChibiOS conf upgrade for function96
function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2
* ChibiOS conf upgrade for geekboards/macropad_v2
geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18
* ChibiOS conf upgrade for generic_panda/panda65_01
generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458
* ChibiOS conf upgrade for handwired/ck4x4
handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7
* ChibiOS conf upgrade for handwired/onekey/blackpill_f401
handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d
* ChibiOS conf upgrade for handwired/onekey/blackpill_f411
handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30
* ChibiOS conf upgrade for handwired/onekey/bluepill
handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a
* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco
handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099
* ChibiOS conf upgrade for handwired/onekey/teensy_32
handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c
* ChibiOS conf upgrade for handwired/onekey/teensy_lc
handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05
* ChibiOS conf upgrade for handwired/pill60/blackpill_f401
handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8
* ChibiOS conf upgrade for handwired/pill60/blackpill_f411
handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51
* ChibiOS conf upgrade for handwired/pill60/bluepill
handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3
* ChibiOS conf upgrade for handwired/riblee_f401
handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b
* ChibiOS conf upgrade for handwired/riblee_f411
handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013
* ChibiOS conf upgrade for handwired/sono1
handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a
* ChibiOS conf upgrade for handwired/t111
handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c
* ChibiOS conf upgrade for handwired/twadlee/tp69
handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158
* ChibiOS conf upgrade for handwired/z150
handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb
* ChibiOS conf upgrade for hub20
hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e
* ChibiOS conf upgrade for iron180
iron180 - 5efb6f21c848b3c964795d9debddceac7628933d
* ChibiOS conf upgrade for jm60
jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299
* ChibiOS conf upgrade for keebio/bdn9/rev2
keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d
* ChibiOS conf upgrade for keebio/choconum
keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7
* ChibiOS conf upgrade for matrix/m20add
matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa
* ChibiOS conf upgrade for matrix/noah
matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f
* ChibiOS conf upgrade for misterknife/knife66
misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699
* ChibiOS conf upgrade for misterknife/knife66_iso
misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70
* ChibiOS conf upgrade for nebula12
nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610
* ChibiOS conf upgrade for nemui
nemui - 4030faa372512f766fd747876cb28176302453f9
* ChibiOS conf upgrade for nibiria/stream15
nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918
* ChibiOS conf upgrade for nightingale_studios/hailey
nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be
* ChibiOS conf upgrade for planck/rev6
planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10
* ChibiOS conf upgrade for primekb/meridian
primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50
* ChibiOS conf upgrade for projectkb/alice
projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc
* ChibiOS conf upgrade for projectkb/signature87
projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d
* ChibiOS conf upgrade for ramonimbao/squishy65
ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53
* ChibiOS conf upgrade for ramonimbao/wete
ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00
* ChibiOS conf upgrade for rart/rartlice
rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0
* ChibiOS conf upgrade for retro_75
retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91
* ChibiOS conf upgrade for rocketboard_16
rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54
* ChibiOS conf upgrade for satt/vision
satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a
* ChibiOS conf upgrade for technika
technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2
* ChibiOS conf upgrade for tkc/godspeed75
tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6
* ChibiOS conf upgrade for tkw/stoutgat/v2/f411
tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426
* ChibiOS conf upgrade for viktus/styrka
viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60
* ChibiOS conf upgrade for westfoxtrot/prophet
westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b
* ChibiOS conf upgrade for whitefox
whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c
* ChibiOS conf upgrade for wolfmarkclub/wm1
wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4
* ChibiOS conf upgrade for xelus/kangaroo
xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e
* ChibiOS conf upgrade for xelus/trinityxttkl
xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79
* ChibiOS conf upgrade for xelus/valor_frl_tkl
xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd
* ChibiOS conf upgrade for xiaomi/mk02
xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c
* ChibiOS conf upgrade for zoo/wampus
zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a
* ChibiOS conf upgrade for zvecr/split_blackpill
zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
2021-01-21 17:00:53 +11:00
ea51cbf1d9
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 20:39:04 +00:00
111eb8990d
Fix QMK_BUILDDATE ( #11641 )
2021-01-20 20:38:18 +00:00
8401b0a6e5
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 18:46:42 +00:00
4e8166750b
Small tweaks to docs to make them more user friendly ( #11518 )
...
* first pass
* firmware firmware?
* Split out debug + testing docs
* tidy up duplicate css
* Add extra info to debug example
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-20 18:46:01 +00:00
34b88a2fd4
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 07:33:12 +00:00
1328ab7c7d
Correct LED physical mapping on monstargear xo87 rgb pcb ( #11629 )
...
* corrected LED physical mapping
* Corrected issue that made VIA display layer 1 incorrectly
Co-authored-by: datafx <digitalfx@phreak.tech>
2021-01-19 23:32:39 -08:00
b1e6f1b7e0
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 07:27:33 +00:00
9a070475ef
Handwired ASkeyboard Sono1: Configurator fixes ( #11625 )
...
* info.json: human-friendly formatting
* info.json: correct key order
2021-01-19 23:27:04 -08:00
ef3bd54a17
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 05:07:32 +00:00
eacb596d8b
[Keyboard] Add indicator LED support to playkbtw/helen80 ( #11560 )
...
* add indicator led support
* use LED config instead
2021-01-19 21:06:35 -08:00
87d9534d81
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 03:15:12 +00:00
1bb9f155a6
[Keyboard] Update X-Bows Nature Keyboard ( #11538 )
...
* Update config.h
* Update nature.c
* Update rules.mk
* Update keymap.c
2021-01-19 19:14:39 -08:00
6db22011a5
[Keymap] add happysalada ( #11535 )
...
* add keymap: happysalada
* use enum instead of define
* remove uneeded config file
2021-01-19 19:14:16 -08:00
1ab1ba3c3e
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 03:05:53 +00:00
45bec2d281
[Keymap] Mac-friendly KBD 75% layouts ( #11507 )
...
* Add Aaron's KBD75 v2 for Macbook
* Add Colemak & Dvorak layers
* Update keymap to adhere to style guide and add license
* Rename README.md to readme.md
2021-01-19 19:05:23 -08:00
a9df4263bb
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 03:05:04 +00:00
eba512596a
Add stm32-dfu and apm32-dfu to bootloader.mk ( #11019 )
...
* Add stm32-dfu and apm32-dfu to bootloader.mk
* Update flashing docs
* Update comment
* Further wordsmithing
2021-01-20 14:04:21 +11:00
a9dee31362
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 02:52:01 +00:00
d28d474dc0
[Keyboard] Leafcutterlabs ( #11464 )
...
* add support for bigknob
Add support for bigknob macropad
* corrected files
* Apply suggestions from code review
Co-authored-by: Joel Challis <git@zvecr.com>
* corrected tap dance
* Update config.h
* correct image link
* Apply suggestions from code review
Co-authored-by: Ryan <fauxpark@gmail.com>
* added GPL headers
* Update readme.md
* update rules to disable tap dance
* remove tap dance
* Update rules.mk
trying to get to pass travis test
* Update rules.mk
remove tap dance
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:51:33 -08:00
cfde37eec1
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 02:49:41 +00:00
c0728bd189
Improve the Lighting Layers example in RGB Lighting docs ( #11454 )
...
* Improve the keymap layer state -> lighting layers example
* A few more improvements
2021-01-19 18:49:02 -08:00
6328c25573
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 02:09:03 +00:00
71f067a60e
Fix wrong key when "Music Map" is used with MAJOR_MODE. ( #11234 )
...
With MAJOR_MODE (= major scale), keys in one octave is not 12 but 7.
To solve this problem, change divisor number from 12 to 7 at %(Modulo) and /(Division).
NOTE:
The last 12 represents half step keys in one octave for pitch calculation.
2021-01-19 18:08:06 -08:00
0857321317
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 02:05:38 +00:00
974d3f1ffd
[Keyboard] Add Mesa TKL ( #11294 )
...
* Add keyboard: Mesa TKL
* Fix image link in readme
* Update keyboards/mesa/mesa_tkl/mesa_tkl.c
Co-authored-by: Joel Challis <git@zvecr.com>
* Update keyboards/mesa/mesa_tkl/rules.mk
White space changes
Co-authored-by: Ryan <fauxpark@gmail.com>
* Replace tabs with spaces per C coding conventions.
* Update keyboards/mesa/mesa_tkl/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-19 18:05:08 -08:00
1bc8e785bf
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 01:47:32 +00:00
e6a90c8b04
Update info.json - Program Yoink ( #11558 )
...
* Update info.json
Fix ortho_split
2021-01-19 17:47:02 -08:00
b9ddccf035
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 01:42:07 +00:00
2cdc3699e1
Remove `DESCRIPTION`, W-Z ( #11633 )
2021-01-20 12:41:34 +11:00
36784a99a9
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 01:41:10 +00:00
e0ed2c950d
Remove `DESCRIPTION`, R-V ( #11632 )
2021-01-20 12:40:35 +11:00
d5ab40aa60
Merge remote-tracking branch 'origin/master' into develop
2021-01-20 00:58:19 +00:00
4ed67d666e
Remove `DESCRIPTION`, N-Q ( #11631 )
2021-01-20 11:57:45 +11:00
14c2f671cb
Switch to nano specs on ChibiOS builds - Round 2 ( #11607 )
2021-01-20 10:27:21 +11:00
9e18f41fcf
Merge remote-tracking branch 'upstream/master' into develop
2021-01-20 10:00:28 +11:00
1e1b469fa2
Remove `DESCRIPTION`, K-M ( #11619 )
2021-01-20 09:56:41 +11:00
78fe155b72
Fix up comments showing how to execute config migration. ( #11621 )
2021-01-20 02:19:36 +11:00
3b1ffd2ede
ChibiOS enable memory allocations ( #11620 )
2021-01-19 14:50:51 +00:00
49dcc824db
Fixup declaration for _kill, add other missing syscalls, populate errno. ( #11608 )
2021-01-19 14:23:03 +00:00
a7c45daeb8
ChibiOS 20.3.2 ( #11495 )
...
* Update ChibiOS submodule
* Update ChibiOS-Contrib submodule
* Update ChibiOS config files
2021-01-20 00:59:12 +11:00
QMK Bot
James Young
Danny
jakobkg
mtei
Nick Brassel
Zach White
Joel Challis
datafx
LSChyi
X-Bows Tech
Raphael Megzari
Aaron Ireland
Ryan
Craig Gardner
Joshua Diamond
Takeshi Nishio
MesaKeyboards
melonbred