gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-30 23:15:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,314 Commits 62 Branches 1,612 Tags 954 MiB
1715fa0e8b
Commit Graph

9497 Commits

Author SHA1 Message Date
Drashna Jaelre
7bcbeffc2d
Fix compile issues due to LED changes (#13821) 2021-07-31 17:30:13 +01:00
slashbunny
3f5482bbb7
Update endgame keymap to work with suspend changes (#13805) 
Updates the Massdrop CTRL keyboard engame keymap to work after the
changes to USB suspend in #12697

Fixes #13782
 2021-07-31 16:28:09 +01:00
Joel Challis
70fb3e1aaf
__flash? (#13799) 2021-07-31 14:35:30 +01:00
Joel Challis
206a995ccd
Move some led drivers to common folder (#13749) 
* Move some led drivers to common folder
 2021-07-31 14:31:09 +01:00
James Young
954806c80f
DP60 layout macro renames (#13811) 
* info.json: apply human-friendly formatting

* rename LAYOUT_60_wkl to LAYOUT_60_ansi_tsangan_split_rshift

* rename LAYOUT_60_wkl_split_bs to LAYOUT_60_tsangan_hhkb

* info.json: remove `key_count` keys
 2021-07-31 14:25:47 +01:00
James Young
4604b58769
Charue Sunsetter: layout macro fixes (#13809) 
* remove K214 from LAYOUT_1065_ansi macro

Position K214 is only used by the ISO layout (as KC_NUHS); it doesn't get used here. Removing it so the layout macro matches the info.json layout data.

Also updates info.json to use human-friendly formatting.

* add layout macros

Adds:

- LAYOUT_1065_ansi_split_bs macro
- LAYOUT_1065_iso macro
- LAYOUT_1065_iso_split_bs macro
- `default_iso` keymap

* add LAYOUT_all macro

Adds LAYOUT_all macro and a `default_all` keymap.

This PCB is unusual in that the ANSI Backslash and ANSI Enter do not share their matrix positions with the Non-US Backslash or ISO Enter keys at all. This layout macro supports both the ANSI and ISO positions in one macro/keymap.
 2021-07-31 14:23:27 +01:00
James Young
56f84774d7
Rartland: add 65_ansi and 65_iso layouts (#13807) 
* add 65_ansi and 65_iso layouts

... with Community Layout support

* add block comment of layouts to rartland.h
 2021-07-31 14:22:12 +01:00
peott-fr
d191ccfdc5
[Keymap] Add peott-fr Kinesis keymap (#13812) 2021-07-31 06:14:56 -07:00
Jay Greco
56200de2eb
[Keyboard] Reduce nibble oled_status keymap size (#13813) 2021-07-31 06:11:11 -07:00
Drashna Jaelre
e755c5fe1f
[Keyboard] Fix RGBKB Pan Rev1 Encoder RGB handling (#13781) 2021-07-31 06:09:47 -07:00
MakotoKurauchi
fb6c66a14b
change DIP_SWITCH_ENABLE to off (#13815) 2021-07-31 18:51:32 +09:00
QMK Bot
6c33290ffa Merge remote-tracking branch 'origin/master' into develop 2021-07-31 09:47:25 +00:00
James Young
ec2f6026b9
Neito: correct key sequence in info.json (#13808) 2021-07-31 02:47:00 -07:00
QMK Bot
6d82c92476 Merge remote-tracking branch 'origin/master' into develop 2021-07-31 00:34:43 +00:00
Nick Brassel
a4c050b5ae
Fix up paths for bioi boards - parallel compilation failures due to file collisions. (#13806) 2021-07-31 10:34:14 +10:00
QMK Bot
99fc2173a4 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 23:15:44 +00:00
Joel Challis
addb389a5e
Move ergosaurus via keymap to correct location (#13802) 2021-07-31 00:15:11 +01:00
QMK Bot
f1af7da9ba Merge remote-tracking branch 'origin/master' into develop 2021-07-30 21:00:46 +00:00
Ryan
7bfe53ee2f
Fix onekey console keymap (#13797) 2021-07-30 22:00:14 +01:00
QMK Bot
770a525425 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:45:24 +00:00
James Young
aece9ad5fa
Xelus Dharma: add info.json file (#13796) 2021-07-30 11:44:50 -07:00
QMK Bot
de1898e69e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:18:01 +00:00
James Young
e180524c10
txuu: rename LAYOUT to LAYOUT_65_ansi_blocker_split_bs (#13794) 
Renames the layout macro to be more conformant to the rest of QMK.
 2021-07-30 11:17:48 -07:00
James Young
57ad8db60e
Tiger910: fix Left Control key size in info.json (#13793) 2021-07-30 11:17:30 -07:00
QMK Bot
d34e61a43c Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:17:17 +00:00
James Young
4758ea2188
Stratos: fix layout macro reference in info.json (#13792) 
- change LAYOUT_60_ansi_tsangan_hhkb to LAYOUT_60_tsangan_hhkb
 2021-07-30 11:16:59 -07:00
QMK Bot
70dceefa01 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 18:16:50 +00:00
James Young
069f479af4
Ristretto: fix Configurator layout data (#13791) 2021-07-30 11:16:37 -07:00
James Young
6af2d3a32c
X-Bows Ranger: rename LAYOUT to LAYOUT_tkl_ansi (#13795) 2021-07-30 11:16:18 -07:00
QMK Bot
701808372e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 17:10:40 +00:00
Ryan
d1db008745
Onekey cleanup (#13786) 2021-07-30 18:10:05 +01:00
QMK Bot
3461bdad43 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 17:02:12 +00:00
Matthew Dias
cfca970718
[Keyboard] Add portal 66 (#13767) 2021-07-30 10:01:43 -07:00
QMK Bot
e6c884415d Merge remote-tracking branch 'origin/master' into develop 2021-07-30 16:54:23 +00:00
8bits4ever
1e2408af91
[Keyboard] Add Commodore Amiga 1200 Membrane Converter (#13705) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-30 09:53:55 -07:00
QMK Bot
04a2fa8ff3 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:13:15 +00:00
James Young
77735b0a56
Pearl Boards Pandora: correct layout macro reference in info.json (#13787) 2021-07-30 08:12:36 -07:00
QMK Bot
dfb370402e Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:12:13 +00:00
James Young
6823e03b01
Ocean Sus Board: rename layout macro (#13785) 
- rename LAYOUT_ortho_3x4 to LAYOUT_ortho_4x3
  - ... because ortho layouts in QMK are named by <rows>x<columns> instead of <columns>x<rows>
 2021-07-30 08:11:37 -07:00
QMK Bot
f87c72ef8f Merge remote-tracking branch 'origin/master' into develop 2021-07-30 15:11:30 +00:00
James Young
f2d34f38be
Nack: rename layout macro to LAYOUT_ortho_4x13 (#13784) 2021-07-30 08:10:59 -07:00
QMK Bot
ba1fdf97b1 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 07:17:44 +00:00
James Young
d93089d8ea
MNK1800s: fix Configurator key sequence (#13783) 2021-07-30 17:17:11 +10:00
QMK Bot
38686dd0c5 Merge remote-tracking branch 'origin/master' into develop 2021-07-30 07:07:41 +00:00
James Young
e1ce0d2836
Clawsome Luggage Rack: correct keymap directory name (#13780) 
Rename `keyboards/clawsome/luggage_rack/keymap/` to `keyboards/clawsome/luggage_rack/keymaps/`.
 2021-07-30 00:07:10 -07:00
James Young
80d8c4a483
Merge remote-tracking branch 'upstream/master' into develop 2021-07-29 23:04:06 -07:00
Álvaro A. Volpato
a1f7d86ef5
[Keyboard] Initial Noxary 378 support (#13156) 
Co-authored-by: Gondolindrim <alvaro.augusto.volpato@gmail.com>
 2021-07-29 22:54:06 -07:00
Jonavin
03212ced24
[Keymap] jonavin gmmk pro keymap add RGB functionality (#13591) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Jonavin <=>
 2021-07-29 22:38:38 -07:00
James Young
7e1d28006f
CherryB Studio CB1800: fix key sequence in info.json (#13779) 
This commit fixes the position in sequence of the arrow keys.
 2021-07-29 22:37:41 -07:00
Jonavin
219ce2b58a
[Keymap] jonavin quefrency keymap (#13751) 
add winkeylock and rgb functions
Co-authored-by: Jonavin <=>
 2021-07-29 22:36:21 -07:00
James Young
104cdef329
Cannonkeys Balance: Configurator fixes (#13778) 2021-07-29 22:26:47 -07:00
Trent Hoh
327e5a08d9
[Keyboard] Added YMD40v2 VIA (#13770) 
VIA support for YMD40v2
 2021-07-29 22:24:21 -07:00
fvolpe83
86c0a6d3d7
[Keymap] Update keymaps for fvolpe83 (#13739) 
changed folder name to match github username, changed caps from LT(1,KC_CAPS) to MO(1) and updated readme
 2021-07-29 22:16:51 -07:00
James Young
fab1af4154
AnomalyKB a65i Configurator fixes (#13775) 2021-07-29 22:11:57 -07:00
Ramon Imbao
987e8e3529
[Keyboard] Add Mona v1.1 (#13721) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-29 22:08:05 -07:00
James Young
8ca6d835b9
Atomic Refactor (#13761) 
* info.json: human-friendly formatting

- one key per line
- line breaks between physical rows
- four-space indent

* info.json: add data for LAYOUT_grid

* fix keymap paths

This commit corrects the paths for three keymaps that were in the wrong directory.

* refactor and bugfix abienz keymap

- remove extra commas
- use QMK-native aliases for KC_TRNS and KC_NO
- add include for Colemak keycode support
- use four-space indent

* refactor and bugfix michelle keymap

- remove inline comments for keymap layout
- remove extra commas
- use QMK-native aliases for KC_TRNS and KC_NO
- use four-space indent

* refactor and bugfix twolayer keymap

- remove extra commas
- refactor action_get_macro() keycode to QMK-native keycode
- use QMK-native aliases for KC_TRNS
- use four-space indent
- adjust grid alignment

* rename LAYOUT_grid to LAYOUT_ortho_5x15

* refactor config.h file

- use #pragma once include guard
- update MANUFACTURER and PRODUCT strings to be consistent with other OLKB boards
- remove Magic config (all settings are default)

* refactor atomic.c

- add license header
- use GPIO control functions

* refactor atomic.h

- add license header
- use #pragma once include guard
- remove redundant file includes

* refactor rules.mk

- remove Bootloader selection comments
- unify Build Option header comment to QMK template
- unify Build Option rules and inline comments

* alias LAYOUT_grid to LAYOUT_ortho_5x15
 2021-07-29 12:14:26 -07:00
James Young
c0149dc376
Alu84 Refactor (#13760) 
* info.json: human-friendly formatting

* use QMK 3-character notation for layout macro/data

* alu84.h: use #pragma once include guard

* clean up alu84.c

Remove unnecessary includes and functions.

* refactor config.h

- use #pragma once include guard
- enable Backlight Breathing
- align comments to QMK AVR template

* refactor default keymap

- add license header
- use layer_names enum
- refactor keymap to be more generic
- remove unnecessary and empty functions

* refactor turbomech keymap.c

- edit license header
- refactor keymap for readability (use QMK-native keycode aliases)
- remove unnecessary and empty functions

* refactor turbomech config.h

- use #pragma once include guard
- align to QMK template

* refactor turbomech rules.mk

Edit the file to make it conform to QMK template.

* align rules.mk to QMK template

* touch-up default keymap

* touch-up alu84.h

* rename LAYOUT to LAYOUT_75_ansi

Also enables Community Layout Support

* modernize readme.md

- update description
- convert keyboard data to list
- add flashing and bootloader instructions
- update Docs links

* alias LAYOUT to LAYOUT_75_ansi

* change readme image URL per fauxpark

* touch up turbomech keymap rules.mk per fauxpark

* rules.mk: convert tab to spaces
 2021-07-29 11:09:16 -07:00
QMK Bot
441914e0ad Merge remote-tracking branch 'origin/master' into develop 2021-07-29 17:45:54 +00:00
James Young
a78fdbb1f6
Draytronics Elise Configurator fixes (#13763) 2021-07-29 10:45:22 -07:00
QMK Bot
d243512ad6 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:50:56 +00:00
TreasureTypes
5a0985aa4a
[Keyboard] Add Treasure TYPE-9 Series II (#13725) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-29 09:50:05 -07:00
QMK Bot
703d886c21 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:12:56 +00:00
Alabahuy
aa0b7079a4
[Keyboard] add sus board (#13701) 2021-07-29 09:12:29 -07:00
QMK Bot
ae6a3ae20e Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:12:19 +00:00
Takeshi Nishio
441fd2ca5b
[Keyboard] Match Vendor ID to my other keyboard, "unison". (#13699) 
Co-authored-by: Takeshi Nishio <kkeennnn@gmail.com>
 2021-07-29 09:11:40 -07:00
QMK Bot
5bb736d1d6 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 16:04:06 +00:00
Uy Bui
6bdecb16c0
[Keyboard] we27 update info.json (#13678) 2021-07-29 09:03:21 -07:00
QMK Bot
935079f266 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:58 +00:00
bomb
768072e824
[Keyboard] Add Mojo68 for Melgeek (#13578) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:50:28 -07:00
QMK Bot
957bd4d1d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:50:24 +00:00
AquaCylinder
ae268596ce
[Keyboard] Add Emi20 (#13603) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:49:51 -07:00
QMK Bot
faf4f6d005 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:49:11 +00:00
DA
ad6acb3a03
[Keyboard] add cherryb studio cb1800 keyboard (#13639) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:48:39 -07:00
QMK Bot
58baf5a3d8 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:48:22 +00:00
QMK Bot
04a0f0cb18 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:47:52 +00:00
X-Bows Tech
8fa674727d
[Keyboard] Add X-Bows Ranger Keyboard (#13660) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:47:51 -07:00
Jonavin
8d611f6873
[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670) 
Co-authored-by: Jonavin <=>
 2021-07-29 08:47:14 -07:00
QMK Bot
1df2f23ab4 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:43:12 +00:00
N2-Sumikko
dc2dfe2a6c
[Keyboard] Add halfcliff keyboard (#13515) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:42:28 -07:00
QMK Bot
5418777454 Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:29:02 +00:00
ESCA47
3a48cd64cb
[Keyboard] Add GetawayVan (#13412) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:28:33 -07:00
QMK Bot
ec8d08810f Merge remote-tracking branch 'origin/master' into develop 2021-07-29 15:23:56 +00:00
Jordan Blackbourn
f3d7901950
[Keyboard] Added Orthocode keyboard (#13487) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-29 08:23:27 -07:00
QMK Bot
69661eb5ab Merge remote-tracking branch 'origin/master' into develop 2021-07-28 23:34:48 +00:00
James Young
ccdb432f71
Allison Numpad: Configurator fix for LAYOUT_numpad_6x4 (#13759) 
* info.json: human-friendly formatting

- one key object per line; line breaks between physical rows
- four-space indent
- remove trailing whitespace

* info.json: correct key object order for LAYOUT_numpad_6x4
 2021-07-28 16:34:17 -07:00
QMK Bot
2f4361c88f Merge remote-tracking branch 'origin/master' into develop 2021-07-28 07:25:28 +00:00
Jonavin
9088df04c3
[Keyboard] fix short circuit in led_update_kb for quefrency rev3 (#13752) 
Co-authored-by: Jonavin <=>
 2021-07-28 00:24:51 -07:00
Joel Challis
7ac7ca96e9
Remove some legacy files (#13715) 2021-07-27 23:57:42 +01:00
Ryan
56443fe3cf
Fix typo in Dactyl Manuform (#13740) 2021-07-27 08:16:41 -07:00
Ryan
468f705455
Dactyl Manuform cleanup (#13686) 2021-07-27 22:00:38 +10:00
QMK Bot
998ac203e4 Merge remote-tracking branch 'origin/master' into develop 2021-07-27 02:44:18 +00:00
James Young
a617c8b80a
[Keyboard] Ares refactor (#13730) 2021-07-26 19:43:48 -07:00
Albert Y
be34fdea4b
[Keyboard] Add RGB matrix support for Kyria (#12789) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-07-26 19:42:34 -07:00
Drashna Jaelre
3affdcb45b
Reduce firmware size in prep for #12670 (#13724) 
* Reduce firmware size in pre for #12670

* Also disable pixel mode, just in case
 2021-07-27 12:41:28 +10:00
Albert Y
e032fbe326
[Keyboard] Update kyria make path example (#13720) 
Co-authored-by: filterpaper <filterpaper@localhost>
 2021-07-26 18:01:16 -07:00
Drashna Jaelre
eb46c954dc
[Keymap] Drashna's Defaults cleanup (#13722) 2021-07-26 17:59:49 -07:00
Joel Challis
368efb5d2b
Remove legacy BACKLIGHT_CUSTOM_DRIVER option (#13731) 2021-07-27 10:17:58 +10:00
Nick Brassel
394272a266 Merge remote-tracking branch 'upstream/master' into develop 2021-07-27 10:11:52 +10:00
datafx
b1c5a53a68
Add bootloader size (#13729) 
* Add bootloader size

Bootloader size needs to be 6144 to allow QMK to jump to the correct location with bootmagic

* Include dz60rgb v2.1

Add boot loader size to this pcb also
 2021-07-27 10:07:29 +10:00
James Young
e6e4ec6267
40percentclub/nein: update info.json layout macro reference (#13726) 
- change LAYOUT to LAYOUT_ortho_3x3
 2021-07-26 21:02:44 +01:00
Xelus22
e0375c0b71
[Keyboard Update] Change to L422 (#13717) 
* change to L422

* Add bootloader

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

* add bootloader

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-26 16:05:13 +10:00
Cyril
a73e0a7b13
Revert "Fixed the ortho60 and ortho48 matrix layout after testing (#12106)" (#13456) 
This reverts commit e25f05224f.
 2021-07-25 22:51:23 -07:00
Xelus22
b9902a3f59
[Keyboard] Valor Rev 2 (#13551) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 22:34:39 -07:00
bomb
2e5cecd704
[Keyboard] Change RGB light defaults for melgeek/mj6xy (#13657) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 21:22:13 -07:00
Drashna Jaelre
4bb595f94b
[Keyboard] Fix up SplitKB keyboards (#13511) 2021-07-25 18:18:39 -07:00
Drashna Jaelre
d45da3f0fb
[Keyboard] Update ZSA Keyboard Readmes and keymaps (#13041) 
* [Keyboard] Update ZSA Keyboard Readmes and keymaps

* Apply suggestions from code review

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

* Remove custom rgb code for RGB_M_P

* Fix inevitable typo

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

* Update keyboards/planck/ez/readme.md

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-25 18:18:22 -07:00
Drashna Jaelre
a030950fd6
[Keyboard] Fix compile size for the Vitamins Included via keymap (#13696) 2021-07-25 14:19:38 +10:00
Dasky
a938c54512
dirty fix (#13695) 2021-07-25 12:33:30 +10:00
Nick Brassel
4ec8764c70 Merge remote-tracking branch 'upstream/master' into develop 2021-07-25 12:17:15 +10:00
Drashna Jaelre
b69e7431aa
[Keyboard] Fix keymaps for clueboard 66_hotswap (#13694) 
* [Keyboard] Fix default keymap for clueboard proto

* Fix keymaps, because they're not actually revision compatible

* Add copyright headers
 2021-07-25 12:07:46 +10:00
Drashna Jaelre
fdf3ce3cd1
[Keyboard] Fix compile size for the Lets Split Sockets via keymap (#13691) 2021-07-25 11:05:48 +10:00
Drashna Jaelre
210da7b233
[Keyboard] Fix Compile size on ungodly Launch Pad (#13692) 2021-07-25 11:05:19 +10:00
Ryan
8cc568bc29
Fix & clean up tronguylabs/m122_3270 (#13684) 2021-07-25 11:02:36 +10:00
Drashna Jaelre
95730d4f96
[Keyboard] Fix compile size for the Merge UM70 via keymap (#13690) 2021-07-25 11:01:13 +10:00
Drashna Jaelre
0b95ac2e4b
Clean up remaining RGB_DISABLE_WHEN_USB_SUSPENDED defines (#13689) 2021-07-24 20:17:04 +01:00
Dasky
ab42945c9a
[Keyboard] Fix Q1 change dip switch to bool (#13687) 2021-07-24 10:45:34 -07:00
QMK Bot
93fc2cbc8a Merge remote-tracking branch 'origin/master' into develop 2021-07-24 16:37:57 +00:00
lokher
145d89ab91
[Keyboard] Add Keychron Q1 (#13397) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-24 09:37:24 -07:00
QMK Bot
e681c4368b Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:40:38 +00:00
James Won
44a0aa924c
[Keymap] add kinesis/keymaps/jwon (#13618) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-24 08:40:05 -07:00
QMK Bot
7aa1938fa4 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 15:39:35 +00:00
Xelus22
1b002b7dcc
[Keyboard] Dharma (#13663) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-24 08:39:26 -07:00
Shane Celis
d4bc77ac94
feature: Add swap hands support for sofle keyboard. (#13654) 2021-07-24 08:39:04 -07:00
Joel Challis
e562238309
Fix up xd002 rgb keymaps (#13685) 2021-07-24 15:50:32 +01:00
Drashna Jaelre
7907a72584
[Keyboard] Reduce compile size for dz60rgb v2.1 (#13680) 2021-07-24 19:36:41 +10:00
Drashna Jaelre
a2d0efe5ad
[Keyboard] Fix type on pandora via keymap (#13681) 2021-07-24 18:06:56 +10:00
Drashna Jaelre
b8a1e14f53
Remove deprecated callbacks for encoders and dip switches (#13404) 2021-07-24 00:37:19 -07:00
Drashna Jaelre
73d4d7dc2b
[Keyboard] Quick hack to fix Astro65 board (#13665) 
* [Keyboard] Quick hack to fix Astro65 board

* Use proper pins
 2021-07-23 23:38:54 -07:00
QMK Bot
b7fe93c4b8 Merge remote-tracking branch 'origin/master' into develop 2021-07-24 03:45:59 +00:00
Rafael Yumagulov
e08203f16a
[Keyboard] Added Compound keyboard support (#12942) 
* [Keyboard] Added Compound keyboard support

* Small fixes for Compound keyboard

* Fixed readme and header file for Compound keyboard

* Update keyboards/compound/rules.mk

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

* Changed info.json and readme.md for Compound Keyboard

info.json - removed key_count
readme.md - changed PCB picture url to low-resolution

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

Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-23 20:45:24 -07:00
Drashna Jaelre
83a0d85f2b
[Keyboard] Fix split matrix for sekigon grs 70ec (#13672) 2021-07-23 18:06:06 -07:00
Drashna Jaelre
e35672169e
[Keyboard] Fix matrix delay on Drop boards (#13671) 2021-07-23 23:36:39 +01:00
Drashna Jaelre
8f1ebdb718
[Keyboard] Disable console by default on all Keebio boards (#13649) 2021-07-23 14:57:24 -07:00
Drashna Jaelre
164a74a078
[Keyboard] Enable LTO by default on BastardKB Scylla (#13664) 2021-07-23 11:28:41 -07:00
Takeshi ISHII
5b904a92c4
[Keyboard] Fix symmetric70_proto build break on develop branch (#13667) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-23 09:05:06 -07:00
Nick Brassel
6747890562
[Keyboard] Remove broken, unmaintained converter/ibm_5291 (#13658) 2021-07-23 08:17:15 -07:00
QMK Bot
8ea31698c9 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 15:11:42 +00:00
Matthew Dias
4a47ee937d
[Keyboard] Add model-v keyboard (#13643) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-23 08:10:01 -07:00
Zach White
fa32c66e9d
[Keyboard] Fix dc01/left so that it doesn't throw a warning (#13653) 2021-07-23 08:06:12 -07:00
QMK Bot
4ff4c05719 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 04:45:49 +00:00
Matthew Dias
cda1792ece
[Keyboard] Add Txuu keyboard (#13650) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 21:45:35 -07:00
Jay Greco
a08c7087be
[Keymap] Reduce NIBBLE oled_bongocat keymap size so it compiles (#13638) 2021-07-22 21:45:17 -07:00
Drashna Jaelre
816accda3d
Fix errors with matrix_output_unselect_delay function calls (#13645) 2021-07-22 21:42:59 -07:00
QMK Bot
750f40566a Merge remote-tracking branch 'origin/master' into develop 2021-07-23 04:24:47 +00:00
Domantas
dfd795e48e
Add backslash in lily58 domnantas keymap (#12713) 2021-07-23 14:24:16 +10:00
Drashna Jaelre
21e0a9780d
[Keyboard] Fix matrix issues with Promethium (#13648) 2021-07-22 21:02:50 -07:00
Drashna Jaelre
bf57c552c9
[Keyboard] Fix Matrix Row number for ggkeyboards/genisis (#13647) 2021-07-22 21:02:16 -07:00
Drashna Jaelre
7f8bc83b30
[Keyboard] Fix default keymap for 0xCB 1337 keyboard (#13646) 2021-07-22 20:59:55 -07:00
Zach White
677222301e
[Keyboard] Remove the vision_division keyboard (#13571) 2021-07-22 19:19:47 -07:00
QMK Bot
94065ca64a Merge remote-tracking branch 'origin/master' into develop 2021-07-23 01:51:40 +00:00
kb-elmo
4a8f540949
[Keyboard] Added another layer for VIA on the AEK II (#13100) 2021-07-22 18:51:29 -07:00
kb-elmo
270bf7a87a
[Keyboard] Added Stratos keyboard (#13139) 2021-07-22 18:51:12 -07:00
QMK Bot
e1eb307d74 Merge remote-tracking branch 'origin/master' into develop 2021-07-23 01:48:06 +00:00
KnoblesseOblige
79c8f035cc
[Keyboard] Added Crin keyboard (#13630) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 18:47:32 -07:00
QMK Bot
490fa5a9e3 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 22:01:53 +00:00
Joel Challis
5d7f2823c9
Implement GPIO abstraction for atsam (#13567) 
* Implement GPIO abstraction for atsam

* Convert Drop boards to normal matrix config

* Work round pin conflicts and matrix delay
 2021-07-22 23:01:19 +01:00
QMK Bot
34a9acd090 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 16:39:42 +00:00
Dasky
f33532764f
[Keyboard][Bug] Add timer_avr to includes for broken builds (#13641) 2021-07-22 09:39:27 -07:00
Tran Kim Tung
95a7c22824
[Keyboard] adds new revision: dztech/dz60rgb/v2_1 (#13636) 2021-07-22 09:39:08 -07:00
QMK Bot
3316ac3f42 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 16:36:05 +00:00
Md. Mashur Shalehin Sakib
58abdfc834
[Keyboard] Fixing info.json for h0oni/hotduck (#13640) 2021-07-22 09:35:28 -07:00
QMK Bot
62099dc120 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 08:11:39 +00:00
Trent Hoh
78a3f43c08
[Keyboard] Ymd40v2new layouts and fixed per-switch backlight (#13622) 2021-07-22 01:11:11 -07:00
Xelus22
6e9f667672
[Bug] Develop - DC01 left (#13597) 2021-07-22 01:06:03 -07:00
QMK Bot
78fb223da7 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 07:53:44 +00:00
Drashna Jaelre
8158473464
[Keyboard] Fix clawsome/hatchback and reviung5 compile issues (#13607) 2021-07-22 00:53:18 -07:00
QMK Bot
44ea6d0442 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 07:18:21 +00:00
drhigsby
336c8d3efe
[Keyboard] add ogurec (#13242) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-22 00:17:47 -07:00
Donald Kjer
13a514923a
[Keyboard] Add Durgod Taurus K310 keyboard (#12314) 
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
Co-authored-by: Simon Arlott <sa.me.uk>
 2021-07-22 00:09:00 -07:00
QMK Bot
931bf52b74 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:58:28 +00:00
farfalleflickan
a400681ccf
[Keyboard] Updated keyboard & keymaps (#12667) 
Co-authored-by: pastapojken <6597735+pastapojken@users.noreply.github.com>
 2021-07-21 23:57:35 -07:00
QMK Bot
b5a1db9c05 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:48:20 +00:00
joedinkle
e9c3f71e74
[Keyboard] add SPRH keyboard (#12999) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-21 23:47:48 -07:00
QMK Bot
85128302c8 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:51 +00:00
Sắn
92cca84651
[Keyboard] Add keypad Satxri6key (#13423) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-21 23:40:24 -07:00
QMK Bot
a2d94371c6 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:40:15 +00:00
jmaynard
8e905a7a5c
[Keyboard] Initial Tron Guy Labs keyboard implementation. (#13438) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jay Maynard <jmaynard@conmicro.com>
 2021-07-21 23:39:45 -07:00
QMK Bot
0753cbc77f Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:31:35 +00:00
Brandon Lewis
8c17a822a8
[Keyboard] Add Ristretto Keyboard (#13479) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Brandon Lewis <blewis308@users.noreply.github.com>
 2021-07-21 23:31:03 -07:00
QMK Bot
5c42446508 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 06:22:35 +00:00
Kyle McCreery
5766b9bfb7
[Keyboard] New Keyboard - OBE (#13545) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-21 23:22:00 -07:00
QMK Bot
203c4fdf58 Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:57:21 +00:00
Adam Abrams
fbe782534a
[Keyboard] Add personal planck keymap (#13635) 2021-07-21 22:56:46 -07:00
QMK Bot
71560853ce Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:46:45 +00:00
Manassarn "Noom" Manoonchai
665af4fa8d
[Keymap] narze/xd004 (#13634) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-21 22:46:15 -07:00
QMK Bot
b28c5e6acb Merge remote-tracking branch 'origin/master' into develop 2021-07-22 05:40:08 +00:00
Md. Mashur Shalehin Sakib
5b8d2b5cde
[Keyboard] Add h0oni hotduck keyboard (#13609) 2021-07-21 22:39:36 -07:00
QMK Bot
874a3df950 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:30:35 +00:00
Ryan
b564ba13ee
Fix API generation failure caused by GRS-70EC (#13631) 2021-07-21 19:30:29 +01:00
Ryan
c79bc7c909
Fix MATRIX_COLS for peranekofactory/tone (#13632) 2021-07-21 19:28:58 +01:00
QMK Bot
201b4dc7ab Merge remote-tracking branch 'origin/master' into develop 2021-07-21 18:26:05 +00:00
Ryan
78265ea742
Fix MATRIX_COLS for aeboards/constellation/rev2 (#13633) 2021-07-21 19:26:00 +01:00
Alabahuy
2b260bd846
fixed number layer on keymap (#13627) 2021-07-21 19:25:21 +01:00
QMK Bot
d2cdb0b1d3 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 17:14:33 +00:00
gkeyboard
ca1aa56c7f
[Keyboard] Fix iso layout compile error (#13628) 
Fix iso layout compile erreo on qmk web.
 2021-07-21 10:14:04 -07:00
QMK Bot
df37ce4ea2 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 15:36:02 +00:00
Xelus22
afc629210c
[Bug] VIA compile fixes (#13626) 2021-07-21 08:35:10 -07:00
QMK Bot
531886b984 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:28:30 +00:00
Alabahuy
ec1a6f6b8b
[Keyboard] add rartland with via support (#13585) 
* add rartland and via support

* moved encoder adn oled to c file

* update c file
 2021-07-20 22:28:05 -07:00
QMK Bot
793fabc449 Merge remote-tracking branch 'origin/master' into develop 2021-07-21 05:05:45 +00:00
Andrew Kannan
ddc2766537
Fix vicious40 rules (#13623) 2021-07-21 15:05:10 +10:00
QMK Bot
598fa867d1 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:10:21 +00:00
AlisGraveNil
c98e25887c
[Keyboard] GameBuddy v1.M (#12637) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 13:10:15 -07:00
Weirdo
dbca44ae8d
[Keyboard] Add Tiger910 (#12605) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 13:09:53 -07:00
QMK Bot
200f1e8e6a Merge remote-tracking branch 'origin/master' into develop 2021-07-20 20:08:44 +00:00
Conor Burns
81cac8eec6
[Keyboard] 0xcb 1337 - Added keymap "conor" and fixed some minor stuff (#12744) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-07-20 13:07:53 -07:00
QMK Bot
c4db9f7fb2 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:48:49 +00:00
kb-elmo
c1ba35363d
[Keyboard] Added Kineticlabs Emu (#12968) 2021-07-20 10:48:17 -07:00
QMK Bot
32a44b6a2c Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:47:04 +00:00
Paul Ewers
3591312fa3
[Keymap] Updates to personal Drop ALT keymap (#13058) 2021-07-20 10:46:52 -07:00
StefanGrindelwald
42ac7c0541
[Keyboard] Add Momoka ergo (#13127) 
Co-authored-by: precondition <57645186+precondition@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 10:46:29 -07:00
QMK Bot
362bbe53c7 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:44:20 +00:00
gkeyboard
8c526703f8
[Keyboard] Update lm60n.h (#13249) 2021-07-20 10:43:44 -07:00
QMK Bot
11334ef6af Merge remote-tracking branch 'origin/master' into develop 2021-07-20 17:25:14 +00:00
sekigon-gonnoc
c6698cfce3
[Keyboard] Add keyboard GRS-70EC (#11296) 2021-07-20 10:24:22 -07:00
QMK Bot
638fda5946 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:59:21 +00:00
FateEverywhere
16e52980c4
[Keyboard] Hard Light - Add keyboard, basic keymap (#12654) 
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 09:58:39 -07:00
Jsully
4188d2272c
[Keyboard] Add Durgod Hades, Galaxy and Venus Keyboards (#12893) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Don Kjer <don.kjer@gmail.com>
 2021-07-20 09:44:22 -07:00
QMK Bot
6fa53023cb Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:41:40 +00:00
imchipwood
ec78f8bca2
[Keymap] Adding user code & keymaps for dumbpad & hotdox (#12924) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 09:40:54 -07:00
QMK Bot
154c7bc3e2 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:35:24 +00:00
AlisGraveNil
4f880801ec
[Keyboard] luggage rack (#12959) 2021-07-20 09:34:56 -07:00
QMK Bot
02f8bbee45 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:34:49 +00:00
lfgberg
9d523499af
[Keyboard] add anomalykb a65i (#12967) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 09:34:18 -07:00
QMK Bot
dbaba42175 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 16:19:56 +00:00
Andrew Kannan
388a4ae817
[Keyboard] Add Vicious40 to QMK (#12981) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-20 09:19:26 -07:00
fauxpark
2e673c419a Merge remote-tracking branch 'upstream/master' into develop 2021-07-20 23:13:39 +10:00
Ryan
7ea1b97785
Fix CRLF in xbows/knight:via config.h (#13614) 2021-07-20 14:04:36 +01:00
QMK Bot
52ce2088e8 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:29:00 +00:00
projectcain
815c17b726
[Keyboard] Add vault45 (#13119) 
* adding my keymap

* Update keyboards/projectcain/vault45/keymaps/default/config.h

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

* Update keyboards/projectcain/vault45/keymaps/default/keymap.c

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

* Update keyboards/projectcain/vault45/keymaps/default/keymap.c

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

* Update keyboards/projectcain/vault45/vault45.c

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

* Update keyboards/projectcain/vault45/keymaps/default/keymap.c

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

* Update readme.md

* Update keyboards/projectcain/vault45/keymaps/default/config.h

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

* Update keymap.c

* Update keyboards/projectcain/vault45/keymaps/default/config.h

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

* Update keyboards/projectcain/vault45/readme.md

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update info.json

* Update keyboards/projectcain/vault45/vault45.c

Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>

* Update keyboards/projectcain/vault45/readme.md

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

* Update keyboards/projectcain/vault45/readme.md

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

* Update keyboards/projectcain/vault45/readme.md

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: ridingqwerty <george.g.koenig@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 22:28:32 -07:00
QMK Bot
8109363148 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:27:43 +00:00
Ryan Boone
b887a1b995
[Keyboard] Add q4z keyboard (#13198) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 22:27:18 -07:00
QMK Bot
36e2666cba Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:26:56 +00:00
Uy Bui
1256915583
[Keyboard] Add we27 numpad (#13137) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 22:26:26 -07:00
QMK Bot
692e80d3c0 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:26:17 +00:00
Michael
35ee990bd0
[Keyboard] fix LED issue BOCC keyboard (#13175) 
Co-authored-by: Michael Wamsley <wamsl@Michaels-MacBook-Pro.local>
 2021-07-19 22:25:46 -07:00
QMK Bot
80c8a99204 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 05:25:11 +00:00
yiancar
17933a884a
[Keyboard] mnk1800s initial commit (#13444) 2021-07-19 22:24:40 -07:00
QMK Bot
9c5a0fb0b2 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 04:05:10 +00:00
cole smith
6ab0593f44
[Keyboard] Boardsource technik (#13111) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 21:04:43 -07:00
QMK Bot
18ae1f423f Merge remote-tracking branch 'origin/master' into develop 2021-07-20 04:02:05 +00:00
TerryMathews
9941cf0051
[Keyboard] PORTICO: add support for wt_rgb (#13241) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 21:01:36 -07:00
QMK Bot
cf4a121700 Merge remote-tracking branch 'origin/master' into develop 2021-07-20 03:50:18 +00:00
ぺらねこ
8b0a996d5d
[Keyboard] Add tone (#13337) 
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Takeshi ISHII <2170248+mtei@users.noreply.github.com>
Co-authored-by: kakunpc <15257475+kakunpc@users.noreply.github.com>
 2021-07-19 20:49:45 -07:00
QMK Bot
d5907a674f Merge remote-tracking branch 'origin/master' into develop 2021-07-20 03:46:37 +00:00
Andrew Kannan
f439bfd543
[Keyboard] Aella Keyboard PCB (#13372) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 20:46:01 -07:00
Joakim Tufvegren
1414e9736d
Switch Ergodox Infinity over to split_common (#13481) 2021-07-19 18:54:32 -07:00
QMK Bot
85621311db Merge remote-tracking branch 'origin/master' into develop 2021-07-20 01:49:28 +00:00
Andrew Kannan
46b8230468
[Keyboard] Add CannonKeys Balance PCB to QMK (#13489) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2021-07-19 18:49:26 -07:00
npspears
8e30ec1eee
[Keyboard] enable RGB underglow on heckerboards/axon40 (#13490) 
This PCB uses RGB underglow LEDs. If the user doesn't want them, they can turn them off with a keycode.
 2021-07-19 18:48:58 -07:00