6b0ed6a29b
Merge remote-tracking branch 'origin/master' into develop
2021-01-19 02:12:14 +00:00
1dc466d22b
New keymaps with KC_LGUI on another key and scroll with encoder ( #11479 )
...
* feat(kyria): new keymaps with KC_LGUI on another key
add also possibility to scroll with encoder and finally play with olded
screen to replace default kyria logo by Magic the Gathering mana color
icon.
* Update keyboards/kyria/keymaps/benji/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* add magic logo
* add mouse button
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-19 13:11:45 +11:00
bfdedbe5b2
Merge remote-tracking branch 'origin/master' into develop
2021-01-19 02:10:55 +00:00
993982a985
[Keymap] Add peej userspace and keymaps ( #11332 )
2021-01-19 13:10:28 +11:00
732e80e3fe
Merge remote-tracking branch 'origin/master' into develop
2021-01-19 02:09:28 +00:00
01bc8e3b52
Cannonkeys Onyx: Configurator/QMK CLI improvements ( #11603 )
...
* info.json: human-friendly formatting
* info.json: correct key object order
* info.json: replace Unicode characters
They don't play nice with `qmk info -l`.
* info.json: correct keyboard dimensions
2021-01-19 13:08:57 +11:00
2f18993905
Merge remote-tracking branch 'origin/master' into develop
2021-01-19 01:22:57 +00:00
dfb8a29718
Caps Unlocked CU65 layout macro fixes ( #11606 )
2021-01-19 12:22:26 +11:00
94746b6557
Fixup builds on develop branch. ( #11600 )
2021-01-19 12:18:57 +11:00
814c4cb56d
Merge remote-tracking branch 'origin/master' into develop
2021-01-18 18:59:13 +00:00
3bb1897bdc
[Keyboard] Monstargear XO87 RGB Hot-Swap PCB ( #11555 )
...
* Support for Monstargear XO87 Hot-Swap PCB
* Remove manufacturer from product line
* Removed alternate bootloaders
* Updated info.json
* Missed RGB_DISABLE_WHEN_USB_SUSPENDED in config.h
* Delete kb.h
* Update rgb.h
* Update rules.mk
* Add files via upload
* Delete kb.h
* Update keymap.c
* Update config.h
* Update rgb.c
* Add via RGB support
* Update info.json
* Update readme.md
* Update readme.md
* Update config.h
* Update rgb.h
* Update config.h
* Mirror factory layout
* Mirror factory layout
* Update rgb.h
* Update keyboards/xo87/rgb/rgb.c
* Update rgb.c
* Update keyboards/xo87/rgb/config.h
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/keymaps/via/keymap.c
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/keymaps/via/keymap.c
* Update config.h
* Update keyboards/xo87/rgb/readme.md
* Update keyboards/xo87/rgb/readme.md
* Update keyboards/xo87/rgb/readme.md
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* Update keyboards/xo87/rgb/rules.mk
* remove deprecated action_get_macro()
* rearrange layout per request
* rearrange layout per request
* Update keyboards/xo87/rgb/rgb.h
* Update keyboards/xo87/rgb/keymaps/default/readme.md
* Update keyboards/xo87/rgb/readme.md
* Bugfix for RGB Matrix
* Bugfix for RGB Matrix
* Moved to new subdirectory and updated build commands to reflect changes
* Remove old files
2021-01-18 10:58:09 -08:00
ffaaadc270
Merge remote-tracking branch 'origin/master' into develop
2021-01-18 12:47:01 +00:00
03bacec87d
Naked64 Configurator update and rework ( #11568 )
2021-01-18 23:45:56 +11:00
e0e67df933
ChibiOS conf migrations... take 9 ( #11598 )
...
* ChibiOS conf upgrade for akegata_denki/device_one
akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f
* ChibiOS conf upgrade for ergodox_stm32
ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f
* ChibiOS conf upgrade for jm60
jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef
* ChibiOS conf upgrade for matrix/m20add
matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209
* ChibiOS conf upgrade for matrix/noah
matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf
* ChibiOS conf upgrade for nibiria/stream15
nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82
* ChibiOS conf upgrade for xiaomi/mk02
xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18 13:16:59 +11:00
82a875056c
Merge remote-tracking branch 'origin/master' into develop
2021-01-18 01:50:00 +00:00
cc3f2e2865
Remove `DESCRIPTION`, E-G ( #11574 )
2021-01-18 12:49:25 +11:00
31c57aab35
`qmk cformat`
2021-01-17 10:19:56 -08:00
e702c7f1b4
Keep track of last matrix activity. ( #11552 )
...
Co-authored-by: Dasky <daskygit@users.noreply.github.com>
Co-authored-by: Dasky <daskygit@users.noreply.github.com>
2021-01-18 05:01:38 +11:00
d6d15b91f3
Merge remote-tracking branch 'origin/master' into develop
2021-01-17 17:46:01 +00:00
e524e0a397
Add syscall fallbacks to ChibiOS builds ( #11573 )
...
* Add fallback syscalls to ChibiOS builds that are present but able to be overridden as appropriate.
* Modified location to be ChibiOS-specific.
2021-01-18 04:45:21 +11:00
3a06e88566
Merge remote-tracking branch 'origin/master' into develop
2021-01-17 17:33:59 +00:00
da40242dbc
Generate version.h when compiling json files ( #11581 )
...
* generate version.h when compiling json files
* make flake8 happy
* fix formatting and verbose
* quiet up the compile output
2021-01-17 17:33:29 +00:00
98b1cccd12
Merge remote-tracking branch 'origin/master' into develop
2021-01-17 17:04:28 +00:00
f0f6174136
[Keyboard] add Stream15 keyboard ( #11515 )
...
* add keyboard Stream15
* committted changes as suggested by drashna
* committed further changes as suggested
* Update info.json
removed excessive comma
* Update keyboards/nibiria/stream15/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/nibiria/stream15/keymaps/via/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/nibiria/stream15/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
* resolved 2 more issues
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-17 09:03:53 -08:00
f08a11fad3
ChibiOS conf upgrade for hub20 ( #11588 )
...
hub20 - 089b49b233c4e9b8ab643c6b338c91f5c3136e32
2021-01-17 13:53:03 +00:00
5abe666749
Merge remote-tracking branch 'origin/master' into develop
2021-01-16 15:21:06 -08:00
d9785ec313
Improve the compile and flash subcommands ( #11334 )
...
* add support for --clean to compile and flash
* compile standalone JSON keymaps without polluting the tree
* Add support for passing environment vars to make
* make flake8 happy
* document changes to qmk compile and flash
* add -e support to json export compiling
* Fix python 3.6
* honor $MAKE
* add support for parallel builds
2021-01-16 15:13:04 -08:00
f35b1127fa
Merge remote-tracking branch 'origin/master' into develop
2021-01-15 21:50:23 +00:00
c628408688
New Keyboard: walletburner/cajal ( #10458 )
...
* adding alpha variants
* adding cajal layouts
* adding V2 PCB support
adding additional layouts for new PCB version, and correecting incorrect image in info file
* Cleanup master -- remove alpha9
* Cleanup master -- remove g4m3ralpha
* Cleanup master -- remove cajal & sl40
* Master cleanup -- re-add sl40
* Master cleanup -- correct SL40 image
* New Keyboard: walletburner/cajal
* Added license attribution to *.{c,h} files
* Update keyboards/walletburner/cajal/config.h
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update keyboards/walletburner/cajal/keymaps/ortho/keymap.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Rename 'ortho' keymap to 'default_ortho'
* Update keyboards/walletburner/cajal/cajal.c
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update readme.md
Adding bootloader instructions.
Co-authored-by: worldspawn00 <mcmancuso@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-15 16:49:49 -05:00
296552e358
Merge remote-tracking branch 'origin/master' into develop
2021-01-15 21:43:07 +00:00
3d70766327
Add BGR byte order for WS2812 drivers ( #11562 )
...
* add byte order bgr for ws2812
* update docs for driver change
* Update ws2812_driver.md
* Update docs/ws2812_driver.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-16 08:42:30 +11:00
bd2764cccc
Merge remote-tracking branch 'origin/master' into develop
2021-01-15 20:56:59 +00:00
0bf0977c02
Modify my keymap ( #11407 )
2021-01-15 15:56:21 -05:00
6525551357
Merge remote-tracking branch 'origin/master' into develop
2021-01-15 20:41:00 +00:00
fe14907039
Adds VIA support for the KPRepublic's BM60 Poker ( #11267 )
...
* WIP working on new keymap
* tweaking keymap
* updated keymap
* cleaned up a little bit
* New preonic keymap
* my preonic keymap
* added mac layout
* preonic map update
* cleaning up old repo
* cleaning up to match upstream
* more cleanup
* removing old keymaps
* cleaned up commit history for bm60poker via support
* cleaned up via keymap
* fixed copywrite
Co-authored-by: Peter Peterson <ppeterson@noao.edu>
2021-01-15 15:40:26 -05:00
fef4ed568e
Merge remote-tracking branch 'origin/master' into develop
2021-01-15 08:26:36 +00:00
d72f5435fb
Afternoon Labs Breeze Rev0: Configurator key sequence fix ( #11550 )
...
* human-friendly formatting
* correct key order
2021-01-15 00:25:50 -08:00
ca7da3866d
Merge remote-tracking branch 'upstream/master' into develop
2021-01-15 18:34:12 +11:00
8cf5f72aad
Cutie Club Borsdorf: Configurator key sequence fix ( #11549 )
...
* human-friendly formatting
* correct key order (ISO Enter)
2021-01-14 23:26:30 -08:00
6009a91514
[Keyboard] Add cool836A 1_2 ( #11467 )
...
* 1st trial on 1_2
* remove keymaps/default/km_default.c
* fix cool836A.h
* fix keymap.c into 3x12
* rename to cool836a (not 'A')
* remove cool836A (not a)
* remove backslashes at keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* update keymap.c (add licence)
* Update keyboards/cool836a/keymaps/default/readme.md
removed "<br>" in line 2
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/keymaps/default/readme.md
remove "<br>" in line 4
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/keymaps/default/readme.md
remove "<br>" in line 8
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/cool836a/cool836a.h
remove cool836a.h line 30:36
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 22:27:21 -08:00
84e2f1ec17
Adafruit BLE cleanups ( #11556 )
2021-01-15 14:32:00 +11:00
f519a9908e
arm_atsam: temporarily lower raw HID endpoint/report size ( #11554 )
2021-01-15 14:11:04 +11:00
ab375d3d07
Revert "Keep track of last matrix activity ( #10730 )"
...
This reverts commit 79d1db3324
2021-01-15 06:55:07 +11:00
f1b06d0ae7
[Keymap] Adds ymdk/ymd09 andys8 layout ( #11320 )
...
Custom layout for macropad. It shows the usage of macros with unicode,
and other layouts (ISO-DE) with unicode, emojis, and git commands.
2021-01-14 11:29:22 -08:00
345a041cf5
allow customizing decrease delay of rgb heatmap ( #11322 )
...
* allow customizing decrease delay of rgb heatmap
* rename rgb typing heatmap decrease delay variable
* address review comments
* nix-shell: add clang-tools required for formatting the C code
* heatmap: use real timer to track decrement rate
* heatmap: fix ifndef var name typo
* heatmap: add docs
* Update docs/feature_rgb_matrix.md
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-01-14 11:29:00 -08:00
e9f73e5454
[Keymap] Add domnantas lily58 keymap ( #10910 )
...
* Initialize domnantas layout
* Update oled status display
* Layout and oled changes
* Updates to keymap
* Add F keys and page moves
* Add media keys, rearrange home and end
* Add instructions
* Swap backspace and enter
* Remove unnecesary Enter keymap
* - Change display timeout
- Update minus sign to work on both English and Lithuanian layouts
* Add copyright header
* Replace static strings with PSTR
* Update keyboards/lily58/keymaps/domnantas/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lily58/keymaps/domnantas/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lily58/keymaps/domnantas/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lily58/keymaps/domnantas/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/lily58/keymaps/domnantas/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-14 11:04:30 -08:00
f325bd6eb2
Remove `DESCRIPTION`, B-D ( #11513 )
2021-01-15 05:00:04 +11:00
4b44452900
Merge remote-tracking branch 'origin/master' into develop
2021-01-14 16:58:07 +00:00
3525a61baf
Updated documentation for new BDN9 board revisions ( #11380 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Danny <nooges@users.noreply.github.com>
2021-01-14 11:57:30 -05:00
749d9f2227
Merge remote-tracking branch 'origin/master' into develop
2021-01-14 07:08:25 +00:00
QMK Bot
Benjamin Garcia
Paul James
James Young
Nick Brassel
datafx
Ryan
Zach White
nibiria
ridingqwerty
kb-elmo
Reibl János Dániel
Peter Peterson
Ohashi
Andy
André Silva
Domantas
Nick Blyumberg