Scott Shawcroft
543940e0a7
Fix the docs
2022-03-18 14:56:20 -07:00
Scott Shawcroft
6f0d62d85e
Formatting and shrink build size on C3
2022-03-18 12:05:54 -07:00
Jeff Epler
e9d81c2826
Add mdns module
...
This allows for CircuitPython to resolve a .local domain and find
other devices with MDNS services.
First step for #6174
2022-03-17 18:16:16 -07:00
Dan Halbert
bad6cdcfa5
Merge pull request #6160 from tannewt/merge_7.2.2
...
Merge 7.2.2 changes into main
2022-03-17 20:02:30 -04:00
Michael Himing
84fa7c2bde
Fix countio.Counter.__init__ type hints
2022-03-16 14:54:49 +11:00
Scott Shawcroft
dcc3ec171e
Merge remote-tracking branch 'adafruit/7.2.x' into merge_7.2.2
2022-03-15 13:56:11 -07:00
Dan Halbert
f13d218749
Merge pull request #6125 from tannewt/usb_host
...
Start of USB host API
2022-03-11 21:41:28 -05:00
Scott Shawcroft
7cb66dd316
Merge pull request #6142 from dhalbert/7.2.x-autoreload-fake-sleep
...
7.2.x autoreload rework (again)
2022-03-11 16:46:04 -08:00
Dan Halbert
e4cd9690f1
rework auto-reload delay logic
2022-03-11 14:03:04 -05:00
Scott Shawcroft
00dcf6bd03
Tweaks from review
2022-03-11 10:51:50 -08:00
Dan Halbert
dbc8a312a2
Merge pull request #6137 from dhalbert/7.2.x-__future__
...
Backport from __future__ import annotations from #6117
2022-03-10 20:46:05 -05:00
Dan Halbert
b5504a872a
Merge pull request #6104 from FoamyGuy/wifi_docstring_types
...
update wifi module doc types to str
2022-03-10 12:50:10 -05:00
DavePutz
d365d1b2a0
Update Counter.c
...
Add a comment as to why the countio object needs to be long-lived.
2022-03-10 11:26:42 -05:00
root
a165bdf583
Make countio object long-lived
2022-03-10 11:26:42 -05:00
Dan Halbert
c70425ab6b
add annotations to __future__; don't generate __future__ stubs
2022-03-10 11:19:35 -05:00
Dan Halbert
f59f8acf78
implement: from __future__ import annotations
2022-03-10 11:19:35 -05:00
Dan Halbert
9b2e22a6df
Make autoreload checking more robust
...
- Add reset for autoreload. De-request ticks.
- Separate state a little more in autoreload.c
- Rename some routines.
- Remove redundant settings of CIRCUITPY_AUTORELOAD_DELAY_MS.
2022-03-09 11:07:55 -05:00
Dan Halbert
1c8f671f0a
Merge pull request #6118 from pewpew-game/parallel-reset-optional
...
paralleldisplay: reset and read pins should be optional
2022-03-08 09:34:25 -05:00
Dan Halbert
05a4d24a0f
Merge pull request #6117 from dhalbert/__future__
...
implement `from __future__ import annotations`
2022-03-08 09:33:36 -05:00
Scott Shawcroft
83593a1558
Start of USB host API
...
This allows you to list and explore connected USB devices. It
only stubs out the methods to communicate to endpoints. That will
come in a follow up once TinyUSB has it. (It's in progress.)
Related to #5986
2022-03-07 18:07:25 -08:00
Dan Halbert
dd239efc94
add annotations to __future__; don't generate __future__ stubs
2022-03-07 17:43:15 -05:00
Radomir Dopieralski
f477848ac1
paralleldisplay: reset and read pins should be optional
...
The ``reset`` and ``read`` pins should be optional, but the espressif
code had several places where it assumed they are not, and a bug that
caused a crash on ``release_displays`` if they were made optional.
The bug was caused by the fields for storing pin numbers being set
to ``NO_PIN``, which has value of -1, while the fields have type
``uint8_t``. That set the actual value to 255, and a subsequent
comparison to ``NO_PIN`` returned false.
2022-03-05 18:54:12 +01:00
Scott Shawcroft
08b44eade5
Merge pull request #6114 from pewpew-game/displayio-9bit
...
Add support for 9-bit mode to displayio.FourWire
2022-03-04 16:55:02 -08:00
Radomir Dopieralski
102ee716a7
Add support for 9-bit mode to displayio.FourWire
...
If the ``command`` pin is None, that information will instead be
sent as a ninth bit in the SPI transactions.
Fix #6109
2022-03-04 22:59:17 +01:00
Dan Halbert
1164f2b081
implement: from __future__ import annotations
2022-03-04 14:16:40 -05:00
Alec Delaney
ad502a946d
Change reference of "ports" to "boards"
2022-03-04 11:44:40 -05:00
foamyguy
6a792ab373
update types
2022-03-03 18:47:04 -06:00
tekktrik
842d807086
Add disclaimer about availability of math functions
2022-03-03 17:40:07 -05:00
Dan Halbert
6af4c7797c
Merge pull request #6106 from DavePutz/issue_5982
...
Make countio object long-lived
2022-03-02 18:30:24 -05:00
DavePutz
4ac28587ef
Update Counter.c
...
Add a comment as to why the countio object needs to be long-lived.
2022-03-02 12:21:13 -06:00
root
1ef8aacd73
Make countio object long-lived
2022-03-02 12:07:54 -06:00
foamyguy
c24d16ceae
update wifi module doc types to str
2022-03-01 19:33:26 -06:00
Dan Halbert
548d6beb4c
Merge pull request #6085 from rimwolf-redux/msgpack
...
changed msgpack to use ByteStream type annotations
2022-03-01 10:17:10 -05:00
Dan Halbert
38e9fd703b
add circuitpython_typing. to some annotations; generalize extract_pyi.pi
2022-02-28 21:27:24 -05:00
Michael Himing
1fe9eea225
Fix usb_hid.Device constructor typing
...
descriptor -> report_descriptor
2022-03-01 12:44:21 +11:00
Dan Halbert
4f2d88e669
use pip-installed circuitpython_typing instead of private copy
2022-02-25 13:49:06 -05:00
Randy Hudson
1e03c9dfb9
changed msgpack to use ByteStream type annotations
2022-02-23 21:25:42 -05:00
Kevin Matocha
790af2d9a6
fix REPL terminal garbled characters upon code.py finished
2022-02-21 14:58:16 -06:00
Kevin Matocha
03f42406d3
updated code so the REPL will retain its text if not resized when code stops
2022-02-21 10:33:08 -06:00
gamblor21
e7d99bda0c
More doc fixes
2022-02-21 00:14:24 -06:00
gamblor21
57d916c249
Doc fix
2022-02-20 16:26:20 -06:00
gamblor21
664e02535b
Renaming and documentation
2022-02-20 15:32:44 -06:00
gamblor21
ba229f1007
Initial commit of uzlib module
2022-02-19 10:41:42 -06:00
Jeff Epler
5d213e53af
bus device: properly register submodules
...
Closes : #6066 (except for similar work that needs to be done in ulab)
2022-02-19 08:39:51 -06:00
Scott Shawcroft
9f751927e7
Merge pull request #6054 from tannewt/funhouse_crash
...
Don't update status LED color on brightness change
2022-02-17 17:02:26 -08:00
Scott Shawcroft
7f3f4e409d
Update set_rgb_status_brightness doc and arg check
2022-02-17 14:37:25 -08:00
Dan Halbert
28714963d5
don't wait for USB or BLE workflow after true deep sleep
2022-02-17 15:41:55 -05:00
Dan Halbert
5a063c1a76
Merge pull request #6035 from FoamyGuy/bitmap_blit_type_error
...
bitmap.blit type checking and raise error
2022-02-14 22:38:22 -05:00
foamyguy
dc01505cfc
bitmap.blit type checking and raise error
2022-02-14 19:05:53 -06:00
anecdata
5742a12497
input validation consistent with esp-idf is moved to common-hal
2022-02-13 22:14:45 -06:00
anecdata
7884e73089
build-doc fix
2022-02-12 14:31:23 -06:00
anecdata
b559a0ee2a
new kwarg: wifi.radio.start_ap(max_connections=)
2022-02-12 13:34:57 -06:00
Scott Shawcroft
5355092e4a
Merge pull request #6003 from dhalbert/spi-half-duplex-signature
...
add half_duplex to busio.SPI signature
2022-02-10 10:27:14 -08:00
Dan Halbert
c234d92bdc
Merge pull request #5989 from tekktrik/doc/update-ref-volt-desc
...
Expand AnalogIn.reference_voltage description
2022-02-09 18:13:59 -05:00
Dan Halbert
c4e54ce671
add half_duplex to busio.SPI signature
2022-02-09 14:20:46 -05:00
Scott Shawcroft
88b000f739
Merge pull request #5996 from anecdata/channel_validate
...
WiFi Monitor: improve channel validation
2022-02-09 11:01:14 -08:00
Dan Halbert
da035fe958
Merge pull request #5990 from sgauche/stm_spi_3wire
...
Add support for half-duplex SPI to CPy
2022-02-09 13:11:37 -05:00
Scott Gauche
3b418dbddc
change half_duplex to be on spi construct
2022-02-08 21:37:38 -05:00
anecdata
ffc217e468
consolidate exception strings
2022-02-08 17:55:44 -06:00
anecdata
2c19f4f898
improve channel validation
2022-02-08 17:14:28 -06:00
tekktrik
74bc41b01a
Change reference of "libraries" to "classes
2022-02-08 12:20:28 -05:00
tekktrik
909a554dbd
Expand AnalogIn.reference_voltage description
2022-02-07 18:10:09 -05:00
Jeff Epler
07e710b0a0
Merge remote-tracking branch 'origin/main' into floppy
2022-02-04 09:01:36 -06:00
Dan Halbert
4dc9b00221
Merge pull request #5954 from kmatch98/repl_wrangler
...
Expose display’s root_group, add function to resize REPL terminal
2022-02-02 15:36:22 -05:00
Kevin Matocha
65837a9941
update doc string
2022-02-02 09:23:37 -06:00
kmatch
89a0f37661
Update shared-bindings/supervisor/__init__.c
...
Co-authored-by: Scott Shawcroft <scott@tannewt.org>
2022-02-01 14:36:35 -06:00
kmatch
ff36932388
Update shared-bindings/supervisor/__init__.c
...
Co-authored-by: Scott Shawcroft <scott@tannewt.org>
2022-02-01 14:36:25 -06:00
Mark
5972fdc108
Merge branch 'main' into is31pixelbuf
2022-02-01 13:59:28 -06:00
Dan Halbert
d0453f460d
shrink sensebox; fix doc error
2022-02-01 10:12:26 -05:00
Kevin Matocha
0290fc35d2
Removing some unnecessary files that were changed
2022-02-01 08:28:40 -06:00
Dan Halbert
cc410ad6a3
common-hal I2C combined write_read
2022-01-31 22:03:30 -05:00
Dan Halbert
d5740c8ad9
Merge remote-tracking branch 'adafruit/main' into i2c-common-hal-write-read
2022-01-31 18:51:32 -05:00
gamblor21
02728f1668
Doc changes
2022-01-31 16:23:07 -06:00
Kevin Matocha
db0140f586
Expose splash group, add function to resize REPL terminal
2022-01-31 15:02:00 -06:00
Dan Halbert
83e6e6690a
wip; works on espressif
2022-01-29 22:44:27 -05:00
Dan Halbert
93a60eecab
Merge pull request #5946 from tammymakesthings/pr4218-neopixel-show-after-deinit
...
Fixes neopixel show() after deinit() not raising an exception
2022-01-29 18:30:37 -05:00
Tammy Cravit
bd39bf3797
Check to see if neopixel is deinited before writing to it
2022-01-29 11:13:00 -07:00
Michael Himing
a560ef309e
Fix wifi.Radio.ping return type
2022-01-29 21:31:47 +11:00
Michael Himing
f7c05bc384
Fix wifi.Radio.connect return type
2022-01-29 21:17:04 +11:00
TheWoodsy
b70d5ac713
Update I2SOut.c
...
Redundant import of analogio in example.
Confused MagTag user. MagTag does not come with analogio in uf2 and cannot play native WAV with buzzer hardware.
2022-01-29 10:13:51 +10:00
gamblor21
19660ec66d
Doc and KW_REQ changes
2022-01-28 14:12:05 -06:00
gamblor21
6916307e76
Doc fix
2022-01-27 18:17:38 -06:00
gamblor21
31e183ddad
Documentation fix to the fix
2022-01-27 18:01:27 -06:00
gamblor21
d8a7fa025d
Documentation fixes 2
2022-01-27 16:49:54 -06:00
gamblor21
dd729d8fef
Documentation updates
2022-01-26 19:42:21 -06:00
Scott Shawcroft
5a6f456dbb
Add BLE scanning for S3 and C3.
...
Everything else should raise NotImplementedError.
First step in #5926
2022-01-25 16:28:46 -08:00
Dan Kulinski
19f9163892
Bringing branch up to date with current main
2022-01-25 11:02:00 -07:00
Mark
21c8ac9d4c
Merge branch 'main' into is31pixelbuf
2022-01-23 13:41:10 -06:00
gamblor21
563d8f297c
Major refractor to make a common base object
2022-01-23 13:12:37 -06:00
Neradoc
048ccbcdb2
pulseio doc example little fix
2022-01-22 20:39:26 +01:00
microDev
67293c265c
Merge branch 'main' into board-bus
2022-01-21 10:08:39 +05:30
microDev
30c0891fba
cleanup post instance parameter removal
2022-01-20 20:07:42 +05:30
gamblor21
cf2c8eeec4
Moved init functions to helper python library
2022-01-17 16:13:27 -06:00
Dan Kulinski
fbd9e3284b
Add two byte length check
2022-01-14 15:25:40 -07:00
Jeff Epler
a08c5c0950
fix types
2022-01-13 19:33:10 -06:00
Jeff Epler
d816a4f19d
Add floppyio
...
Initially enabled for samd51, this enables reading raw flux data as well
as DOS/MFM formatted media.
This is only the low-level code for reading & decoding flux pulses from a floppy drive.
high level details will live in a Python library.
adafruit-circuitpython-floppy will take care of details like stepping
from track to track, etc.
2022-01-13 15:37:36 -06:00
Jeff Epler
db5f99c63e
Add a function to get low level register access
...
The port is free to return NULL for any/all of these, and the caller has
to check.
This will be used in the floppy code, because aside from getting the
registers, it looks like all is independent of MCU.
2022-01-13 15:29:03 -06:00
microDev
2f6ef766ea
remove instance parameter
2022-01-05 13:41:36 +05:30
Ben Combee
98b0029a29
audiomp3: add decoded_samples property
...
In my testing, there is no way to accurately know how far into a MP3 file
you're currently playing. You can use monotonic time, but that can have
drift versus the audio playback system, which may not be running at exactly
the expected sample rate.
To allow syncing animation with timestamps in a MP3 file, this presents a
new property, decoded_samples, that records the number of audio samples
sent out of the decoder. While this may not be a completely accurate time,
due to mixer delays, it's much better position that the monotonic clock
difference.
Implementation is keeping track of this value in the mp3file structure and
adding to it whenever data is sent out of the decoder. The property
implementation was a copy/paste from current properties in the audiomp3
files.
2022-01-01 23:28:43 -06:00
Dan Halbert
d166834e09
Merge pull request #5803 from dhalbert/countio-enhancements
...
countio: add selectable rise and fall detection, pulls
2021-12-31 23:45:59 -05:00
Jeff Epler
8a94d9a255
Merge pull request #5784 from WarriorOfWire/vectorio_contains
...
vectorio contains(x, y)
2021-12-31 16:11:24 -07:00
Dan Halbert
9d2a32d07e
countio: add selectable rise and fall detection, pulls
2021-12-31 16:34:58 -05:00
Dan Halbert
2c4e3aa880
Merge pull request #5786 from prplz/fix-busdevice-stub-path
...
Fix busdevice stub path
2021-12-28 10:43:54 -05:00
Dan Halbert
9ef8bce7bd
Merge pull request #5759 from jepler/font-protocol
...
Add a font protocol
2021-12-28 10:36:24 -05:00
Michael Himing
fe71ee0812
Fix busdevice stub path
2021-12-28 19:31:40 +11:00
Kenny
8de5f90086
vectorio contains(x, y)
...
new utility function for all vectorio shape specializations for testing
whether a screen-space x,y point falls within a shape's x,y.
This respects the current orientation of the screen in the manner of
displayio and vectorio - so your x,y requests are in the same coordinate
domain as your x,y locations and your width/height etc. properties that
ou set on other shapes. I.e., if you're using this for touch points then
you will need to make sure the touch events are in the same x,y domain as
your display.
```
contains(2, 4) -> true
------------------
| |
| |
| -- |
| | \ |
| |. \ |
| | \ |
| |____\ |
| |
------------------
contains(5, 4) -> false
------------------
| |
| |
| -- |
| | \ |
| | \. |
| | \ |
| |____\ |
| |
------------------
```
This helps provide low overhead introspection of shape coverage on screen.
It's envisioned that this will be used for things like touch-and-drag
widget controls, touch "areas" and may help with random ornament placement
on toy Christmas trees.
2021-12-27 12:01:19 -10:00
Jeff Epler
316c25303d
Provide a protocol for Fonts
2021-12-27 10:31:35 -06:00
Jeff Epler
900ec91fa6
Merge pull request #5761 from adafruit/7.1.x
...
Bring 7.1.x changes into main - cascadetoml undo + alarm fixes
2021-12-23 06:30:05 -07:00
Scott Shawcroft
674c845fb6
Merge pull request #5760 from jepler/rename_under_typing
...
circuitpython_stubs: Use `circuitpython_typing` for cp-specific typing
2021-12-22 14:05:04 -08:00
Jeff Epler
fb79d1c1d1
bitmaptools: add missing types
...
These diagnostics occurred, but weren't treated as errors:
```
[WARN] Missing return type: alphablend on line 38
[WARN] Missing argument type: dest_bitmap on line 38
[WARN] Missing argument type: source_bitmap_1 on line 38
[WARN] Missing argument type: source_bitmap_2 on line 38
```
2021-12-22 11:16:38 -06:00
Jeff Epler
166793f843
circuitpython_stubs: Use circuitpython_typing for cp-specific typing
...
Installing stubs for a module named `_typing` seems like a dubious
decision.
2021-12-22 11:14:21 -06:00
Dan Halbert
3bb9a4439d
Fix recording of wake_alarm
2021-12-21 21:48:36 -05:00
foamyguy
8b71519317
code format
2021-12-20 10:48:08 -06:00
foamyguy
2ce9dc7680
Merge branch 'adafruit_main' into tilegrid_size_props
2021-12-20 07:31:08 -06:00
Jeff Epler
7f189b3e30
Merge pull request #5747 from adafruit/7.1.x
...
Merge 7.1.x fixes and updates into main
2021-12-17 20:44:43 -07:00
Jeff Epler
eeb84ce97f
Merge pull request #5731 from rsbohn/dexter-editorial
...
Fix some documentation issues
2021-12-16 08:05:35 -07:00
Randall Bohn
fd655301b5
edit docstring for pixel_shader
2021-12-15 13:07:12 -07:00
Scott Shawcroft
d50079c4ca
Merge pull request #5716 from timhawes/ssl_improvements
...
SSL improvements
2021-12-15 10:52:48 -08:00
microDev
70b3e73349
traceback: fix for crash on non-native exceptions
...
Co-authored-by: Tim Hawes <me@timhawes.com>
2021-12-15 12:29:21 +05:30
gamblor21
bb8ad7f611
Fixed doc
2021-12-14 22:44:27 -06:00
microDev
96c6271134
apply suggestions from reviews
...
- minor typo fix
- update documentation for board module
2021-12-15 02:02:20 +05:30
gamblor21
7c1afb070a
Documentation fixes
2021-12-13 22:31:29 -06:00
gamblor21
9fafd7d7fd
Initial commit
2021-12-13 22:31:29 -06:00
Tim Hawes
c325633f8e
Add methods to ssl.SSLContext for handling self-signed certs
2021-12-14 01:00:50 +00:00
Tim Hawes
bcb516c496
Handle server_hostname=None in SSLContext.wrap_socket
2021-12-14 01:00:50 +00:00
Tim Hawes
8ef24afe7a
Documentation fix for SSLContext.wrap_socket
2021-12-14 00:09:15 +00:00
foamyguy
c4be8a5c94
tilegrid size properties
2021-12-13 09:44:08 -06:00
Kenny
17b53c7ebe
vectorio: Add width and height properties to rectangle
...
Closes: https://github.com/adafruit/circuitpython/issues/5695
2021-12-12 19:50:00 -08:00
Dan Halbert
c06eee9841
Clear TAMPER interrupt properly; make keypad module table const
2021-12-12 22:00:08 -05:00
microDev
b6858e4ca7
allow multiple board buses
...
Co-authored-by: Neradoc <neraOnGit@ri1.fr>
2021-12-11 23:07:21 +05:30
Jeff Epler
5797b68153
Merge pull request #5649 from microDev1/traceback
...
Run test for traceback module
2021-12-02 08:51:53 -06:00
microDev
69faaa52b8
run test for traceback module
2021-12-02 14:55:02 +05:30
Jeff Epler
f94d3e86cf
UART: Don't allocate the object so early
...
This object has a finalizer, so once it's no longer referenced, GC can
call that finalizer and then deallocate the storage.
In the case of a failure during construction (e.g., when checking
`validate_obj_is_free_pin_or_none`) this will happen on an incompletely
initialized structure. On samd, in particular, a newly allocated object
(with construct never called) appears to be valid, so GC collecting it
causes deinit() to do things, leading to a hard fault.
The double creation of the UART object was necessary specifically so that
the second allocation would fail. Probably there were other (single
call) ways to make it fail, but this was the easiest / the one discovered
in real life.
Closes : #5493
2021-12-01 20:54:39 -06:00
Scott Shawcroft
fea0103ff2
Merge pull request #5638 from jepler/test-aesio
...
Test aesio
2021-12-01 10:05:37 -08:00
Scott Shawcroft
39cc38e008
Merge pull request #5641 from jepler/bitbangio-spi-write-slice
...
bitbangio.SPI: Handle kwargs like busio.SPI
2021-12-01 09:56:04 -08:00
Jeff Epler
9ee46bb462
bitbangio.SPI: Handle kwargs like busio.SPI
...
untested
2021-11-30 17:22:13 -06:00
Jeff Epler
62895b2636
aesio: fix docs
2021-11-30 15:25:42 -06:00
Jeff Epler
1f1def54b7
add aesio to unix coverage build
2021-11-30 15:25:05 -06:00
Kamil Tomaszewski
9a8d8b1bf1
spresense: Fix time.time()
2021-11-30 12:38:48 +01:00
Scott Shawcroft
ee5536386d
Merge remote-tracking branch 'adafruit/main' into rpi
2021-11-24 14:23:23 -08:00
Scott Shawcroft
153ff6031e
Merge pull request #5616 from jepler/bitmaptools-bugfixes
...
Bitmaptools bugfixes
2021-11-24 11:50:29 -08:00
Scott Shawcroft
b09c777d0a
Merge pull request #5584 from gamblor21/is31
...
IS31FL3741 Framebuffer Driver
2021-11-24 11:41:51 -08:00
Jeff Epler
6191696232
bitmaptools: Fix the DitgherAlorithm.FloydStenberg value
2021-11-24 09:51:19 -06:00
Scott Shawcroft
927a720de9
Fix I2C and feedback from Dan
2021-11-23 17:23:13 -08:00
gamblor21
97032fdbd0
Renaming files
2021-11-23 17:21:13 -06:00
gamblor21
9f2660f6ac
Capitalization changes
2021-11-23 17:06:39 -06:00
gamblor21
9b85714b76
Removed unused imports
2021-11-23 13:24:36 -06:00
Timon
a1052d5f73
Initial broadcom port for Raspberry Pi
...
This targets the 64-bit CPU Raspberry Pis. The BCM2711 on the Pi 4
and the BCM2837 on the Pi 3 and Zero 2W. There are 64-bit fixes
outside of the ports directory for it.
There are a couple other cleanups that were incidental:
* Use const mcu_pin_obj_t instead of omitting the const. The structs
themselves are const because they are in ROM.
* Use PTR <-> OBJ conversions in more places. They were found when
mp_obj_t was set to an integer type rather than pointer.
* Optimize submodule checkout because the Pi submodules are heavy
and unnecessary for the vast majority of builds.
Fixes #4314
2021-11-22 14:54:44 -08:00
gamblor21
c38612d59d
Fixed capitalization
2021-11-21 11:39:42 -06:00
Jeff Epler
711f1f833b
bitmaptools: Fix the case where factor's Python type is int
...
mp_obj_float_get gets the value of an object, which must be
exactly a float. mp_obj_get_float gets the float value of
an object of various types, including floats & ints.
2021-11-20 21:15:26 -05:00
