mg/qmk_sweep_skeletyl
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
18057 commits 9 branches 0 tags 294 MiB
Commit graph

10081 commits

Author SHA1 Message Date
Ananya Kirti
85b052bdd4
[Keyboard] add support for Bobpad (#13989) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-11 14:36:58 -07:00
QMK Bot
0a57d55eeb Merge remote-tracking branch 'origin/master' into develop 2021-09-11 14:34:19 +00:00
John Mueller
22dd68520b
[Keyboard] Add 3keyecosystem and 2key2 keyboard (#14023) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-11 07:33:48 -07:00
QMK Bot
52b017b593 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 14:33:43 +00:00
alittlepeace
99d465bee0
[keyboard] Add hotswap YMDK Wings (#14176) 
* Add files via upload

* Update keyboards/ymdk/wingshs/readme.md

Co-authored-by: Joel Challis <git@zvecr.com>

* Delete wingshs.json

* Update keyboards/ymdk/wingshs/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/ymdk/wingshs/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/ymdk/wingshs/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-11 07:33:13 -07:00
QMK Bot
3540d374fc Merge remote-tracking branch 'origin/master' into develop 2021-09-11 14:31:54 +00:00
john-ezra
5eb500a877
[Keymap] Add john-ezra Kyria Keymap (#14338) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-11 07:31:24 -07:00
QMK Bot
e1540a41b7 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 07:32:58 +00:00
Seth
35bff470f7
[Keyboard] Update rocketboard_16 with *most* of its final features (#12537) 2021-09-11 00:32:29 -07:00
QMK Bot
a27df035ee Merge remote-tracking branch 'origin/master' into develop 2021-09-11 06:25:03 +00:00
rhmokey
5f94191075
[Keyboard] Add mokey63 (#14357) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-10 23:24:37 -07:00
QMK Bot
40fa562fb1 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 06:01:41 +00:00
Sebastian Laube
9630a7bde2
[Keyboard] added KPs BM43 RGB board (#13888) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-10 23:01:14 -07:00
QMK Bot
b49b3b3dcc Merge remote-tracking branch 'origin/master' into develop 2021-09-11 05:50:19 +00:00
AnthonyNguyen168
047291728d
[Keyboard] New PCB Canary60RGB from CanaryTeam (#14321) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-10 22:49:45 -07:00
QMK Bot
fcda0a7ff0 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 04:59:55 +00:00
yfuku
46f15cd1a5
[Keyboard] owl8 bugfix (#14020) 2021-09-10 21:59:28 -07:00
QMK Bot
f72a358931 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 04:21:16 +00:00
AKiwi92
d0b1d9f548
[Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ash <ash@splitpixel.co.uk>
 2021-09-10 21:20:43 -07:00
QMK Bot
a433ce36eb Merge remote-tracking branch 'origin/master' into develop 2021-09-11 03:52:49 +00:00
rarick
6213989c32
[Keymap] Add keymap for crkbd/rarick (#13240) 
* Added new keymap for crkbd/rarick

* Delete flash.sh

Deleted rarick crkbd flashing script, as it will not be used by most users.

* Applied feedback, and fixed build error caused by builder updates

* Update keyboards/crkbd/keymaps/rarick/config.h

Removed USE_MATRIX_I2C, no longer used.

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-10 20:52:17 -07:00
QMK Bot
0ca04e6852 Merge remote-tracking branch 'origin/master' into develop 2021-09-11 01:57:21 +00:00
Zac Moulton
d7747a2d70
[Keymap] moults31 userspace and keymaps (#12025) 2021-09-10 18:56:50 -07:00
QMK Bot
f197b30a47 Merge remote-tracking branch 'origin/master' into develop 2021-09-10 19:15:37 +00:00
Xelus22
759d1927f0
[Keyboard] Add RS60 (#14073) 
* initial rs60

* update

* remove

* Include rs60.h

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* List form readme.

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* change layout name

Co-authored-by: Joel Challis <git@zvecr.com>

* add layout

Co-authored-by: Joel Challis <git@zvecr.com>

* add license

Co-authored-by: Joel Challis <git@zvecr.com>

* 2021 update

Co-authored-by: Joel Challis <git@zvecr.com>

* add license

Co-authored-by: Joel Challis <git@zvecr.com>

* sigprof suggested changes

* Remove redundant define

Co-authored-by: Ryan <fauxpark@gmail.com>

* Fixup readme

Co-authored-by: Sergey Vlasov <sigprof@gmail.com>

* Update keyboards/xelus/rs60/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
 2021-09-10 20:14:39 +01:00
QMK Bot
b6a6217f85 Merge remote-tracking branch 'origin/master' into develop 2021-09-10 13:11:50 +00:00
Ryan
7277f1febe
Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375) 2021-09-10 14:11:17 +01:00
fauxpark
a7c972b329 Merge remote-tracking branch 'upstream/master' into develop 2021-09-10 17:36:17 +10:00
Ryan
d5cb7de5e4
Change USBasp and bootloadHID bootloaders to lowercase (#14354) 2021-09-10 17:17:54 +10:00
Zach White
c94cc1effa
Move non-assignment code to post_rules.mk (#14207) 
* 40percentclub/ut47: move non-assignment code to post_rules.mk

* converter/palm_usb: move non-assignment code to post_rules.mk

* converter/sun_usb: move non-assignment code to post_rules.mk

* dm9records/ergoinu: move non-assignment code to post_rules.mk

* ergotaco: move non-assignment code to post_rules.mk

* handwired/symmetric70_proto: move non-assignment code to post_rules.mk

* hhkb/ansi: move non-assignment code to post_rules.mk

* hhkb/jp: move non-assignment code to post_rules.mk

* lfkeyboards/lfk78: move non-assignment code to post_rules.mk

* lfkeyboards/lfk87: move non-assignment code to post_rules.mk

* lfkeyboards/lfkpad: move non-assignment code to post_rules.mk

* lfkeyboards/mini1800: move non-assignment code to post_rules.mk

* manta60: move non-assignment code to post_rules.mk

* mschwingen/modelm: move non-assignment code to post_rules.mk

* newgame40: move non-assignment code to post_rules.mk

* numatreus: move non-assignment code to post_rules.mk

* rgbkb/zen: move non-assignment code to post_rules.mk

* rgbkb/zen/rev2: move non-assignment code to post_rules.mk

* Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk"

This reverts commit cffaf0075c3c9b2473a660ba4af8835a9162311b.
 2021-09-09 21:37:31 -07:00
Zach White
d971020cd8
Fix number of elements in info.json does not match errors (#14213) 
* evyd13/atom47/rev3: best guess at fixing info.json

* evyd13/atom47: best guess at fixing info.json

* eyeohdesigns/sprh: best guess at fixing info.json

* handwired/unicomp_mini_m: best guess at fixing info.json

* lazydesigners/the60/rev2: best guess at fixing info.json

* melgeek/mj6xy: best guess at fixing info.json

* pizzakeyboards/pizza65: best guess at fixing info.json

* plx: best guess at fixing info.json

* rojectcain/vault45: best guess at fixing info.json

* sidderskb/majbritt/rev2: best guess at fixing info.json

* spacey: best guess at fixing info.json
 2021-09-09 21:33:23 -07:00
QMK Bot
e6ff638abf Merge remote-tracking branch 'origin/master' into develop 2021-09-10 03:36:14 +00:00
Ryan
7eea780a7d
Remove bootloader listings from rules.mk (#14330) 2021-09-10 13:35:46 +10:00
QMK Bot
504c00c2e1 Merge remote-tracking branch 'origin/master' into develop 2021-09-10 03:32:53 +00:00
Ryan
2cb9219a3e
Remove commented out BLUETOOTH_ENABLE rules (#14361) 2021-09-10 13:32:22 +10:00
QMK Bot
767836fb9c Merge remote-tracking branch 'origin/master' into develop 2021-09-09 17:03:21 +00:00
Uy Bui
2249963687
[Keyboard] Add custom pcb for Polaris (#14347) 
* [Keyboard] pcb for Polaris

* [Keyboard] pcb for Polaris: update  layout

* Update keyboards/wekey/polaris/info.json

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-09 10:02:45 -07:00
fauxpark
93387f8941 Merge remote-tracking branch 'upstream/master' into develop 2021-09-09 16:54:39 +10:00
Ryan
d6dd2e0d51
Fix CRLF in lyra/rev1 (#14360) 2021-09-09 16:50:52 +10:00
QMK Bot
4e8f064c27 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 06:35:29 +00:00
Malevolti
4c88f76be8
[Keyboard] add lyra (#13977) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 23:34:32 -07:00
QMK Bot
9ce3d1a7d4 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 05:23:52 +00:00
mechlovin
82ee9bd475
[Keyboard] Add Olly JF PCB (#14056) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 22:23:26 -07:00
QMK Bot
f03e78e888 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 02:45:20 +00:00
Felix Jen
cb4006c0b4
[Keymap] Fix Maker Keyboards Alexa Keymap (#14355) 2021-09-08 19:44:52 -07:00
QMK Bot
588a3afe40 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 02:14:37 +00:00
Ethan Yates
891ddd9a30
[Keyboard] Add 61Key (#14259) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 19:14:03 -07:00
QMK Bot
d961d8df83 Merge remote-tracking branch 'origin/master' into develop 2021-09-09 01:11:20 +00:00
Drashna Jaelre
853e56d080
[Keyboard] Minor tweaks to Work Board layout (#14351) 2021-09-08 18:10:43 -07:00
QMK Bot
8fa2a7ea2a Merge remote-tracking branch 'origin/master' into develop 2021-09-09 00:28:34 +00:00
Ryan
9e77cdf4e6
Bugfix for Joystick and JSON schema (#14295) 2021-09-09 10:27:58 +10:00
QMK Bot
60c985ac8e Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:58:10 +00:00
rhmokey
3f2a030de6
[Keyboard] Add new Mokey keyboard (#14329) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-08 16:57:43 -07:00
QMK Bot
cab0d7955f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:55:47 +00:00
Gastón Jorquera
d510f6afa9
[Keymap] Add Gaston's Lily58 custom keymap (#14334) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
 2021-09-08 16:55:12 -07:00
QMK Bot
24000ef2e1 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:53:13 +00:00
Drashna Jaelre
4294aa0f1e
[Keyboard] Tractyl Manuform - configuration updates (#14314) 
* [Keyboard] Tractyl Manuform - configuration updates

* Update readmes

* Add more details

* Fix issues with encoder pins

* Additional fixes for pin config

* Fix up some comments
 2021-09-08 16:52:43 -07:00
QMK Bot
983580322f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 23:03:20 +00:00
Keenan Brock
8f8411a98a
[Keyboard] Add VIA keymap for the reviung39 (#14234) 2021-09-08 16:02:50 -07:00
QMK Bot
38afc7e4cc Merge remote-tracking branch 'origin/master' into develop 2021-09-08 22:44:49 +00:00
Joel Challis
2e0659f7fd
Fixes for recent i2c migrations (#14352) 2021-09-08 15:44:18 -07:00
QMK Bot
9b3e973aa2 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 07:35:06 +00:00
jackytrabbit
9c175f1801
[Keyboard] Update VIA support for lazydesigners/the40 (#14240) 
Co-authored-by: Joel Challis <git@zvecr.com>
 2021-09-08 00:34:36 -07:00
QMK Bot
4164f4148b Merge remote-tracking branch 'origin/master' into develop 2021-09-08 06:54:03 +00:00
Gabriel Bustamante
541e101291
[Keymap] New keymap for bm40 (#14182) 2021-09-07 23:53:33 -07:00
QMK Bot
6482fb9911 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 04:07:40 +00:00
Rifaa Subekti
3ef01a3482
[Keyboard] add wang ergo (#14245) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-07 21:07:00 -07:00
QMK Bot
1498ecaa24 Merge remote-tracking branch 'origin/master' into develop 2021-09-08 03:24:22 +00:00
James Young
1ebaec96e7
Sneakbox Ava tidy-up (#14298) 2021-09-07 20:23:45 -07:00
QMK Bot
456f7019de Merge remote-tracking branch 'origin/master' into develop 2021-09-08 03:02:25 +00:00
IFo Hancroft
267ffb9914
[Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap (#14342) 2021-09-07 20:01:58 -07:00
QMK Bot
4ba8305a5c Merge remote-tracking branch 'origin/master' into develop 2021-09-08 01:54:23 +00:00
Drashna Jaelre
0b8d6df390
[Keyboard] Fix issues with 3w6 rev2 matrix (#14346) 2021-09-08 02:53:55 +01:00
QMK Bot
f6b0484f0f Merge remote-tracking branch 'origin/master' into develop 2021-09-08 01:23:43 +00:00
Joel Challis
60c5bd7b5e
handwired/dactyl - Refactor use of legacy i2c implementation (#14344) 2021-09-07 18:23:11 -07:00
QMK Bot
af19461a02 Merge remote-tracking branch 'origin/master' into develop 2021-09-07 15:35:32 +00:00
Joel Challis
04c0704b28
3w6 - Refactor use of AVR only I2C functions (#14339) 
* Refactor use of legacy i2c functions

* Align rev2

* Review fixes
 2021-09-07 16:35:13 +01:00
Joel Challis
e7a5c006d9
Refactor use of legacy i2c implementation (#14341) 2021-09-07 16:34:59 +01:00
QMK Bot
c669c43769 Merge remote-tracking branch 'origin/master' into develop 2021-09-07 15:33:58 +00:00
Joel Challis
2d6635214a
ergodone - Refactor use of legacy i2c implementation (#14340) 
* Refactor use of legacy i2c implementation

* copy-paste error
 2021-09-07 16:33:29 +01:00
QMK Bot
f98f23d6d6 Merge remote-tracking branch 'origin/master' into develop 2021-09-06 19:45:19 +00:00
shiftux
1dbe4e7dd0
[Keyboard] Redox media (#13084) 
* adding a new revision 'media' to the redox keyboard

* readme update

* encoder fix

* video link

* drashna change requests

* removing SPLIT_USB_TIMEOUT

* intermediate rename

* lowercase

* drashna comments

* include if defined KEYBOARD_redox_media

* lowercase readme, tmp step

* lowercase readme

* drashna changes

* more drashna comments

* readme update

* readme update

* fauxpark and drashna comments

* fauxpark comments

* Update keyboards/redox/media/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-06 12:44:39 -07:00
QMK Bot
943e413f76 Merge remote-tracking branch 'origin/master' into develop 2021-09-06 13:49:44 +00:00
Monksoffunk
85a14ac25b
[Keyboard] Zinc: fix RGBLED_NUM bug (#13287) 2021-09-06 06:49:09 -07:00
QMK Bot
d72f29556a Merge remote-tracking branch 'origin/master' into develop 2021-09-05 22:36:16 +00:00
Drashna Jaelre
1e1be4c229
[Bug] Fix compile issues for boards with custom matrix (#14323) 2021-09-05 23:35:42 +01:00
QMK Bot
147289e173 Merge remote-tracking branch 'origin/master' into develop 2021-09-05 20:37:03 +00:00
Joel Challis
8d6d8cfadf
Tidy up defines within STM EEPROM emulation (#14275) 
* Tidy up defines within stm eeprom emulation

* Fix tests

* Resolve todo

* Still use page notion in clear

* Remove more f4 refs
 2021-09-05 21:36:43 +01:00
Ryan
fe6d6cf76d
Remove empty override functions (#14312) 
* Remove empty override functions, 0-9

* Remove empty override functions, A-D

* Remove empty override functions, E-H

* Remove empty override functions, handwired

* Remove empty override functions, I-L

* Remove empty override functions, M-P

* Remove empty override functions, Q-T

* Remove empty override functions, U-Z
 2021-09-05 21:36:31 +01:00
QMK Bot
a66e8c884f Merge remote-tracking branch 'origin/master' into develop 2021-09-05 16:06:24 +00:00
kb-elmo
0471429c01
[Keyboard] Fix rotary encoder function for Voice65 (#14316) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-05 09:05:55 -07:00
QMK Bot
e4fcdf57cf Merge remote-tracking branch 'origin/master' into develop 2021-09-04 02:02:43 +00:00
Albert Y
c9262cf7f8
Enable extra keys for Technik ortho and stagger (#14282) 
* Extra keys for technik ortho

* Extra keys for technik staggered

Co-authored-by: filterpaper <filterpaper@localhost>
 2021-09-04 03:02:15 +01:00
QMK Bot
d272bf2dc2 Merge remote-tracking branch 'origin/master' into develop 2021-09-03 20:03:43 +00:00
James Young
b15bd128a5
FJLabs Ready100 Configurator Fixes (#14291) 
* grid-align keycodes; use short-form keycodes

No logic change.

* info.json: correct layout macro reference

* info.json: correct LAYOUT_64key data

Removes an extra key from the layout data.

* 64_ansi Community Layout support

* rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility)
* add LAYOUTS = 64_ansi to rules.mk

* remove width and height keys from info.json
 2021-09-03 21:03:15 +01:00
QMK Bot
9f17f9b2e1 Merge remote-tracking branch 'origin/master' into develop 2021-09-03 20:02:20 +00:00
James Young
06c89e8abf
Naiping NPhhkb: 60_tsangan_hhkb Community Layout support (#14292) 
* 60_tsangan_hhkb Community Layout support

* rename LAYOUT to LAYOUT_60_tsangan_hhkb
* add LAYOUTS = 60_tsangan_hhkb to rules.mk

* correct maintainer field in info.json

* remove width and height keys from info.json

* fix GitHub account link on readme
 2021-09-03 21:01:50 +01:00
QMK Bot
88bb29fb17 Merge remote-tracking branch 'origin/master' into develop 2021-09-03 20:00:59 +00:00
James Young
90909fbaf7
takashicompany/endzone34: correct QMK Configurator key sequence (#14290) 
* update info.json formatting

* convert tabs to spaces
* apply human-friendly formatting

* correct Configurator key sequence

* remove width and height keys from info.json
 2021-09-03 21:00:29 +01:00
QMK Bot
f95706810a Merge remote-tracking branch 'origin/master' into develop 2021-09-03 18:48:40 +00:00
James Young
5f6d9913f8
OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support (#14293) 
* 65_ansi_blocker Community Layout support

* rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility)
* add LAYOUTS = 65_ansi_blocker to rules.mk

* remove width and height keys from info.json
 2021-09-03 11:48:10 -07:00
QMK Bot
337be283ca Merge remote-tracking branch 'origin/master' into develop 2021-09-03 16:10:08 +00:00
Ryan
8574bf20d3
Remove more cruft in keyboard files (#14288) 2021-09-03 17:09:30 +01:00
QMK Bot
5bb9da6bca Merge remote-tracking branch 'origin/master' into develop 2021-09-02 17:50:50 +00:00
jhauh
a01057d19d
[Keymap] Update iris fluffactually keymap (#14265) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-02 10:50:17 -07:00
QMK Bot
751dc35546 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 17:50:12 +00:00
Drashna Jaelre
956cf8d7bf
[Keyboard] Work Louder board fixup (#14247) 
* [Keyboard] Add some last minute tweaks to Work board

* Additional fixes

* Fix rgb pin

* Fix ws2812 hackery

* additional led tweaks

* Add indicator LEDs

* fix bootmagic settings

* Fix up RGB stuff

* Limit power draw for entire board

* fixup lights and such

* change LED order on loop

* Fix indicators if via is not enabled

* Enable Sleep for rgb matrix

* Even more LED tweaks

* Final tweaks?

* Tweak keycodes
 2021-09-02 10:49:44 -07:00
QMK Bot
d68d34644a Merge remote-tracking branch 'origin/master' into develop 2021-09-02 17:18:08 +00:00
James Young
d36a7c512d
PistachioPro: correct Configurator key sequence (#14277) 
* info.json: apply human-friendly formatting

* correct LAYOUT key sequence

Moves the Enter key object to the correct place in sequence.
 2021-09-02 10:17:35 -07:00
QMK Bot
d8a2142f24 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 17:10:14 +00:00
James Young
ebfa7e14f3
Matrix Falcon info.json fixes (#14273) 
* apply human-friendly formatting to info.json

* update key labels; correct maintainer field

* add LAYOUT_all data to info.json

* remove width and height keys from info.json (per fauxpark)

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-09-02 18:09:38 +01:00
QMK Bot
c2da0da1dc Merge remote-tracking branch 'origin/master' into develop 2021-09-02 17:09:13 +00:00
James Young
0290dd3547
Yoichiro Lunakey Macro: correct Configurator key sequence (#14276) 
* apply human-friendly formatting to info.json

* correct Configurator key sequence
 2021-09-02 18:08:35 +01:00
QMK Bot
0ed4002c19 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 04:13:12 +00:00
jonavin
98a2e9dc0e
[Keymap] new murphpad landscape keymap with encoder enhanced functions (#14103) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonavin <=>
 2021-09-01 21:12:57 -07:00
peott-fr
e056ae58a0
[Keymap] Fine-tuning Nyquist keymap. (#14269) 2021-09-01 21:12:15 -07:00
QMK Bot
98436577d7 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 04:09:36 +00:00
Drashna Jaelre
37aef4ebe1
[Keymap] Fix Drashna Keymap issues missed before Develop merge (#14271) 2021-09-01 21:08:58 -07:00
QMK Bot
cfedd3054e Merge remote-tracking branch 'origin/master' into develop 2021-09-02 03:51:21 +00:00
James Young
c1e5c920a9
naiping/np64: 64_ansi Community Layout support and codebase touch-up (#14264) 2021-09-01 20:50:44 -07:00
QMK Bot
e597469964 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 03:47:31 +00:00
James Young
b55154fb0a
neson design/n6: Extended Community Layout Support and Layout Macro Fix (#14266) 2021-09-01 20:47:28 -07:00
James Young
c0eab2a504
wuque/serneity65: Layout Macro rework and Configurator fix (#14267) 2021-09-01 20:46:53 -07:00
QMK Bot
f77602b8fb Merge remote-tracking branch 'origin/master' into develop 2021-09-02 03:44:58 +00:00
hvp
cb53c4fd41
[Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace (#14187) 2021-09-01 20:44:36 -07:00
peott-fr
872414f454
[Keymap] Add peott-fr H87 keymap (#14232) 2021-09-01 20:44:12 -07:00
QMK Bot
7847acdded Merge remote-tracking branch 'origin/master' into develop 2021-09-02 03:43:04 +00:00
jonavin
b6ca21c65c
[Keymap] Jonavin keymap gmmk pro (#14220) 
add rgb nightmode and optional colemak layer 

Co-authored-by: Jonavin <=>
 2021-09-01 20:42:31 -07:00
QMK Bot
b0104e99a5 Merge remote-tracking branch 'origin/master' into develop 2021-09-02 03:41:44 +00:00
Christian Eiden
cded3b7582
[Keymap] own scylla keymap (#14224) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-09-01 20:41:17 -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
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
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
Zach White
596c4a1f87
Remove bin/qmk (#14231) 
* Remove the bin/qmk script

* remove bin/qmk from workflows
 2021-08-29 16:50:22 -07:00
peott-fr
13a2da973f
Nyquist (#14202) 
* adding my Nyquist keymap

* Updating Nyquist keymap with licensing.

* Cleaning-up and improving Nyquist keymap.

* Cleaning-up and improving Nyquist keymap.
 2021-08-29 22:52:49 +01:00
J.Flanagan
ef7fdee6c8
[Keyboard] Add Viktus SP Mini (#14069) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-29 12:18:56 -07:00
Trent Hoh
f87cd8e8a0
[Keyboard] Corrected layout for np24 by YMDK (#14096) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-29 04:09:43 -07:00
peott-fr
94d7635a4a
[Keymap] My Prime E keymap (#14117) 2021-08-29 04:08:23 -07:00
Weirdo
5d5668c3f8
[Keyboard] Add kelownaRGB64 (#14141) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-29 04:07:54 -07:00
Takeshi ISHII
9afc64cd61
[Keyboard] fix compile error make helix/rev2/sc:all (#14214) 2021-08-29 15:06:00 +09:00
QMK Bot
7e1634e2a6 Merge remote-tracking branch 'origin/master' into develop 2021-08-26 17:50:09 +00:00
jackytrabbit
ff65185dec
Add support for lazydesigners/cassette8 (#14145) 
* Add support for lazydesigners/cassette8

Add support for lazydesigners/cassette8

* Update keyboards/lazydesigners/cassette8/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/lazydesigners/cassette8/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/lazydesigners/cassette8/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/lazydesigners/cassette8/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/lazydesigners/cassette8/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/lazydesigners/cassette8/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/lazydesigners/cassette8/info.json

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
 2021-08-26 18:49:36 +01:00
QMK Bot
a13b0d8a6c Merge remote-tracking branch 'origin/master' into develop 2021-08-26 17:47:28 +00:00
jpuerto96
3fce5e6912
New Keyboard - V4n4g0rth0n (#14152) 
* General: Initial commit for v4n4g0rth0n

* Remove unecessary things|

* General: Fix info.json

* Finalize changes

* Update keyboards/v4n4g0rth0n/config.h

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/v4n4g0rth0n/v1/rules.mk

Co-authored-by: Joel Challis <git@zvecr.com>

* Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/v4n4g0rth0n/v4n4g0rth0n.h

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/v4n4g0rth0n/v2/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/v4n4g0rth0n/v1/keymaps/default/keymap.c

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-26 18:45:48 +01:00
Joel Challis
87cdb1cf9a
Update readme files (#14172) 2021-08-26 16:53:24 +01:00
QMK Bot
6d646880a4 Merge remote-tracking branch 'origin/master' into develop 2021-08-26 11:38:28 +00:00
kb-elmo
edf35615cf
Skeletn87 - Fix RGB pin (#14170) 
* add Skeletn87

* update skeletn87 files

* update skeletn87 soldered

* update readme image

* update readme (again)

* fix skeletn87 indicator LEDs

* fix led pin for production PCB
 2021-08-26 12:37:55 +01:00
QMK Bot
2bc978437e Merge remote-tracking branch 'origin/master' into develop 2021-08-25 23:56:39 +00:00
Charles
ee3a1133f1
[keyboard] Add 0x3E (#14088) 
* Add 0x3E - default config

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Apply suggestions from code review 2

Firmware size optimization

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Rename files as per project guidelines + remove empty

* Update link in readme.md

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-26 00:56:09 +01:00
QMK Bot
0c97bc5179 Merge remote-tracking branch 'origin/master' into develop 2021-08-25 23:40:04 +00:00
8bits4ever
4c5334cb9e
[converter/a1200] Changing layout macro reference info.json (#14143) 
* Rename keyboards/converter/a1200/config.h to keyboards/converter/a1200/teensy2pp/config.h

* Rename keyboards/converter/a1200/rules.mk to keyboards/converter/a1200/teensy2pp/rules.mk

* Create dummy

* Add files via upload

* Delete dummy

* Update readme.md

* Update info.json
 2021-08-26 00:39:34 +01:00
QMK Bot
329c130202 Merge remote-tracking branch 'origin/master' into develop 2021-08-25 19:04:06 +00:00
MechMaster48
89f2b9486f
[Keymap] mechmaster48 keymap for OLKB Preonic rev3 (#14137) 2021-08-25 12:03:27 -07:00
QMK Bot
3855713ca0 Merge remote-tracking branch 'origin/master' into develop 2021-08-24 22:10:04 +00:00
Albert Y
bb1b822247
[Keyboard] Update Technik ortholinear RGB matrix points (#14124) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-08-24 15:09:26 -07:00
Joel Challis
622c3cac3a
Fix merge artifacts (#14146) 2021-08-24 17:18:25 +01:00
QMK Bot
2827a3cf75 Merge remote-tracking branch 'origin/master' into develop 2021-08-24 15:44:36 +00:00
Yoichiro Tanaka
b4867e1600
[Keyboard] Add yoichiro/lunakey_macro (#13849) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-24 08:44:00 -07:00
Drashna Jael're
e3b68ddfe8
Merge remote-tracking branch 'origin/master' into develop 2021-08-24 07:32:31 -07:00
GG
097e85e930
[Keyboard] Add serneity65 (#13889) 2021-08-24 02:50:56 -07:00
Xelus22
c4a2dc9a2d
fix (#14142) 2021-08-24 19:39:24 +10:00
Christian Sandven
3ef978cb13
[Keyboard] Fix keyprez qmk configurator (#14119) 2021-08-24 01:54:17 -07:00
kb-elmo
a4aa6ccf7b
[Keyboard] Add QEZ keyboard (#14131) 2021-08-24 01:49:50 -07:00
Albert Y
b8c74d6b5d
[Keyboard] Update Technik staggered RGB matrix points (#14125) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-08-24 01:49:13 -07:00
stickandgum
eaad654798
[Keymap] Fixed GMMK Pro -> stickandgum keymap readme.md (#14123) 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-08-24 01:48:35 -07:00
Rifaa Subekti
e1c264f579
[Keyboard] Update info.json for ocean/gin_v2 (#14121) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-24 01:42:23 -07:00
Drashna Jaelre
bc239cd520
[Keymap] Drashna keymap fixups (#14140) 2021-08-24 01:37:14 -07:00
Drashna Jaelre
3455e2408d
[Keyboard] Fix default keymap for quark squared keyboard (#14139) 2021-08-24 01:19:00 -07:00
Xelus22
4e1c5887c5
[Core] Refactor OLED to allow easy addition of other types (#13454) 
* add docs

* core changes

* update keyboards to new OLED

* updated users to new OLED

* update layouts to new OLED

* fixup docs

* drashna's suggestion

* fix up docs

* new keyboards with oled

* core split changes

* remaining keyboard files

* Fix The Helix keyboards oled options

* reflect develop

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: mtei <2170248+mtei@users.noreply.github.com>
 2021-08-24 16:28:26 +10:00
lalalademaxiya1
e3483b4126
[Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029) 
* Add keyboard Q1

* Update keyboards/keychron/q1/readme.md

* Update keyboards/keychron/q1/rev_0100/rules.mk

* Update keyboards/keychron/q1/readme.md

* Change layer switch function to "default_layout_set"

* Update keyboards/keychron/q1/rev_0100/info.json

* Update keyboards/keychron/q1/q1.c

* Mask out the DIP switch to fix sleeping issue when switch is ON

* Added and changed readme.md

Added keyboards\q1\rev_0100\readme.md
Changed keyboards\q1\readme.md since different MCU may used in other version.

* update

* update keymap name

* update keymap for keychron/q1/rev_0102

* Update info.json
 2021-08-23 17:32:15 -07:00
Donald Kjer
e756a21636
eeprom_stm32: implement high density wear leveling (#12567) 
* eeprom_stm32: implement wear leveling
Update EECONFIG_MAGIC_NUMBER
eeprom_stm32: check emulated eeprom size is large enough
* eeprom_stm32: Increasing simulated EEPROM density on stm32
* Adding utility script to decode emulated eeprom
* Adding unit tests
* Applying qmk cformat changes
* cleaned up flash mocking
* Fix for stm32eeprom_parser.py checking via signature with wrong base
* Fix for nk65 keyboard

Co-authored-by: Ilya Zhuravlev <whatever@xyz.is>
Co-authored-by: zvecr <git@zvecr.com>
 2021-08-23 23:15:34 +01:00
QMK Bot
718f0a2482 Merge remote-tracking branch 'origin/master' into develop 2021-08-23 14:26:24 +00:00
Rifaa Subekti
a72b562141
[Keyboard] update default and via keymap for ocean/wang_v2 (#14122) 2021-08-23 07:25:51 -07:00
Nick Brassel
d8778eba92 Fixup line endings. 2021-08-23 19:37:16 +10:00
stickandgum
71df135254
[Keymap] Feature rich keymap for GMMK Pro (ANSI) (#14120) 
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-08-22 19:19:11 -07:00
QMK Bot
355872cc1d Merge remote-tracking branch 'origin/master' into develop 2021-08-23 02:10:58 +00:00
Vino Rodrigues
5cd7999bc4
[Keyboard] Update rgb matrix config in kbdfans/kbd67/mkiirgb/v3/v3.c (#14094) 
This patch corrects 2 issues with the LED matrix of the KDBFans KBD67 Lite (v3)
* Incorrect mapping of the right-shift, down-arrow, and right-arrow.  (i.e. `NO_LED` positions of the `g_led_config` key matrix in the .c file do not match the `LAYOUT_65_ansi_blocker` matrix in the .h file.
* Remapping of the *LED Index to Physical Position* using physical measurements from actual keyboard and accounting for the southpaw LED position to define the true centre of the keyboard (more relevant to circular animations).
 2021-08-22 19:10:23 -07:00
QMK Bot
4b87c1f40b Merge remote-tracking branch 'origin/master' into develop 2021-08-22 16:29:18 +00:00
Ryan
5319727b70
Fix line endings for quark_squared info.json (#14113) 2021-08-22 17:28:48 +01:00
QMK Bot
7dfa93d9b6 Merge remote-tracking branch 'origin/master' into develop 2021-08-22 06:04:52 +00:00
npspears
46fb874269
[Keyboard] add support for Quark² (#14109) 
Quark² is a hotswap version of the Quark PCB
 2021-08-21 23:04:20 -07:00
QMK Bot
34d0376ab9 Merge remote-tracking branch 'origin/master' into develop 2021-08-22 05:12:24 +00:00
Christian Sandven
9a51076859
[Keyboard] Keyprez bison (#14100) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-21 22:11:56 -07:00
QMK Bot
f709394442 Merge remote-tracking branch 'origin/master' into develop 2021-08-22 05:11:44 +00:00
precondition
aedd8cca31
[Keyboard] Kyria default reformat (#14080) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-21 22:11:32 -07:00
Conor Burns
b1b6fe1c3d
[Keymap] added bongocat keymap to 0xCB Static (#14093) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-21 22:11:15 -07:00
peepeetee
78ccd9c201
Organize KPrepublic, K.T.E.C, xiudi boards into directories (#12159) 
* reset; redoing my steps; and recommit

* include xd002/.noci
 2021-08-22 13:53:49 +10:00
Drashna Jaelre
dcef03853d
[Keyboard] Disable Console on Keebio Quefrency (#14108) 2021-08-22 12:08:05 +10:00
Drashna Jaelre
f4a2f2bb7e
[Keyboard] Fix compile issues for Tractyl Manuform (#14105) 2021-08-21 18:34:16 -07:00
Joakim Tufvegren
0ae20e7457
Make solo half of split keyboards (more) usable. (#13523) 
* Make solo half of split keyboards (more) usable.

Using only one half of a split keyboard (that's using the split_common
framework to communicate) is not a great experience, since several read
timeouts per scan cycle cause an unusably slow scan rate.

This change blocks all split communication attempts for 500 ms
(configurable) after an error occurs, causing the scan rate to become at
least _more_ usable, but might need some tweaking to work fully on most
keyboards. One read timeout still needs to occur after the 500 ms has
passed, and if that timeout isn't low enough, some scan cycles may still
be too slow.

* Fix lint complaint.

* Require 25 consecutive comm errors to see comms as disconnected.

The number of max errors can be overridden by defining
`SPLIT_MAX_CONNECTION_ERRORS`.

* Add comments to new defines, and ability to disable disconnection check.

Also increase `SPLIT_MAX_CONNECTION_ERRORS` to 40, since it's divisible
by most relevant numbers for the description.

* Make lint happy ...again

* Only update `connection_check_timer` when needed.

* Add new defines to split keyboard documentation.

* Move connection timeout logic to transport.c, add `is_transport_connected`.

* Use split_common disconnection logic in matrix.c.

Instead of doing more or less the same thing twice.

* Move disconnection logic to `transport_master`.

Is a cleaner implementation, and causes the scan rate while disconnected
to increase instead of decrease.

* Lint fixes.

* Lower default `SERIAL_USART_TIMEOUT` to 20 ms.

The read timeout must be low enough to not cause exessively long scan
cycles when using a solo split half. 10 ms was determined from testing
to work fine even with the slowest defined baudrate of 19200 (5 ms was
too low for that case), so 20 ms should be fine for most cases.

* Remove `SERIAL_USART_TIMEOUT` from ergodox_infinity/config.h

Was somewhat mistakenly included in an earlier PR.

* Fix building with `USE_I2C`.

* Reduce built firmware size.

Not really sure why this works, the idea was taken from tzarc's work on
split disconnection.

* Tweak and improve opt-out for split disconnection logic.

There are now two ways to opt out from this feature:
* Set `SPLIT_MAX_CONNECTION_ERRORS` to 0. This will completely disable
  the connection status checks (also affects the slave matrix reset logic in
  matrix.c, though).
* Set `SPLIT_CONNECTION_CHECK_TIMEOUT` to 0. This will only disable the
  communication throttling while disconnected. Will make the firmware
  smaller.

* Make split disconnection logic work with custom transports.

Includes a fallback implementation for keyboards using a custom
split_util.c but not a custom matrix.c (currently no such keyboard seems
to be merged, though).

* Remove unnecessary include of timer.h

Co-authored-by: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
 2021-08-22 10:51:17 +10:00
Drashna Jaelre
c5f41d42d8
Updated RGB Matrix suspend define part 3 (#13954) 
* Updated RGB Matrix suspend define part 3

* Revert "Update config.h for kbdfans/kbd67/mkiirgb/v3 (#13978)"

This reverts commit 80015f7fb0.

* Add additional boards/keymaps
 2021-08-22 09:46:35 +10:00
Drashna Jaelre
58a5030661
[Keymap] Drashna's Improve OLEDs and custom Split code (#14063) 
* Fill the oleds with right mods

* Enable double mods on x32 oleds

* Disable forced NKRO

* Make oleds fancy only on good MCUs

* Overhaul oled display

* Further enhance oled, with kitty!

* Final oled form

* Not working transport

* Transport id of woring

* Add acceleration

* fix button placement for accel macro

* Fix accelartion location and behavior

* Remove OLED sync code

* Fix alignment issue

* Remove audio hack

* Fix up zima keymap

* Add matrix slave scan function and cleanup drashna.h

* Clean up user space

* Allow userspace sync to be disable-able

* Fix weird issue with audio

* Fix alignment issue with user split sync

* Disable second rgb matrix task

* Disable additional animations

* Change dynamic keymap settings

* Hacky fix for borked corne

* Add Blackpill (F411) support to tractyl manuform

* remove manual via eeprom reset

* Remove all references to rgblight twinkle

* Fix issues with config processing
 2021-08-21 13:34:44 -07:00
Drashna Jaelre
da1c011afc
Improve pmw3360 sensor and make it more hardware agnostic (#14097) 2021-08-20 21:14:23 -07:00
QMK Bot
3452c89c8b Merge remote-tracking branch 'origin/master' into develop 2021-08-21 04:13:34 +00:00
Drashna Jaelre
c1cad5b751
[Keyboard] Fix naiping/npminila layout macro (#14098) 2021-08-21 14:13:02 +10:00
QMK Bot
e8943a8b0c Merge remote-tracking branch 'origin/master' into develop 2021-08-20 17:33:25 +00:00
Weirdo
30bb807c13
[Keyboard] Add Naiping series keyboard (#14040) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-20 10:32:53 -07:00
QMK Bot
da11a49905 Merge remote-tracking branch 'origin/master' into develop 2021-08-20 13:14:35 +00:00
tiltowait
90ff4fe749
[Keyboard] Add IBM Model M SSK configuration (#14050) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-20 06:13:59 -07:00
QMK Bot
0741aae1d9 Merge remote-tracking branch 'origin/master' into develop 2021-08-20 04:36:09 +00:00
Drashna Jaelre
fd54992e1f
[Keyboard] Fix Feels65 Via keymap (#14086) 2021-08-19 21:35:29 -07:00
QMK Bot
8dfd33e3d1 Merge remote-tracking branch 'origin/master' into develop 2021-08-20 04:27:09 +00:00
Drashna Jaelre
37b5ead17d
[Keyboard] Fix space_space rev1 keyboard files (#14087) 2021-08-19 21:26:37 -07:00
QMK Bot
c6f24f66bd Merge remote-tracking branch 'origin/master' into develop 2021-08-20 04:22:05 +00:00
Drashna Jaelre
cc0ae9cc4c
Revert "[Keyboard] Dumbpad VIA support added (#13512)" 2021-08-19 21:21:00 -07:00
moyi4681
462e7f075a
move volcano660 to ilumkb folder (#13550) 
* move volcano660 to ilumkb folder

* Update rules.mk

* Fix up readme

Co-authored-by: zvecr <git@zvecr.com>
 2021-08-19 20:02:07 +01:00
QMK Bot
3413766649 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 18:59:06 +00:00
SneakboxKB
b724a0dfd5
[Keyboard] Ava initial commit (#13845) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: SneakboxKB <64090325+mujimanic@users.noreply.github.com>
 2021-08-19 11:58:35 -07:00
QMK Bot
e988f58374 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 18:45:19 +00:00
minibois
a12f3a3fb8
[Keyboard] Minor fixes for mini_elixivy/info.json (#14022) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-19 11:44:47 -07:00
James Young
4279b14adf
Merge remote-tracking branch 'upstream/master' into develop 
Conflicts:
	keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
	keyboards/space_space/rules.mk
 2021-08-19 11:32:23 -07:00
GG
f4f679779e
[Keyboard] Add Mammoth20x (#14014) 2021-08-19 11:17:54 -07:00
Yaroslav Smirnov
c592128219
[Keyboard] Add Elrgo S to keyboards/handwired (#13893) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 11:15:30 -07:00
weteor
1bfbaae533
[Keyboard] add 3w6 (#13746) 2021-08-19 11:13:00 -07:00
kb-elmo
8200804e96
[Keyboard] Add Voice65 (#13744) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 11:12:34 -07:00
James Young
c039796d9d
keebzdotnet F-Me Configurator fixes and codebase touch-up (#14077) 
* rename LAYOUT to LAYOUT_all

* add info.json

* override DYNAMIC_KEYMAP_LAYER_COUNT for via keymap

The via keymap only initialized two layers without overriding the default value of DYNAMIC_KEYMAP_LAYER_COUNT (4).

This commit sets DYNAMIC_KEYMAP_LAYER_COUNT for the via keymap to 2.
 2021-08-19 18:47:10 +01:00
James Young
9aedf515c0
kb-elmo Noah AVR Community Layout support and Configurator fix (#14078) 
* noah_avr.h: use QMK 3-character notation for matrix positions

* Community Layout support, Stage 1

- rename LAYOUT_ansi to LAYOUT_65_ansi_blocker
- rename LAYOUT_ansi_splitbs to LAYOUT_65_ansi_blocker_split_bs
- enable Community Layout support

* info.json: add line breaks between rows

* info.json: correct LAYOUT_iso data

- unsplit the Backspace
- change ANSI Enter to ISO Enter
- split the left Shift

* Community Layout support, Stage 2

- rename LAYOUT_iso to LAYOUT_65_iso_blocker
- update Community Layout support

* Community Layout support, Stage 3

- add LAYOUT_65_iso_blocker_split_bs
- update Community Layout support

* noah_avr.h: add matrix diagram
 2021-08-19 18:46:22 +01:00
jonavin
98af5bc64e
[Keymap] Add jonavin user space / common functions (#13876) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonavin <=>
 2021-08-19 10:45:49 -07:00
jfescobar18
425e1e665d
[Keyboard] Dumbpad VIA support added (#13512) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 10:39:30 -07:00
Alan Pocklington
3b4c35da6b
[Keymap] Quark AJP10304 layout (#13290) 2021-08-19 10:36:20 -07:00
qpockets
c98e1694fb
[Keyboard] update space_space keyboard (#13305) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 10:17:01 -07:00
QMK Bot
af3673a5b6 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 17:14:07 +00:00
James Young
48a8682438
Linworks Whale75 Layout Macro refactor and Configurator fixes (#14059) 
* info.json: human-friendly formatting

* info.json: remove "w":1 instances

* info.json: correct positions of Left, Down and Right Arrow keys

* info.json: add LAYOUT_all data

* move Home key to end of home row

According to photographs of the keyboard, the fourth key down on the right side is physically on the home row. This commit moves the key argument and keycodes to the home row.

* whale75.h: use QMK 3-character notation for matrix

* whale75.h: add matrix diagram

* add keyboard-level encoder functionality

* info.json: correct key sequence on ISO layouts
 2021-08-19 10:13:31 -07:00
Evelien-Lillian Dekkers
81e19d61c0
[Keyboard] Refactor atom47 and add rev4 and rev5 (#13201) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2021-08-19 09:40:28 -07:00
QMK Bot
374b388382 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:31:49 +00:00
Felix Jen
a43952f35d
[Keyboard] Add Ready100 Keyboard (#13158) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-19 09:31:12 -07:00
QMK Bot
d112935cea Merge remote-tracking branch 'origin/master' into develop 2021-08-19 16:29:30 +00:00
Zereef
4fc01ddefe
[Keyboard] Ymdk_np21 via port (#12693) 2021-08-19 09:28:59 -07:00
QMK Bot
1445fd21c8 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:53:48 +00:00
yiancar
9ac0023a6a
Add MNK50 (#14031) 
* Add MNK50

* Update keyboards/mnk50/rules.mk

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update keyboards/mnk50/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mnk50/readme.md

hihi thanks!

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update keyboards/mnk50/keymaps/default/readme.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: yiancar <yiancar@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 16:53:20 +01:00
QMK Bot
a995dd16a2 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:51:56 +00:00
Tran Kim Tung
49be4860f7
[Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1 (#14021) 
* [Keyboard] adds new keyboard version: dztech/dz60rgb_wkl/v2_1

* Update keyboards/dztech/dz60rgb_wkl/readme.md

Remove external flash manual link

Co-authored-by: Ryan <fauxpark@gmail.com>

* dz60rgb_wkl/v2_1: remove NO_USB_STARTUP_CHECK

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-19 16:51:23 +01:00
QMK Bot
2ff1a6a72f Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:42:23 +00:00
rate
d6eee3e0f2
Added VIA keymap for pistachio_mp (#14015) 
* Added VIA keymap for pistachio_mp

* Fixed typos
 2021-08-19 16:41:49 +01:00
QMK Bot
7a125872e2 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 15:41:40 +00:00
AquaCylinder
468661280b
emi20 update (#14013) 
* Update keymap & readme

-Keymap.c: Key combinations removed for resetting and added a new way to reset. Also removed unused timer code.

-config.h & rules.mk: Removed on kemap level (these were there for the key combo's)

-Readme.md: Changed the preview image and changed the description to reset the keyboard. Also added what connector type is used.

* Update readme.md

Better wording on how to get the keyboard in bootloader mode

* Update keymap.c

Switched + and - around, same with / and *.
 2021-08-19 16:41:05 +01:00
Takeshi ISHII
f86a087127
[Keymap] fix helix:fraanrosi compile error caused by #13677. (#14061) 
I'm against using RGBLIGHT_ANIMATIONS because this happens.
See also #8688.
 2021-08-19 15:45:47 +09:00
QMK Bot
c8e8c21367 Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:42:53 +00:00
James Young
068ab2800c
Keebio Quefrency Configurator rework (#14060) 
* add info.json for Quefrency rev1

* add info.json for Quefrency rev2

* add info.json for Quefrency rev3

* add info.json for Quefrency rev4

* remove "global" Quefrency info.json

* remove layout macro aliases from keyboard headers

These were moved into the info.json files.
 2021-08-18 17:42:17 -07:00
QMK Bot
b23a4db47a Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:38:25 +00:00
James Young
ac1309cd75
Feels Feels65 Refactor (#14032) 
* rename layout macros

The existing layout macro names were not accurate to QMK's standard for the names that were given.

- rename LAYOUT_65_ansi_blocker to LAYOUT_65_ansi_blocker_split_bs
- rename LAYOUT_65_iso_blocker to LAYOUT_65_iso_blocker_split_bs

* correct info.json data

* add LAYOUT_65_iso_blocker

* add LAYOUT_65_ansi_blocker

* add Community Layout support

* update grid alignment on layout macros

* add LAYOUT_all

* refactor default and via keymaps

- use LAYOUT_all macro
- use _______ for KC_TRNS
- via keymap fixes
  - swap KC_BSPC for KC_DEL on Layer 1 (matches default keymap)
  - remove KC_PGUP from Layers 2 and 3 (makes both layers fully transparent)
 2021-08-18 17:37:53 -07:00
QMK Bot
c6dc1f7f8d Merge remote-tracking branch 'origin/master' into develop 2021-08-19 00:33:59 +00:00
James Young
6200907417
cest73 TKM Configurator Fixes (#14066) 
* info.json: update human-friendly formatting

* correct info.json layout data

- adds missing objects for:
  - split Backspace
  - split Numpad Plus
  - split Numpad Enter
  - split Left Shift
  - ANSI Backslash
  - split Numpad 0
- deletes Mod1 object (not supported in source)
- correct key object sequence
 2021-08-18 17:33:26 -07:00
Joel Challis
2e734fb6b9
Add config.h and rules.mk support for data driven keymaps (#12859) 
* Add config.h and rules.mk support for data driven keymaps

* tidy up after rebase

* Rename key as it can contain more than just keyboard overrides

* tidy up after rebase

* Add validation
 2021-08-18 21:52:41 +01:00
QMK Bot
10fab4ec07 Merge remote-tracking branch 'origin/master' into develop 2021-08-18 17:35:15 +00:00
Logan Butler
0daccebaf9
[Keyboard] Fixes to info.json and rules.mk for Southpad n(#14053) 
Making info.json work better with the QMK Configurator and updating rules to work properly with the correct bootloader.
 2021-08-18 10:34:43 -07:00
QMK Bot
342e765e9c Merge remote-tracking branch 'origin/master' into develop 2021-08-18 08:51:22 +00:00
James Young
b21e093057
Setta21 Configurator Fix (#14055) 
* info.json: add line breaks for rows

* info.json: correct key sequence

* info.json: correct width dimension
 2021-08-18 09:50:25 +01:00
Drashna Jael're
cf5e40c251
Merge remote-tracking branch 'origin/master' into develop 2021-08-17 22:33:17 -07:00
AnthonyL
b51a187d77
[Keyboard] Use Bootmagic Lite on Montex (#14036) 
Co-authored-by: Anthony Lowery <anthony.lowery@unity3d.com>
 2021-08-17 22:27:02 -07:00
Matthias Liffers
33587254a0
[Keyboard] Fix pins, add VIA support for Stream Cheap 2x4 (#14001) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-17 17:33:28 -07:00
Joel Challis
58cd8c366c
Various fixes from reorg of files (#14051) 2021-08-18 09:54:41 +10:00
Tomas Guinan
999391f3ae
Created "paddlegame" keymap (#13629) 
* Added gmmk pro paddlegame keymap

* Replaced config.h with my own

* Adjust code to better fit style guide

* Update readme to include layout

* Fixed keymap, was missing a few keys

* Replaced all instances of _isWinKeyDisabled with keymap_config.no_gui

* Update keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Tomas Guinan <bngrybt@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-08-18 08:43:27 +10:00
Mikael Manukyan
857716794b
gmmk/pro/mike1808 keymap (#13398) 
* Add gmmk/pro/mike1808 keymap

* Add licenses

* Update readme

* Add underglow support for rgb matrix layers

* Change FN to TT

* Fix rgb layer disabling during rgb settings change

* also clean up some code
 2021-08-18 07:10:46 +10:00
Nick Brassel
8db1d22117
Fixup massdrop/alt, cest73/tkm. (#14048) 
* Fixup massdrop/alt.

* Fixup `cest73/tkm` bootmagic lite.

* Update keyboards/cest73/tkm/rules.mk

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
 2021-08-18 06:44:18 +10:00
a-chol
75b49aff56
Digitizer HID interface : absolute coordinates for mouse cursor (#12851) 
* Add digitizer HID interface for setting the mouse cursor position at
absolute screen coordinates. Tested on Pro Micro, Proton C and
Blackpill.

* Update docs/feature_digitizer.md

Co-authored-by: Ryan <fauxpark@gmail.com>

* Update tmk_core/protocol/usb_descriptor.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Add missing copyrights
Add V-USB support

* Add support for digitizer dedicated endpoint for lufa and chibios.
Fix formatting issues
Move digitizer_task definition to the feature's base implementation file

* Run cformat on modified files

* Change digitizer report usage to Digitizer instead of Pen to avoid
pointer disappearing on Windows.

* Update tmk_core/protocol/vusb/vusb.c

Co-authored-by: Ryan <fauxpark@gmail.com>

* Run cformat from docker image

* Remove send_digitizer from host_driver_t and instead rely on the
declaration being the interface to the implementation in each
HW-specific usb implementation.

* Fix build : send_digitizer shouldn't be static in vusb and add
weak-linkage implementation for tests without usb implementation

* Change digitizer user interface to match pointing device's

* Update documentation with new API

Co-authored-by: a-chol <nothing@none.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-18 04:52:44 +10:00
mechlovin
7794e97f32
Add mechlovin9 rev2 PCB (#12767) 
* Add mechlovin9 rev2 PCB

Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2

* update

* change bootloader and  bootmagic button

* Add mechlovin9 rev2 PCB

Move mechlovin9 PCB from mechlovin/hannah65/mechlovin9 to mechlovin/mechlovin9
And add mechlovin9 rev.2
 2021-08-18 04:49:40 +10:00
50an6xy06r6n
4b96d5876e
Fix Indicator LED issues (#12097) 2021-08-18 04:44:19 +10:00
Drashna Jaelre
fae5cc6c67
[Keyboard] Fixup Neson Design N6 ISSI includes (#14045) 2021-08-17 10:31:34 -07:00
QMK Bot
aeda1a003e Merge remote-tracking branch 'origin/master' into develop 2021-08-17 16:07:05 +00:00
yulei
a8f893ed2c
[Keyboard] add n6 keyboard (#13768) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-08-17 09:06:26 -07:00
QMK Bot
b87e2947c1 Merge remote-tracking branch 'origin/master' into develop 2021-08-17 15:44:51 +00:00
Charly Delay
837571ef7f
[Keyboard] bastardkb/skeletyl: fix LED configuration (#14030) 2021-08-17 08:44:19 -07:00
Drashna Jaelre
e443fa2892
Fix wait_us overflow in matrix for dactyl based boards (#14039) 2021-08-17 08:20:01 -07:00