Commit Graph

5817 Commits

Author SHA1 Message Date
fauxpark
d3bd1d893b Ensure PROGMEM is present on default keymaps (#7836) 2020-01-09 10:19:24 +00:00
James Young
d2e6a4bf5e Handwired Minorca Refactor (#7833)
* update config.h

- use #pragma once include guard
- update USB Device Descriptor strings

* update minorca.c

- remove matrix_init_kb function (same as QMK default)

* update minorca.h

- use #pragma once include guard
- update matrix identifiers

* update info.json

- update matrix identifiers
- change to four-space indent

* update rules.mk

- remote firmware size impact notes
- disable RGBLIGHT_ENABLE (no RGB config present)
- templating

* update readme.md

- templating

* update keymaps/default/rules.mk

- remove firmware size impact numbers
- templating

* update keymaps/rgb/rules.mk

- remote firmware size impact notes
- templating

* update keymaps/rgb/readme.md

- fix header

* remove keymaps/default/rules.mk

- identical to keyboard's rules.mk

* elevate Bootmagic configurations to keyboard level

* update keymaps/rgb/config.h

- use #pragma once include guard
- remove redundant config.h include

* update keymaps/rgb/rules.mk

- remove redundant rules

* update keymaps/rgb/readme.md

- change RGB function list to a table
- make wiring call-out a header

* remove keymaps/default/config.h

- it's blank now

* update minorca.h

- use four-space indent

* add Teensy 2.0 to readme
2020-01-09 10:47:33 +11:00
yulei
fe860131dd [Keyboard] fixed hhkb keymap issue on e6_rgb (#7684)
* fixed hhkb keymap issue and added allleds configuration

* fixed layout mismatch

* add more matrix control

* remove redundent define in rules.mk

* turn NKRO on

* remove allled macro, adding readme in allleds mode, add via support

* add two more layers for via

* update readme file

* Update keyboards/exclusive/e6_rgb/keymaps/allleds/readme

* Update keyboards/exclusive/e6_rgb/keymaps/allleds/readme.md
2020-01-08 00:11:45 -08:00
yiancar
4a09679d74 [Keyboard] add Allison Numpad (#7823)
* add Allison Numpad

* alternative layout
2020-01-07 21:36:43 -08:00
Kenny Greulich
331bbd602d [Keymap] added custom keymap and config for dz60rgb v1 (#7808) 2020-01-07 21:23:03 -08:00
Perry Huynh
9086d720e0 [Keyboard] add VIA support to Kyuu (#7804)
* add VIA support to Kyuu

* update keymap file to follow indenting guidelines

* add missing newline to rules.mk

* remove unnecessary backslashes and reindent default keymap
2020-01-07 21:21:52 -08:00
fauxpark
8fa64568f0 [Keyboard] Update Wasdat config (#7826) 2020-01-07 17:47:43 -08:00
Lucas Moreira
fdc144d215 [Keymap] Improvements to KidBrazil keymap to better handle OLED/LED Matrix timeout. (#7688)
* Added KidBrazil custom keymap for CRKBD
-Custom Font
-Custom OLED output

* Added missing readme

* Oled Timeout Update for KidBrazil Keymap (#1)

* Setup Oled timeout based on simple timer

* Cleaned up comments and added timeout for LEDs

* Fixed some small errors

* Updated oled timout with matrix scan

* Updated oled timout with matrix scan

* Update withou eeprom

* Update timer code

* Use process user instead of keymap

* Added ifdef to protect oledtimer

* Updated with half timeout state for logo

* Removed middle tier timer

* Final cleanup of unused files

* Updated code as per suggestions & requests

* Second round of revisions

* Updated keymap to better handle LED timeout
- Added boolean to hold LED state
- Added init function to set rgb to known state
- Modified RGB_TOG to work with noeeprom commands

* Finished adding the timeout for OLED and testing on CRKBD

* Updated documentation

* fixed the timeout logic so it works as intended

* Update keyboards/crkbd/keymaps/kidbrazil/README.md
2020-01-07 17:28:06 -08:00
yiancar
ee70d496f4 [Keyboard] add Allison keyboard (#7818)
* Initial commit

* Cosmetic Fixes

* Delete config.h
2020-01-07 17:26:04 -08:00
James Young
0027a0a948 Tada68 Fixes and Minor Refactoring (#7820)
* fix ANSI layout macro reference

* update ISO layout macro and enable 65_iso community layout support

- rename to LAYOUT_65_iso (with LAYOUT_iso alias for backwards compatibility)
- rename position k2c to k1d (electrical position)

* rules.mk templating

* tada68.h: use #pragma once include guard

* config.h: use #pragma once include guard

* make product id unique

* update info.json

* update readme

* cleanup default keymap

- keycode alignment
- layout macro reference
- four-space indent

* remove matrix_*_user functions from tada68.h
2020-01-08 00:17:01 +00:00
Jesse Leventhal
0c86cfeaed [Keyboard] Added NCC-1701-KB 3x3 Keypad with Encoder and Keymap (#7819)
* Added NCC-1701-KB Keypad and Keymap

* Update keyboards/ncc1701kb/config.h

* Update keyboards/ncc1701kb/config.h

* Update keyboards/ncc1701kb/config.h

* Update keyboards/ncc1701kb/config.h

* Update keyboards/ncc1701kb/ncc1701kb.h

* Update keyboards/ncc1701kb/readme.md

* Update keyboards/ncc1701kb/readme.md

* Update keyboards/ncc1701kb/readme.md

* Fixed changes rules.mk bootloader

* Fixed rules.mk Build Options

* Recomended fauxpark changes/fixes

* Update keyboards/ncc1701kb/ncc1701kb.h

* Update keyboards/ncc1701kb/ncc1701kb.h

* Update keyboards/ncc1701kb/readme.md

* Update keyboards/ncc1701kb/readme.md
2020-01-07 14:29:45 -08:00
Xyverz
b69457a192 More minor tweaks. (#7813)
Made the MACLOCK key easier tu use by putting it on right thumb
cluster as well.
2020-01-08 08:54:08 +11:00
Rob Haswell
cf30c5d17f RGB matrix effect - left-right gradient (#7742)
* Left-right gradient.

* Update the comment to match the new functionality.

* CPP does integer division so this round is not necessary.

* The x-range is actually 224, update comment and use bit-shifting again.

* Update docs with gradient left-right effect and associated "DISABLE" option.
2020-01-07 21:25:17 +00:00
Robert Snyder
957b8f553c [Keyboard] add info.json for dactyl_promicro (#6993)
* add info.json for dactyl_promicro

* tabs to spaces
reformat dactyl_promicro to match the LAYOUT_6x6
changed the default map to match dactyl
2020-01-07 13:23:47 -08:00
Karol Samborski
004ef3fad7 [Keymap] New levinson keymap (#7613)
* Vim oriented scheme

* Meta on both sides

* Removed unused staff

* Changed dynamic macro codes to the built ones

* Fixed formatting
2020-01-06 23:57:58 -08:00
gtips
10d18820d2 [Keyboard] Add keyboard Reviung41 (#7807)
* [Keyboard] Add keyboard Reviung41

* Modified files

* deleted keyboards/reviung41/keymaps/default/config.h

* modified keyboards/rebiung41/keymaps/default/keymap.c

* modified keyboards/reviung41/readme.md

* modified keyboards/reviung41/readme.md

* modified keyboards/reviung41/readme.md
2020-01-06 22:23:32 -08:00
Rossman360
6486c7809c Making keymaps based on userspace (#7812)
* hope this works

* TF working with userspace

* rules for tf

* Fixed changed default files

* delete old keymap

* revert tf68 default to default

Co-authored-by: Akaash Suresh <casa.akaash@gmail.com>
2020-01-07 15:36:00 +11:00
Juno Nguyen
37d7fd12e2 Juno (#7652)
* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* Added community layout juno and junonum; removed poorly maintained variants of juno; added junonum-a47.

* updated layout type for juno

* Performing requested changes; renaming a47; fine-tuning of codes in community layout keymaps.

* Fine tuning to requested changes.

* Further tuning to suggestion.

* Update layouts/community/ortho_4x12/juno/keymap.c

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

* Update layouts/community/ortho_4x12/juno/keymap.c

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

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

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

* Update keyboards/maartenwut/atom47/keymaps/junonum_a47/keymap.c

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

Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-07 15:35:08 +11:00
Yan-Fa Li
5f795d8382
Add an 65_ansi community layout (#7793)
* Add an 65_ansi community layout

 - fix quoting because of comma in config.h

* Enable LAYOUT_65_ansi for tada68

* cleanups

* Update keyboards/tada68/tada68.h

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

Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-06 15:29:27 -08:00
Drashna Jaelre
00d3061e02 [Keymap] Cleanup of Drashna code (#7800)
* ifdef rgb stuff like a madman for RGB Coexistance

* Re-enable RGB Light on Planck

* fix RGB Coexistance issue

* Tweak feature settings for Ergodox EZ Glow

* Their powers combine, and I am Captain RGB

This one is for noroadsleft and yan.

* Limit brightness when both RGB features are enabled

* Change shutdown method

* Add RGB Coexistience stuff to keymap

* disable RGBLIGHT_SLEEP until a solution can be found

* Disable Unicode on the kyria

* Fix up Iris rev defines

* Fix up community layouts to compile properly

* Cleanup rgb stuff

* Merge ergodox keymaps

* Update CCCV macro to use tap_code16

* Enable Solenoid on C39

Because josh couldn't

* Enable RGB Light, not Matrix on rev6 keymap

* Only enable LTO on non-ARM boards

* Clean up Bootmagic OLED display

* Enable RGBLIGHT_SPLIT on kyria

Not that it does anything

* Add hotkey for discord
2020-01-06 01:49:48 -08:00
Josh Hinnebusch
f2c61f8840 h75_singa changes (#7799) 2020-01-05 22:28:53 +00:00
Wilba
12c6f9a412 [Keyboard] Added VIA support to Efreet (#7788)
* Added Efreet

* Review changes
2020-01-05 00:18:36 -08:00
James Young
a68f514a8a [Keyboard] Add QMK support for Red Scarf I numberpads (#7767)
* Add support for Red Scarf I numberpads

* update info.json for configurator

* Update keyboards/redscarf_i/redscarf_i.c

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

* Update keyboards/redscarf_i/redscarf_i.h

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

* Update keyboards/redscarf_i/redscarf_i.h

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

* Update keyboards/redscarf_i/rules.mk

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

* Update keyboards/redscarf_i/info.json

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

* Update keyboards/redscarf_i/info.json

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

* Update keyboards/redscarf_i/info.json

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

* Update keyboards/redscarf_i/keymaps/4x5_ortho/keymap.c

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

* Update keyboards/redscarf_i/keymaps/4x5_ortho/keymap.c

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

* Update keyboards/redscarf_i/keymaps/4x6_ortho/keymap.c

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

* Update keyboards/redscarf_i/keymaps/4x6_ortho/keymap.c

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

* Update keyboards/redscarf_i/readme.md

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

* Update keyboards/redscarf_i/readme.md

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

* Update keyboards/redscarf_i/rules.mk

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

* rename keymaps, add default

* final touches! i think we're there

* remove .gitignore from keymaps directory

* remove unused custom keycodes from ortho_custom_4x5 keymap

* remove ortho_custom_5x4 keymap (identical to ortho_5x4 keymap)

* remove firmware size impacts from rules.mk

* change "MCU selection" to "MCU name" in rules.mk

* complete matrix array for LAYOUT_ortho_5x4 macro

Probably not needed, but I like when it's complete.

* add numpad layout macros

* correct info.json data

* update readme

Co-Authored-By: Ben Weakley <2173281+Defying@users.noreply.github.com>

* rename ortho keymaps to rows by columns per QMK convention

* rules.mk templating

* change uint32_t to layer_state_t per drashna

* use led_update_kb() per drashna

Co-authored-by: Ben Weakley <2173281+Defying@users.noreply.github.com>
Co-authored-by: fauxpark <fauxpark@gmail.com>
2020-01-04 17:06:24 -08:00
Hung DO
59c783df48 [Keyboard] Add support for db63 hotswap rbg (#7771)
* correct the matrix pin for db63

* first correct layout

* adding RGB support for db63

* adding backlighting keycode

* enable back extension

* update readme for the bootloader

* correct the capslock pin

* update correct info.json and layout following suggestion

* editing contact

* Update keyboards/db/db63/README.md

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

* Update keyboards/db/db63/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-04 17:04:49 -08:00
James Young
d4b15cd93a [Keyboard] GH60 rev. C: fix LAYOUT_60_iso key sequence in QMK Configurator (#7792)
ISO Enter's key object was out of sequence.
2020-01-04 16:44:45 -08:00
Joel Challis
dcb7ca3f79
Move some common matrix code to a common location (#7699)
* Move some common matrix code to a common location

* Refactor some 'custom_matrix_helper' logic to use custom matrix lite

* Fix build for kinesis/stapelberg - abuse of vpath was picking up matrix.c from core when custom matrix was enabled

* Add validation for CUSTOM_MATRIX
2020-01-04 20:29:44 +00:00
Jason Thigpen
0f43c26525 [Keymap] crd's personal keymap for hotswap leaf60 (#7777) 2020-01-03 16:38:59 -08:00
csc027
2c14172467 [Keymap] Added csc027 keymaps for keebio/iris and planck (#7472)
* Added csc027 user folder and keymaps for both keebio/iris and planck

* Moved the git_macros variable out of the process_record_user function.

* Updated the usb_led code to use the new led_update_user instead of the led_set_user function.

* Update users/csc027/defines.h

Removed the "_______" macro definition in defines.h, since it has already been defined in QMK.

* Update users/csc027/defines.h

Removed the "XXXXXXX" macro definition in defines.h, since it has already been defined in QMK.

* Update users/csc027/csc027.c

Simplified several keyboard macro definitions in the csc027.c file by switching from SS_LCTRL to SS_LCTL in their definitions.

* Condensed both the planck and iris rules files to the minimal set of declarations.
2020-01-03 14:12:53 -08:00
Wilba
320822d75b VIA Configurator Refactor (#7268)
* VIA Refactor

* Remove old code

* review changes

* review changes

* Fix cannonkeys/satisfaction75/prototype:via build

* Add via.h to quantum.h

* Move backlight init to after backlight config load

* Merge branch 'master' into via_refactor_pr

* Update user's rules.mk to new way of enabling VIA

* Added id_switch_matrix_state

* Review changes
2020-01-03 12:52:00 -08:00
hineybush
2dc0fd2b50 small hbcp changes 2020-01-03 14:32:54 -05:00
ridingqwerty
48eda75c83
Merge pull request #7762 from CurryFurious/userspace_curry
Adding custom userspace & 2 keymaps
2020-01-03 13:37:09 -05:00
Akaash Suresh
2a7c715bc6 Fixed formatting and added font file 2020-01-03 08:55:47 -06:00
Rossman360
abca0ccf4a remove head 2020-01-03 03:19:53 -05:00
Rossman360
a1788a8398 remove unneccesary line 2020-01-03 03:15:43 -05:00
Rossman360
2f338c0608 more cleanup 2020-01-03 03:05:02 -05:00
Rossman360
c87d88be4d cleanup 2020-01-03 03:05:02 -05:00
Rossman360
ee5bf03767 Add Levinson keymap 2020-01-03 03:05:02 -05:00
Rossman360
983026ad8b [Keymap] adding tf68 keymap, my first pull request. expecting there's lots of bad practice, sorry (#7763)
* adding tf68 keymap

* had tf keymap in wrong folder

* added tragicforce readme

* cleaned up code

* more cleanup

* indent love and layer name change
2020-01-02 23:22:21 -08:00
Tom Saleeba
474f7f399c [Keyboard] add initial ergoslab directory (#7730)
* feat: add initial ergoslab directory

* fix: address all comments from noroadsleft

* fix: address comment from drashna

* feat: add swap hands config to ergoslab

* chore: change ergoslab image to real photo

* re
2020-01-02 14:40:13 -08:00
Josh Hinnebusch
61173dce5d [Keyboard] adjust h87a RGB settings (#7751)
* update VID and PID for h87a

* update default RGB underglow pattern

* update comments

* Update keyboards/hineybush/h87a/h87a.c

* Update keyboards/hineybush/h87a/h87a.c

* Update keyboards/hineybush/h87a/h87a.c
2020-01-02 14:35:05 -08:00
Legonut
f08ffc2715 [Keyboard] Updates for Sol 2 (#7746)
Add Numpad to keymap
Fix OLED rotation
Add LED locations for Starfighter case
2020-01-02 13:03:19 -08:00
Gergely Peidl
2406c04d89 [Keymap] Personal keymap for Let's Split keyboard. (#7702)
* Add Initial layout configuration.

* Set arduino pro micro's built in RX LED as Numlock

* Enable Autoshift feautre.

* Remove DVORAK layout.

* Add Numpad, update default layer.

* Update AutoShift timeout.

* Beautify ASCII Art.

* Update keymap.

* Add Initial verison of RGB lighting.

* Add Tap dance, hungarian letters.

.Xmodmap example: 09f058753d

* Update RGB to use only noeeprom functions.

* Change default rgb led color.

* Add `pragma once`.

* Emojis added.

* Add tap dance for hungarian letters, multimedia control, slash/backslash.

* Remove audio related code.

* Add Gaming layer.

* Remove unnecessary code, update copyright.

* Add readme.md

* Implement code review suggestions.

* Implement code review suggestions #2
2020-01-02 12:03:47 -08:00
fauxpark
156d319604 Remove remnants of custom matrix from Skog rules.mk (#7764) 2020-01-02 19:50:25 +00:00
hvp
5404d6baef [Keymap] Hvp baseline19 (#7690)
* Added my UT47.2 Swedish layout with tap dance function.

* Move tap dance over to user space

* Removed config_common from config file

* Changes to workspace with new support for code16. Tested ok

* Swedish support

* Added code16 version of tapdance to userprofile.

* Created 4th layer and updated readme file. Removed ascii rep of layout.

* Tabdance updates

* Removed duplicated RGB keys.

* Added hvp minivan config

* Fixed tapdance key maps

* Added Planck 1 space base hvp layout

* Start of hvp xd75 layout. Way to many keys

* Added working config ink test for atreus62

* fixed smaller layout changes

* Updated tap dance with option 5

* Added better thump keys

* Created lets split layout

* Removed not used modes

* Updated to correct url

* Readme file

* Atreus62 readme

* Cleanup of keymap file

* Added tap dance

* Fixed missed adjustment

* Added hvp planck setup

* Update ascii

* will this work better?

* removed ascii

* Planck 1 space setup

* Fixed ascii local

* Added Corne setup

* Changes for lets split

* Atreus62 config

* Added Lily58

* Setup corne

* Setup planck

* Updated lets split

* UT47 setup

* Setup a The Vanboard.

* Alt Ctrl

* #define D_NAVI MT(MOD_LCTL | MOD_LSFT, KC_D)

* Fix D_NAVI & plank midi

* Fixed PR comments

* Added pragma

* Moved def to user space

* Removed not used endif

* Added def to users space

* Added rules to van

* Removed not used part of config

* Removed not used layout

* Removed not needed comments

* Remove not needed keymap_config_t

* Removed broken ascii from readme files and removed not needed rules

* Added spaces to readme file

* Removed xd75 from branch
2020-01-02 11:31:54 -08:00
Akaash Suresh
291ef064a7 Formatting 2020-01-02 12:22:22 -06:00
Akaash Suresh
3650d59afe Merge upstream/master with userspace 2020-01-02 11:52:23 -06:00
marhalloweenvt
53757f9705 [Keyboard] Add p65rgb PCB (#7753)
* [Keyboard] Add new keyboard Symmetry60

* Add new keyboard Symmetry60

* Fix Typo

* Update keyboards/handwired/symmetry60/config.h

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/readme.md

* Update keyboards/handwired/symmetry60/rules.mk

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update keyboards/handwired/symmetry60/symmetry60.h

* Update readme.md

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Update rules.mk

* Update symmetry60.c

* Update keyboards/handwired/symmetry60/rules.mk

* Add ColorLice

* Update ColorLice

- Adjust info.json to support Configurator
- Adjust layout name to fit with info.json
- Seperate 2 feature: RGB Switch and RGB Underglow

* Update new way of control lock leds

* Remove #ifndef COLORLICE_H

* Update make example

* Revert Helix

* Revert Helix

* Revert Helix

* Revert Helix

* Update keyboards/handwired/colorlice/colorlice.h

* Update keyboards/handwired/colorlice/colorlice.h

* Update default keymap

* Revert Helix

* Update keyboards/handwired/colorlice/readme.md

* Update keyboards/handwired/colorlice/rules.mk

* Update keyboards/handwired/colorlice/colorlice.c

* Update keyboards/handwired/colorlice/colorlice.c

* Remove unnecessary function

* Update keyboards/handwired/colorlice/colorlice.c

* Adjust rules option for working with Configurator

- Move RGB_MATRIX_ENABLE and RGBLIGHT_ENABLE to keyboard rule.
- Add RGB_DI_PIN in keyboard config

* Update keyboards/helix/rev2/keymaps/default/keymap.c

* Update keyboards/handwired/colorlice/readme.md

* Update keymap for Colorlice

* Adjust rules.mk to use space indent

* Update ColorLice to work with QMK online configurator

- Delete rgb_underglow keymap
- Move config from keymap layer to keyboard layer
- Tweak a little layout so it can appear default layout on QMK config

* Update keyboards/handwired/colorlice/rules.mk

* Update keyboards/handwired/colorlice/rules.mk

* Add p65rgb

* Update keyboards/handwired/p65rgb/config.h

* Update p65rgb.c

* Update keymap.c

* Update rules.mk
2020-01-02 08:57:47 -08:00
fauxpark
2557bc8e6f
Remove custom matrix from PS2AVRGB boards (#7396)
* Remove custom matrix from PS2AVRGB boards

* Add custom backlight.c to SRC for bminiex, for now

* Add missing DIODE_DIRECTIONs
2020-01-02 17:45:41 +11:00
Drashna Jaelre
b83e3ae556
[Keyboard] Ergodox EZ - Re-init ISSI driver on reconnect (#7731) 2020-01-01 22:42:04 -08:00
Jianfei Wang
77f66cc5e1 [Keyboard] add Just60 keyboard (#7752)
* [Keyboard] add Just60 keyboard

* [Keyboard] just60: fixes per suggestions

* Update keyboards/just60/rules.mk

* Update keyboards/just60/readme.md

* Update keyboards/just60/rules.mk

* [Keyboard] just60: add keymap specific bootloader

* Revert "[Keyboard] just60: add keymap specific bootloader"

This reverts commit 0357e0a6f40233eec43f42c32fb405f60e7fbb1c.
2020-01-01 22:28:05 -08:00