gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-12-14 05:40:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,954 Commits 63 Branches 1,613 Tags 896 MiB
7687207454
Commit Graph

154 Commits

Author SHA1 Message Date
Drashna Jael're
6576127b4c
Merge remote-tracking branch 'origin/master' into develop 2023-01-11 14:18:08 -08:00
James Young
377f87cb7e
Keychron V1: correct layout data for ANSI versions (#19558) 
* keychron/v1/ansi: correct layout data

* keychron/v1/ansi_encoder: correct layout data
 2023-01-11 12:50:11 -08:00
QMK Bot
f4a25bcfaf Merge remote-tracking branch 'origin/master' into develop 2023-01-10 16:34:14 +00:00
James Young
5e5b19cf94
Keychron S1 ANSI Layout Touch-Up (#19556) 2023-01-10 15:09:09 +00:00
QMK Bot
14fabfd893 Merge remote-tracking branch 'origin/master' into develop 2023-01-09 21:34:03 +00:00
Nick Brassel
01de98428c
[Keychron Q5] Build failures: recursive function call. (#19553) 2023-01-10 08:33:28 +11:00
Joel Challis
d0ebafaea6
Align definition of unicode_map (#19452) 2023-01-01 11:54:12 +11:00
QMK Bot
d95a51fb17 Merge remote-tracking branch 'origin/master' into develop 2022-12-20 06:45:05 +00:00
lalalademaxiya1
8560280afe
Add Keychron S1 (#19378) 2022-12-20 17:44:23 +11:00
QMK Bot
3944eda299 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:57:45 +00:00
lalalademaxiya1
90bd710b69
Add Keychron V7 (#19360) 2022-12-19 20:55:30 +11:00
QMK Bot
995aad1123 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:55:02 +00:00
lalalademaxiya1
007a8c8b35
Add Keychron V8 (#19361) 2022-12-19 20:54:05 +11:00
QMK Bot
0b079424c8 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:48:45 +00:00
lalalademaxiya1
d27d6f0485
Add Keychron Q7 (#19308) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2022-12-19 20:48:30 +11:00
lalalademaxiya1
90c4a8785e
Add Keychron Q60 (#19309) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2022-12-19 20:46:56 +11:00
QMK Bot
5d3fccf006 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:46:29 +00:00
lalalademaxiya1
4c28f93520
Add Keychron Q65 (#19310) 
Co-authored-by: jack <0x6a73@protonmail.com>
 2022-12-19 20:45:57 +11:00
QMK Bot
e8d6c62934 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:45:26 +00:00
lalalademaxiya1
e0ff1189ce
Add Keychron V1 (#19315) 2022-12-19 20:44:47 +11:00
QMK Bot
830bdd9a85 Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:42:33 +00:00
lalalademaxiya1
de64c61d17
Add Keychron V2 (#19316) 2022-12-19 20:42:00 +11:00
QMK Bot
bef4d9965d Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:40:13 +00:00
lalalademaxiya1
a3392fdd1e
Add Keychron V3 (#19317) 2022-12-19 20:39:36 +11:00
QMK Bot
f46018457f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 09:07:33 +00:00
lalalademaxiya1
0ab4f53691
Add Keychron V4 (#19319) 2022-12-19 20:06:51 +11:00
QMK Bot
f249789a8f Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:54:27 +00:00
lalalademaxiya1
4a0027d493
Add Keychron V5 (#19320) 2022-12-19 19:53:51 +11:00
QMK Bot
cf1c50987a Merge remote-tracking branch 'origin/master' into develop 2022-12-19 08:43:20 +00:00
lalalademaxiya1
359caf1432
Add Keychron Q9 (#19318) 2022-12-19 19:42:45 +11:00
Ryan
1978007fae
Tap Dance: remove qk_ prefix (#19313) 2022-12-14 12:40:25 -08:00
lalalademaxiya1
1431f314a4
Add Keychron Q10 (#19127) 
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-12-13 07:10:32 +11:00
adophoxia
fa56e51894
Add support for Keychron Q4 (#19048) 2022-12-09 03:45:10 +11:00
lalalademaxiya1
1215fc2a78
Update Q1 and Q2 for keychron (#18713) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: jpe230 <pablin.123.ra@gmail.com>
 2022-12-09 03:43:28 +11:00
lalalademaxiya1
d878edfaad
[Keyboard] Add Keychron Q8 (#19126) 2022-12-04 01:26:27 -08:00
Ryan
e12ca14af8
Change RGB_MATRIX_STARTUP_* defines to RGB_MATRIX_DEFAULT_* (#19079) 2022-11-27 04:18:24 +11:00
jack
6c40a46057
Fixup keychron/q5 (#19119) 2022-11-20 14:30:40 +00:00
QMK Bot
4b99336c4b Merge remote-tracking branch 'origin/master' into develop 2022-11-20 05:38:05 +00:00
lalalademaxiya1
0f6a4edfb2
[Keyboard] Keychron Q5 (#18283) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
 2022-11-19 21:37:23 -08:00
jack
7901ba431a
Fixup keychron/q6 (#19066) 2022-11-14 09:49:06 +11:00
QMK Bot
81bf60a636 Merge remote-tracking branch 'origin/master' into develop 2022-11-13 01:13:00 +00:00
lalalademaxiya1
6c4e6a86f7
[Keyboard] Keychron Q6 (#18288) 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-11-12 17:12:20 -08:00
Wilba
bc6f8dc8b0
VIA V3 - The Custom UI Update (#18222) 2022-11-10 07:46:44 +11:00
Nick Brassel
575b0e33fa
Rollback unrelated changes from previous PR. (#19015) 2022-11-10 07:43:51 +11:00
jack
f7df771e70
Fixup keychron/q1/iso_encoder (#19006) 2022-11-09 06:51:04 +11:00
QMK Bot
425f906473 Merge remote-tracking branch 'origin/master' into develop 2022-11-08 16:22:40 +00:00
adophoxia
a25e5ce1b3
[Keyboard] Add ISO Encoder variant of Keychron Q1v1 (#18829) 2022-11-08 08:21:51 -08:00
Ryan
5974d989fe
Normalise Unicode keycodes (#18898) 
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV`

* `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*`

* `UC_MAC` -> `UNICODE_MODE_MACOS`

* `UC_LNX` -> `UNICODE_MODE_LINUX`

* `UC_WIN` -> `UNICODE_MODE_WINDOWS`

* `UC_BSD` -> `UNICODE_MODE_BSD`

* `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE`

* `UC_EMACS` -> `UNICODE_MODE_EMACS`

* `UC__COUNT` -> `UNICODE_MODE_COUNT`

* `UC_M_MA` -> `UC_MAC`

* `UC_M_LN` -> `UC_LINX`

* `UC_M_WI` -> `UC_WIN`

* `UC_M_BS` -> `UC_BSD`

* `UC_M_WC` -> `UC_WINC`

* `UC_M_EM` -> `UC_EMAC`

* Docs

* Update quantum/unicode/unicode.h
 2022-10-31 21:15:12 +00:00
Ryan
b33fc34967
Deprecate KC_LEAD for QK_LEAD (#18792) 2022-10-21 14:25:54 +01:00
QMK Bot
6e55aa42fa Merge remote-tracking branch 'origin/master' into develop 2022-10-21 01:20:56 +00:00
Stefan
2c3859fbf7
Keychron Q3 I2C & CKLED2001 transfer speedup (#18780) 2022-10-20 18:20:47 -07:00
Ryan
5629ba1807
Remove legacy keycodes, part 4 (#18683) 
* `KC_PGDOWN` -> `KC_PGDN`

* `KC_PSCREEN` -> `KC_PSCR`

* `KC_SCOLON` -> `KC_SCLN`

* `KC_BSLASH` -> `KC_BSLS`

* `KC_BSPACE` -> `KC_BSPC`
 2022-10-13 18:28:14 +01:00
QMK Bot
6829476fb7 Merge remote-tracking branch 'origin/master' into develop 2022-10-13 10:53:59 +00:00
lalalademaxiya1
f50ba3b031
Update info.json of Q3 ISO with Encoder (#18697) 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-13 21:53:16 +11:00
QMK Bot
6a363fbb5b Merge remote-tracking branch 'origin/master' into develop 2022-10-13 07:13:51 +00:00
James Young
d5b9081864
Keychron Q3 Layout Touch-Up (#18696) 2022-10-13 18:13:16 +11:00
jack
3f4fd85dc7
Fixup keychron/q3 (#18687) 
Co-authored-by: Ryan <fauxpark@gmail.com>
 2022-10-13 14:09:10 +11:00
QMK Bot
a751565468 Merge remote-tracking branch 'origin/master' into develop 2022-10-12 18:34:25 +00:00
lalalademaxiya1
cf749f2dd0
Keychron q3 (#16912) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
Co-authored-by: bootstrapper <ido.samuelson@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-10-13 05:33:44 +11:00
Ryan
c6f1b594a2
Remove legacy keycodes, part 2 (#18660) 
* `KC_SYSREQ` -> `KC_SYRQ`

And one `KC_ALT_ERASE` -> `KC_ERAS`

* `KC_NONUS_BSLASH` -> `KC_NUBS`

* `KC_NUMLOCK` -> `KC_NUM`

* `KC_CLCK` -> `KC_CAPS`

* `KC_SCROLLLOCK` -> `KC_SCRL`

* `KC_LBRACKET` -> `KC_LBRC`

* `KC_RBRACKET` -> `KC_RBRC`

* `KC_CAPSLOCK` -> `KC_CAPS`
 2022-10-10 20:06:26 +01:00
QMK Bot
7c4a012509 Merge remote-tracking branch 'origin/master' into develop 2022-10-07 05:33:01 +00:00
adophoxia
ca2f9e4c8f
Add encoder map support for Keychron Q1v1 and Q2 (#18598) 2022-10-06 22:32:19 -07:00
Drashna Jaelre
64b1ed4550
Fix Per Key LED Indicator Callbacks (#18450) 
Co-authored-by: Dasky <32983009+daskygit@users.noreply.github.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
 2022-10-04 15:24:22 -07:00
fauxpark
dbb70871fc Merge remote-tracking branch 'upstream/master' into develop 2022-09-30 05:19:53 +10:00
Daniel Bast
b51b3681b7
Fix keychron q2 iso default keymaps (#18501) 2022-09-29 13:15:00 -04:00
lalalademaxiya1
bfcbcfe3c7
Update q0 for keychron (#18522) 2022-09-29 17:50:47 +01:00
jack
c7a65558ee
Remove lingering DRIVER_LED_TOTAL references (#18475) 2022-09-25 19:32:51 +10:00
Drashna Jael're
8478e96de6
Merge remote-tracking branch 'origin/master' into develop 2022-09-24 12:23:36 -07:00
adophoxia
7caf0b1ab8
[Keyboard] Add Keychron Q0 (#18348) 2022-09-24 11:53:22 -07:00
Ryan
36c410592d
Change DRIVER_LED_COUNT to {LED,RGB}_MATRIX_LED_COUNT (#18399) 2022-09-23 22:46:23 +10:00
Joel Challis
bbc3bc55f2
RESET -> QK_BOOT user keymaps (#17940) 2022-08-21 23:55:30 +01:00
fauxpark
61689ae609 Merge remote-tracking branch 'upstream/master' into develop 2022-08-20 10:55:40 +10:00
Ryan
835c971f78
Move keyboard USB IDs and strings to data driven, pass 2: J-L (#18080) 2022-08-20 10:39:35 +10:00
QMK Bot
54be228882 Merge remote-tracking branch 'origin/master' into develop 2022-07-17 00:32:15 +00:00
Teimor Epstein
28f9def219
[Keymap] teimor keymap for Keychron Q1 (#16396) 
* teimor keymap

* quickfix and cleanup

* update readme

* quickfix and cleanup before pr

* clang

* clean layout

* add reset

* pr fix

* fix pr

* Rename README.md to readme.md
 2022-07-16 17:31:21 -07:00
jpe230
d206c1791e
(develop)Keychron Q2: Enable support for WL EEPROM Driver (#17507) 2022-06-30 12:25:33 +10:00
Ladduro
336791b915
Keychron Q2 add Caps Lock indicator and layer RGB (#16641) 2022-04-22 17:21:15 +10:00
Dan Hertz
92d38c37ec
[Keymap] Add dhertz keychron map v0 (#16571) 2022-03-23 09:34:42 -07:00
Nick Brassel
a2ffdb4abd Merge remote-tracking branch 'upstream/master' into develop 2022-02-09 16:00:09 +11:00
Nick Brassel
efdaa7f972
Add support for driving unselected row/col. (#16278) 2022-02-09 15:50:13 +11:00
Ryan
f4f3bf81c7
Add missing BOOTLOADER for a handful of boards (#16225) 2022-02-05 16:55:24 +11:00
James Young
a211887978
Keychron QMK Configurator Refactor (#16034) 2022-01-26 21:16:09 -08:00
dnlsmy
1bc1b1b313
Update readme.md (#15989) 
Spelling correction
 2022-01-22 15:03:50 +00:00
lalalademaxiya1
57d116796a
Add rgb matrix support for q2 of keychron. (#15946) 
* Add new keyboard keychron_q1_rev_0101 for Keychron.

* Update keymaps of keychron_q1_rev_0100 and keychron_q1_rev_0102.

* Update keyboards/keychron/q1/rev_0101/rev_0101.h

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

* Update keymap.c

* Add new info.json.

* Update info.json

* Update keyboards/keychron/q1/rev_0101/keymaps/default/keymap.c

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

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

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

* Update keyboards/keychron/q1/rev_0101/keymaps/via/keymap.c

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

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

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

* Update keymap.c

* Update info.json

* Update all via keymaps keymaps of q1 series.  KC_TASK and KC_FLXP are now defined using the VIA user keycodes range so they can be renamed "TASK" and "TILE" as a shortName in VIA.

* Add keyboards keychron_q2 series.

* Update default keymaps of keychron_q2 series.

* Update rules.mk and MCU_LDSCRIPT specified as STM32L432xB.

* Update keyboards/keychron/q1/rev_0101/rev_0101.c

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

* Update config.h

* Update config.h

* Update config.h

* removed duplicated ifdef

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

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

* Update keyboards/keychron/q2/rev_0110/rules.mk

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

* Update keyboards/keychron/q2/rev_0110/rules.mk

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

* Update keyboards/keychron/q2/rev_0113/rules.mk

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

* Update keyboards/keychron/q2/rev_0111/rules.mk

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

* Update keyboards/keychron/q2/rev_0111/rules.mk

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

* Update keyboards/keychron/q2/rev_0112/rules.mk

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

* Update keyboards/keychron/q2/rev_0112/rules.mk

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

* Update keyboards/keychron/q2/rev_0113/rules.mk

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

* Update rev_0101.c

* Update rev_0101.

* Enable support for edit RGB lighting in VIA.

The updated design file at https://git.io/JyE0K includes only the
enabled RGB_MATRIX modes.

* Update q1.

* Add rgb matrix support for q2 of keychron.

* Update rule.mk.

* Delete comment block which is unwanted.

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
 2022-01-22 21:25:51 +11:00
lalalademaxiya1
ca0f922e07
[Keyboard] Add Keychron_q1 rev_0101 and Keychron q2 series (#15025) 
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Cesar Rojas <cesar.fieoner@gmail.com>
Co-authored-by: lokher <lokher@gmail.com>
Co-authored-by: Adam Karim <adam@akarsoft.com>
 2022-01-14 10:58:09 -08:00
ripdog
1b953ac1e2
[Keyboard] Keychron Q1: Turn off RGB during PC suspend (#15685) 2022-01-02 19:26:16 -08:00
Victor Savu Gabriel
6ec9cd511d
Addd victorsavu3's Keychron Q1 keymap (ISO) (#15517) 
Co-authored-by: Savu Victor-Gabriel <dev@victorsavu.com>
 2021-12-27 21:22:27 +11:00
Jakub Horák
743f780221
[Keymap] Add keymap for the Keychron Q1 ISO layout (#14853) 
* Add keymap for the Keychron Q1 ISO layout

- The rightest key column is: Ins, Home, PgUp, PgDn, which differs from the default.
- RGB lighting turns off when the computer sleeps
- Caps Lock and alpha keys turn red to indicate when Caps Lock is on
- When the Fn layer is active, RGB lighting turns off for keys that are not assigned

* Update keyboards/keychron/q1/rev_0102/keymaps/kubahorak/rgb_matrix_user.c

Suggestion from review

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

Co-authored-by: Drashna Jaelre <drashna@live.com>
 2021-12-27 13:42:01 +11:00
Ryan
a8d440e4e0
Tidy up NKRO_ENABLE rules (#15382) 2021-12-09 16:05:44 +11:00
Ryan
c12b997679
Tidy up SLEEP_LED_ENABLE rules (#15362) 2021-12-01 21:13:00 +11:00
Joel Challis
282e916d86
Remove use of __flash due to LTO issues (#15268) 2021-11-24 18:38:49 +11:00
Drashna Jaelre
160b0558f5
Require explicit enabling of RGB Matrix modes (#15018) 2021-11-15 10:41:04 -08:00
James Young
84ea77ead6
Remove BOOTMAGIC_ENABLE = lite option (#15002) 
* remove BOOTMAGIC_ENABLE=lite setting

* change keyboard BOOTMAGIC_ENABLE rules

Edits keyboard-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keyboard BOOTMAGIC_ENABLE inline comments

Edits keyboard-level BOOTMAGIC_ENABLE inline comments to "Enable Bootmagic Lite".

* change keymap BOOTMAGIC_ENABLE rules

Edits keymap-level instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

* change keymap BOOTMAGIC_ENABLE inline comments

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* change layout/user BOOTMAGIC_ENABLE rules/comments

Edits instances of `BOOTMAGIC_ENABLE = lite` to `BOOTMAGIC_ENABLE = yes`.

Edits/adds keymap-level BOOTMAGIC_ENABLE inline comments to read "Enable Bootmagic Lite".

* update non-rules.mk BOOTMAGIC_ENABLE references in keyboards/

* remove docs references to Full Bootmagic

* convert data-driven Bootmagic Lite instances

* remove Bootmagic Lite bodge from data-driven generation

* Merge remote-tracking branch 'upstream/develop' into rm/bootmagic-full_q4a

* update docs/ja/config_options.md per mtei

* update docs/faq_misc.md per mtei

Remove remaining Full Bootmagic reference.
 2021-11-05 08:18:09 +11:00
Mike Killewald
3f33362740
[Keymap] added caps lock indicator for Keychron Q1 rev_0100 (#14653) 2021-11-03 21:20:35 -07:00
Grayson Carr
d5fae3a6f9
Updated Keychron Q1 user keymap (#14666) 
* Updated Keychron Q1 user keymap
- Added Caps Lock indicator
- Mission Control and Launchpad custom keycodes are now defined using the VIA user keycodes range so they can be labeled properly in VIA

* Only use VIA keycode range if VIA is enabled

* Reformatted led_indexes enum to match layout

* Feature: When the Fn layer is active, RGB lighting turns off for keys that are not assigned

* Fixes

* Cleanup: Updated method signature of rgb_matrix_set_color_by_keycode to more closely match rgb_matrix_set_color

* Fixed int sizing for keycodes
 2021-10-06 08:36:04 -07:00
Grayson Carr
046e3ce5c9
[Keymap] Keychron Q1 user keymap (#14636) 2021-09-28 19:45:29 -07:00
Ryan
5af1799735
Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379) 2021-09-12 15:27:29 +10:00
Ryan
4791cfae1a
Remove width, height and key_count from info.json (#14274) 2021-09-12 14:04:56 +10:00
Drashna Jael're
e3b68ddfe8
Merge remote-tracking branch 'origin/master' into develop 2021-08-24 07:32:31 -07:00
lalalademaxiya1
e3483b4126
[Keyboard] Add new keyboard version: keychron/q1/rev_0102 (#14029) 
* Add keyboard Q1

* Update keyboards/keychron/q1/readme.md

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

* Update keyboards/keychron/q1/readme.md

* Change layer switch function to "default_layout_set"

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

* Update keyboards/keychron/q1/q1.c

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

* Added and changed readme.md

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

* update

* update keymap name

* update keymap for keychron/q1/rev_0102

* Update info.json
 2021-08-23 17:32:15 -07:00