5d7ad69cd8
[Bugs] Fix VIA Compiles ( #12186 )
2021-03-12 13:50:15 -08:00
f279f4731b
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 21:48:20 +00:00
b8ad5f4249
Document LED physical location index for Planck and Preonic ( #12147 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-13 08:47:45 +11:00
d95df57297
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 07:44:20 +00:00
63f9e7ee86
Enable default features on VIA keymap for Lily58 ( #12185 )
...
Co-authored-by: filterpaper <filterpaper@localhost>
2021-03-12 18:43:31 +11:00
71f8f5048b
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 07:04:21 +00:00
88dce24375
Remove hex_to_keycode and move tap_random_base64 to send_string.c ( #12079 )
2021-03-12 18:03:44 +11:00
183c49f352
Merge remote-tracking branch 'origin/master' into develop
2021-03-12 06:34:50 +00:00
ea2a7c5ea4
ChibiOS conf upgrade for boston ( #12170 )
...
boston - 8bded9dabff58de6febd927d4ad976bb743696a3
2021-03-12 17:33:48 +11:00
97268662fe
Merge remote-tracking branch 'origin/master' into develop
2021-03-11 18:02:34 +00:00
0ad7833ca4
[Keymap] arkag Userspace updated ( #12183 )
...
Co-authored-by: Alex <alex@turncommerce.com>
2021-03-11 10:01:53 -08:00
b113772bb1
Merge remote-tracking branch 'origin/master' into develop
2021-03-10 22:48:53 +00:00
790f94533c
Refactor to use led config - Part 6 ( #12115 )
...
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* Convert to config
* revert changes
2021-03-10 22:48:18 +00:00
40c7ecfdea
Move gpio wait logic to wait.h ( #12067 )
2021-03-10 22:47:36 +00:00
2e24cfadb7
Remove `FUNC()` ( #12161 )
2021-03-11 05:21:28 +11:00
bb01ea3809
Merge remote-tracking branch 'origin/master' into develop
2021-03-10 05:18:14 +00:00
9089244db7
Add VIA support to doodboard/duckboard_r2 ( #12028 )
...
* Update R1 keymap and config
* Add duckboard R2
* Add VIA support for duckboard R2
* Set bootmagic lite row and column
* Update config.h
* Update keyboards/doodboard/duckboard/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-09 21:17:35 -08:00
25ec655162
Merge remote-tracking branch 'origin/master' into develop
2021-03-09 21:37:12 +00:00
aed8bace97
Fix typo in `get_git_version()` ( #12182 )
2021-03-10 08:36:39 +11:00
4496983233
Merge remote-tracking branch 'origin/master' into develop
2021-03-09 18:37:19 +00:00
4f5e0dd325
Add BFO-9000 info.json ( #12179 )
2021-03-09 10:36:38 -08:00
7b91af780a
Merge remote-tracking branch 'origin/master' into develop
2021-03-09 16:07:25 +00:00
6d8d20774f
improve detection of community layout support
2021-03-09 08:04:07 -08:00
9155b59e1a
LED Matrix: decouple from Backlight ( #12054 )
2021-03-08 16:55:00 +11:00
b0069c5c05
Begin the process of deprecating bin/qmk in favor of the global cli ( #12109 )
...
* Begin the process of deprecating bin/qmk in favor of the global cli
* Correctly set the qmk bin
2021-03-07 19:10:03 -08:00
7d45b7f269
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 23:34:13 +00:00
2aa38f5bd3
[Keymap] add crkbd/keymaps/armand1m ( #12098 )
2021-03-07 15:33:40 -08:00
43b47495e3
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 20:20:33 +00:00
75fd6bd269
[Keyboard] Capsunlocked CU80 - added variant's for RGB matrix support ( #12019 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-07 12:20:02 -08:00
b15288fb87
trivial change to trigger api update
2021-03-07 12:01:13 -08:00
e6e572bf5c
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 16:15:38 +00:00
86e6be342c
minor change to trigger api update
2021-03-07 08:14:43 -08:00
37d1fa53e0
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 06:40:08 +00:00
8556068534
Require `BOOTLOADER = qmk-dfu` for `:bootloader` target ( #12136 )
2021-03-07 17:39:35 +11:00
f48d95b415
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 05:26:50 +00:00
0763269ec5
fix CI job: api-data->api_data
2021-03-06 21:26:07 -08:00
5fb16e3442
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 05:22:57 +00:00
01b8ef39f5
Remove stale references to "handwired/ferris"
...
The code was moved to the "ferris" directory.
Fixes the following commands:
```
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/default/keymap.json
qmk compile ~/qmk_firmware/keyboards/ferris/keymaps/pierrec83/keymap.json
```
Addresses this issue:
https://github.com/pierrechevalier83/ferris/issues/5
2021-03-06 21:22:24 -08:00
d170a1c0e2
Merge remote-tracking branch 'origin/master' into develop
2021-03-07 05:18:28 +00:00
08e512a273
upload api data to spaces
2021-03-06 21:17:55 -08:00
fbd6b28633
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 23:57:11 +00:00
1cbf1c681a
Enforce minimum versions for jsonschema and MILC ( #12141 )
2021-03-06 15:56:45 -08:00
56d5131715
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 23:13:57 +00:00
9b85b1b638
[Keyboard] bm68rgb ( #12128 )
...
* add support for Bbm68rgb
* pull request changes filled
* pull request changes filled(this time for real)
* added new line to files that did not have new lines at end of file
* updated modifier keys for rgb effects
* Update keyboards/bm68rgb/readme.md
* Apply suggestions from code review
* Apply suggestions from code review
* add nkro suppport
* Update keyboards/bm68rgb/rules.mk
* modified keymap to better correspond to physical layout
* updated comment style
2021-03-06 15:13:20 -08:00
bee226b3ee
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 21:04:21 +00:00
788b1854b4
[Keyboard] add Soup10 support ( #11921 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-03-06 13:03:48 -08:00
6e19dbc923
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 18:57:16 +00:00
86e28b4db8
Adding Zodiark Split keyboard ( #11837 )
...
* Adding Files for Zodiark
* zodiark.h and keymap.c layout corrections
* Apply suggestions from code review
Applied all suggestions from zvecr.
Co-authored-by: Joel Challis <git@zvecr.com>
* Applied all suggestions from fauxpark
Co-authored-by: Ryan <fauxpark@gmail.com>
* Defined matrix driver
* Update keymap with GPL2
* Added GPL2+ to All keymap.c, cleaned up config.h, and removed the rgbmatrixwip keymap
* Apply suggestions from code review
Removed the two lines from the config.h and changed to the smaller resolution picture on the Readme.
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
* Added VIA keymap
* Corrected VIA Keymap oled.c
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-03-06 18:56:48 +00:00
cde4165097
Merge remote-tracking branch 'origin/master' into develop
2021-03-06 08:50:30 +00:00
9c94de070a
Remove ifdefs for UC and X/XP too ( #12131 )
2021-03-06 19:50:01 +11:00
Xelus22
QMK Bot
Albert Y
Ryan
Nick Brassel
Alexander Kagno
Joel Challis
somepin
Danny
Zach White
Armando Magalhães
maz0r
Pierre Chevalier
peepeetee
icesoup
Aleblazer