QMK Bot
d437f78f57
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:41:03 +00:00
qieq
bb356a1584
[Docs] Update path to keycode.h ( #14263 )
2021-09-01 20:40:12 -07:00
QMK Bot
48a7b50238
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 17:44:43 +00:00
James Young
7575bc23a6
MatchstickWorks SouthPad: correct Configurator key sequence ( #14255 )
...
* matchstickworks/southpad: correct Configurator key sequence
* replace tabs with spaces; apply four-space indent
2021-09-01 10:44:03 -07:00
QMK Bot
b4065c557a
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 12:21:39 +00:00
James Young
583f07ac58
owl8: add info.json file ( #14256 )
...
* owl8: add info.json file
* remove width and height keys (per fauxpark)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-01 13:20:56 +01:00
Ryan
1b357ea432
Fix typos from 14248 ( #14261 )
2021-09-01 13:19:17 +01:00
QMK Bot
4df91985f7
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 09:49:03 +00:00
Jay Greco
c573926e05
Fix snailmap compilation error ( #14250 )
...
* Fix snailmap compilation error
* Update keymap.c with correct OLED_ENABLE defines
2021-09-01 10:48:14 +01:00
Ryan
41c50bb653
Change keyboard level include guards to `pragma once` ( #14248 )
...
* Change keyboard level include guards to `pragma once`
And clean up a lot of layout macros
* Oops
* Remove dangling endif
2021-09-01 19:03:14 +10:00
QMK Bot
971d36bb9e
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 02:51:13 +00:00
James Young
8d97c54770
mnk50: Configurator Fix and Layout Macro Additions ( #14257 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-01 12:50:32 +10:00
QMK Bot
d019c8a991
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 00:51:16 +00:00
Casey Webster
c5ec423438
[Keymap] cwebster2 Keymap and userspace updates ( #14258 )
2021-08-31 17:50:42 -07:00
QMK Bot
54ae829b04
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 23:19:00 +00:00
Andre Brait
fac5ec4656
Move GMMK Pro layouts to the correct subdir ( #14241 )
...
Also fix a compilation issue in the mike1808 keymap
2021-09-01 00:18:35 +01:00
QMK Bot
7d797d2e34
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 22:26:19 +00:00
Drashna Jaelre
b7693c971c
[Keyboard] Disable console on Iris Rev5 ( #14249 )
2021-08-31 15:25:46 -07:00
QMK Bot
94c9716e5b
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 18:30:22 +00:00
James Young
92106ee038
emi20: remove dead space from Configurator layout ( #14254 )
2021-08-31 19:29:49 +01:00
QMK Bot
9abc657903
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 18:25:13 +00:00
Felix Jen
b6d7b13a7a
[Keyboard] Add FJLabs KF87 PCB ( #14179 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-08-31 11:24:41 -07:00
QMK Bot
7830d671d3
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 18:23:39 +00:00
Ibnu Daru Aji
6f5428687c
[Keymap] reflects current rick's keymap ( #14169 )
2021-08-31 11:23:02 -07:00
Takeshi ISHII
1fdf766988
handwired/symmetric70_proto use post_rules.mk ( #14235 )
2021-08-31 16:58:43 +09:00
Takeshi ISHII
b8c68afb2f
[Keyboard] Helix use `post_rules.mk` ( #14216 )
...
* Helix/pico use post_rules.mk insted of local_features.mk
Tested with the following procedure.
```
git checkout 77a93fec79
(qmk/develop)
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
git checkout helix_use_post_rules.mk
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
```
* Helix/rev2 use post_rules.mk
Tested with the following procedure.
```
git checkout 77a93fec79
(qmk/develop)
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
make helix/rev2:all:check-md5
make helix/rev2/sc:all:check-md5
git checkout helix_use_post_rules.mk
make clean
make helix/pico:all:check-md5
make helix/pico/sc:all:check-md5
make helix/rev2:all:check-md5
make helix/rev2/sc:all:check-md5
```
2021-08-31 16:58:07 +09:00
QMK Bot
bab997c8c4
Merge remote-tracking branch 'origin/master' into develop
2021-08-31 05:19:55 +00:00
Salicylic-acid3
bdd0a6c097
[Keyboard] Addition of VIA keymap and a few fixes for naked60 ( #14225 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-30 22:19:21 -07:00
QMK Bot
4d4c61f2e8
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 23:26:17 +00:00
Joel Challis
f2c9e82e5b
cherry pick tidy up ( #14244 )
2021-08-31 00:25:41 +01:00
QMK Bot
a163d34abc
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 23:13:53 +00:00
coliss86
1e7117317f
Documentation: Fix links in key overrides ( #14228 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-08-31 09:13:19 +10:00
QMK Bot
25a2502216
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 19:34:52 +00:00
JX
5ed8edae49
Update ws2812_spi.c ( #14237 )
2021-08-30 20:34:19 +01:00
Drashna Jaelre
15710db4ad
Move feature suspend logic out of platform specific code ( #14210 )
2021-08-30 20:21:03 +01:00
QMK Bot
cf28feaf4d
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:50:23 +00:00
Danny
2dc07391bd
[Keyboard] Add Iris Rev. 5 ( #13934 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:49:46 -07:00
QMK Bot
d770e273e1
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:42:37 +00:00
dogspace
27aebba1b1
[Keymap] Add new snailmap keymap to nullbitsco/nibble keyboard ( #14024 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:42:04 -07:00
QMK Bot
3f4d39ec84
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:29:26 +00:00
kb-elmo
c9283f4c1f
[Keyboard] Add OwLab Jelly Epoch ( #14190 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:29:15 -07:00
Rifaa Subekti
b63114ea29
[Keyboard] add slamz keyboard ( #14188 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-08-30 11:28:54 -07:00
QMK Bot
3471b2ac89
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:23:31 +00:00
Purdea Andrei
9583f9f589
[Bug] Fix build error when enabling NO_HAPTIC_MOD ( #14178 )
...
Without this build would fail, if a keyboard had haptic feedback enabled,
TAPPING_TOGGLE was not overridden in a config.h, and if NO_HAPTIC_MOD was
defined in config.h.
2021-08-30 11:22:53 -07:00
QMK Bot
4853ca1437
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:05:43 +00:00
Felix Jen
949cfd4632
[Keyboard] add maker keyboards alexa ( #14165 )
2021-08-30 11:05:13 -07:00
QMK Bot
9a888a5ec5
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:05:13 +00:00
peott-fr
557fce7a8e
[Keymap] Add peott-fr keymap for Kbd6x ( #14164 )
2021-08-30 11:04:42 -07:00
QMK Bot
5b4f63c45f
Merge remote-tracking branch 'origin/master' into develop
2021-08-30 18:04:21 +00:00
Vincent Vorholter
9d32cb68c3
[Keyboard] Changed ProductID on basketweav keyboards ( #14162 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Vince Vorholter <vince@28east.co.za>
2021-08-30 11:03:53 -07:00