mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-21 01:23:56 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,471 Commits 51 Branches 64 Tags
f918ab7967ba25d8fe21275fd03330046cfe94de
Commit Graph

109 Commits

Author SHA1 Message Date
Dylan Herman
d2eef1955c add mypy check for return-any (#24379) 
* add mypy check for return-any

* remove unused import

* typing

* remove unnecessary variable typing

* cleanup

* cleanup

* bump submodules

* small fixes

* only a problem on mac

Co-authored-by: Willem Melching <willem.melching@gmail.com>
 2022-05-12 14:59:00 +02:00
Adeeb Shihadeh
2466233b1c body: opt-out logging (#24423) 
* body: opt-out logging

* wait a bit

* little better

* fix that too

Co-authored-by: Comma Device <device@comma.ai>
 2022-05-04 14:57:39 -07:00
Adeeb Shihadeh
670126cbf1 body: opt-in logging (#24416) 2022-05-03 23:46:59 -07:00
Adeeb Shihadeh
cdf6338388 manager: start process by callback (#24417) 2022-05-03 23:30:35 -07:00
Willem Melching
3063c70ff1 updated: only run offroad & disable automatic git garbage collection (#24269) 
* updated: disable automatic git garbage collection

* set gc.autoDetach false

* add gc cloudlogs

* trigger updated

* handle exception

* trigger updated

* only while offroad

* no trigger needed

* trigger updated

* check if git gc was interrupted

* trigger updated

* dont set params when shutting down

* let manager clear params

* no offroad check anymore

* event is nicer to parse

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2022-04-22 14:43:44 -07:00
grekiki
b8b15d5cf1 mypy: enable --warn-unreachable (#24282) 
* Optional solves mypy assuming None is always None

* oops

* spaces

* Update registration.py

* fix local error

Co-authored-by: Willem Melching <willem.melching@gmail.com>
 2022-04-21 18:27:45 +02:00
Willem Melching
207df4742f manager: cleanup ensure_running (#24270) 
* manager: cleanup ensure_running

* make notcar a blocking condition

* invert last conditions

* duplicate

* always run daemon process

* comment

* typo

* make notcar like driverview
 2022-04-21 16:23:39 +02:00
Adeeb Shihadeh
76a8338197 manager: start bridge and web joystick for notcars (#24212) 
* manager: start bridge and web joystick for notcars

* fix that

* bump cereal

Co-authored-by: Comma Device <device@comma.ai>
 2022-04-19 14:13:05 -07:00
Adeeb Shihadeh
5c48e7bc86 remove comma two support (#24248) 
* remove comma two support

* cleanup release files

* little more

* more libs

* no more gralloc

* add snpe back
 2022-04-18 17:55:23 -07:00
Shane Smiskol
f1f40c117a Add Disengage on Accelerator Toggle (#23977) 
* Squashed commit of the following:

commit 953bcf0ecf8d03f0fec9ce0d5442cc660ae2347d
Merge: b4198608d 333257bad
Author: Shane Smiskol <shane@smiskol.com>
Date:   Fri Apr 1 19:58:06 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit b4198608dac9595bfeb9443f95cd6c5d385cd62d
Merge: 24f90b2c8 0b9790dd2
Author: Shane Smiskol <shane@smiskol.com>
Date:   Fri Apr 1 14:32:54 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 24f90b2c8d6ae509c0776b6e33b743467aa08dee
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 31 14:07:52 2022 -0700

    revert changes and get ready for override

commit aa514df6b5e8431f0faa07f6b25eb5cb6c9f2749
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 30 20:52:24 2022 -0700

    temporary

commit c874e10c2555968c683f629c4582ab22e51d431f
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 30 00:30:13 2022 -0700

    move gasPressed to controlsd

commit fe670439dff5bc6dfc5963d79ca2febe0c5920c7
Merge: 49d3b6d11 81862fce7
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 30 00:15:48 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 49d3b6d1162893fa94b2294152f0718eeb4698ed
Merge: 475b27e74 d60c44e03
Author: Shane Smiskol <shane@smiskol.com>
Date:   Mon Mar 28 13:06:08 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 475b27e74fd6479f1d148e9ded1eca6ee476865c
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 24 20:24:59 2022 -0700

    update SAFETY.md

commit 0798eadb82749e12ecbaa86f4e57b21bd3dbc7e8
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 24 17:52:06 2022 -0700

    ⛽ ➡️ 🔋

    bump

commit d2b64b89cf8d7265bc90848b4e3a2276c9a4cb78
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 24 16:19:34 2022 -0700

    these changes will be in border PR

    these changes will be border PR

commit bed31e63de2244c161729773978fef8a9246ddb5
Merge: 491417640 e91613bc6
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 24 16:17:31 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 49141764098e3a701ff123ead52de4656b31db4d
Merge: 9291e9f00 c88ced1f1
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 23 19:00:26 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 9291e9f0045780669b2ffa7f08fb10373c03b070
Merge: 2aed64157 99c02bdd2
Author: Shane Smiskol <shane@smiskol.com>
Date:   Fri Mar 18 19:03:13 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 2aed64157d6e9dc993d103a2c6abf7e643410562
Author: Shane Smiskol <shane@smiskol.com>
Date:   Fri Mar 18 19:03:03 2022 -0700

    Revert "send pre-enable state when gas is pressed"

    This reverts commit 8d82e697dc2efade307413e767d14b56b4d2d079.

commit a219defe5342efa731a957b2ff4fd86292c1f239
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Mar 17 12:50:46 2022 -0700

    bump cereal

commit 8d82e697dc2efade307413e767d14b56b4d2d079
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 16 22:40:13 2022 -0700

    send pre-enable state when gas is pressed

    formatting and it's out

    forgot one

    allow gas press

    show toggle

    revert changes

    revert changes

commit 5eb4d1ab1b77ac65bdd901f692ebfb848d5187ca
Merge: bad1bdc74 db7b49c71
Author: Shane Smiskol <shane@smiskol.com>
Date:   Wed Mar 16 22:29:43 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit bad1bdc7428c5d8a4a765b259da504f0ade84424
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 23:03:56 2022 -0700

    clean up a bit

commit 7516ed9b786536a07f00a92b9c1742ca252a01d1
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 22:55:09 2022 -0700

    these are null checks right now

commit 408f5f1d633521b29b08d966c9b387fa79dff0d6
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 22:51:14 2022 -0700

    should work

commit be1978e29c03d8843cf073cc9ddf84020fd2b378
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 22:36:16 2022 -0700

    stash

commit f0bd4c47e9d27061c6cd3b88765a7c10995f42db
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 22:26:24 2022 -0700

    this was flipped

commit d5b6e30389a727e8559331acd706422e1b246f60
Merge: 820b19894 5fe00fb77
Author: Shane Smiskol <shane@smiskol.com>
Date:   Tue Mar 15 22:25:49 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 820b1989496225df1f66f39b477f1e9402db1b19
Merge: 91763f9ff d7c758d4b
Author: Shane Smiskol <shane@smiskol.com>
Date:   Mon Mar 14 23:39:34 2022 -0700

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 91763f9ff4321986babce1a7b1272fcf64c8f753
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Feb 24 20:15:26 2022 -0800

    add icon from jozef 🔥

commit 1885c9e2bacd9351c7e421b1436dcbfbde238436
Merge: 1f591736a 9c70e8bca
Author: Shane Smiskol <shane@smiskol.com>
Date:   Thu Feb 24 20:08:07 2022 -0800

    Merge remote-tracking branch 'upstream/master' into disengage-on-gas

commit 1f591736a2767b1ed892c29ec5000cc7348f01c7
Merge: 465811f0b 7410160d0
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date:   Sat Feb 12 10:24:29 2022 -0500

    Merge branch 'master' into disengage-on-gas

commit 465811f0b4776e43a289398e4d4369362b7da58c
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 11:20:32 2022 -0500

    Add param to process replay

commit 0344363a533505435cff87eb33356b2364a4156f
Merge: 700efcb3f 3e915cf62
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date:   Fri Feb 11 11:07:31 2022 -0500

    Merge branch 'master' into disengage-on-gas

commit 700efcb3f444092f99ef10e9908f83402429d742
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 11:04:39 2022 -0500

    Add param to unsafeMode

commit 220ce272fee1f7f5ace2a04052605a6e4f95712b
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 10:54:16 2022 -0500

    Add param to unsafeMode

commit d273bb78acbc23ee5255e461fa71b2f0400a5e03
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 10:52:22 2022 -0500

    Resolve conflicts

commit 1a85afd60c2f0d3140dfa8e7cd574d6b88abd5e3
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 10:51:50 2022 -0500

    Resolve conflicts

commit e3be32afc2bb2423d29e2b4f85b3cff3fe72aab9
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Feb 11 10:51:08 2022 -0500

    Resolve conflicts

commit f27203af3afe612173bf9a63e15c57118598b5b8
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Wed Jan 19 00:30:09 2022 -0500

    Add param to process replay

commit 04c0ad1a54f4fea5efe74b3203d9bdbd693b64a6
Author: Jason Wen <47793918+sunnyhaibin@users.noreply.github.com>
Date:   Wed Jan 19 00:28:49 2022 -0500

    Update interfaces.py

    Co-authored-by: Willem Melching <willem.melching@gmail.com>

commit 99cf13caeb4d9f2c95c25e1e78b6e353ea508cb6
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Sat Jan 15 00:03:38 2022 -0500

    Fix missing params lib

commit 2230254ca709625d591b0c73d1a6022c450f6ef6
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Jan 14 23:38:46 2022 -0500

    Disengage on gas toggle

commit 87475e02cb63cc39c9b16edc67f303e02d17e6ef
Author: Jason Wen <haibin.wen3@gmail.com>
Date:   Fri Jan 14 23:24:00 2022 -0500

    Disengage on gas toggle

* bump

* use ALTERNATIVE_EXPERIENCE

* or it

* de-bump

* update refs

* update refs!

* you can just ctrl+click ALTERNATIVE_EXPERIENCE!

* already have a params

* update text
 2022-04-04 21:59:52 -07:00
Adeeb Shihadeh
8af20af66d pylint: enforce indentation (W0311) (#24039) 
* pylint: enforce indentation (W0311)

* few more
 2022-03-24 23:23:29 -07:00
George Hotz
1df3c86999 sensord: add support for Quectel raw gps (#24027) 
* connecting to rawgps

* dumping rawfps packets

* this works, but it might be useless

* fix parsing

* parsing 0x1476

* compare

* compare better

* refactoring

* parsing and broadcasting GPS packet

* glonass support

* compare using submaster

* fix compare for glonass

* update cereal

* make linter happy

* other linter issue

* last mypy complaints

* add support for publishing gpsLocationExternal

* set flags to 1 to match ubloxd

* ready to ship

* qcomdiag

* use unused variables

* last one

Co-authored-by: Comma Device <device@comma.ai>
Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2022-03-24 23:07:26 -07:00
Adeeb Shihadeh
8ac30fea24 move pandad to boardd/ (#23958) 2022-03-13 21:21:30 -07:00
Adeeb Shihadeh
edcee81796 manager: kill UI when manager failed to start 2022-02-01 11:06:32 -08:00
Adeeb Shihadeh
8b5b0ae341 sentry improvements (#23627) 
* sentry: filter out unregistered devices and PC

* add daemon name
 2022-01-26 11:44:10 -08:00
Adeeb Shihadeh
818d4a0a96 manager: don't start uploader with dongle id 2022-01-25 15:42:38 -08:00
Ryan
aa9e635311 Add more type hinting (#23595) 
* Add more type hinting.

* Revert joystick_alert changes.

* Add typing to statsd.

* Update selfdrive/statsd.py

* Update selfdrive/test/test_fingerprints.py

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2022-01-21 15:11:16 -08:00
Adeeb Shihadeh
b63bc89bc9 sentry fixups (#23249) 
* set env

* do init in same place

* no sentry for forks

* start session

* start session

* remove that

* val
 2022-01-14 15:25:16 -08:00
Adeeb Shihadeh
308a6f1730 manager: log exit reason (#23532) 2022-01-14 08:55:51 -08:00
Adeeb Shihadeh
610b99fd68 Log android system shutdown to param (#23520) 
* Log android system shutdown to param

* comment

Co-authored-by: Comma Device <device@comma.ai>
 2022-01-13 22:40:35 -08:00
Adeeb Shihadeh
8c53adf4ab swaglog: add daemon name to context (#23518) 
* cleanup first

* add daemon name

* add test

* fix

* daemon name
 2022-01-13 20:23:08 -08:00
Willem Melching
9e1428fd84 Do not disable loggerd when below 5% space (#23440) 2022-01-13 10:31:37 +01:00
Shane Smiskol
6e817f9eb5 manager: default driverview to False (#23492) 2022-01-11 14:07:35 +01:00
Robbe Derks
1b49ce6ec4 Statsd (#23413) 
* device side of statsd

* need to start it

* enable in manager

* add sleep

* cleanup

* remove aggregates for now and standardize on industry terms

* manager needs main

* need to have a try/except

* atomic_write_on_fs_tmp does not work

* cleaner

* use dump

Co-authored-by: Willem Melching <willem.melching@gmail.com>

* one file at a time

* limit amount of files

* move to influx line protocol and cleanup

* needs to be a list

* fix timezone bug

* actually rate limit

* add to release

* normalized origin

* also log deviceType

* more stats

Co-authored-by: Willem Melching <willem.melching@gmail.com>
 2022-01-10 15:21:48 +01:00
Adeeb Shihadeh
c70fc7dbe5 Revert "soundd: back to onroad only (#23236)" 
This reverts commit 3bdb445c84.
 2022-01-03 16:37:35 -08:00
George Hotz
dc96d4bee7 Add More Types for mypy (#23268) 
* mypy passes

* a few more

* a few in manager

* more types, will lint

* more

* simple types

* events type

* Update selfdrive/thermald/thermald.py

* Apply suggestions from code review

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2021-12-28 18:07:00 +01:00
Ewout ter Hoeven
332f568a82 Pyupgrade 3.6: Update syntax with Python 3.6+ features (#23305) 
Updated Python code with Python 3.6+ features:
- utf-8 encoding is now the default (PEP 3120)
- Replace list comprehensions by Generator Expressions (PEP 289)
- Replace yield loop by yield from (PEP 380)
- Remove the (object) subclass when defining a class
- Replace the IOError alias by OSError (PEP 3151)
- Define sets with curly braces {} instead of set()
- Remove "r" parameter from open function, which is default

Co-Authored-By: Adeeb Shihadeh <8762862+adeebshihadeh@users.noreply.github.com>
Co-Authored-By: GregorKikelj <96022003+GregorKikelj@users.noreply.github.com>

Co-authored-by: Adeeb Shihadeh <8762862+adeebshihadeh@users.noreply.github.com>
Co-authored-by: GregorKikelj <96022003+GregorKikelj@users.noreply.github.com>
 2021-12-24 11:18:39 -08:00
Ewout ter Hoeven
55390d273f Convert format strings strings to f-strings (#23241) 
* Convert all text strings to f-strings

Reformats all the text from the old "%-formatted" and .format(...) format to the newer f-string format, as defined in PEP 498. This requires Python 3.6+.

Flynt 0.69 was used to reformat the strings. 120 f-strings were created in 51 files.

F-strings are in general more readable, concise and performant. See also: https://www.python.org/dev/peps/pep-0498/#rationale

* revert pyextra changes

* revert ublox.py

Co-authored-by: Willem Melching <willem.melching@gmail.com>
 2021-12-16 14:58:17 +01:00
Adeeb Shihadeh
3bdb445c84 soundd: back to onroad only (#23236) 2021-12-15 14:29:32 -08:00
Adeeb Shihadeh
b27a19e9d1 cloudlog: add daemon name to context for python daemons (#23225) 
* python

* manager is a daemon too

* Update selfdrive/manager/process.py

Co-authored-by: Comma Device <device@comma.ai>
 2021-12-14 20:43:26 -08:00
Shane Smiskol
b745a14ff7 version.py: make function names more clear (#23216) 
* rename a few version functions

* and is_prebuilt

* and some formatting 😊
 2021-12-14 12:15:13 +01:00
Adeeb Shihadeh
7e66a944b2 fix startup test 2021-12-06 14:40:42 -08:00
grekiki
6951b3271d Python: Replace more lists with generators (#23116) 
* Replace lists with generators v2

* Replace set with {}

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>

* Replace more set() with {}

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2021-12-03 22:57:19 -08:00
Willem Melching
e8d56f241a manager.py use get_short_branch() for GitBranch param 2021-12-02 10:25:03 +01:00
Adeeb Shihadeh
bc57ffd16f increase scons cache size for CI devices 2021-11-30 14:51:31 -08:00
Willem Melching
f7c46c6949 Do not run code on version.py import (#23063) 
* Do not run code on version.py import

* fix athena
 2021-11-29 19:38:55 +01:00
Willem Melching
7c8044d2db Add LastPowerDropDetected and create bootlog before clearing params (#23062) 
* Add LastControlledShutdown and create bootlog before clearing params

* update param name

* sorting
 2021-11-29 15:51:27 +01:00
Adeeb Shihadeh
ba67c355db manager: kill procs in parallel (#23010) 
* manager: kill procs in parallel

* oops block
 2021-11-29 11:49:04 +01:00
grekiki
68c1a666a0 replace list comprehensions with generators (#23037) 2021-11-25 15:53:11 -08:00
Adeeb Shihadeh
e13630dfee faster jenkins (#22973) 
Co-authored-by: Comma Device <device@comma.ai>
 2021-11-18 23:43:09 -08:00
Willem Melching
77b334a698 swaglog.py: respect LOGPRINT env variable (#22950) 
* swaglog.py: respect LOGPRINT env variable

* only change handler that prints

* keep usefull manager prints

* only print running list

* revert process changes

* fix test
 2021-11-18 16:05:06 +01:00
Dean Lee
ca88a8769b watchdog_kick: non-allocating (#22892) 
* non-allocating

* unpack

* call kick every second

* cleanup include
 2021-11-17 12:02:31 +01:00
Adeeb Shihadeh
ed8e6f857c soundd: configure as persistent process (#22878) 
* soundd: configure as persistent process

* update c2 test

* fix that

* little more

Co-authored-by: Comma Device <device@comma.ai>
 2021-11-12 15:04:57 -08:00
Willem Melching
07ff724726 Move shutdown/reboot handling to manager (#22882) 
* Move shutdown/reboot handling to manager

* more logging

* check enagaged

* Apply suggestions from code review

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2021-11-12 09:10:34 -08:00
Dean Lee
797bb1acb0 soundd: misc cleanup + tests (#22796) 
* pass AudibleAlert to setAlert

* apply reviews

* remove trailing underscore

* add current_alert_type

* common function get_alert

* same freq as ui

* small cleanup

* setvolumne on change

* static Alert::get

* test_sounds

* remove old test files

* loop twice

* assert loopsRemaining

* assert stop

* init to min_volumne

* Revert "remove old test files"

This reverts commit 12e8bfefae1ae7f8649d3eda1e4126ff8eb1fe17.

* move to ui/soundd

* move test to tests/test_sound.cc

* remove old tests

* cleanup

* lower volume

* Revert "remove old tests"

This reverts commit e6bb12abfa3d5cd0aa8986d2b8da0b1edc7ea31b.

* return Alert

* cleanup

* remove #include <optional>

* cleanup .gitignore

* revert to std::optional

* Revert "revert to std::optional"

This reverts commit a66291c51f3a846652837cc4a43d5d60dd81896b.

* cleanup

* remove volume check

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
 2021-11-09 14:18:29 -08:00
Willem Melching
1289ebe9bd make soundd exit cleanly (#22794) 2021-11-04 15:50:48 +01:00
Willem Melching
802efe0e22 soundd doesnt exit cleanly 2021-11-04 15:05:16 +01:00
Willem Melching
bef686f275 Move navigation into separate daemon (#22767) 
* Add navd folder

* prints route instructions to console

* broadcast NavInstuction without lanes

* show basic instructions and eta

* parse out lane info

* use swaglog

* clip distance on ui side

* draw lane directions

* show route

* add to process config

* add to release files

* small cleanup

* show route without gps

* pop open map on initial route

* fix error messages around no gps

* done

* make persistent process

* handle end of route

* clear route on offroad

* only one timer

* fix layout hacks

* explicit rendering at 20Hz
 2021-11-04 14:32:32 +01:00
Adeeb Shihadeh
7feae28705 run onroad tests on release build (#22700) 
* check startup aelrt

* release decorator

* run in jenkins

* run onroad tests

* no push

* fix release2 build

* fix path

* no overwrite

* single release build script

* make files_eon non empty

* files

* run in source

* add that for now

* print

* ignore initialzing

* print

* fetch

* run tests last

* check alert text

* revert some stuff

* fixup jenkinsfile

Co-authored-by: Comma Device <device@comma.ai>
 2021-10-26 23:50:05 -07:00
Willem Melching
8c01ae5716 Add DisableRadar_Allow param and settings toggle (#22329) 2021-09-23 17:19:47 -07:00