Commit Graph

69 Commits

Author SHA1 Message Date
MechMerlin
5909c243d4
KBD67 Rev2 VIA: Increase layer count from 2 to 4 (#11039) 2020-11-30 05:05:46 +11:00
James Young
c66df16644
2020 November 28 Breaking Changes Update (#11053)
* Branch point for 2020 November 28 Breaking Change                                                

* Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183)                                           

* Add support for soft serial to ATmega32U2 (#10204)                                               

* Change MIDI velocity implementation to allow direct control of velocity value (#9940)            

* Add ability to build a subset of all keyboards based on platform.                                

* Actually use eeprom_driver_init().                                                               

* Make bootloader_jump weak for ChibiOS. (#10417)                                                  

* Joystick 16-bit support (#10439)                                                                 

* Per-encoder resolutions (#10259)                                                                 

* Share button state from mousekey to pointing_device (#10179)                                     

* Add hotfix for chibios keyboards not wake (#10088)                                               

* Add advanced/efficient RGB Matrix Indicators (#8564)                                             

* Naming change.                                                                                   

* Support for STM32 GPIOF,G,H,I,J,K (#10206)                                                       

* Add milc as a dependency and remove the installed milc (#10563)                                  

* ChibiOS upgrade: early init conversions (#10214)                                                 

* ChibiOS upgrade: configuration file migrator (#9952)                                             

* Haptic and solenoid cleanup (#9700)                                                              

* XD75 cleanup (#10524)                                                                            

* OLED display update interval support (#10388)                                                    

* Add definition based on currently-selected serial driver. (#10716)                               

* New feature: Retro Tapping per key (#10622)                                                      

* Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638)             

* Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530)

* Rescale both ChibiOS and AVR backlighting.                                                       

* Reduce Helix keyboard build variation (#8669)                                                    

* Minor change to behavior allowing display updates to continue between task ticks (#10750)        

* Some GPIO manipulations in matrix.c change to atomic. (#10491)                                   

* qmk cformat (#10767)                                                                             

* [Keyboard] Update the Speedo firmware for v3.0 (#10657)                                          

* Maartenwut/Maarten namechange to evyd13/Evy (#10274)                                             

* [quantum] combine repeated lines of code (#10837)                                                

* Add step sequencer feature (#9703)                                                               

* aeboards/ext65 refactor (#10820)                                                                 

* Refactor xelus/dawn60 for Rev2 later (#10584)                                                    

* add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824)                                 

* [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549)                                    

* update chibios os usb for the otg driver (#8893)                                                 

* Remove HD44780 References, Part 4 (#10735)                                                       

* [Keyboard] Add Valor FRL TKL (+refactor) (#10512)                                                

* Fix cursor position bug in oled_write_raw functions (#10800)                                     

* Fixup version.h writing when using SKIP_VERSION=yes (#10972)                                     

* Allow for certain code in the codebase assuming length of string. (#10974)                       

* Add AT90USB support for serial.c (#10706)                                                        

* Auto shift: support repeats and early registration (#9826)                                       

* Rename ledmatrix.h to match .c file (#7949)                                                      

* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231)                                        

* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840)                                        

* Merge point for 2020 Nov 28 Breaking Change
2020-11-28 12:02:18 -08:00
Joel Challis
adfd34c451
Refactor to use led config - Part 2 (#10906)
* Refactor to use led config

* Refactor to use led config

* Refactor to use led config
2020-11-17 17:06:23 +00:00
Brandon Schlack
f12dcb0659
[Keymap] add brandonschlack userspace and keymaps (#10411) 2020-11-04 21:55:03 -08:00
Ryan
555b1640b2
Add layout: 65_iso_blocker_split_bs (#10733)
* Add layout: 65_iso_blocker_split_bs

* Add layout to readme
2020-10-26 16:56:34 -07:00
Christian Eiden
bb35f6a6f5
[Keymap] Add own KBD67 MKII keymap (#10532)
* own KBD67 MKII keymap

Signed-off-by: Christian Eiden <christian@eiden.ch>

* Update keyboards/kbdfans/kbd67/mkiirgb/keymaps/cykedev/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>
Signed-off-by: Christian Eiden <christian@eiden.ch>

Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-10-13 04:40:47 -07:00
kingwangwong
d828e991a9
[Keymap] update to king keymaps by kingwangwong (#10299)
Adding my kbd67mkii keymap and some changes to kumo

Keymaps for kbdfans/kbd67/mkii_soldered and thevankeyboards/minivan

* Changes to minivan layout

* KBD67 keymap

* commiting my files
2020-09-22 17:58:45 -07:00
James Young
fb4a6ad30e
KBD67 MkII Soldered: ISO layout patches (#10367)
* KBD67 MkII Soldered: Fix ISO blocker layout

Matrix data was wrong; KC_NUHS key did not work.

* KBD67 MkII Soldered: Add ISO blocker with Split Backspace layout
2020-09-19 23:37:31 -07:00
rupa
c3ab20511d
kbd67/mkiirgb - allow disabling rgb matrix (#10147)
* kbd67/mkiirgb - allow disabling rgb matrix

wrap rgb matrix funs in defines

* kbd67mkiirgb - changes per review

remove kb funcs that just call the user version. what's left is all rgb
matrix stuff so we can just wrap the whole file.
2020-08-26 01:09:45 -07:00
moyi4681
3d2e5bfe63
add kbd67 capslock indicator (#9839) 2020-07-31 04:20:14 -07:00
Adam DeHaven
9236c3a9d0
[Keymap] Adding custom keymaps (#9426)
* Adding custom keymaps

* Update keyboards/kbdfans/kbd75/keymaps/adamdehaven/keymap.c
2020-06-26 03:17:31 -07:00
elmo-space
1f2807c2de
Add ANSI and ISO layout for KBD67mkII soldered PCB (#9340)
* add ansi and iso layouts

* fix iso map mistake

* fix mistake again...

* Update keyboards/kbdfans/kbd67/mkii_soldered/keymaps/iso/keymap.c

* rename layout macros to the blocker variants and add ansi_split_bs

* Apply suggestions from code review
2020-06-13 11:45:03 -07:00
Catriel Müller
ccb4b81b3f
Fix my personal keymap // Custom keymap for Kbdfans/kbd67/rev2 with improvements on Accessibility (#9207)
Co-authored-by: Ryan <fauxpark@gmail.com>
2020-06-11 22:39:56 +10:00
Sergey Vlasov
cce301ae83
kbdfans/kbd67/rev2: Fix ISO layout macro (#9329)
A user in Discord reported that the right bracket and ISO hash keys on
KBD67 rev2 using LAYOUT_65_iso were swapped.  When comparing
LAYOUT_65_iso with LAYOUT_65_ansi, the problem with a wrong assignment
of the right bracket key is obvious — that key is K1D in the ANSI layout
macro, but the ISO layout macro had K1E there, and K1D at the position
of the ISO hash key.

Fix the LAYOUT_65_iso macro by swapping those arguments (and also align
the K1D argument for the right bracket key properly).
2020-06-10 18:43:09 +01:00
KOBAYASHI Daisuke
5c9906eb4f
Add VIA support for kbd67rev1 (#9173) 2020-05-25 19:26:27 -07:00
Jonathan Rascher
81c648e947
More community layout support for legacy KBD67 PCBs (#8933)
* Community layout support for KBD67 hotswap

* Community layout support for KBD67 rev1

* Community layout support for KBD67 rev2

* Move bcat's KBD67 hotswap layout to community
2020-05-06 22:47:55 -07:00
Jonathan Rascher
4597f2bcc8
[Keymap] Make personal keymaps a bit more consistent (#8915)
* Move menu key on ergo boards to match staggered

* Unify 60_tsangan_hhkb and 60_ansi_split_bs_rshift

* Sync KBD67, Quefrency with community layouts

* Update ergo KLE images

* Update community layout KLE images

* Update KLE images/descriptions for remaining keebs
2020-04-25 23:01:43 -07:00
MechMerlin
c261076f8e
[Keyboard] VIA Support: KBD67mkii SOLDERED (#8837)
* add VIA keymap to soldered kbd67mkii

* clean up config file
2020-04-19 10:11:32 -07:00
moyi4681
55002338b1
add kbd67 rev2 via support, kbd67mkiirgb small change (#8810)
* add kbd67 rev2 via support, kbd67mkiirgb small change

add kbd67 rev2 via support, kbd67mkiirgb small change

* Update keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c

* Update keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c

* define DYNAMIC_KEYMAP_LAYER_COUNT 2
2020-04-16 17:41:56 -07:00
Jason Scatena
5185c52b4a
[Keymap] Added custom layout for KBDFans KBD67 rev2 (#8752)
* added v1 of keyboard layout

* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c

* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c

* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c

* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c

* Update keyboards/kbdfans/kbd67/rev2/keymaps/jscatena88/keymap.c

* Delete config.h
2020-04-14 18:38:48 -07:00
moyi4681
f7601dba13
change kbd67 rev1 and rev2 default keymaps (#8758)
* change kbd67 default keymap
2020-04-10 20:15:23 -07:00
elmo-space
016d417253
add ansi with blocker layout and keymap for KBD67 rev2 PCB (#8538)
* add new layout for 65% with blocker and add matching keymap

the rev2 pcb gets used in the kbd67 which has a blocker between the left arrow key and the right ctrl key. this layout is missing so far even though it's probably the most used one for this board.

* add split backspace layout with blocker

* change keycode for backslash

* update rules.mk and add missing layouts in info.json

* Update keyboards/kbdfans/kbd67/rev2/rules.mk

Co-Authored-By: Joel Challis <git@zvecr.com>

Co-authored-by: Joel Challis <git@zvecr.com>
2020-03-25 14:51:05 -07:00
Brandon Schlack
e18be69104
Add community layout support to KBD67 MKIIRGB v2 (#8249) 2020-02-27 13:19:34 +11:00
dnsnrk
f4c1e066ba
[Keymap] User keymap for KBDfans KBD67 MKII RGB (hot-swap) (#7697)
* initial custom keymap

* initial code for caps lock LED

* added debounce overrides

* override caps lock handler

* finished up on CAPS LOCK LED customization

* lowered debounce

* layer lightning fx

* Added layer tap-toggle

* reformatting

* refined keymap

* copyright and more clean-up

* increased DEBOUNCE

* initial custom keymap

* initial code for caps lock LED

* added debounce overrides

* override caps lock handler

* finished up on CAPS LOCK LED customization

* lowered debounce

* layer lightning fx

* Added layer tap-toggle

* reformatting

* refined keymap

* copyright and more clean-up

* increased DEBOUNCE

* added readme and some more clean-up

* incorporated pull request feedback
2020-02-10 18:05:25 -08:00
MechMerlin
b015c37922
VIA Support: KBD67 mkii v1/v2 (#8085)
* add the via keymap

* get an appropriate unused VID

* fix formatting up a bit

* Update keyboards/kbdfans/kbd67/mkiirgb/v1/config.h

* Update keyboards/kbdfans/kbd67/mkiirgb/v2/config.h
2020-02-05 12:34:08 -08:00
Mike Rix Wolfe
acef512730
[Keymap] Add User Keymap for FC660C (#8062)
* add my keymaps

* tri layer keymap

* update tri layer

* update tri layer

* cleaning up

* formatting

* move to correct location

* lily58: move caps off mod key in sublayer

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

* remove unnecessary trailing whacks

* remove unneeded file

* swap spacebar

* update code for comments in PR

* add fc660c keymap

* rm readme

* move layer key

* remove inconvenient alternate keys

* swap format

* add them media keys

* add rules mk

* swap caps and ctrl

* remove unneeded config

* use gesc instead of esc
2020-02-02 13:11:17 -08:00
ridingqwerty
0f7d294ac3
Remove filesize changes from default-ish rules.mk files, sans handwired (#8040) 2020-01-30 13:47:48 -05:00
Adi M
9b4052e5a3 Adi's KBD67 layout (#7896)
* Add files via upload

* Rename keyboards/kbdfans/kbd67/rev2/keymaps/keymap.c to keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

* Rename keyboards/kbdfans/kbd67/rev2/keymaps/readme.md to keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md

* Update readme.md

* Update readme.md

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

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

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/keymap.c

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

* Update keyboards/kbdfans/kbd67/rev2/keymaps/adi/readme.md

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

Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-01-15 08:44:59 +11:00
Mike Rix Wolfe
09b4457bf2 Add user keymaps for KBD67MKII/Lily58 (#7671)
* add my keymaps

* tri layer keymap

* update tri layer

* update tri layer

* cleaning up

* formatting

* move to correct location

* lily58: move caps off mod key in sublayer

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/lily58/keymaps/mikefightsbears/rules.mk

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* remove unnecessary trailing whacks

* remove unneeded file

* swap spacebar

* update code for comments in PR

Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-12 22:42:55 +11:00
MechMerlin
886eb98e2a KBD67 MKII Notes Update (#7824)
* add readme to each of the mkii versions

* update the most parent of kbd67 readmes to have history of the new versions

* fix up the parent readme for the two types of boards

* Update keyboards/kbdfans/kbd67/mkiirgb/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kbdfans/kbd67/mkiirgb/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kbdfans/kbd67/mkiirgb/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/kbdfans/kbd67/mkiirgb/readme.md

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* fixup readmes

Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-10 09:28:56 +11:00
codecoffeecode
36d913e1b1 [Keymap] Adding keymap for KBDFans Kbd67 MKII RGB (#7712)
* Adding keymap for Kbd67 MKIIRGB

* "addressing comments by fauxpark"
2019-12-28 18:15:32 -08:00
moyi4681
58b2c72d53 [Keyboard] add kbd67mkiirgb v2 keyboard (#7618) 2019-12-12 20:58:06 -08:00
Kemmel-Dev
b663a5b248 [Keymap] added a KBD67v2 layout that allows swapping of num/sym keys and f-rows (#7469) 2019-11-26 10:28:44 -08:00
moyi4681
1c9e450218 [Keyboard] kbdfans keyboards NKRO enable (#7364) 2019-11-15 00:01:51 -08:00
fauxpark
f98750de6e [Core] Cleanup rules.mk for F303 keyboards (#7306)
* Cleanup rules.mk for F303 keyboards

* Fix small typo
2019-11-14 18:25:40 -08:00
moyi4681
426c03eda0 [Keyboard] add kbdmini; dztech, kbdfans keyboards cleanup (#7223)
* add kbdmini, dztech and kbdfans keyboards small fix

* Caps lock indicator moved from keymap

* Update dz65rgb.c

* fix error

* fix matthewrobo keymap error

* Update keyboards/kbdfans/kbd67/mkiirgb/mkiirgb.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/dztech/dz60rgb/dz60rgb.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* Update keyboards/dztech/dz65rgb/dz65rgb.c

Co-Authored-By: fauxpark <fauxpark@gmail.com>

* wrap all of the g_led_config stuff and rgb matrix functions in ifdefs

wrap all of the g_led_config stuff and rgb matrix functions in ifdefs
2019-11-14 11:55:46 -08:00
Jonathan Rascher
1f6cb53fb3 [Keymap] Moar personal keymap and userspace tweaks (#7238)
* Enable link-time optimization

* Make RGB static gradient ranges shorter

* Shift Quefrency media keys to the right

* Shift KBD67 media keys to the right

* Move some 60% keys from function to adjust layer

* Set "extra" Lily58 keys to browser back/forward

* Remove Instant60 EEPROM hack after #6968

* Remove unnecessary bits from macropad keymaps

* Update KLE images
2019-11-01 18:48:58 -07:00
fauxpark
2ce6adff2b Miscellaneous rules.mk cleanups (#7212)
* Miscellaneous rules.mk cleanups

* Put back ARM bootloader rules
2019-10-31 13:11:36 +00:00
ai03
096a49c3dc [Keyboard] Add KBD67 MKII Solderable PCB Variant (#7202)
* Clone 8x source to begin

* Start replacing stuff

* Get things compiling

* Rename files

* Move board files to match MKII RGB files

* Adjust readme

* Adjust main keymap to be functional

* Make defualt keymap more basic; add personal keymap

* Remove unnecessary trailing slashes from keymap

* Remove unused functions from keymaps

* Remove obsolete build flags

* Adjust comments as requested

* Apply suggestions from code review

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Adjust as suggested

* Fix broken compile following applying suggestions
2019-10-30 17:10:40 -07:00
fauxpark
e214f2826e Add ISO layout macro for KBD67 rev2 (#7113) 2019-10-22 06:44:50 -07:00
fauxpark
2ee961c9e8 Cleanup rules.mk for 32U4 keyboards, I-K (#7097)
* Cleanup rules.mk for 32U4 keyboards, I-K

* Clean up ivy rules.mk
2019-10-21 21:43:18 -07:00
Jonathan Rascher
a41066beed [Keymap] Assorted personal keymap and layout updates (#7082)
* Enable PERMISSIVE_HOLD and TAPPING_FORCE_HOLD

* Fix indentation in userspace

* Shuffle around more Lily58 symbol keys

* Reformat KBD67 keymap and KLE images

* Fix Lily58 lower layer image

* Reformat Quefrency keymap and KLE images

* Fix KBD67 KLE images... again

* Add KLE links for Quefrency

* Reformat 60% layouts and KLE images

* Move Super key back to right half of Lily58

* Move Lily58 ins/del out of the way of numbers

* Fix bottom row of Lily58 KLE image
2019-10-20 11:41:36 -07:00
MechMerlin
0850a8cb63 65 ansi blocker everywhere (everywhere I can find) (#6805)
* e6.5 actually already had a 65_ansi_blocker LAYOUT macro, so just had to enable in rules.

* Add the 65_ansi_blocker LAYOUT macro and enable in rules.mk

* rename LAYOUT macro in .h and in the keymap.c as it was only a default keymap. Also enable in rules.mk

* rename but also had to define the existing LAYOUT macro as the new one to prevent breakage of existing keymaps

* add 65_ansi_blocker support for vinta

* forgot to update the info.json on these

* add new default layout 65_ansi_blocker support to alt

* add 65_ansi_blocker support

* undo changes
2019-09-25 12:55:27 -07:00
MechMerlin
460da06ce4 [Keyboard] KBD67 Mk.II RGB info.json missing a column (#6807)
* looks like configurator layout was missing a column

* add a key count
2019-09-24 11:26:17 -07:00
MechMerlin
37b6a2abbd Refactor the KBD67 Mk.II RGB (#6799)
* move kbd67mkiirgb into kbd67 directory as mkiirgb

* rename files

* rename LAYOUT to LAYOUT_65_ansi_blocker

* add support for default layout

* update readme for new build target

* update parent readme with the fourth variant
2019-09-23 23:34:59 -07:00
Jonathan Rascher
9340b70b7e [Keyboard] Assorted personal keymap/layout updates (#6621)
* Switch Quefrency back to I2C (#6161 fixes the lag)

* Update Quefrency keymap

* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.

* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.

* Update KBD67 keymap

* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.

* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.

* Move Menu to a layer tap on the Fn key since that's a more natural
location.

* Update 60% Tsangan HHKB layout

* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.

* Update 60% ANSI split backspace/right-shift layout

* Add reset and EEPROM reset keybindings so these tasks can be performed
separately, rather than relying on Bootmagic Lite, which performs both
tasks at the same time.

* Move Caps Lock from Fn+Ctrl to Fn+Tab since Fn+Ctrl is sometimes used
as part of a more complex keybinding, whereas Fn+Tab is always safe.
2019-08-30 17:45:49 -07:00
Konstantin Đorđević
267a85c885 Remove KC_DELT alias in favor of KC_DEL (#6327)
* Remove KC_DELT alias in favor of KC_DEL

* Add changelog
2019-08-30 15:01:52 -07:00
Stevan Milic
3dd2905b7b Add personal KBD67 keymap (#6292)
* Add kbdfans/kbd67/hotswap:stevanmilic keymap

* Change Fn+H, Fn+L to Ctrl+Left, Ctrl+Right

* Add keymap comments
2019-07-11 07:37:16 -07:00
tucznak
aa587a5abb [Keymap] Add personal keymaps (#6217)
* TuCZnak's NIU keymap

* TuCZnak's KBD75 layout

* TuCZnak's KBD67 layout

* Implemented suggested changes

* Implemented suggested changes, cleanup

* Implemented suggested changes, cleanup
2019-07-01 12:42:17 -07:00
Jimmy Multani
a825bbf5ea [Keyboard] Fix incorrect RGBLED_NUM value (#6148)
KBD67 Rev 2 has 20 LEDs, not 18. This was causing 2 of the underglow LEDs to remain off. This fix updates that.
2019-06-18 22:54:55 -07:00