Kyle McCreery
1a7a821582
Merc updates ( #12289 )
2021-04-12 20:40:38 +02:00
QMK Bot
ebdf750cdd
Merge remote-tracking branch 'origin/master' into develop
2021-04-12 17:56:32 +00:00
jackytrabbit
50e0f5dc80
Update layout option for lazydesigners/THE40 ( #12312 )
2021-04-12 19:55:57 +02:00
QMK Bot
79bdfc1110
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:51:12 +00:00
Arthur Tabatchnic
0f516d9026
A few small typo fixes in docs ( #12524 )
2021-04-11 12:50:45 +02:00
QMK Bot
90875997ac
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:49:39 +00:00
swampmonster
b23eeb6a14
Documentation update ( #12484 )
...
Update documentation to reflect what the actual target flags are
Co-authored-by: swampmonster <>
2021-04-11 12:49:12 +02:00
QMK Bot
f02af23973
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:47:14 +00:00
Joseph Whom
1298eab6ab
Update readme.md ( #12502 )
...
Noticed a letter missing in "compiling".
2021-04-11 12:46:43 +02:00
QMK Bot
c9d7a4af45
Merge remote-tracking branch 'origin/master' into develop
2021-04-11 10:45:56 +00:00
Hawley Waldman
98939868fa
Update github instruction link in newbs_getting_started.md ( #12510 )
...
Clarify that the link to the github/forking instructions is a link to how to fork this project. Previous wording implied that the link was to a how-to-use github in general page.
2021-04-11 12:45:30 +02:00
QMK Bot
34323ecd8b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 16:34:58 +00:00
github-actions[bot]
7daa2e210c
Format code according to conventions ( #12540 )
...
Co-authored-by: QMK Bot <hello@qmk.fm>
2021-04-10 17:34:26 +01:00
QMK Bot
d5a8431af4
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 15:04:12 +00:00
Michael Stapelberg
7d953332e0
ChibiOS USB driver: prevent deadlock with CONSOLE_ENABLE = yes ( #12472 )
...
Before this commit, attaching an ARM-based (i.e. ChibiOS-based) keyboard that
uses CONSOLE_ENABLE = yes and produces debug messages would deadlock the
keyboard unless one was running hid_listen.
With this commit, dead-locking writes to the queue are detected and prevented.
fixes #5631
2021-04-10 16:03:38 +01:00
QMK Bot
2e2dd3113b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 13:23:47 +00:00
Álvaro A. Volpato
03685309fd
Reverse K0E and K0G ( #12491 )
...
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
2021-04-10 23:23:08 +10:00
QMK Bot
11e5bb2d8a
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 05:58:04 +00:00
Eithan Shavit
e09ca63317
[Keyboard] Add afternoonlabs/oceanbreeze ( #12299 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Eithan Shavit <eithan@fb.com>
2021-04-09 22:57:30 -07:00
QMK Bot
29d537ce7b
Merge remote-tracking branch 'origin/master' into develop
2021-04-10 00:38:17 +00:00
Ryo Maeda
3dbb7f261d
[Keymap] Remove LAYOUT_kc macros from edvorakjp keymaps ( #12217 )
2021-04-09 17:37:49 -07:00
QMK Bot
688fb1999b
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:36:55 +00:00
littleferris
93e8a401df
[Keyboard] ergosaurus - add VIA support, enabled RGB ( #12126 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-04-09 14:36:18 -07:00
QMK Bot
bcfa3fb9f2
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 21:32:31 +00:00
hadi
7f9409bbb3
[Keyboard] Added senselessclay had60 ( #12093 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 14:31:57 -07:00
QMK Bot
58afb87288
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 19:05:51 +00:00
kiwikey
633464acfa
Add VIA keymap for Kawii9 ( #12521 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-09 21:05:14 +02:00
QMK Bot
0a453194e8
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 18:49:03 +00:00
mechlovin
f744e22b49
Add TH1800 PCB, Hex6C PCB, Rogue87 PCB, Rouge87 PCB, Infinity87 series ( #11977 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: vuhopkep <boy9x0@gmail.com>
2021-04-09 20:48:30 +02:00
QMK Bot
3190c2f98d
Merge remote-tracking branch 'origin/master' into develop
2021-04-09 02:42:00 +00:00
peepeetee
1a913aa12e
Fix Breaking Change date ( #12272 )
2021-04-09 12:41:29 +10:00
QMK Bot
d4b3d00d88
Merge remote-tracking branch 'origin/master' into develop
2021-04-08 16:48:07 +00:00
Adrian
75f83210f4
Add new handwired keyboard (Ergocheap) ( #11857 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-04-08 18:47:24 +02:00
QMK Bot
15674d0259
Merge remote-tracking branch 'origin/master' into develop
2021-04-08 04:16:47 +00:00
Ryan
2170b75b26
`qmk chibios-confmigrate`: Make `-i` and `-r` required ( #12515 )
2021-04-08 14:16:15 +10:00
QMK Bot
52e8875eba
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 13:58:12 +00:00
Kosuke Adachi
d1270c9d55
Update info.json to correctly. ( #12507 )
2021-04-07 09:57:36 -04:00
Ryan
40c314fe5c
LED Matrix: Implement CIE1931 curve ( #12417 )
2021-04-07 20:06:11 +10:00
QMK Bot
69bc465ace
Merge remote-tracking branch 'origin/master' into develop
2021-04-07 10:04:21 +00:00
Ryan
546dfce209
Add info.json for CK60i ( #12318 )
2021-04-07 20:03:45 +10:00
Nick Brassel
96acb499d2
Fix up builds that are now too big for `develop` branch. ( #12495 )
2021-04-06 16:39:31 +10:00
Nick Brassel
64a0f5a659
Add support for producing UF2-format binaries. ( #12435 )
...
* First stab at enabling builds of UF2-format binaries.
* Add description on producing a UF2 file.
2021-04-06 16:39:15 +10:00
QMK Bot
3ce8c9fc8f
Merge remote-tracking branch 'origin/master' into develop
2021-04-04 09:10:07 +00:00
SneakboxKB
e0614e4f52
Disarray ProductID change ( #12440 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mujimanic <64090325+mujimanic@users.noreply.github.com>
Co-authored-by: Zach White <skullydazed@gmail.com>
2021-04-04 11:09:43 +02:00
QMK Bot
8428cedc83
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 19:43:05 +00:00
Takeshi ISHII
49dc332a04
[Keymap] cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows ( #12259 )
...
* cleanup keyboards/helix/{rev2|rev3_5rows}/keymaps/five_rows
* Made the layout data easier to read.
* helix/rev2/keymaps/five_rows/keymap.c
* helix/rev3_5rows/keymaps/five_rows/keymap.c
* The following two were made the same.
* keymaps/five_rows/config.h
* keymaps/five_rows/oled_display.c
The binary of the compilation result has not changed.
* update keyboards/helix/rev2/keymaps/five_rows/rules.mk
KEYBOARD_LOCAL_FEATURES_MK was moved to the end.
* add '#define DISABLE_SYNC_TIMER' into helix/rev3_5rows/keymaps/five_rows/config.h
The sync timer features worsen the matrix scan rate of the Helix keyboard. I'm not sure if it makes sense to have sync timer features enabled on the Helix keyboard. So in my keymap I disable this.
2021-04-04 04:42:29 +09:00
QMK Bot
9bedc6300d
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 16:29:37 +00:00
Joel Challis
60e1910e5b
Add WSL specific logic for avrdude device detection ( #12392 )
2021-04-03 17:29:06 +01:00
QMK Bot
cc4066189a
Merge remote-tracking branch 'origin/master' into develop
2021-04-03 16:16:12 +00:00
Excitable Snowball
4e2ab3a177
Remove `wave` from requirements-dev.txt ( #12387 )
...
This resolves to <https://pypi.org/project/Wave/ >, but the places where
the `wave` module is imported make it clear that the standard library
module <https://docs.python.org/3/library/wave.html > was intended.
Was originally added in #11820 and used in the following files:
* `util/sample_parser.py`
* `util/wavetable_parser.py`
2021-04-03 09:15:39 -07:00