bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
16,457 Commits 1 Branch 4 Tags 151 MiB
ed477abbd5
Commit Graph

1162 Commits

Author SHA1 Message Date
Scott Lahteine
426d555f6e TFT cleanup 2021-04-29 08:45:05 -05:00
Jason Smith
3afa6e526b STM32F1 cleanup, incl. SoftwareSerial removal (#20046) 2021-04-29 08:45:05 -05:00
Scott Lahteine
5a918e2b2e Update some file headers 2021-04-29 08:45:05 -05:00
Victor Oliveira
2dd1522e30 Standardize Marlin SPI (part 1) (#19989) 2021-04-29 08:45:05 -05:00
Scott Lahteine
b643a07b66 Comment, spacing cleanup 2021-04-29 08:45:05 -05:00
Victor
b767a82bd8 FAST_PWM for STM32 (#20025) 2021-04-29 08:45:05 -05:00
Scott Lahteine
67d58ccb98 HAL support for 8s watchdog 2021-04-29 08:45:05 -05:00
Victor Oliveira
172996f2b3 Fix STM32 HW Serial + EP compile (#19990) 2021-04-29 08:45:04 -05:00
Victor Oliveira
3c512648da Increase SPI Speed on LPC. Color and Classic UI for MKS SGEN L. (#19945) 2021-04-29 08:45:04 -05:00
Scott Lahteine
95fb749923 Clean up SPI and ST7920 defines (#19956) 2021-04-29 08:45:04 -05:00
Jason Smith
d9a47ec075 Get STM32 clock rates from framework (#19978) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-04-29 08:45:04 -05:00
Scott Lahteine
2774b70fbf gcode_D EEPROM size, cleanup 
Fixes #19920

Co-Authored-By: Orel <37673727+0r31@users.noreply.github.com>
 2021-04-29 08:45:04 -05:00
Victor
3dbe4ac593 FAST_PWM for STM32F1 (#19952) 2021-04-29 08:45:04 -05:00
Scott Lahteine
59914df5b7 Fix comments, spacing 2021-04-29 08:45:04 -05:00
Victor Oliveira
b590cee35a Keep SPI active on LPC176x (#19932) 2021-04-29 08:45:04 -05:00
Scott Lahteine
aecf545446 Fix Archim 1, add Archim 1&2 tests 2021-04-29 08:45:04 -05:00
Scott Lahteine
6c103b72a2 Clean up comments, USB flash, NULLs 2021-04-29 08:45:04 -05:00
Scott Lahteine
d3ee5d7dfe Fix warning in gcode_D 2021-04-29 08:45:04 -05:00
Scott Lahteine
2fed3982d6 Pins post-process header (#19860) 2021-04-29 08:45:04 -05:00
Scott Lahteine
e32bdf6a93 ESP32: i2s_init requires I2S_STEPPER_STREAM 2021-04-29 08:45:03 -05:00
bilsef
c6f17ac01e Teensy 4.1 Ethernet support (#19801) 2021-04-29 08:45:03 -05:00
Scott Lahteine
53a4b8fa33 Misc. cleanup, serial strings 2021-04-29 08:45:03 -05:00
Scott Lahteine
141f6825ce Rename ultralcd => marlinui 2021-04-29 08:45:03 -05:00
Serhiy-K
19498040ef Fix HAL/STM32 FastIO for analog pins (#19735) 2021-04-29 08:45:03 -05:00
Jason Smith
d5340675ae Fix SAMD Serial name macro (#19765) 2021-04-29 08:45:03 -05:00
Victor Oliveira
1fa19e1fc2 Sanity check unsupported EP (#19745) 2021-04-29 08:45:03 -05:00
Scott Lahteine
7905aa64fa TFT Presets, Generic options, Sanity checks (#19723) 2021-04-29 08:45:03 -05:00
Jason Smith
6a5799fc7d Revert at90usb1286 conditional (#19733) 2021-04-29 08:45:03 -05:00
Jason Smith
33b2f0700e Add NUCLEO-F767ZI dev board (#19373) 
Co-authored-by: Lorenzo Delana <lorenzo.delana@gmail.com>
 2021-04-29 08:45:02 -05:00
Victor Oliveira
9b1ed45b3e TFT Refactoring (#19192) 
* split tft folder in two: tft for color ui; tft_io for shared tft code

* after the files got moved, now the code was moved to the right place

* classic ui using TFT IO init lcd codes

* feature to compile tft_io when enabled

* compiling fix

* lvgl spi tft working with tft io init codes

* there is no need for separeted fsmc and spi class in lvgl anymore, as tft io handle everything

* remove debug

* base for TFT rotation and mirroring API, and ILI9488 support

* ST7796S rotate and mirror support

* ST7789V rotate and mirror support

* ST7735 rotate and mirror support

* ILI9341 rotate and mirror support

* ILI9328 rotate and mirror support

* R61505 rotate and mirror support

* MKS TFT definitions

* more configs for mks tfts

* update config

* naming typo

* to configure the user interface

* ANYCUBIC_TFT35

* tft configs

* support for SSD1963

* tft display types

* updated conditionals lcd; first board fully working with the new code - all 3 ui!

* compatiblity

* changed name

* move classic ui file name

* rename TURN -> ROTATE

* GRAPHICAL_TFT_ROTATE_180 deprecated

* first fsmc board fully working - chitu v5

* mks robin nano v1.2 + tft 35 ok!

* right pin name

* anycubic tft tested in a TRIGORILLA_PRO

* chitu v6

* nano 32 tft orientation

* mks tft43

* mks tft43 rotation

* fixed LONGER LK tft setup

* GRAPHICAL_TFT_UPSCALE defined by the display type

* better offsets defaults

* Update Configuration.h

* Update tft_fsmc.cpp

* Update Conditionals_LCD.h

* Tweak comments

* update nano tests

* Revert "update nano tests"

This reverts commit a071ebbfad30e28855a4a5695ec8a726542a1a65.

* default tft

* outdated comments

* to not break non-vscode builds

* upscale tft 35

* support tft 180 rotation for color ui

* Each TFT Driver is responsible for its default color mode.

* use auto detect in mks displays, because some of them could be shipped with diferent drivers

* extra s

* unused code

* wrong -1

* missing mirror options

* Smaller regex pattern

* Comment updates

* Clean up old defines

* Apply pins formatting

* GRAPHICAL_TFT_ROTATE_180 => TFT_ROTATE_180

* MKS_ROBIN_TFT_V1_1R

* merge fix

* correct resolution

* auto is default, dont need be there, and it will allow the user to configure it even for named displays

* to not use rotation with MKS_ROBIN_TFT_V1_1R

* i like () in macros

* avoid sleepy commits

* default for st7789 is rgb

* nano follow up

* to allow ili9328 rotation

* default is rgb

* boards merge follow up

* to match bootloader orientation

* HAS_TOUCH_XPT2046 is not hal specific anymore

* lets not forget LPC

* 180 rotation for ili9328 and R61505

* Clean up whitespace

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2021-04-29 08:45:02 -05:00
Victor Oliveira
c1729330c5 Option to prevent (extra) Watchdog init on STM32 (#19693) 2021-04-29 08:45:02 -05:00
Jason Smith
67e0e6d5ad Fix I2C_ADDRESS sign warning (#19685) 2021-04-29 08:45:02 -05:00
Jason Smith
2c7b5fe1f2 Fix at90usb1286 build (#19687) 
* Skip check for USBCON during dependency detection
* Ignore incompatible Teensy_ADC library, which requires Teensy >= 3
* Add IS_AT90USB

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-04-29 08:45:02 -05:00
Scott Lahteine
a30e8baf3e Digipots refactor / cleanup (#19690) 2021-04-29 08:45:02 -05:00
Victor Oliveira
2adac87c45 Restore correct STM32 port-bits code (#19678) 2021-04-29 08:45:02 -05:00
Serhiy-K
72f9fdc05f Fixes for TFTGLCD Panel, FastIO (#19614) 2021-04-29 08:45:02 -05:00
Scott Lahteine
7e09160ba3 Batch appercase hex values 2021-04-29 08:45:02 -05:00
Victor Oliveira
2553a18f40 Support for Debug Codes - Dnnn (#19225) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-04-29 08:45:02 -05:00
Scott Lahteine
3516c3f936 Use 0xFF (not 'ff') for byte transfer 2021-04-29 08:45:02 -05:00
Scott Lahteine
6002dc634e Trailing whitespace 2021-04-29 08:45:01 -05:00
Ryan V1
85c6ffb364 Fix 'bossac' upload on Windows (#19545) 2021-04-29 08:45:01 -05:00
ellensp
9804677669 Fix wrappers on HAL/STM32F1 .cpp files (#19581) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-04-29 08:45:01 -05:00
ellensp
c5614c8529 Fix TEMP_ADC_PROBE support for STM32F1 (#19582) 
Co-authored-by: ellensp <ellensp@ellensp-HP-ProBook-6470b.fritz.box>
 2021-04-29 08:45:01 -05:00
Scott Lahteine
69917690f3 Adjust HAL platform defines, comments 2021-04-29 08:45:01 -05:00
Victor Oliveira
0507df61b2 Minor SPI fixes, systick_callback for STM32F1 HAL compatibility (#19565) 2021-04-29 08:45:01 -05:00
Nick
2069ab3a15 Anycubic Chiron full feature support (#19505) 2021-04-29 08:45:01 -05:00
qwewer0
04a712dacc Multi-line comments cleanup (#19535) 2021-04-29 08:45:01 -05:00
Scott Lahteine
58deab1915 Rename LCD conditionals (#19533) 2021-04-29 08:45:00 -05:00
Tanguy Pruvot
717de1e703 Working LCD_USE_DMA_FSMC (#19522) 2021-04-29 08:45:00 -05:00
Scott Lahteine
affb5e53df Sanity check old serial names 2021-04-29 08:45:00 -05:00
Jason Smith
9d02cedfed Fix and improve STM32F1 serial (#19464) 2021-04-29 08:45:00 -05:00
Scott Lahteine
bfa6cd3693 HAL/serial followup 2021-04-29 08:45:00 -05:00
Scott Lahteine
f588d50d57 HAL and serial cleanup 
Co-Authored-By: Jason Smith <20053467+sjasonsmith@users.noreply.github.com>
 2021-04-29 08:45:00 -05:00
ellensp
a3a5b334c4 Define UART pins for LPC debug based on LPC_PINCFG_UART (#19475) 2021-04-29 08:45:00 -05:00
Jason Smith
632ac54440 MKS Robin Mini uses ONBOARD_SPI_DEVICE (#19460) 2021-04-29 08:45:00 -05:00
makerbase
33788c8405 Add MKS Robin E3P, improve LVGL UI (#19442) 2021-04-29 08:44:59 -05:00
Scott Lahteine
ee1232051c Cleanup before MKS changes 2021-04-29 08:44:59 -05:00
Scott Lahteine
b3890d385c Add multi-extruder condition 2021-04-29 08:44:59 -05:00
Scott Lahteine
5a35595a3a Whitespace cleanup 2021-04-29 08:44:59 -05:00
Victor Oliveira
d3f88a2482 Only set up SPI pins as needed (#19372) 2021-04-29 08:44:59 -05:00
Scott Lahteine
d6bbcd020b General cleanup 2021-04-29 08:44:59 -05:00
Victor Oliveira
42619a3a81 LPC: Finish DMA transfer, use HW SPI class (#19191) 2021-04-29 08:44:59 -05:00
Victor Oliveira
8393c6a63d Raise STM32F1 UART IRQ Priority, add error handling (#19301) 
(Error handling for Overrun, Framing and Parity.)
 2021-04-29 08:44:59 -05:00
Marcio Teixeira
ba6659f6be Fix ExtUI SD sorting, compile issues 2021-04-29 08:44:58 -05:00
bilsef
ea39d3c45e Support for Teensy 4 (#19311) 2021-04-29 08:44:58 -05:00
Scott Lahteine
a8904d25ba Minor HAL cleanup 2021-04-29 08:44:58 -05:00
Jason Smith
784016a25e Update HAL/STM32 platform to 8.0 (#18496) 2021-04-29 08:44:58 -05:00
Victor Oliveira
643f192515 STM32F1 EP with USB_COMPOSITE (#19281) 2021-04-29 08:44:58 -05:00
Victor Oliveira
24fbfae0fd Fix STM32F1 SPI device init, MKS_LCD12864 (#19271) 2021-04-29 08:44:58 -05:00
Victor Oliveira
563bd5b5bc Emergency Parser for STM32F1 (#19279) 2021-04-29 08:44:58 -05:00
Victor Oliveira
3b4779fa15 TFT (plus Hardware SPI) for LPC (#19139) 2021-04-29 08:44:58 -05:00
Scott Lahteine
f3d0b49928 PGMSTR constexpr => const 2021-04-29 08:44:57 -05:00
Giuliano Zaro
3aa5b45768 Prefer Servo AVR timer4 over 3 (#19025) 2021-04-29 08:44:57 -05:00
Giuliano Zaro
fe1e880ffe HIGH/LOW naming of pin state settings (#19089) 2021-04-29 08:44:57 -05:00
Victor Oliveira
dded56c4bb Emulated DOGM via HAL TFT, XPT IO (#19017) 2021-04-29 08:44:57 -05:00
Giuliano Zaro
16f2f2bce7 Let laser/spindle use free AVR servo timers (#19011) 2021-04-29 08:44:57 -05:00
Victor Oliveira
4e7c5f19fe Optimize LVGL with HAL TFT IO (SPI and FSMC) (#18974) 2021-04-29 08:44:56 -05:00
Victor Oliveira
6f686b1801 Marlin Color UI for STM32F1 (SPI) (#18958) 2021-04-29 08:44:56 -05:00
Victor Oliveira
9af3b06fc2 Marlin Color UI (FSMC) for STM32F1 (#18952) 2021-04-29 08:44:56 -05:00
ellensp
8d6a263c1c HW PWM sanity checks for SPINDLE_LASER_FREQUENCY (#18947) 2021-04-29 08:44:56 -05:00
Victor Oliveira
cd977c70ca Fix / optimize FSMC init (#18941) 2021-04-29 08:44:56 -05:00
Marco Burato
f4894b7140 More Anycubic + Trigorilla mappings, ExtUI (#18903) 2021-04-29 08:44:56 -05:00
Scott Lahteine
76eff24718 Simple rename of hex_print 2021-04-29 08:44:56 -05:00
Scott Lahteine
7dd7d6dda6 Move scaled TFT / touch defines (#18915) 2021-04-29 08:44:55 -05:00
Alexander Gavrilenko
8f8b0d84ae Support for TFT & Touch Screens (#18130) 2021-04-29 08:44:55 -05:00
Victor Oliveira
3fbc002bad SanityCheck: No Adafruit NeoPixel for STM32F1 (#18833) 2021-04-29 08:44:55 -05:00
Victor Oliveira
fc12ffcb30 SPI Emulated DOGM (like FSMC_GRAPHICAL_TFT, but SPI) (#18817) 2021-04-29 08:44:55 -05:00
Giuliano Zaro
796471a7c6 [SAMD51] ES Interrupt parity with other HALs (#18836) 2021-04-29 08:44:55 -05:00
Diego von Deschwanden
f2205b1725 Update more external links (#18819) 2021-04-29 08:44:55 -05:00
Scott Lahteine
bc688f27dc Clean up after changes 2020-07-25 01:53:07 -05:00
Scott Lahteine
451f48231d
Ender 3 V2 BL24C16 EEPROM support (#18758) 2020-07-24 03:09:14 -05:00
Scott Lahteine
d1e20eb29f Update links, README, contributing, etc. 2020-07-23 20:46:51 -05:00
Scott Lahteine
e27f031a55 General cleanup 2020-07-23 16:11:58 -05:00
Diego von Deschwanden
42fbd527f3
Fix links to secure sites (#18745) 2020-07-22 22:20:14 -05:00
Giuliano Zaro
c6233b1ea8
SAMD51: More reliable Servo/BLTouch PWM (#18710) 2020-07-19 21:41:23 -05:00
Jason Smith
12bc63913c
Fix BLTouch PWM reliability in HAL/STM32 (#18702) 2020-07-19 17:41:36 -05:00
Sergey1560
9424567189
Fix passive Chamber Temp reading (#18674) 2020-07-16 21:42:55 -05:00
Jason Smith
95b76a65c3
Increase STM32F1 Servo Timer Interrupt Priority (#18637) 2020-07-14 19:07:27 -05:00
Jason Smith
af8be58d92
Fix broken POWER_LOSS_RECOVERY prompt (#18557) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-07-06 01:18:49 -05:00
GhostlyCrowd
c8f7aceb20
STM32: No compile-time check for PWM_PIN (#18539) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-07-05 16:05:47 -05:00
Victor Oliveira
e5bc9d31cc
Add TFT_LVGL_UI support (#18438) 2020-07-01 01:30:24 -05:00
Giuliano Zaro
bfcf7ac2fd
Use "reset reason" defines (#18462) 2020-06-29 01:02:36 -05:00
Giuliano Zaro
ce3fb61604
SAMD51 cleanup (#18419) 2020-06-26 01:39:49 -05:00
Giuliano Zaro
aae5f7229c
[samd51] Manifest assigned timers priority (#18402) 2020-06-26 01:23:39 -05:00
Scott Lahteine
1fb2fffdbf General cleanup 2020-06-23 19:59:38 -05:00
Jason Smith
e52afa8b19
Better STM32 Tone timer int priority (#18385) 2020-06-22 15:30:45 -05:00
Chris Barr
900d4cf8e7
Allow STM32 HAL_TIMER_RATE override (#18374) 2020-06-21 03:56:00 -05:00
Scott Lahteine
424569b4c4
Power monitor and display (#17437) 2020-06-18 15:23:03 -05:00
InsanityAutomation
23806aeb3c
Fix non-PWM spindle/laser compile (#18311) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Luu Lac <45380455+shitcreek@users.noreply.github.com>
 2020-06-16 15:49:32 -05:00
Scott Lahteine
f4c258dc23
Creality Ender 3 v2 (#17719) 2020-06-16 01:45:27 -05:00
Scott Lahteine
aea60d9450 Clean up trailing spaces 2020-06-15 18:11:32 -05:00
Sergey1560
bcf7ac7483
STM32F1: Fix SDIO read errors (#18228) 2020-06-08 19:59:44 -05:00
Alexander Amelkin
8994cc8b26
Fix BTT SKR Pro 1.0 UART4/5 (#18222) 2020-06-08 03:04:52 -05:00
Luu Lac
eda2fd8dbe
Improvements for Laser / Spindle (#17661) 2020-06-08 00:47:31 -05:00
Victor
215b400038
Allow SDIO clock/retry overrides (#18223) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-06-07 23:35:52 -05:00
ellensp
33d1e77e2e
Allow pins override of *_TIMER_NUM and HAL_*_TIMER_ISR (#18128) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-06-01 18:33:30 -05:00
Scott Lahteine
785f442c8c Group some sanity checks 2020-06-01 17:03:58 -05:00
Jason Smith
dcb90a8d61
No SERIAL_STATS for LPC, STM32 (#18145) 2020-05-31 00:45:04 -05:00
MoellerDi
d2d52e3c34
Declare MSerial6 (etc.) for STM32 (#18149) 2020-05-31 00:43:37 -05:00
Scott Lahteine
6ee81f0d26 eeprom_init from STM32F1/access_start 2020-05-30 22:34:30 -05:00
Bob Kuhn
6c994002af
No SD_CHECK_AND_RETRY with USE_USB_COMPOSITE (STM32F103 + SDIO) (#18108) 
* disable SD_CHECK_AND_RETRY when USE_USB_COMPOSITE is enabled

* Update Sd2Card.cpp

* Disable SD_CHECK_AND_RETRY with USE_USB_COMPOSITE

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-05-26 00:44:12 -05:00
rudihorn
38ccc769f7
Emergency Parser for STM32 (#18095) 2020-05-26 00:43:29 -05:00
g3gg0.de
f776260d7a
Fix OCR / PWM calculation (#18094) 
Fixes #17968
 2020-05-25 17:14:15 -05:00
ellensp
9bfdc88e52
Provide strcmp_P where needed (#18103) 2020-05-25 15:36:37 -05:00
Chris Pepper
4f1ebb4440
Fix Due wired EEPROM init (#18074) 2020-05-22 15:37:11 -05:00
Scott Lahteine
461647fcee
Use MARLIN_EEPROM_SIZE with E2END as fallback (#18059) 2020-05-22 02:15:40 -05:00
Jason Smith
7696dea1c6
Fix LPC + EXPERIMENTAL_I2CBUS build error (#18040) 2020-05-19 02:29:19 -05:00
Colin Godsey
8a22ef0c83
G6 Direct Stepping (#17853) 2020-05-11 19:22:41 -05:00
Jason Smith
25aade1cf1
Improve STM32F4 Flash Behavior (#17946) 2020-05-11 01:10:20 -05:00
Desuuuu
fcd1678a17
Actually apply DGUS_[RT]X_BUFFER_SIZE (#17952) 2020-05-10 21:21:47 -05:00
Bob Kuhn
8f3d17699a
Init all ESP01 (module) WIFI pins (#17679) 2020-05-08 02:43:53 -05:00
Gurmeet Athwal
a4c981469e
Extended reporting options (#16741) 2020-05-05 23:34:04 -05:00
Scott Lahteine
39f703310b Move S_FMT to HAL, apply to mixer 2020-05-05 18:12:36 -05:00
randellhodges
4c4be32ad7
LPC176x requires USE_SHARED_EEPROM (#17858) 2020-05-04 14:54:33 -05:00
Jason Smith
208af8cb15
Fix STM32 + SoftwareSerial compile (#17831) 2020-05-02 17:24:51 -05:00
Scott Lahteine
2107bc5836
Clean up EEPROM interfaces (#17803) 2020-05-01 00:04:55 -05:00
Scott Lahteine
6edc2c3690 Fix eeprom init glitch 2020-04-30 22:50:05 -05:00
J.C. Nelson
b4aebbe78d
Allow STM32 pins to specify timers (#17805) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-04-30 22:42:40 -05:00
Scott Lahteine
76bc7bf7b8 Pre-clean DUE flash eeprom code 2020-04-30 22:10:46 -05:00
Scott Lahteine
306578d7be More explicit LPC timer defines 2020-04-30 19:31:49 -05:00
Giuliano Zaro
bd8436d1c5
Fix SAMD51 i2c EEPROM (#17815) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-04-30 18:14:49 -05:00
Scott Lahteine
7f5730ea3b Minimal interface for F4/F7 flash 2020-04-30 18:00:42 -05:00
Scott Lahteine
3c080ee3e6 Cleanup, comment "wired" eeproms 2020-04-30 18:00:42 -05:00
Scott Lahteine
a521b0edbb Strip never-used eeprom functions 2020-04-30 17:25:27 -05:00
Scott Lahteine
b335c38162 Drop extra Marduino includes 2020-04-30 17:25:27 -05:00
Scott Lahteine
5e6faa999d
Refine EEPROM types / flags (#17772) 2020-04-29 14:46:33 -05:00
Scott Lahteine
56e3106b63 Clean up whitespace 2020-04-28 07:53:04 -05:00
Scott Lahteine
2c959123e5 Clean up whitespace 2020-04-28 06:09:52 -05:00
randellhodges
5f7a75979f
LPC176x SPI / I2C PersistentStore (#17651) 2020-04-28 02:27:55 -05:00
Jason Smith
f709c565a1
STM32F1: SD EEPROM fallback (#17715) 2020-04-27 23:45:20 -05:00