Commit Graph

8969 Commits (c2f227d2a87d6258bca6d2f96b6fc475e2fe54f5)

Author SHA1 Message Date
Jonavin 8d611f6873
[Keymap] Jonavin keymap Mercutio add win key lockout function (#13670)
Co-authored-by: Jonavin <=>
2021-07-29 08:47:14 -07: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
ESCA47 3a48cd64cb
[Keyboard] Add GetawayVan (#13412)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-29 08:28:33 -07: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
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
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
James Young a617c8b80a
[Keyboard] Ares refactor (#13730) 2021-07-26 19:43:48 -07: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
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
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 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 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
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
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
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
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
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
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
Domantas dfd795e48e
Add backslash in lily58 domnantas keymap (#12713) 2021-07-23 14:24:16 +10: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
KnoblesseOblige 79c8f035cc
[Keyboard] Added Crin keyboard (#13630)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-22 18:47:32 -07: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
Tran Kim Tung 95a7c22824
[Keyboard] adds new revision: dztech/dz60rgb/v2_1 (#13636) 2021-07-22 09:39:08 -07:00
Md. Mashur Shalehin Sakib 58abdfc834
[Keyboard] Fixing info.json for h0oni/hotduck (#13640) 2021-07-22 09:35:28 -07:00
Trent Hoh 78a3f43c08
[Keyboard] Ymd40v2new layouts and fixed per-switch backlight (#13622) 2021-07-22 01:11:11 -07:00
Drashna Jaelre 8158473464
[Keyboard] Fix clawsome/hatchback and reviung5 compile issues (#13607) 2021-07-22 00:53:18 -07: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
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
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
Sắn 92cca84651
[Keyboard] Add keypad Satxri6key (#13423)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 23:40:24 -07: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
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
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
Adam Abrams fbe782534a
[Keyboard] Add personal planck keymap (#13635) 2021-07-21 22:56:46 -07:00
Manassarn "Noom" Manoonchai 665af4fa8d
[Keymap] narze/xd004 (#13634)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-21 22:46:15 -07:00
Md. Mashur Shalehin Sakib 5b8d2b5cde
[Keyboard] Add h0oni hotduck keyboard (#13609) 2021-07-21 22:39:36 -07: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
Alabahuy 2b260bd846
fixed number layer on keymap (#13627) 2021-07-21 19:25:21 +01: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
Xelus22 afc629210c
[Bug] VIA compile fixes (#13626) 2021-07-21 08:35:10 -07: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
Andrew Kannan ddc2766537
Fix vicious40 rules (#13623) 2021-07-21 15:05:10 +10: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
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
kb-elmo c1ba35363d
[Keyboard] Added Kineticlabs Emu (#12968) 2021-07-20 10:48:17 -07: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
gkeyboard 8c526703f8
[Keyboard] Update lm60n.h (#13249) 2021-07-20 10:43:44 -07:00
sekigon-gonnoc c6698cfce3
[Keyboard] Add keyboard GRS-70EC (#11296) 2021-07-20 10:24:22 -07: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
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
AlisGraveNil 4f880801ec
[Keyboard] luggage rack (#12959) 2021-07-20 09:34:56 -07: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
Andrew Kannan 388a4ae817
[Keyboard] Add Vicious40 to QMK (#12981)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-20 09:19:26 -07:00
Ryan 7ea1b97785
Fix CRLF in xbows/knight:via config.h (#13614) 2021-07-20 14:04:36 +01: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
Ryan Boone b887a1b995
[Keyboard] Add q4z keyboard (#13198)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 22:27:18 -07: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
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
yiancar 17933a884a
[Keyboard] mnk1800s initial commit (#13444) 2021-07-19 22:24:40 -07:00
cole smith 6ab0593f44
[Keyboard] Boardsource technik (#13111)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 21:04:43 -07: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
ぺらねこ 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
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
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
Adrian L Lange 1105f2eb47
[Keymap] Update bface p3lim keymap (#13582) 2021-07-19 18:48:00 -07:00
X-Bows Tech 5ee5280fa1
[Keyboard] Update the XBows/Knight keyboard (#13541)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-19 18:28:50 -07:00
Daegara 10905a6500
[Keyboard] CU65 layout update (#13589) 2021-07-19 17:52:19 -07:00
bomb 44a8ad265c
[Keyboard] Repaired melgeek/mj63/ RGB lamp driver problem (#13579) 2021-07-19 17:52:00 -07:00
Giorgi Chavchanidze 8bc8eadaf9
[Keymap] Orthon keymap for idobo (#13584)
Co-authored-by: Giorgi Chavchanidze <giorgi@vivaldi.com>
2021-07-19 17:32:20 -07:00
Suschman 7e698c71cd
Six Pack and ortho_ layout updates (#13587)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Suschman <suschman@gmail.com>
2021-07-19 17:30:09 -07:00
James Young 046429fa87
Knobgoblin: rename ortho keymap to default (#13592)
Keyboard did not previously have a `default` keymap.
2021-07-19 17:26:34 -07:00
James Young 4b55b7f852
converter/periboard_512: add Configurator layout data (#13600) 2021-07-19 17:06:45 -07:00
James Young 58f9321a77
fluxlab zplit: keymap restructuring (#13599) 2021-07-19 17:05:47 -07:00
Xelus22 5b6780f999
[Keyboard][Bug] Constellation Rev2 (#13595) 2021-07-19 17:04:14 -07:00
James Young 07ae72ea6b
LazyDesigners Bolt: move via keymap to keymaps directory (#13581) 2021-07-17 17:41:29 -07:00
James Young 876f861715
Discipline layout macro/Configurator fixes (#13574)
* use human-friendly formatting in info.json

* move layout macro aliases to info.json

* correct and complete layout data

Corrects the layout data for a few layouts, adds the missing data, and renames some of the layout macros.

- rename LAYOUT_wkl_ansi_2_right_mods to LAYOUT_65_ansi_wkl
- rename LAYOUT_wkl_ansi_3_right_mods to LAYOUT_65_ansi_lwkl
- rename LAYOUT_wkl_iso_2_right_mods to LAYOUT_65_iso_wkl
- rename LAYOUT_wkl_iso_3_right_mods to LAYOUT_65_iso_lwkl
2021-07-17 16:25:56 -07:00
James Young 26e64f4fd3
ACR60 Refactor (#13575)
* modernize acr60.h

- use #pragma once include guard
- add license header
- use four-space indent
- use QMK three-character notation for layout macro arguments

* human-friendly format info.json

* remove `key_count` keys from info.json

* rename LAYOUT_2_shifts to LAYOUT_all

* move LAYOUT_all to top

* use QMK three-character notation in info.json

* refactor default keymap

- add license header
- remove third layer (does nothing)
- replace Shift-Escape keycode with KC_GESC
- use LAYOUT_all macro instead of LAYOUT

* modernize readme.md

- update header
- convert metadata section to list
- add flashing and bootloader jump instructions
- update Docs links

* use #pragma once include guard in config.h

* update LED Indicator API

* add license headers
2021-07-17 16:17:48 -07:00
James Young ca0e7e7bd9
Cutie Club Giant Macro Pad: add info.json (#13576) 2021-07-17 10:16:20 -07:00
James Young b127180c0c
Xelus Akis Configurator Fixes (#13577)
* correct layout macro references

The keyboard's header file and info.json referenced different layout macro names.

* correct layout data

Insert an object for the Non-US Backslash key, which was previously missing.
2021-07-17 01:43:02 -07:00
Dasky 932a67ced2
Limit RGB brightness for crkbd when not defined (#13568) 2021-07-16 12:16:06 -07:00
lukeski14 89eeb4987c
adding tw40 via support (#13032) 2021-07-17 02:42:50 +10:00
Oliver Granlund 455a988aa6
[Keyboard] Neito + my DZ60 keymap tweaks (#11773) 2021-07-16 09:39:35 -07:00
Andre Brait c330fa725d
Set some default configurations for GMMK Pro (#13219)
* Set some default configurations for GMMK Pro

* Remove FORCE_NKRO to avoid issues with KVMs
2021-07-16 09:06:23 +10:00
bomb 68b1ef2d1d
[Keyboard] correct the info.json for qmk configurator and add two empty layers for via (#13552) 2021-07-15 09:54:58 -07:00
Zach White 9d0b7ab9b9
[keyboard] Clueboard 2x1800 2021 Support (#13220)
* 2x1800 2021

* add support for writing a whole frame at a time

* improvements

* wip

* fix scrolling

* small tweak

* add a buffer that's larger than the display

* add the start of a font

* working upper and lower case letters

* add qmk animation

* integrate the message sign into the qmk task system

* add encoder defaults

* add MAX7219_LED_CUSTOM to config.h

* tweaks

* remove unneeded keymaps

* add a keymap showing how to control the signboard

* cleanup

* cleanup

* add a way to disable the startup test

* make it easier to define options at the keymap level

* Fix define names

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>

* Apply suggestions from gcochard

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>

* feedback from noroads

* format info.json

Co-authored-by: Greg Cochard <gcochard@users.noreply.github.com>
2021-07-14 21:24:15 -07:00
mechlovin 18c6e1d46d
[Keyboard] Add Serratus PCB (#13281)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 13:55:52 -07:00
Koobaczech 867d60bd64
[Keyboard] Tidying up my projects and subprojects (#13289)
Co-authored-by: Erovia <Erovia@users.noreply.github.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ethan Madden <maddene@madden.ninja>
2021-07-14 13:55:12 -07:00
Ryan 99f637e82c
Fix some RGB Matrix-enabled keymaps referring to RGBLight mode (#13509) 2021-07-15 03:50:09 +10:00
mechlovin 1c9af238dc
correct data info.json (#13544)
rouge87 and rogue87
2021-07-14 08:46:44 -07:00
bomb 9c4916e2e8
[Keyboard] Add MelGeek MJ6xy which is a 60% keyboard that support mul… (#13494)
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-07-14 08:39:54 -07:00
James Young dd5ead676b
Traveller handwired layout macro refactor (#13539) 2021-07-13 21:28:56 -07:00
James Young 70efc82c1c
Lucid Phantom soldered: layout macro touch-up (#13540) 2021-07-13 21:27:11 -07:00
Albert Y b29179de1a
RGB Matrix support for Scylla (#13415)
Co-authored-by: filterpaper <filterpaper@localhost>
2021-07-13 21:26:00 -07:00