Commit Graph

716 Commits

Author SHA1 Message Date
Adeeb Shihadeh dea5b1fbe0 define new prime types
old-commit-hash: ab7c653cc59c0935495ca359d30d5f87fbdaf69e
2022-05-18 18:50:42 -07:00
Adeeb Shihadeh f4675fc260 Merge common/ and selfdrive/common (#24556)
* Merge common/ and selfdrive/common

* fix that

* fix version

* fix unit tests
old-commit-hash: cb8885cffb313bea258c012c3026461a22bf8135
2022-05-18 14:11:57 -07:00
Willem Melching 860487c4b7 ui: fix cameraview widget on MacOS after YUV changes (#24506)
old-commit-hash: aac7248a0150c0f31d1a45eb9f7f84af551b4691
2022-05-12 17:16:30 +02:00
Adeeb Shihadeh 5e42de3e36 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>
old-commit-hash: 2466233b1cf5195bc4005c647d00408c838fe1a8
2022-05-04 14:57:39 -07:00
Willem Melching 1ccab5f034 ui: fix HUD drawing order (#24419)
old-commit-hash: e8892481abc7e3c529be35dd093614c50e6bfbbd
2022-05-04 12:12:13 +02:00
Willem Melching 44a92a53d0 cameraview.cc: set alignment to 1 when copying texture (#24418)
old-commit-hash: 3fc01ec15acc5a4f8fdd427240dfc178362760dd
2022-05-04 11:44:16 +02:00
Willem Melching 43b558f6db map.cc: fix crash on older route with missing liveLocationKalman values
old-commit-hash: 9307fe434cf7e9adb68a12d0b9073ebcf75e1f3e
2022-05-04 11:37:31 +02:00
Adeeb Shihadeh 9424f67e19 body: opt-in logging (#24416)
old-commit-hash: 670126cbf15ceecb03279e6fa9779798d905cb99
2022-05-03 23:46:59 -07:00
Adeeb Shihadeh 98e1937b9d ui: new notcar battery design (#24412)
* ui: new notcar battery design

* if charging

* cleanup

* remove that

* slower

* real colors

* relative from left

* fix that
old-commit-hash: 043a309d67da9c4d4671303b370e04aa29cd115d
2022-05-03 16:51:44 -07:00
Adeeb Shihadeh b35ac8b532 UI: add battery percent to body (#24401)
* UI: add battery percent to body

* little smaller

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 061b18805e131aeff6582730d1b6d2994ce7f985
2022-05-02 21:34:06 -07:00
Joost Wooning 3783eb811f UI: remove unused lock and fence (#24355)
old-commit-hash: 7ac92938d246030095c2928d24d55d74b57565db
2022-05-01 18:57:39 -07:00
Willem Melching 2a5eae5a56 ui: combine OnroadHud into NvgWindow (#24369)
* ui: combine OnroadHUD and NVGWindow

* draw hud first

* cleanup

* removed commented line

* fix text rendering

* increase cpu usage
old-commit-hash: a3cfa444d37bacdac5278335ac7a49b6cb5b81f0
2022-04-29 10:55:44 -07:00
Willem Melching 0817a5aaef ui: only open map pane when route is not empty (#24352)
old-commit-hash: bff0db566bfc20a8f2ab936646c67be22b9ade76
2022-04-28 14:51:02 +02:00
Adeeb Shihadeh 35e073a22e Revert "onroad UI: show negative speed (#23987)"
This reverts commit cac807daf9e39f982db2a856403a50a67622b992.

old-commit-hash: de56544531ea70ce1ca913e5aa6fd6fb3e293ec6
2022-04-25 15:16:06 -07:00
Joost Wooning 31f9e8af0f UI: remove memcpy on frame receive (#24318)
* UI: remove frame memcpy

* fix freezing

* fix onroad test
old-commit-hash: f84fdc86bbd8223f22158abfa37e368fa18bedf6
2022-04-25 13:45:55 -07:00
Joost Wooning c3bebf3e19 UI: use YUV stream instead of RGB (#24317)
* UI: use YUV stream instead of RGB

* cleanup

* cleanup
old-commit-hash: 43f43b1c64c6b95808e9a876083a70adf4e9a09d
2022-04-25 21:07:08 +02:00
Adeeb Shihadeh 8eb8cf95ec Revert "UI: remove RGB buffer usage (#24298)"
This reverts commit 2a13d8446cd19340bfb67f14470b7c35f643e8b8.

old-commit-hash: 13e1c0b3393617a47bd1f9acf20485a1993f83e9
2022-04-24 11:56:30 -07:00
Joost Wooning e0c973fe70 UI: remove RGB buffer usage (#24298)
* ui: use yuv buffer

* cleanup

* fix watch3

* replay always send yuv

* fix drawing of path

* fix onroad test

Co-authored-by: Willem Melching <willem.melching@gmail.com>
old-commit-hash: b9907e86b2dde54263d55d36346bb5609950ab99
2022-04-22 12:55:37 -07:00
Adeeb Shihadeh 5a9644261f remove comma two support (#24248)
* remove comma two support

* cleanup release files

* little more

* more libs

* no more gralloc

* add snpe back
old-commit-hash: 5c48e7bc86a621dd35f4ff25da7a26ee506bac76
2022-04-18 17:55:23 -07:00
Shane Smiskol 96ef36dcb4 ui: adjust laneless design (#24246)
* tune design

* adjust

* adjust

* fix and compromise!

* fix sl
old-commit-hash: fdeb590ae66bc2e6d930803c4401cea98d99786b
2022-04-18 13:32:09 -07:00
Shane Smiskol 4d820e1096 UI: new laneless design (#24169)
* stash

* Revert "stash"

This reverts commit f0019010e28ffb6d70b3c84666572f30c22077c9.

* new laneless ui

* clean up

* always draw lane lines

* no compensation

* make sure it's long enough

* debug time

* tune design

* tune design 2

* correct scaling with new updated curve hue

* debug time

* full test

* revert test

* move yellow back a bit
old-commit-hash: 998cd7fa204081c12f7211113044dfa254a9e24c
2022-04-14 20:09:51 -07:00
Adeeb Shihadeh 6371a16f4e UI: double click to switch between body and onroad views (#24214)
* UI: double click to switch between body and onroad views

* fix that

* Update selfdrive/ui/qt/home.cc

Co-authored-by: Comma Device <device@comma.ai>
old-commit-hash: 639255bd10e8cf00ccb1c3ef4bc6b47c9a5cb7fb
2022-04-14 17:33:17 -07:00
Brett Sanderson 58771d8bdd UI: improved disengage on gas toggle description (#24132)
* Update settings.cc

Should be depressed as standard in automotive industry.

Pressed implies state change from down -> up, depressed means the state is down

* Update selfdrive/ui/qt/offroad/settings.cc

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 61d987f630237c079a4c13b7d40b8a5b46a062c9
2022-04-05 15:07:28 -07:00
Shane Smiskol 474ba19c81 Add Disengage on Accelerator Toggle (#23977)
* Squashed commit of the following:

commit 953bcf0ecf8d03f0fec9ce0d5442cc660ae2347d
Merge: b4198608d efd04715e
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 0e983562d
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 c78701e47
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 3e819bc5a
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 603e07793
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 46ed8bb8e
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 2c947f193
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 d0ef25959
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 c814c1383
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 6d2483ff9
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 eae207a84
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 ebf5b27a7
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 1175355b7
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
old-commit-hash: f1f40c117a65294e27f93f953a772c43078bdceb
2022-04-04 21:59:52 -07:00
Adeeb Shihadeh 78bb03345e better support non-car robots (#24106)
* better support non-car robots

* bump cereal

* update refs
old-commit-hash: e40c36f22ba93200a5fc83211005b28fca3fa728
2022-04-01 20:03:20 -07:00
Adeeb Shihadeh 1ce647b0a6 UI: body support (#24079)
* body ui template

* faces

* abs

* not raw

* auto switch

* check that

* no smoosh

* cmath
old-commit-hash: b51deb97d162f724df5e7469cdef2615a0a23a0e
2022-04-01 15:12:54 -07:00
George Hotz 05be126142 sidebar: the word SEARCHING didn't fit
old-commit-hash: f3d390bdfa03098efe9465796db10e32ec3b1452
2022-03-31 18:57:00 -07:00
Willem Melching 619b88c1f4 api.cc: expose error type in requestDone signal (#24064)
* put error in requestDone

* only check in tools
old-commit-hash: 34a8a5ea76d05432ee24f5d2a2307b74ad755971
2022-03-30 12:12:33 +02:00
Shane Smiskol d2f8c085c0 Training guide updates (#24033)
* add new images

* update boxes

* copy updates and fix checkmark spacing

* update wide images and boxes

* tune path and smaller triangle

* tune bounding boxes

* clean up

* same triangle as c3

* revert panda

* optimize images

* Revert "revert panda"

This reverts commit f66aac85a01135d68d0c51ad4c383b7cd23ef86f.

* add comment

* add new step18

* final fixes

* pixel perfect
old-commit-hash: 405ecbced38e27e1b5ce14b30042b6ccb9acf254
2022-03-25 17:04:53 -07:00
Adeeb Shihadeh 9f2a58e9c4 UI: better lag logging (#24042)
* UI: better lag logging

* remove print
old-commit-hash: 67e3a2c39ae17e55c5faacce1949599178b3e30e
2022-03-25 13:52:37 -07:00
Shane Smiskol 769c76a773 ui: repaint toggles after offroadTransition (#24038)
* repaint after offroadTransition

* Update selfdrive/ui/qt/widgets/controls.h

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

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 4802c864d5ccfc606c7392a73ead858a5a2a2bcf
2022-03-25 13:52:22 -07:00
Igor Biletskyy 8db72d15f0 onroad UI: show negative speed (#23987)
* show negative speed

* remove ()
old-commit-hash: 62087a6368efb5fee555aa0b3b2458e721b87b68
2022-03-17 13:17:33 -07:00
Gijs Koning cedd8abc05 Rename RGB vision streams to match YUV streams (#23961)
* Renaming VISION_STREAM_RGB_.. to match yuv names like VISION_STREAM_ROAD
VISION_STREAM_RGB_BACK -> VISION_STREAM_RGB_ROAD
VISION_STREAM_RGB_FRONT -> VISION_STREAM_RGB_DRIVER

* little more

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 57b6fdc17a1f84ec922647c044da5df3cafc0ddc
2022-03-14 14:03:54 -07:00
Lee Jong Mun 247dff5621 ui: white color define (#23930)
old-commit-hash: 0b47800e74b02b0c6897a3950c6ff2f5fe22d895
2022-03-09 11:24:56 +01:00
royjr 388ae5e59e UI: remove redundant condition (#23918)
old-commit-hash: 82bc052dc631512f3cf871c1dc4b5c2be1cab052
2022-03-07 09:57:32 -08:00
Willem Melching 7e12817e02 MacOS: ensure 1:1 rendering on HiDPI screens (#23860)
old-commit-hash: ca8d4e417e53e5869ad77e8bfd5da62a78a88de3
2022-02-25 14:36:27 +01:00
Adeeb Shihadeh 6ca0269f47 same check
old-commit-hash: 95da47079510afc91665263619e5939126da637c
2022-02-15 16:44:13 -08:00
Adeeb Shihadeh b695ffbfdb UI: fix power buttons disable logic (#23774)
old-commit-hash: 00d469dbc9d5ab8237247f7036892fe74c5e3c8a
2022-02-15 16:18:09 -08:00
Willem Melching 3de449a993 nav: set settings stack based on uiState.prime_type (#23770)
* nav: set settings stack based on uiState.prime_type

* also show on success
old-commit-hash: f8c81103fc1dc98b0403a89c549947a9777f87ce
2022-02-15 16:39:10 +01:00
Willem Melching 06add8928d nav: handle route responses with duplicate points (#23769)
old-commit-hash: 14f7a7825151ab55975a24f53e4178fb7a595bea
2022-02-15 16:14:57 +01:00
Willem Melching 5d55924fac ui: fix onroad transition with active nav (#23757)
old-commit-hash: e76ef93a833396dba4e3478966f9b48894c08638
2022-02-14 13:55:30 +01:00
Lee Jong Mun c5e11d7491 missing optional include (#23749)
old-commit-hash: ab9fb0541df1d3455060a24c3093f463a752951e
2022-02-11 12:08:09 +01:00
Willem Melching 30a0b40b5d ui: configure tethering based on prime type (#23733)
* Store prime type in param

* set tethering metric based on prime type

* update existing connections

* returning zero is fine

* always set

* add callback on activate

* call systemctl

* match server enum

* add delay

* assume field is there

* snake case
old-commit-hash: 4e4cb07297485eac378058c6b4e60901e10cbd15
2022-02-09 20:27:58 +01:00
Dean Lee fab73e6e9f remove trailing whitespaces (#23716)
old-commit-hash: 786152f0f125f9c78dc129cab8f24a98d93f36a1
2022-02-06 10:42:41 -08:00
Dean Lee d76c70cb2f WifiManager: fix crash if no wifi device found (#23701)
old-commit-hash: 4e0c08c0a6b700d2532e80e6c35e208fca86c5b6
2022-02-03 15:33:29 -08:00
Jason Wen e2b296f0ae UI: hide power off button on C3 while onroad (#23689)
* Grey out power button while onroad - comma three only

* Apply suggestions from code review

Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
old-commit-hash: 4715510e918ce31f07170965aebc32ee41c263fc
2022-02-03 15:32:57 -08:00
Adeeb Shihadeh c491f3fc2c for those who want to live in the moment
old-commit-hash: e6d8a845782e1b902b2966edb3c39c882e735b97
2022-01-31 14:30:40 -08:00
Adeeb Shihadeh 9b9d6ce772 setup: add OS version to user agent (#23656)
old-commit-hash: e9cd0a059c0985e16bdd64eeffb1791c1001088c
2022-01-28 14:21:37 -08:00
Adeeb Shihadeh 70f1418256 remove community features toggle (#23214)
* remove community features toggle

* bump cereal

* little more

* update refs
old-commit-hash: 3e9cb7fa12b5f686fdcf6122ef5979d01c41f0a3
2022-01-24 14:49:47 -08:00
Dean Lee 0d468d6253 ui/setup: check http status code (#23597)
* check resp code

* always cleanup curl and close file

* curl_global_init

* space

* cleaner

* Revert "curl_global_init"

This reverts commit c3f1a7cee87804993ce8f5fd5939570a8e9ffd3a.
old-commit-hash: 1e906366f8439e3ef3f4f8fc01e2f2ec0f951a86
2022-01-22 13:49:03 -08:00