bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
11,447 Commits 1 Branch 4 Tags 151 MiB
d29cb09b3e
Commit Graph

579 Commits

Author SHA1 Message Date
Scott Lahteine
96f313fb41 Move Info Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
423ab029b2 Move Temperature Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
489017995e Move UBL Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
a489c9fa52 Move Motion Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
3a9ad9f2b1 Move Configuration Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
143d4ec043 Move Tune Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
829effc1fe Move Main Menu to its own file 2018-10-28 15:46:45 -05:00
Scott Lahteine
37ff663b02 Convert LIGHTWEIGHT_UI to CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
a964f098b3 Make dogm status screen a CPP 2018-10-28 15:46:45 -05:00
Scott Lahteine
8055ed24ff Move font data to a subfolder 2018-10-28 15:46:45 -05:00
Scott Lahteine
774a6e8199 Drop TALL_FONT_CORRECTION 2018-10-28 15:46:45 -05:00
Scott Lahteine
c825c419d4 Convert DOGM / HD44780 impl to CPP files 2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Karl Andersson
c1e8bd6add Remove STM32 board-specific delays (#12243) 
...and replace with delays for all HAL_STM32 boards.
 2018-10-27 17:26:12 -05:00
Scott Lahteine
3c9daf322a MSG_CNG_SDCARD => MSG_CHANGE_SDCARD 2018-10-27 13:56:29 -05:00
Scott Lahteine
dacb5324e8 Fix display of Y on Graphical LCD 2018-10-26 01:43:47 -05:00
Scott Lahteine
bf9dd4f4cf
Add helpers for custom text in menu items (#12214) 
For some features it can be useful to write custom text in a menu item. This commit provides helpers to make this easier.
 2018-10-25 15:17:53 -05:00
Scott Lahteine
53c535a0c1 Remove trailing whitespace 2018-10-25 09:46:33 -05:00
Roman Moravčík
55dec02ca1 Allow X, Y, Z manual move when cold. (#12209) 2018-10-25 09:13:52 -05:00
Scott Lahteine
9613f00877 Fix getProgress_seconds_elapsed to return seconds 2018-10-24 18:05:15 -05:00
gjdodd
5d487ef40e Fix null exception due to duration_t of zero (#12207) 2018-10-24 17:59:33 -05:00
Giuliano Zaro
a9061714f2 Update Italian language (#12196) 2018-10-24 16:40:48 -05:00
gjdodd
0a549fd1f2 Fix EXTENSIBLE_UI compile errors (#12206) 2018-10-24 16:36:11 -05:00
Roman Moravčík
a80ba8fc6e Slovak translation update (#12202) 2018-10-24 16:02:38 -05:00
Scott Lahteine
7a04eb3a8b Fix some comment formatting 2018-10-23 22:35:44 -05:00
Scott Lahteine
2f873a119f Revert some UBL strings 2018-10-23 15:39:59 -05:00
Ludy
a93e9e6e9b Use preheat labels in place of PLA/ABS (#12194) 2018-10-23 15:38:17 -05:00
Scott Lahteine
e229b831fa Customizable preheat labels 2018-10-23 00:57:50 -05:00
Scott Lahteine
a553ab82e0 Add e index to _lcd_move_distance_menu 2018-10-22 23:35:04 -05:00
Scott Lahteine
3a46212dd8
Better cold extrusion prevention in LCD menu (#12189) 2018-10-22 20:54:38 -05:00
Marcio Teixeira
fc31da1114 Implement custom delay/millis for EXTENSIBLE_UI (#12188) 2018-10-22 19:37:48 -05:00
Farkas Péter
427c80119a Hide some menu items when busy: fix typo (#12164) 2018-10-20 15:55:31 -05:00
Karl Andersson
b640b3b0d6 Define ST7920 delays for board ARMED (#12161) 2018-10-20 13:12:54 -05:00
Marcio Teixeira
2e5e689a7f Fix kill() and ExtensibleUI (#12160) 
* Fix to isPrintingFromMedia()

  - isPrintingFromMedia() will now return true even if SD print is paused.
  - isPrintingFromMediaPaused() allows UI to determine if the print is paused.

* Don't use _delay_us in minkill (#12145)

  - In HAL_DUE, _delay_us is simply an alias for delay, which causes the board to hang and subsequently reboot due to the watchdog timer.

* Shorten code with IFSD macro
 2018-10-20 01:44:46 -05:00
TheSFReader
1fb9b299d4 Add M524 to abort SD printing (#12155) 2018-10-19 14:25:07 -05:00
Scott Lahteine
c6a5c74208 Add parentheses to SD macros 2018-10-19 13:52:57 -05:00
Marcio Teixeira
71e19baf69 Fix kill => disable_all_heaters => print_job_timer.stop (#12146) 
- Remove `print_job_timer.stop()` from `disable_all_heaters`
- Call `print_job_timer.stop()` for relevant `disable_all_heaters()`.
- Split up `kill()` for watchdog interrupt safety
 2018-10-18 21:20:56 -05:00
Ludy
4cc1c2627e Update German language (#12143) 2018-10-18 19:17:37 -05:00
Ludy
75a0d46edf Fix compile warning re: LCD_INFO_SCREEN_STYLE 2018-10-18 19:16:24 -05:00
Giuliano Zaro
bc22641002 [2.0.x] Updated Italian Language (#12148) 2018-10-18 18:08:39 -05:00
Scott Lahteine
67a3c5a16a
Alternative info screen (Prusa-style) (#12132) 
* Fix Z value display
* Add HAS_PRINT_PROGRESS
* Alternative Info Screen option
* Add LCD_INFO_SCREEN_STYLE to example configs
 2018-10-18 11:34:52 -05:00
Ludy
9c71bff5e8 Update German language (#12115) 2018-10-17 11:17:06 -05:00
InsanityAutomation
3ec3872730 Single Z raise value for all tool-changing / parking (#12090) 
* Universal tool-change Z lift
* Add TOOLCHANGE_ZRAISE to example configs
* Park/unpark changes to example configs
* Implement DEBUG_DXC_MODE
 2018-10-17 11:11:41 -05:00
Scott Lahteine
6bdbe3299e Fix a comment 2018-10-17 10:33:54 -05:00
Marcio Teixeira
f98f4ac7ea Fix and improve EXTENSIBLE_UI (#12117) 
- Add methods to access print counter data
- Clean up some inconsistent method names
- Clear lcd status after filament change
- Implement `lcd_reset_status` so it works like UltraLCD
 2018-10-16 16:58:29 -05:00
Scott Lahteine
8bf596bd4c RETRACT_ZLIFT => RETRACT_ZRAISE 2018-10-16 16:46:40 -05:00
Marcio Teixeira
056561df93 [2.0.x] Enhancements to FILAMENT_RUNOUT_SENSOR (#12069) 
- Added FILAMENT_RUNOUT_DISTANCE_MM option
- Added FILAMENT_MOTION_SENSOR option
 2018-10-16 07:28:52 -05:00
Ludy
2d2cd628c6 Update German language (#12094) 2018-10-16 02:59:04 -05:00
Roman Moravčík
213e94bce2 [2.0.x] Updated slovak translation (#12059) 2018-10-14 02:15:15 -05:00
N95JPL
ab9d5eb38d Add Bootscreen Animation (#12077) 2018-10-12 22:11:20 -05:00
Scott Lahteine
9b6be0ae0f Fix lite status screen SD % 2018-10-12 17:02:59 -05:00
Giuliano Zaro
d8d76cd2ba [2.0.x] Italian language update (#12060) 2018-10-10 20:13:10 -05:00
Scott Lahteine
50cbca4c55 Hide some menu items when busy 2018-10-10 17:18:33 -05:00
Scott Lahteine
d556dc1865
Fix and improve EEPROM storage (#12054) 
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
 2018-10-10 09:45:20 -05:00
Scott Lahteine
cf5284cdf2
Add SD Firmware Update capability (#12043) 
Co-Authored-By: timoxd7 <timoxd7@users.noreply.github.com>
 2018-10-09 20:00:47 -05:00
Marcio Teixeira
cef1de89d0 Fixed incorrect axis index. (#12051) 2018-10-09 16:59:34 -05:00
Marcio Teixeira
d6d48e63fb Allow #defined TYPE arg to ultralcd menu macros (#12041) 
Previously, it was not possible for the TYPE argument to ultralcd menu macros to itself be a #defined value. This made it difficult to create variables to set many related menu items to a common precision that could be easily changed.
 2018-10-08 20:01:00 -05:00
Marcio Teixeira
ec9aa4f468 [2.0.x] Miscellaneous fixes (#12039) 
* Allow override of soft SPI pins in `pins_*.h`
* Add default case to avoid compiler warning.
* Additional pin definitions for Archim 2.
* Einsy Retro has same timings as Einsy Rambo.
 2018-10-08 18:14:52 -05:00
Marcio Teixeira
906a24fa81 Extensible user interface API (#11193) 2018-10-08 15:44:05 -05:00
Scott Lahteine
d5017e2788 Add status screen with 4 nozzles 2018-10-08 01:27:21 -05:00
InsanityAutomation
74cd6cb4fc Single nozzle filament change (#11994) 2018-10-07 17:06:14 -05:00
Giuliano Zaro
c0d9058e25 Shorten an Italian menu title (#12034) 
…and change a multi-use "back" menu item.
 2018-10-07 16:43:48 -05:00
Scott Lahteine
d6b0fbd771
Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Giuliano Zaro
07fe8d28be [2.0.x] Partial Italian revert (#12008) 
- Use a comma for decimals just in one message has not been a good idea.
- Full comments translation
 2018-10-04 14:38:54 -05:00
Scott Lahteine
517b4f4cd4 Fix lightweight UI hotends display 2018-10-04 14:37:24 -05:00
Giuliano Zaro
72a750e0eb [2.0.x] Update Italian language (#11996) 2018-10-04 03:03:47 -05:00
Scott Lahteine
348004c34f
STM32F7 HAL using the official STM32 Arduino Core (#11750) 2018-10-03 03:26:07 -05:00
brian park
2abf3d258d Korean language translation support (#11987) 2018-10-03 01:53:34 -05:00
Scott Lahteine
3019713402 Reorganize some enums 2018-10-01 05:32:55 -05:00
dot-bob
b0fd8f2d74 Add option to move Z on double-click when idle 2018-10-01 01:41:11 -05:00
InsanityAutomation
8ae113ff36 Show zprobe_zoffset when BABYSTEP_HOTEND_Z_OFFSET is disabled (#11973) 2018-10-01 00:30:10 -05:00
InsanityAutomation
2e98437392 Clean up main menu (#11972) 2018-10-01 00:15:06 -05:00
InsanityAutomation
6d862b2916 Home before level corners, if needed (#11976) 
…and add a consistent homing screen for all LCD pre-homing.
 2018-10-01 00:14:28 -05:00
Scott Lahteine
11ac75edcb
Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
InsanityAutomation
4d5566a6b7 Add filament runout sensor menu item (#11971) 2018-09-30 21:33:46 -05:00
AnoNymous
b30ca652ae Replace MIN# / MAX# with variadic MIN / MAX (#11960) 2018-09-30 04:59:14 -05:00
Victor Tseng
93839e2f73 Add option to enable/disable autoretract altogether (#11904) 2018-09-28 16:52:56 -05:00
Scott Lahteine
cee34f7290
Followup for BABYSTEP_HOTEND_Z_OFFSET (#11916) 2018-09-24 21:46:56 -04:00
InsanityAutomation
1104054d73 2.0 IDEX Independent z offset and other fixes (#11862) 
* Add Formbot Raptor board

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Add a second Z probe Z offset

Co-Authored-By: InsanityAutomation <insanityautomation@users.noreply.github.com>

* Modify method to utilize live adjustment of hotend z offset

Should probably move config option to babystepping and rename as it may now apply to all multiextruder systems

* Move config item and catchup other code to current method
 2018-09-24 09:40:48 -05:00
Scott Lahteine
a2b0260f0f Update Sublime files 2018-09-23 19:59:08 -04:00
Hannes Brandstätter-Müller
a4cdffdd69 Support for manually deployed fixed probes (#11899) 2018-09-23 19:59:08 -04:00
InsanityAutomation
f38570ac55 Add custom user menu title (#11769) 2018-09-19 15:04:34 -05:00
Scott Lahteine
c5e5cc5e9f Fix some trailing whitespace, macros 2018-09-17 17:30:04 -05:00
Roxy-3D
378f354939
IDEX Scaled Duplication is still under development 
Take it out of the menu until it is tested and working.
 2018-09-17 10:26:44 -05:00
Roxy-3D
0780913848 IDEX Improvements (#11848) 2018-09-17 01:06:22 -05:00
Scott Lahteine
39732838b4 Tweak indent of Chinese languages 2018-09-17 00:58:32 -05:00
Scott Lahteine
1718eff54a Code changes supporting up to 6 extruders 2018-09-16 22:32:53 -05:00
Thomas Moore
c437bb08f1 Overhaul of the planner (#11578) 
- Move FWRETRACT to the planner
- Combine leveling, skew, etc. in a single modifier method
- Have kinematic and non-kinematic moves call one planner method
 2018-09-16 21:24:15 -05:00
Hannes Brandstätter-Müller
84ed9b5a63 Send "G33 S P1" for Delta Height Calibration (#11831) 2018-09-15 20:17:35 -05:00
Roman Moravčík
8bce5370c7 Updated slovak translation (#11807) 2018-09-12 03:29:17 -05:00
Giuliano Zaro
64d629ba2a [2.0.x] Italian language fix (#11796) 2018-09-12 03:28:22 -05:00
Scott Lahteine
06949ae510 Fix MSG_FILAMENT_CHANGE_HEAT_1 for small LCD 2018-09-10 23:21:37 -05:00
Scott Lahteine
d882717d98
Save some PROGMEM with constexpr (#11798) 
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
 2018-09-10 23:09:26 -05:00
Sam Lane
4f883d5971 [2.0.x] Extruder-Distinct Linear Advance K Factors (#11789) 2018-09-10 22:37:32 -05:00
Marcio Teixeira
2ebfe90be9 Add custom preheat temp to filament change (#11475) 2018-09-10 02:51:46 -05:00
Scott Lahteine
72af8e0f02 Patch extruder_advance_K edit menu 
Fix #11776
 2018-09-09 03:21:08 -05:00
Scott Lahteine
eafd62308e
Use TMC2208Stepper v0.2.5 (#11714) 2018-09-08 20:41:21 -05:00
Marcio Teixeira
beb51c2d58 Show manual extrusion moves as relative in LCD 
- Implements FR#11724
- Old behavior can be restored by commenting out MANUAL_E_MOVES_RELATIVE
 2018-09-06 02:00:25 -05:00
Scott Lahteine
12fded46c2 Correct some FR strings 
Co-Authored-By: pipersw <pipersw@users.noreply.github.com>
 2018-09-04 04:00:22 -05:00
Scott Lahteine
8b837dc3ad No need for last \n in G-code items 2018-09-03 23:23:20 -05:00
Scott Lahteine
d1ceaf5550
[2.0.x] Followup to IDEX changes (#11707) 2018-09-03 23:15:31 -05:00
Roxy-3D
7680b64aa6
IDEX clean up (#11690) 2018-09-02 10:18:59 -05:00
Roman Moravčík
66de50f5f8 Updated slovak translation (#11684) 2018-08-31 15:37:49 -05:00
Marcio Teixeira
0966bdcbc4 Reorganized ultralcd menu (10317) (#10360) 
Replaced "Prepare" and "Control" menus with "Movement", "Temperature", "Configuration" and "Advanced Settings"
 2018-08-29 16:51:14 -05:00
Marcio Teixeira
0f14977b5d LIGHTWEIGHT_UI: Allow feedrate % to exceed 255% (#11656) 
- Changed type of integer used for feedrate percentage from uint8_t to uint16_t.
 2018-08-27 21:26:32 -05:00
Scott Lahteine
a15e570d3b Fix SD progress with Lite Status Screen 
Co-Authored-By: Lê Hoàng <icy.lord.love.angel@gmail.com>
 2018-08-26 17:12:05 -05:00
Scott Lahteine
acf5ae3083 !ENABLED => DISABLED 2018-08-24 16:36:37 -05:00
jneilliii
3671c63cde Einsy Full Graphic LCD Fix (#11604) 
Fixed issue with LCD timings for Einsy RAMBo board.
 2018-08-21 23:43:52 -05:00
InsanityAutomation
c2553f9888 2.0.x - Idex match119 (#11556) 
* Update ubl_G29.cpp

* Update ultralcd.cpp
 2018-08-15 13:26:11 -05:00
petrzjunior
67613bf5bd Update Czech translations (#11510) 2018-08-14 18:45:16 -05:00
Dave Johnson
c64199941e Compile only selected PIO environment (#11519) 2018-08-14 03:28:52 -05:00
Scott Lahteine
6964e1a95a Clean up trailing whitespace 2018-08-14 00:55:37 -05:00
Scott Lahteine
f891416e70 No raise on G28 after power-loss 2018-08-07 13:51:36 -05:00
Marcio Teixeira
f2224755ad Fix jumping progress bar. (#11439) 
- When LCD_SET_PROGRESS_MANUALLY was disabled and an SD print was not active (i.e. the printer was idle), progress_bar_percent would read uninitialized memory from stack and cause progress bar to jump wildly.
- Also updated conditions in `#ifdef` to match `ultralcd.cpp`
 2018-08-03 17:17:02 -05:00
Scott Lahteine
64c493ad82 MKS_12864_OLED code cleanup 2018-07-30 23:22:40 -05:00
Lee Olivares
094e6d81a5 Add Einstart-S support (#11219) 
Indeed the HAL does not need to be mucked around with to expose ATmega2560 pins not available as numbers on the MEGA board, I'll need to update the wiki with that tidbit and a reference to the pin-mapping comment in `fastio_1280.h`.
 2018-07-26 05:52:22 -05:00
MikeLud
aadcf08913 [2.0.x] add Calibrate Z (M915) to Prepare Menu (#11331) 2018-07-26 05:09:49 -05:00
J.C. Nelson
9c2bfa2ab3 Remove extra parameter to enqueue. (#11364) 2018-07-25 18:02:02 -05:00
Scott Lahteine
8c40f0c6c7 Reduce TQ message code size 2018-07-17 18:18:52 -05:00
xC0000005
b04e0c0cbb Malyan LCD feedrate, better temp handling. 2018-07-17 18:18:52 -05:00
Scott Lahteine
065e9c3d66 Add card.longest_filename method 2018-07-17 18:18:52 -05:00
Jamie Bainbridge
8c57cadbe7 Include stdlib in fontutils (#11251) 
When `REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER` is defined and Re-ARM build is attempted, `u8g_fontutf8.cpp` includes `fontutils.h` which uses `abs()`.

However, `abs()` is defined in `stdlib.h` which is not included in `fontutils.h`, so compile fails with an error.

Include `stdlib.h` in `fontutils.h` so that `abs()` is defined before `u8g_fontutf8.cpp` needs to use it, resolving the compile error.

Signed-off-by: Jamie Bainbridge <jamie.bainbridge@gmail.com>
 2018-07-13 00:02:38 -05:00
Scott Lahteine
20761b88e0
Merge pull request #11212 from AlexanderAmelkin/2.0-HD44780-remove-unused-include 
[2.0.x][HD44780] Remove unused include
 2018-07-08 17:19:59 -05:00
Roxy-3D
603e136e87
Resolve issue where user can't edit UBL's mesh 2018-07-08 14:41:38 -05:00
Alexander Amelkin
ed720194d2 [2.0.x][HD44780] Remove unused include 
The <binary.h> header is not available in STM32 toolchain
and is not used anywhere in ultralcd_common_HD44780.h.
If it is used anywhere in HD44780 support for other platforms,
it must be included in the corresponding .cpp file directly
and put under appropriate conditional compilation directives
for the platform requiring it.

As I was unable to find such code, I consider the file unused
and hence remove the inclusion.
 2018-07-06 23:45:47 -05:00
etagle
1367df2875 Replace double with float, optimize calculation 2018-07-04 22:28:56 -05:00
Scott Lahteine
1a0f4dedad
Fix and improve POWER_LOSS_RECOVERY (#11187) 2018-07-02 23:21:28 -05:00
Roman Moravčík
8299ac121d [2.0.x] Slovak translation update (#11175) 2018-07-01 23:15:51 -05:00
teemuatlut
3de0c85d41 Fix RRW graphical LCD constructor macro (#11171) 2018-07-01 23:14:23 -05:00
Scott Lahteine
fbf1c9b496
Fix and tweak POWER_LOSS_RECOVERY (#11151) 2018-06-29 22:41:02 -05:00
Scott Lahteine
3349eb0020 Fix SKEW_CORRECTION compile error 2018-06-29 19:38:18 -05:00
Andy Shaw
3b3029c4bf Make max_e_jerk an array to reduce CPU usage (#11118) 2018-06-26 22:38:31 -04:00
Scott Lahteine
383129728a Edit Z fade as whole numbers 2018-06-21 11:52:29 -04:00
Scott Lahteine
1239e8eda2 Fix value editing with callback 2018-06-21 11:52:03 -04:00
Giuliano
a65d15c905 [2.0.x] Fix Italian msg len (#11058) 
Fix message to long for 12864 display
 2018-06-18 22:04:55 -05:00
Scott Lahteine
9d04f47d98 Improvements for junction_deviation_mm 
- Drop `max_jerk` with `JUNCTION_DEVIATION`
- Add `max_e_jerk_factor` for use by `LIN_ADVANCE`
- Recalculate `max_e_jerk_factor` when `junction_deviation_mm` changes
- Fix LCD editing of `junction_deviation_mm`
 2018-06-11 22:05:16 -05:00
Scott Lahteine
f2c3b0d476 Use bit flags for homed/known 2018-06-11 22:05:16 -05:00
Scott Lahteine
ae07a3e4aa Multiplier edit large ranges 2018-06-10 18:22:12 -05:00
Scott Lahteine
20a5db03bb Junction Deviation limit (0.01 to 0.3) 2018-06-10 18:22:08 -05:00
Scott Lahteine
a2f521d34b
Add Junction Deviation mm runtime setting (#10990) 2018-06-10 18:02:54 -05:00
Scott Lahteine
779d4a17a0 Highlight 64128N and common ST7565 difference 
Followup to #10920, addressing #10962
 2018-06-09 19:18:41 -05:00
Scott Lahteine
334341c632
Hephestos config updates (#10960) 2018-06-07 21:23:55 -05:00
Giuliano
eb1026d438 [2.0.x] Fix compile warning (#10931) 2018-06-05 22:44:34 -05:00
Scott Lahteine
2fd9ba56da LED menu item bool (like Case Lights) 2018-06-03 00:34:29 -05:00
Scott Lahteine
61181b7f24 Add macros for ST7565 commands 2018-06-02 20:48:44 -05:00
Scott Lahteine
d259070980 Clean up trailing spaces from vim, etc. 2018-05-31 00:09:41 -05:00
Scott Lahteine
945139e328 Clean up some formatting 2018-05-27 17:58:40 -05:00
Scott Lahteine
cf7d5a642a
Fix manual moves for switching tools (#10868) 2018-05-26 18:30:53 -05:00
Eduardo José Tagle
1da2c4f1c1 Text LCD display routine fix. Coauthored with @MagoKimbra (#10864) 2018-05-26 18:13:33 -05:00
Eduardo José Tagle
6f330f397e [2.0.x] Buffer overflow and scroll fix, UTF8 cleanup (#10844) 2018-05-25 23:32:37 -05:00