1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-25 04:48:31 +00:00
Commit Graph

915 Commits

Author SHA1 Message Date
Scott Lahteine
68abaeab19
MarlinUI multi-language support (#20725) 2021-01-20 18:52:06 -06:00
Scott Lahteine
00bc094914 Keep G29 N on the DL 2021-01-20 18:51:00 -06:00
Scott Lahteine
bb597dcf66
Internal G29N for G28+G29 (#20800) 2021-01-17 12:08:40 -06:00
Giuliano Zaro
1d5862a39b
MMU2 as standard serial device (#20771) 2021-01-15 20:38:34 -06:00
Victor Oliveira
d6de6de1bb
NO_SD_DETECT option (#20741) 2021-01-10 21:55:16 -06:00
Mike La Spina
cf1f8aff77
Laser Test Fire (#20452) 2021-01-10 06:01:25 -06:00
wilbur4321
e3831c146d
Multi-Z stepper inverting (#20678)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2021-01-05 17:03:45 -06:00
qwewer0
e685950d97
Assisted Tramming improvements (#20298) 2021-01-02 02:33:31 -06:00
Victor Oliveira
c840bbc970
Prefix SD SPI pins (SCK, MISO, MOSI, SS) (#20606)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2021-01-01 14:31:15 -06:00
Victor Oliveira
84ab088b40
USB FD via native USB Host + MSC (#20571) 2020-12-28 23:16:38 -06:00
Keith Bennett
cfcfc8047a
Small / Large Boot Screen option for TFT_COLOR_UI (#20578) 2020-12-27 21:10:53 -06:00
Jason Smith
81d7bd8f41
Validate defined probe points (#20572) 2020-12-27 20:49:15 -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
LinFor
2d88a2cfb7
Remaining Time for FTDI EVE, bp for ExtUI (#20549)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-12-23 16:37:17 -06:00
LinFor
6af6a35d9d
FTDI EVE: Cyrillic font, some minor fixes (#20517) 2020-12-23 00:51:59 -06:00
Keith Bennett
9a8f8f8284
Let boards set Default TMC Slave Addresses (#20498)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-12-19 21:48:31 -06:00
grauerfuchs
e9677594ea
Fix and optimize MightyBoard (#20493) 2020-12-17 17:22:59 -06:00
Scott Lahteine
b0392be4bf SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE 2020-12-13 01:54:31 -06:00
swissnorp
edb2a83e71
Allow positive Z nozzle to probe offset (#20344)
* Allow a positive value for z offset from nozzle to probe without sanity checks
* Simplify menu_probe_offset.cpp (HOMING_Z_WITH_PROBE)
* Add some more explanation to Configuration Files
* Raise after probe_at_point as if homed

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
2020-12-09 01:06:50 -08:00
Scott Lahteine
7f20184ebc
Fix auto#.g file handling, add NO_SD_AUTOSTART (#20071) 2020-12-07 05:53:15 -06:00
Sergey1560
0acd751e2d
Group related homing options (#20283)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-27 00:00:25 -06:00
Scott Lahteine
b6a32500c4
M808 Repeat Markers (#20084) 2020-11-26 21:18:40 -06:00
swissnorp
649965ae32
Probe Offset Wizard improvements (#20239) 2020-11-25 21:38:00 -06:00
Kurt Haenen
ca83e1a26f
Proper pullup/pulldown configurability (#20242)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-11-21 17:56:56 -06:00
Giuliano Zaro
41529b6598
SMUFF (MMU2 clone) support (#19912) 2020-11-18 01:27:21 -06:00
Thomas Niccolo Reyes
ecd8227de0
Open File Browser on Media Insert (option) (#20151)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-17 22:30:32 -06:00
wmariz
5768ee0f9e
Probe Wizard XY position (#20167) 2020-11-17 21:54:21 -06:00
InsanityAutomation
e955dce3dc
Update IDEX menus, add post-M605 event G-code (#20133)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-15 23:56:05 -06:00
Keith Bennett
f9e54331ba
UTF Filenames followup (#20135) 2020-11-13 20:10:50 -06:00
Scott Lahteine
2282801172
Add HOME_Z_FIRST option (#20113) 2020-11-11 16:58:34 -06:00
Hebezo
6ccb4b93b1
Option to ignore SD at startup (#20099)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-11 15:16:19 -06:00
LinFor
5b9aeb2e5f
Handle UTF in long filenames (#20087)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-11 14:14:39 -06:00
Speaka
87ce545e15
Tramming Wizard wait position (#20063) 2020-11-10 19:41:21 -06:00
Speaka
6954772ece
Tramming Wizard submenu option (#20000)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-07 03:20:27 -06:00
Alexander Semion
cd89fa141b
Add SPINDLE_SERVO option (#19971) 2020-10-31 17:42:05 -05:00
Lucas Seiki Oshiro
c0b4f4eb47
"Sound: ON/OFF" menu item (#19901)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-10-27 20:41:12 -05:00
ManuelMcLure
4fccb92e07
Configure TMC interpolation per driver (#19828) 2020-10-22 06:27:33 -05:00
bilsef
9baa944460
Teensy 4.1 Ethernet support (#19801) 2020-10-20 14:35:29 -05:00
Jago Strong-Wright
c2802d35bb
Distinct Chopper Timing settings (#19781)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-10-17 22:35:19 -05:00
Peter Hall
f86c6851fc
Default LASER_POWER_INLINE to OFF (#19727) 2020-10-15 13:18:43 -05:00
Scott Lahteine
f6ffbe548c
TFT Presets, Generic options, Sanity checks (#19723) 2020-10-15 03:00:27 -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
InsanityAutomation
e7838c5f79
G34 Mechanical Gantry Calibration (like Prusa M915) (#18972)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-10-11 21:34:27 -05:00
qwewer0
f21b91f1a7
Add REPORT_TRAMMING_MM option (#19682)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-10-11 21:30:18 -05:00
Scott Lahteine
0988af453c
Optional M42/M226; Add more features filters (#19664) 2020-10-09 16:42:23 -05:00
qwewer0
91df2bea80
Update PROBE_OFFSET_WIZARD comment (#19652) 2020-10-07 20:43:08 -05:00
ellensp
c12f41ec6f
Restore ° to 6x9 small info font (#19645) 2020-10-07 13:00:08 -05:00
ladismrkolj
2c99c1e06f
Add Chamber servo vent, auto fan (#19519) 2020-10-06 18:36:01 -05:00
Scott Lahteine
c25c31b1de Sync config to examples 2020-10-05 17:16:42 -05:00
Mathew Winters
343441d746
Z Probe Offset Wizard (#18866) 2020-10-05 00:31:20 -05:00
Scott Lahteine
44d50c2bd3 Move SF_ARC_FIX option 2020-10-04 15:46:00 -05:00
Nick
60155aa442
Anycubic Chiron full feature support (#19505) 2020-09-28 18:53:40 -05:00
qwewer0
4424645e04
Multi-line comments cleanup (#19535) 2020-09-28 14:53:50 -05:00
Scott Lahteine
4584a52ba5 Update configs to 020007 2020-09-28 03:55:14 -05:00
Serhiy-K
27bdf4b24e
MarlinUI for SPI/I2C TFT-GLCD character-based display bridge (#19375) 2020-09-28 01:52:38 -05:00
Scott Lahteine
c2c6a679ea
Rename LCD conditionals (#19533) 2020-09-28 01:13:27 -05:00
Scott Lahteine
dd118e2f36 Drop extra Bed PID 2020-09-27 16:55:57 -05:00
Scott Lahteine
7ce91c5ffe Sanity check old serial names 2020-09-24 21:46:13 -05:00
Jason Smith
da6c8317a7
Fix and improve STM32F1 serial (#19464) 2020-09-24 20:28:48 -05:00
qwewer0
0251eb85b2
Optional menu item for Assisted Tramming (#19447) 2020-09-20 22:29:34 -05:00
Scott Lahteine
76d8d1742c Add multi-extruder condition 2020-09-20 20:51:21 -05:00
qwewer0
af8f9f790a
Optional Host Start menu item (#19443) 2020-09-19 10:17:24 -05:00
jahartley
da1a60aeb6
Expose JOYSTICK_DEBUG to the general user (#19394)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-09-17 06:01:10 -05:00
deram
24d8daa01b
SHOW_REMAINING_TIME for HD44780 character LCD (#19416) 2020-09-17 05:41:13 -05:00
cosmoderp
073b7f1e3a
E3 V2 DWIN: Z-Offset, cleanup, versatility (#19384)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-09-17 05:35:04 -05:00
Keith Bennett
d19fc64392
Clarify disabling StallGuard for axes (#19263) 2020-09-06 17:51:19 -05:00
Zachary Annand
97ec6c1be6
Independent Neopixel option (#19115) 2020-08-27 14:18:16 -05:00
Scott Lahteine
4955aa5b78 Prusa => Průša 2020-08-26 02:15:50 -05:00
qwewer0
dd6cbbbbad
Feedrate comment (#19116) 2020-08-23 05:08:47 -05:00
Scott Lahteine
638f6f0f06 Neopixel => NeoPixel 2020-08-23 03:14:11 -05:00
qwewer0
434e43cc42
Change XY_PROBE_SPEED format to (x*60) (#18997) 2020-08-22 02:04:28 -05:00
Giuliano Zaro
8652a7bdd2
HIGH/LOW naming of pin state settings (#19089) 2020-08-21 23:13:43 -05:00
Scott Lahteine
38cd7b9938 Config adjustments 2020-08-19 22:42:54 -05:00
qwewer0
bd690f12bc
Mention units for MANUAL_FEEDRATE (#18993) 2020-08-11 03:11:40 -05:00
Robby Candra
9590fcd855
EVENT_GCODE_SD_STOP => ABORT (#18978) 2020-08-10 20:25:35 -05:00
Radek
4c8bb99059
Increase Manual E Move Feedrate to 2mm/s (#18937) 2020-08-06 17:21:55 -05:00
swissnorp
4856ac5028
Add Z_AFTER_DEACTIVATE to account for gravity (#18906) 2020-08-04 00:31:45 -05:00
Keith Bennett
5823ebb446
Assisted Tramming requires a probe (#18912) 2020-08-03 22:39:29 -05:00
Victor Oliveira
38ce5966e1
SPI Emulated DOGM (like FSMC_GRAPHICAL_TFT, but SPI) (#18817) 2020-07-29 21:25:07 -05:00
lethalwallabies
fc95946380
Typo fix (#18856) 2020-07-29 14:49:07 -05:00
InsanityAutomation
c5ec80d6c7
G425/G35 menu items; G425 pre- and post- scripts (#18737) 2020-07-24 23:31:15 -05:00
InsanityAutomation
2c61e6ba28
Add CONTROLLER_FAN_IGNORE_Z (#18735) 2020-07-23 21:27:40 -05:00
Diego von Deschwanden
42fbd527f3
Fix links to secure sites (#18745) 2020-07-22 22:20:14 -05:00
cr20-123
a3795e3e48
Prettier BLTouch menu items (#18682) 2020-07-18 17:41:47 -05:00
George Fu
bd0430dc38
Support FT81050 with FYSETC F6 (#18678)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-07-17 07:40:28 -05:00
Evgeny Z
1d6868852b
Chopper Timing Preset for 24V 0.9° (#18662) 2020-07-16 21:40:56 -05:00
Scott Lahteine
2d33a9fd7c Add REPORT_FAN_CHANGE as an option 2020-07-14 21:15:14 -05:00
Scott Lahteine
4457b9d5d2 Clarify MICROSTEP_MODES 2020-07-12 03:20:06 -05:00
Scott Lahteine
b6051efe5b Capitalize "G-code" 2020-07-10 01:35:37 -05:00
cccc
b64113411c
Add current offset for POWER_MONITOR sensor (#18600) 2020-07-09 22:43:04 -05:00
Scott Lahteine
abc5c93986 Clean up some MMU comments 2020-07-09 02:13:32 -05:00
Scott Lahteine
8a55f9405c Fix some comments 2020-07-08 06:53:03 -05:00
notabucketofspam
588d40aedf
Fix typo in Configuration_adv.h (#18570) 2020-07-07 12:55:01 +01:00
cbteeple
2c15a787c7
Option to set manual Babystepping distance in mm (#18503)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-07-03 09:24:41 -05:00
Scott Lahteine
a907e15ae6 Allow larger ADC debounce
Reference #17205
2020-06-26 19:31:07 -05:00
Fabio Santos
25c7c43a82
Add SERIAL_FLOAT_PRECISION option (#18367) 2020-06-22 21:12:45 -05:00
Rui Caridade
ac50a355a3
G35: Bed tramming assistant (#16897) 2020-06-21 04:27:51 -05:00
Scott Lahteine
424569b4c4
Power monitor and display (#17437) 2020-06-18 15:23:03 -05:00
Scott Lahteine
caeba33d28 Sensor 502 and PTC cleanup 2020-06-16 14:08:51 -05:00
Scott Lahteine
aea60d9450 Clean up trailing spaces 2020-06-15 18:11:32 -05:00
rudihorn
3bf990ec34
PTC: Extend options, fix probing bugs (#18253) 2020-06-10 18:25:17 -05:00
Scott Lahteine
75119c433a Default filament 1.75mm 2020-06-09 23:20:20 -05:00
MoellerDi
bac760207c
Add volumetric extrusion limit (#17017) 2020-06-08 03:24:46 -05:00
Luu Lac
eda2fd8dbe
Improvements for Laser / Spindle (#17661) 2020-06-08 00:47:31 -05:00
ellensp
ce62209bce
Probe margin. Bump config version (#18140)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-06-02 20:41:50 -05:00
Leandro A. F. Pereira
801f99edad
SDCARD_READONLY (#17884) 2020-05-30 23:59:29 -05:00
Scott Lahteine
31eb487da5 whitespace 2020-05-22 02:02:11 -05:00
Mobilinkd LLC
60bed3434b
Ignore spurious MAX31855K / 6675 thermocouple errors (#18039) 2020-05-20 15:38:29 -05:00
thisiskeithb
1e32df4c75
Fix Hotend Idle Timeout comment (#18032)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-05-19 02:34:15 -05:00
Italo Soares
213d4b890e
Hotend Idle Timeout (#16362) 2020-05-18 00:50:35 -05:00
Bastien R
2ec482a102
MMU2 Extruder Sensor support (#17886) 2020-05-17 14:52:45 -05:00
thisiskeithb
5a92462c0f
Less ambiguous option comment (#17983) 2020-05-13 14:26:27 -05:00
Gustavo Alvarez
6d92f56582
FTDI/EVE, pins cleanup for SKR E3/DIP (#17990) 2020-05-13 14:22:03 -05:00
Scott Lahteine
27beade888 Update EP comment 2020-05-12 16:32:40 -05:00
RudolphRiedel
98fdc67f1d
Fixes for FYSETC Cheetah (#17935) 2020-05-11 23:51:07 -05:00
Scott Lahteine
df9cad6a53 Correct DEFAULT_MINSEGMENTTIME units 2020-05-11 22:15:25 -05:00
Colin Godsey
8a22ef0c83
G6 Direct Stepping (#17853) 2020-05-11 19:22:41 -05:00
thisiskeithb
2f3077f219
Tests (LPC176x): Emergency Parser (#17967) 2020-05-11 19:14:06 -05:00
Gurmeet Athwal
a4c981469e
Extended reporting options (#16741) 2020-05-05 23:34:04 -05:00
Scott Lahteine
9ce950e3c1 Move M114 options down 2020-05-05 20:15:48 -05:00
Gustavo Alvarez
3fd8ef52c5
More FTDI EVE fixes (RAMPS, Cheetah) (#17759) 2020-05-05 02:38:06 -05:00
Scott Lahteine
d2b7671253 No Z stall by default 2020-05-05 00:59:39 -05:00
Scott Lahteine
9a6934874a Add XYZ_NO_FRAME option 2020-05-03 01:24:39 -05:00
Neil van Geffen
7c3909bc3f
Save/Load distinct TMC SG thresholds (#17741) 2020-04-28 01:22:03 -05:00
studiodyne
89b17b5463
Followup fixes for singlenozzle, etc. (#17712) 2020-04-28 00:21:23 -05:00
RudolphRiedel
0b3a96412c
Fixes for ExtUI / EVE (#17726) 2020-04-27 10:14:42 -05:00
studiodyne
5ae45bab18
Adjustable XY_FREQUENCY_LIMIT (#17583) 2020-04-27 05:59:52 -05:00
Toni
21067ab062
Add Prusa MMU2S settings - beta (#17523) 2020-04-25 21:07:21 -05:00
Scott Lahteine
3a27933ae7
Fixes for FYSETC Touch EVE 5" on AVR (#17659)
Co-Authored-By: RudolphRiedel <rudolphriedel@users.noreply.github.com>
Co-authored-by: sL1pKn07 <sl1pkn07@gmail.com>
2020-04-24 22:35:46 -05:00
studiodyne
2f6262c27b
Automatic Tool Migration feature (#17248) 2020-04-22 21:03:28 -05:00
Scott Lahteine
e222ba4c81 Prevent DUE / Spindle conflict
Fixes #17449
2020-04-22 18:54:13 -05:00
Scott Lahteine
8a9c14ea1d Remove obsolete comment 2020-04-22 14:55:33 -05:00
Scott Lahteine
c3946dd017 Add a warning on LA + S-Curve 2020-04-21 18:39:43 -05:00
Scott Lahteine
000ec9fc13 Ensure language.h include order
See #17604
2020-04-20 09:43:48 -05:00
Fabio Santos
ccfd5c1010
Trinamic steppers Homing Phase (#17299) 2020-04-20 08:08:00 -05:00
Scott Lahteine
b420fdaa87 Digipots followup 2020-04-18 23:36:34 -05:00
grauerfuchs
4a5a3d27ed
Option to use raw digipot values (#17536) 2020-04-18 22:56:23 -05:00
George Fu
a794538c54 Homing backoff enhancements
- Define homing bump as an array
- Add pre and post homing backoff options
- Consolidate homing config options
2020-04-17 08:52:41 -05:00
Scott Lahteine
880f73d471 Minor cleanup 2020-04-17 04:35:00 -05:00
studiodyne
9110f756ad
AUTOTEMP default proportions (#17560) 2020-04-16 19:03:53 -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
Scott Lahteine
03020dd31e Use the common pattern for auto fan pins
Now that pins.h is guaranteed included after configs.
2020-04-16 03:31:44 -05:00
George Fu
e990a98404
FYSETC TFT81050 LCD support (#17568) 2020-04-15 23:34:48 -05:00
Scott Lahteine
e6ccec17a6 Expose SD_PROCEDURE_DEPTH in config 2020-04-13 14:54:50 -05:00
Scott Lahteine
e3321920f3 Update Marlin website links to https 2020-04-12 17:21:14 -05:00
Scott Lahteine
7aed32df00 Fix SD_FINISHED_RELEASECOMMAND bug
Fixes #17401 bug that was introduced in 8f26c3a
2020-04-11 22:08:37 -05:00
Scott Lahteine
d6badb77a4 Clean up whitespace 2020-04-08 14:04:51 -05:00
Tor-p
d6f39a69af
Fix G76 probe height / position (#17392) 2020-04-06 15:32:06 -05:00
Ben
df8b7dfc40
Various Laser / Spindle improvements (#15335) 2020-04-02 19:31:08 -05:00
Scott Lahteine
747b964295
Clean up user-wait, SD completion (#17315) 2020-03-28 03:18:53 -05:00