zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
19317 commits 1 branch 0 tags 156 MiB
Commit graph

686 commits

Author SHA1 Message Date
Vert 05b39623b0
Board IDs for G2560 Rev B, G2560 v4, GTM32 VD (#21499) 2021-04-01 18:05:02 -05:00
Scott Lahteine 62f37669dc
Replace 'const float &' with 'const_float_t' (#21505) 2021-04-01 17:59:57 -05:00
Scott Lahteine 0f23090545 Serial flags followup 
Followup to #21318
 2021-03-29 22:38:33 -05:00
X-Ryl669 139c149486
Flags for MarlinSerial instance features (#21318) 2021-03-29 21:36:01 -05:00
Scott Lahteine 3b73b115ca Apply pointer formatting 2021-03-29 20:36:37 -05:00
George Fu 1d3f28da2e
FYSETC Spider board (#21458) 2021-03-29 04:38:28 -05:00
Scott Lahteine 86ba0cde35 reduced verbiage 2021-03-29 03:33:19 -05:00
Mike La Spina ccdbffbf3f
Laser Coolant Flow Meter / Safety Shutdown (#21431) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-03-29 01:41:56 -05:00
kpishere fd8207dd9a
Misc build fixes (#21413) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-03-24 09:14:11 -05:00
Scott Lahteine e5ff55a1be
Add typedef celsius_t (#21374) 2021-03-24 04:11:43 -05:00
K.3D 1a23ffd776
KRATOS32 / K.32 board and LCD controllers (#21334) 2021-03-15 11:02:40 -05:00
X-Ryl669 f147a8990a
Fix MeatPack with per-serial-port instances (#21306) 2021-03-10 14:22:20 -06:00
Scott Lahteine dbd28eecc9 Number serial from 1 to match settings 2021-03-10 13:45:53 -06:00
X-Ryl669 55c31fbe9a
Distinguish serial index from mask (#21287) 2021-03-09 03:20:37 -06:00
Victor Oliveira 1b9ff68f8c
Fix Host Keepalive serial target (#21283) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2021-03-08 01:11:37 -06:00
ellensp ced1bb9404
Update obsolete debug define (#21276) 2021-03-06 21:43:43 -06:00
Mike La Spina b95e548ddb
Cooler (for Laser) - M143, M193 (#21255) 2021-03-06 14:13:28 -06:00
Axel a46e025725
TPARA - 3DOF robot arm IK (#21005) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2021-03-03 17:46:32 -06:00
Scott Lahteine dd42831cba Serial macros cleanup 2021-02-28 20:02:24 -06:00
X-Ryl669 ec42be346d
Fix and improve G-code queue (#21122) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-02-26 16:54:46 -06:00
Scott Lahteine 08d54b3d78 Eryone Thinker V2 (#21190) 
Co-Authored-By: Bryan Joshua Pedini <b.pedini@bjphoster.com>
 2021-02-25 09:16:19 -06:00
X-Ryl669 f003e52009
Combined LPC / Serial fixes (#21178) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-02-25 01:23:29 -06:00
Ken Sanislo a3a10b62f2
Chamber Heater PID (#21156) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-02-24 18:26:51 -06:00
Scott Lahteine d9e79fd728 Fix a board comment 2021-02-14 16:27:21 -06:00
Scott Lahteine fd2477923c Minor serial code cleanup 2021-02-12 19:33:19 -06:00
Scott Lahteine 662d81c801
Ender 3 V2 DWIN cleanup (#21026) 2021-02-08 21:27:00 -06:00
X-Ryl669 e7c711996b
Serial refactor. Default 8-bit ECHO to int, not char (#20985) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2021-02-08 00:37:24 -06:00
Scott Lahteine 52c246ae19 Melzi, comments cleanup 2021-02-06 18:19:37 -06:00
X-Ryl669 1c19af2c8f
Fix ARM delay function (#20901) 2021-02-05 22:43:51 -06:00
X-Ryl669 c74f972627
LVGL UI G-code console (#20755) 2021-01-31 18:18:39 -06:00
X-Ryl669 27366197f3
Serial refactor followup (#20932) 2021-01-31 17:21:27 -06:00
rafaljot 0d2645b3e1
MPX_ARM_MINI board (Mingda MD-16) (#20711) 2021-01-28 23:22:18 -06:00
X-Ryl669 9e004a9496
Optimize serial output code for size (#20911) 2021-01-28 19:59:16 -06:00
George Fu 5ac08a44c6
FYSETC Cheetah 2.0 (#20897) 2021-01-28 19:52:49 -06:00
X-Ryl669 3f01b222b2
Refactor serial class with templates (#20783) 2021-01-28 02:02:06 -06:00
ellensp c929fb52dd
Meatpack::report_state on serial port init (#20903) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2021-01-28 01:47:12 -06:00
Scott Lahteine b8186b5081 Apply SEC_TO_MS and other fixes 2021-01-25 08:32:58 -06:00
Scott Lahteine d33fe2378c
Move common strings (#20846) 2021-01-22 15:01:19 -06:00
Scott Lahteine 68abaeab19
MarlinUI multi-language support (#20725) 2021-01-20 18:52:06 -06:00
EmilGustafsson df238fe6a0
Swedish language for MarlinUI (#20826) 2021-01-19 16:52:04 -06:00
Scott Lahteine b41f41589a General cleanup, use _BV 2021-01-16 22:53:50 -06:00
Scott Lahteine edea49f9a9
Creality 4.2.10 board (#20647) 2021-01-03 07:16:50 -06:00
Victor Oliveira 90a2b482e6
LVGL G-code preview. Legacy MKS WiFi Cura plugin compatibility (#20589) 2020-12-28 22:07:11 -06:00
Scott Lahteine 91c350e793 Remove URL scheme 2020-12-27 21:00:07 -06:00
Scott Lahteine f8c6de0cdc Move BTT_SKR_CR6 2020-12-23 19:57:49 -06:00
ubik2 844a8c7074
Add OPTIMIZED_MESH_STORAGE option (for UBL) (#20371) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-23 18:19:48 -06:00
Keith Bennett a0c8d348a0
Anet ET4 / ET4P and Anet TFT28 / TFT35 (#20280) 2020-12-22 06:51:29 -06:00
Sean McGroty 08dcd1f680
Creality v4.3.1 (Ender 6) board (#20512) 2020-12-22 06:25:12 -06:00
Sebastiaan Dammann 3ec59b36eb Add BTT SKR CR6 board (#20522) 2020-12-21 17:36:43 -06:00
InsanityAutomation 2963229dfa
Probe Tare, Probe Activation Switch (#20379) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: Victor Mateus Oliveira <rhapsodyv@gmail.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-12-19 22:11:43 -06:00
Victor Oliveira b167cd2427
MKS Robin Nano V3 and STM32F4x0Vx Variant (#20430) 2020-12-18 16:18:04 -06:00
Scott Lahteine 20b3af1cc2 Use homing_feedrate function 2020-12-16 22:19:04 -06:00
Sebastiaan Dammann 686bb056a4 Creality v4.5.3 (CR-6 SE, CR-6 MAX) (#20468) 2020-12-15 00:33:01 -06:00
Victor Oliveira 9ead6a30f2
SPI TFT for STM32F4 boards (#20384) 
* fix pinsDebug for F1 boards

* add MKS Robin PRO V2 board - development board

* tft spi working with F4 boards

* pins formating

* sanity check for TFT on supported cores in STM32

* Fix tabs/spaces in pins file

Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-12-07 21:26:39 -08:00
InsanityAutomation e8ed880e62
Add Creality 4.5.2 board (#20378) 
Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-12-05 13:23:58 -08:00
Scott Lahteine 5fdd949115
Improved Longer3D LKx Pro board (#20372) 
Co-authored-by: mrv96 <marione96@live.it>
 2020-12-04 23:56:20 -06:00
mks-viva 8c59212ca4
MKS Robin E3 / E3D v1.1 (#20216) 2020-11-26 02:36:29 -06:00
Jason Smith 3a396a25dc
Retire HAL for STM32F4 / F7 (#20153) 2020-11-26 00:37:18 -06:00
Simone Primarosa f8e83f79c5
Superscript substitution (#20219) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-11-20 20:36:19 -06:00
Ajtak a26a21d19a
Longer LK Pro / Alfawise PRO board (#20185) 2020-11-19 18:25:27 -06:00
石立枫 9b2e810bdf
Add FLY_CDY board (#19979) 
Co-authored-by: FLYmaker <FLYmaker@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-11-17 03:35:02 -08:00
Scott Lahteine 1d43e81be0 Fix compile warnings, serial alias 2020-11-13 18:28:15 -06:00
Scott Lahteine 06bf3ccfb7 Add alternative TERN macros 2020-11-07 22:19:25 -06:00
Albert van Osch 7beebcd315
Zonestar Z8 XM2 support (#19991) 2020-11-07 16:59:19 -06:00
George Fu 4785b04aa1
FYSETC E4 board support (#20032) 2020-11-06 23:48:52 -06:00
Scott Lahteine af75e24c2e Clean up corrected urls 2020-11-06 19:11:29 -06:00
Orel a272c019f9
Rename, adjust Dagoma F5 (#19947) 2020-10-29 20:02:29 -05:00
Foxies 9aee6674bb
FLSUN Delta QQS-Pro pins (#19793) 2020-10-21 19:00:57 -05:00
Keith Bennett 1e4691f02a
BigTreeTech SKR Mini MZ V1 (#19818) 2020-10-21 14:14:19 -05:00
TheMichalcinOfficial cf74248949
Support for Ramps-S v1.2 (#19815) 2020-10-21 13:44:55 -05:00
bilsef 9baa944460
Teensy 4.1 Ethernet support (#19801) 2020-10-20 14:35:29 -05:00
Scott Lahteine f6ffbe548c
TFT Presets, Generic options, Sanity checks (#19723) 2020-10-15 03:00:27 -05:00
Jason Smith 54315252c7
Add NUCLEO-F767ZI dev board (#19373) 
Co-authored-by: Lorenzo Delana <lorenzo.delana@gmail.com>
 2020-10-13 18:03:09 -05:00
Victor Oliveira c0920bbf6a
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>
 2020-10-12 16:38:07 -05:00
Serhiy-K 6fdaaf3d20 Fixes for TFTGLCD Panel, FastIO (#19614) 2020-10-10 05:08:01 -05:00
Victor Oliveira 631457ffea Support for Debug Codes - Dnnn (#19225) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-10-09 06:28:53 -05:00
石立枫 bec1844954
Support for FLY MINI (#19185) 2020-10-09 06:09:27 -05:00
qwewer0 4424645e04
Multi-line comments cleanup (#19535) 2020-09-28 14:53:50 -05:00
Scott Lahteine c2c6a679ea
Rename LCD conditionals (#19533) 2020-09-28 01:13:27 -05:00
Keith Bennett ec4a0a3e0d
SKR E3 Turbo followup (#19513) 2020-09-25 19:49:36 -05:00
Keith Bennett 23faf902ab
BigTreeTech SKR E3 Turbo (#19500) 2020-09-24 21:19:04 -05:00
Jason Smith d051c2adbd
Update board/teensy comment (#19456) 2020-09-22 17:36:59 -05:00
makerbase d8ed749045
Add MKS Robin E3P, improve LVGL UI (#19442) 2020-09-20 20:55:02 -05:00
Scott Lahteine 0473f7ee58 M115 strings 2020-09-14 02:42:05 -05:00
Scott Lahteine 3a89d34e7f Always show Compiled: 2020-09-14 02:42:05 -05:00
riodoro1 abf1222f1d
Fix missing BOARD_K8800 (#19331) 2020-09-10 17:06:37 -05:00
makerbase 006b7f3f17
MKS Gen L V2.1 (#19314) 2020-09-09 21:48:42 -05:00
bilsef 049fbc92a9
Support for Teensy 4 (#19311) 2020-09-09 18:57:20 -05:00
Jason Smith 4fc1aba848
Update HAL/STM32 platform to 8.0 (#18496) 2020-09-07 21:41:48 -05:00
Scott Lahteine 14314b68ec No 'ls' if media isn't mounted 2020-09-04 19:57:47 -05:00
Victor Sokolov e97e6865c3
MarkForged kinematics (#19235) 2020-09-03 20:12:53 -05:00
makerbase f375d9bd7b
MKS SGEN L V2 (#18822) 2020-09-01 18:20:16 -05:00
George Fu 1e124e6713
FYSETC S6 2.0 (#19140) 2020-08-26 19:41:15 -05:00
ellensp 04909a2010
Creality3D v4.2.7 (#19088) 2020-08-21 21:56:18 -05:00
Scott Lahteine ee28a10795
String interpolation for 2-digit numbers (#18998) 2020-08-12 16:46:51 -05:00
sherwin-dc 852e5ae042
Password via G-code and MarlinUI (#18399) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-08-08 20:00:42 -05:00
wmariz da4eaebdc9
ZoneStar Z6FB (#18918) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-08-07 17:03:59 -05:00
Scott Lahteine a9912681b4 General cleanup 2020-08-06 00:52:36 -05:00
Alexander Gavrilenko 117df87d19
Support for TFT & Touch Screens (#18130) 2020-07-30 01:43:19 -05:00
Victor Tseng b5ece63778
Fix garbled print_xyz output (#18810) 2020-07-27 20:13:27 -05:00
MKS-Sean d20d459132 Robin nano V2, TFT LVGL UI parameters, and more (#18500) 2020-07-25 01:18:06 -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
Victor Oliveira 4a55bdb165
Only download & compile required libraries (#18699) 2020-07-19 21:42:30 -05:00
Claus Näveke afce012960
Trigorilla Pro board (#18692) 2020-07-18 17:40:10 -05:00
Scott Lahteine b40440cf38 Tool-change debug option 2020-07-14 21:15:14 -05:00
Scott Lahteine 73fc0778b8
Consolidate probe clearance, add section debug (#18576) 
* Better section / function log
* Add do_z_clearance motion function
 2020-07-08 21:44:21 -05:00
J.C. Nelson 6f14d2d37f
Add Lerdge S,X,K (#18302) 2020-07-06 17:08:52 -05:00
Scott Lahteine a6b8b12a6a Simplify home_z_safely, respect HOME_AFTER_DEACTIVATE 2020-07-05 18:01:28 -05:00
Giuliano Zaro 7448b65567
Fix axis name in serial output (#18522) 2020-07-03 11:49:16 -05:00
Scott Lahteine 59e4de8a55
Add Romanian language (#18455) 
Co-authored-by: cristyanul <47246451+cristyanul@users.noreply.github.com>
 2020-06-27 22:59:44 -05:00
Fabio Santos 25c7c43a82
Add SERIAL_FLOAT_PRECISION option (#18367) 2020-06-22 21:12:45 -05:00
thisiskeithb e424dfc885
BigTreeTech SKR Pro 1.2 (#18366) 2020-06-21 03:46:31 -05:00
Scott Lahteine 424569b4c4
Power monitor and display (#17437) 2020-06-18 15:23:03 -05:00
Scott Lahteine f4c258dc23
Creality Ender 3 v2 (#17719) 2020-06-16 01:45:27 -05:00
cbaugher 92435ef5ea
Tenlog D3 Hero 7-axis board (#18263) 2020-06-11 20:43:28 -05:00
Chris Barr c12111e2cc
Improve and extend RUMBA32 (#18249) 2020-06-11 20:28:20 -05:00
Victor e2cc966621
Tronxy X5SA (V5 / V6 boards) (#18243) 2020-06-10 17:16:22 -05:00
Scott Lahteine 6371782263 Add HAS_MULTI_SERIAL conditional 2020-06-05 16:20:27 -05:00
git-user44 9e2f142391
Clean up Melzi LCD timing defaults (#18187) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-06-04 19:55:39 -05:00
cccc 2bf63e29c6
Support for MEEB 3DP board (#18138) 2020-06-01 18:25:13 -05:00
thisiskeithb 3430d45f53
BTT SKR Mini E3 V2 (#18088) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-05-30 23:27:21 -05:00
Scott Lahteine d9593c8ed4 Tweak mesh xy error 2020-05-17 15:12:08 -05:00
Mika Norén 76a65ffe74
Vertex nano with board K8600 (#17736) 2020-05-15 21:11:28 -05:00
chestwood96 18a01f2c40
Add user's build (_date_ _time_) to M115 output (#17957) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-05-12 14:57:18 -05:00
Scott Lahteine d4aa197744 Add MAP macro 2020-05-12 02:11:32 -05:00
espr14 ab19a27f63
Prevent some macro pitfalls (#17956) 
Co-authored-by: espr14 <espr14@users.noreply.github.com>
 2020-05-12 01:01:16 -05:00
Jason Smith 209fd2d0cb
Fix SERIAL_ECHO forever bug (#17932) 2020-05-09 23:25:18 -05:00
Jason Smith a2153c15ee
Add TMC driver HW serial defines (#17909) 2020-05-08 01:15:12 -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
Scott Lahteine 39263efef7 Allow more serial parameters 2020-05-04 23:46:38 -05:00
Scott Lahteine 65104b7d78 Whitespace, M200 test label 2020-05-04 19:26:46 -05:00
Scott Lahteine 38d1587091
Malyan M200 V2 (#17840) 2020-05-04 14:37:43 -05:00
animavitis 3ea1c8a6fa
Support for Ortur 4.3 mainboard (#17790) 2020-05-02 22:12:52 -05:00
Scott Lahteine 6b3ed0f320 Cleanup in language.h 2020-05-02 21:32:36 -05:00
Mathias Gartner 288447d01e
Fix XYZ types multiplication/division (#17826) 2020-05-02 16:15:49 -05:00
Scott Lahteine 76bc7bf7b8 Pre-clean DUE flash eeprom code 2020-04-30 22:10:46 -05:00
Scott Lahteine 66676e6dd4 Remove extra macro 2020-04-27 10:19:37 -05:00
Scott Lahteine 035d6cd16d Patch i2c, info menu 2020-04-27 09:50:10 -05:00
Neil van Geffen c56b66543d
Permit Stall Sensitivity of 0 (#17722) 2020-04-27 08:27:14 -05:00
Scott Lahteine 011ecc341a Fix I2C_ADDRESS ambiguity 2020-04-27 05:07:08 -05:00
Scott Lahteine 4ed912eb23 Misc. patches 2020-04-25 22:10:19 -05:00
randellhodges b700b3cde6
Fix M261, i2c EEPROM, i2c Encoder for LPC (#17678) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-04-25 11:35:35 -05:00
Scott Lahteine 6d90d1e1f5
Apply TERN to compact code (#17619) 2020-04-22 16:35:03 -05:00
Scott Lahteine 000ec9fc13 Ensure language.h include order 
See #17604
 2020-04-20 09:43:48 -05:00
Scott Lahteine f94ab84dac
Malyan M300 support (#17421) 2020-04-17 09:10:41 -05:00
Zs.Antal 78a5079558
Add Hungarian language (#17491) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-04-16 04:11:42 -05:00
mks-viva bc856fd8ec
MKS Robin E3 / E3D support (#17569) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-04-16 01:19:24 -05:00
Marcio T 791873b10d
Fix ExtUI compile errors (#17544) 
Fixes #16628
 2020-04-15 23:17:01 -05:00