1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-12-05 02:19:14 +00:00
Commit Graph

463 Commits

Author SHA1 Message Date
Chris Pepper
9fd358f10c
LPC176x framework update (#20469) 2020-12-14 22:36:25 +00:00
Scott Lahteine
885b0d2ec5 Style, spacing, typo cleanup for recent changes 2020-12-08 20:18:29 -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
Victor Oliveira
1a04c8c7bb
Avoid invalid memory optimizations (#20389)
When building for AVR, merge-all-constants can incorrectly combine constants stored in flash with constants stored in RAM. These have different access requirements, leading to undefined behavior during execution.
Co-authored-by: ellensp <ellensp@hotmail.com>
2020-12-06 12:36:36 -08:00
ellensp
31352f8a8a
Fix up start, monitor baud (#20326) 2020-12-03 04:44:33 -06:00
Mathias Rasmussen
753cf994b6
Update to STM32 v10, optimize build (#20325) 2020-12-01 23:51:04 -06:00
Scott Lahteine
b6a32500c4
M808 Repeat Markers (#20084) 2020-11-26 21:18:40 -06:00
Jason Smith
3a396a25dc
Retire HAL for STM32F4 / F7 (#20153) 2020-11-26 00:37:18 -06:00
Scott Lahteine
b3bd47b4b2 Printrboard labels 2020-11-20 17:41:20 -06:00
Giuliano Zaro
41529b6598
SMUFF (MMU2 clone) support (#19912) 2020-11-18 01:27:21 -06:00
ellensp
b57ca6e4ac
add ethernet to src filter (#20136)
Co-authored-by: ellensp <ellensp@ellensp-HP-ProBook-6470b.fritz.box>
2020-11-17 00:45:43 -08:00
Victor Oliveira
ea371618da
Add Touch Calibration screen (#20049) 2020-11-15 16:39:58 -06:00
InsanityAutomation
1b0a5abd73
G34 Z stepper locking (#20091)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-12 22:54:18 -06:00
JoAnn Manges
40d442fde2
Fix MAX31865 on SPI (PT100/1000) support (#20074) 2020-11-11 15:52:35 -06:00
Scott Lahteine
f17394d677 Ability to disable M32 2020-11-10 02:21:12 -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
Darren Horrocks
53cc8a0d6e
Optimized (non-optiboot) Melzi env (#20021)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-11-07 02:43:51 -06:00
Jason Smith
bd872d5dcf
STM32F1 cleanup, incl. SoftwareSerial removal (#20046) 2020-11-06 23:51:52 -06:00
George Fu
4785b04aa1
FYSETC E4 board support (#20032) 2020-11-06 23:48:52 -06:00
Victor Oliveira
50ba20fe1f
PIO env for MKS Nano boards in STM32 (#19905) 2020-10-29 02:01:25 -05:00
ellensp
8cc0369d97
Use LiquidCrystal_I2C@1.1.4 for RA_CONTROL_PANEL (#19875) 2020-10-24 19:46:27 -05:00
Jason Smith
ea0afd0b4d
Ignore NativeEthernet on AT90USB1286 (#19885) 2020-10-24 19:43:42 -05:00
Foxies
9aee6674bb
FLSUN Delta QQS-Pro pins (#19793) 2020-10-21 19:00:57 -05:00
Scott Lahteine
072f996af7
General cleanup, mostly MKS UI (#19825) 2020-10-21 12:45:27 -05:00
bilsef
9baa944460
Teensy 4.1 Ethernet support (#19801) 2020-10-20 14:35:29 -05:00
Jason Smith
9507c49b18
Fix mega2560ext environment (#19730) 2020-10-14 13:43:36 -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
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
Jason Smith
45731bd022
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>
2020-10-11 18:13:01 -05:00
Scott Lahteine
492ba2a111
Digipots refactor / cleanup (#19690) 2020-10-11 14:58:35 -05:00
Scott Lahteine
0988af453c
Optional M42/M226; Add more features filters (#19664) 2020-10-09 16:42:23 -05:00
石立枫
bec1844954
Support for FLY MINI (#19185) 2020-10-09 06:09:27 -05:00
ellensp
321afd5fef
Apply env:mega2560ext to relevant boards (#19624) 2020-10-08 02:30:31 -05:00
Ryan V1
8989353fab
Fix Archim1 stepper timing (with new variant) (#19596) 2020-10-04 17:41:41 -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
1c372df449 Prettier INI 2020-09-28 01:11:48 -05:00
Scott Lahteine
303d871ca7 Update AnyCubic deps 2020-09-28 01:02:05 -05:00
Victor Oliveira
90bc1993b6
Include pins.h in dependencies script (#19468) 2020-09-23 15:06:36 -05:00
Scott Lahteine
5f5f76956f Fix up tests, warnings 2020-09-22 19:59:02 -05:00
makerbase
d8ed749045
Add MKS Robin E3P, improve LVGL UI (#19442) 2020-09-20 20:55:02 -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
cb9a34c6f7
Fix Creality RET6 env - RE (#19340) 2020-09-11 02:12:49 -05:00
Victor Oliveira
160f70be63
LPC: Finish DMA transfer, use HW SPI class (#19191) 2020-09-10 00:41:26 -05:00
Keith Bennett
700e0fe7d7
Warn in platformio.ini about RCT6 512K (#19312) 2020-09-09 21:59: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
853aec2c9a
Move ExtUI displays to sub-folder (#19070) 2020-08-20 01:38:22 -05:00
ellensp
64e181979c
Env mega2560ext adds pins 70-85 (#19022) 2020-08-19 19:18:39 -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
Victor Oliveira
c3fdc7f81e
Apply PIO-supported custom_option for deps (#18935) 2020-08-06 17:33:42 -05:00
Scott Lahteine
99ba866d8d
Optimize G-code / feature dependencies (#18919) 2020-08-06 08:14:00 -05:00
Marco Burato
6bcfb58cd4
More Anycubic + Trigorilla mappings, ExtUI (#18903) 2020-08-06 05:38:18 -05:00
Claus Näveke
4d36baf375
No mks_robin extra_scripts in Trigorilla build (#18872) 2020-08-02 20:17:43 -05:00
Scott Lahteine
cc50c4956d Add monitor_flags 2020-07-30 02:26:02 -05:00
Scott Lahteine
f3b37229fa Update include_tree 2020-07-30 01:51:08 -05:00
Alexander Gavrilenko
117df87d19
Support for TFT & Touch Screens (#18130) 2020-07-30 01:43:19 -05:00
Scott Lahteine
b80cc09b13 Keep -std=gnu++11 in stm32 build_unflags 2020-07-28 03:10:33 -05:00
Diego von Deschwanden
de5cca6b1f
Update more external links (#18819) 2020-07-28 01:04:44 -05:00
Victor Oliveira
3eef000e2a
Fix MKS Robin Nano V2 build / upload (#18784) 2020-07-25 23:08:30 -05:00
Scott Lahteine
d0222e5c76 Randomize firmware.bin, fix unflag 2020-07-25 23:06:22 -05:00
Victor Oliveira
e02817b077 More folders only compiled when their feature is Enabled (#18780)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-07-25 21:42:13 -05:00
MKS-Sean
d20d459132 Robin nano V2, TFT LVGL UI parameters, and more (#18500) 2020-07-25 01:18:06 -05:00
J.C. Nelson
60500c0c49
Fix Lerdge variant script (#18771) 2020-07-24 22:56:33 -05:00
Scott Lahteine
1d2d616a7c Fix ESP3D_WIFISUPPORT ini typo 2020-07-23 23:35:58 -05:00
Scott Lahteine
d1e20eb29f Update links, README, contributing, etc. 2020-07-23 20:46:51 -05:00
Diego von Deschwanden
42fbd527f3
Fix links to secure sites (#18745) 2020-07-22 22:20:14 -05:00
Scott Lahteine
748c8a7ecd Explicit SdFat 2020-07-22 01:38:02 -05:00
Scott Lahteine
6027055695
Optimize LCD, Wifi, etc. libraries (#18730) 2020-07-21 04:00:39 -05:00
Victor Oliveira
f34024af34
Filter some unused Marlin/src subfolders (#18729) 2020-07-21 03:15:20 -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
3513ea7ae1 Specify ststm32 @ 6.1.x 2020-07-14 21:15:14 -05:00
ellensp
8f725e25b5
Fix CHITU_F103 pio.board name (#18486) 2020-07-09 22:51:04 -05:00
Scott Lahteine
67b2b78717 Fix warning with PIO 2020-07-08 00:03:20 -05:00
Jason Smith
378b5685b3
0.7.1 <= TMCStepper <= 0.7.9 (#18564) 2020-07-06 17:51:36 -05:00
J.C. Nelson
6f14d2d37f
Add Lerdge S,X,K (#18302) 2020-07-06 17:08:52 -05:00
Scott Lahteine
9f5b8c9bbc Get SAMD51 CXX flags from script 2020-07-06 00:12:13 -05:00
ellensp
bb89e33e24
FIx Sanguino/1284p board_upload.maximum_size (#18502) 2020-07-03 16:18:09 -05:00
Keith Bennett
382c566a77
Fix env:mks_robin_nano35 (#18516) 2020-07-03 11:51:44 -05:00
Victor Oliveira
e5bc9d31cc
Add TFT_LVGL_UI support (#18438) 2020-07-01 01:30:24 -05:00
Keith Bennett
c6a066c0be
Update MKS Robin Nano auto-build env (#18417) 2020-06-26 01:37:22 -05:00
Chris Pepper
ea569ca29e
Update LPC176x platform version (#18392) 2020-06-23 22:30:35 +01:00
Scott Lahteine
a0bbdde421 Use libraries from the registry 2020-06-23 16:13:21 -05:00
Jason Smith
e52afa8b19
Better STM32 Tone timer int priority (#18385) 2020-06-22 15:30:45 -05:00
Scott Lahteine
31167c158b TMCStepper 0.7.0 2020-06-21 22:17:48 -05:00
Chris Barr
d2363c5b35
Clean up RUMBA32 PlatformIO & tests (#18271) 2020-06-18 17:26:40 -05:00
Scott Lahteine
f4c258dc23
Creality Ender 3 v2 (#17719) 2020-06-16 01:45:27 -05:00
makerbase
642112d3eb
Add MKS UI (TFT_LITTLE_VGL_UI) (#18071) 2020-06-15 21:05:33 -05:00
Victor
8358f3eadb
Chitu V5 with extra GPIO init (#18299)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-06-15 20:00:44 -05:00
Per Ivar Nerseth
10601a932a
Zonestar P802M bed thermistor (#18289)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-06-14 20:09:25 -05:00
J.C. Nelson
40f55f8b98
Chitu variant for disk-based update (#18264) 2020-06-11 21:53:26 -05:00
Scott Lahteine
ea20c77df9 Clean up envs / variants 2020-06-11 20:26:24 -05:00
Victor
e2cc966621
Tronxy X5SA (V5 / V6 boards) (#18243) 2020-06-10 17:16:22 -05:00
Scott Lahteine
5ac66b0f95 Rumba in the junga 2020-06-07 23:45:25 -05:00
Scott Lahteine
d7561c4b98 Fix rumba32 environments
Followup to #18116
2020-06-07 22:34:39 -05:00
Jason Smith
1a5663fbf4
PIO base STM32 environment (#18116) 2020-06-07 20:29:10 -05:00
Scott Lahteine
89704ce7f9 Support STM32 platform up to 6.1.x 2020-06-07 19:50:22 -05:00
grauerfuchs
d5bfc5b07b
Fix Mightyboard envs (#18194) 2020-06-03 23:23:53 -05:00
cccc
419f31f371
SoftwareSerialM for MEEB (#18178) 2020-06-02 21:03:59 -05:00
Scott Lahteine
c9a260ee12 MEEB cleanup, whitespace
Followup to #18138
2020-06-02 02:34:08 -05:00
cccc
2bf63e29c6
Support for MEEB 3DP board (#18138) 2020-06-01 18:25:13 -05:00
ellensp
a740b6b318
More 'extend'ed environments (#18118)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
2020-05-28 12:52:13 -05:00
Jason Smith
f402ab7afb
Limit MAX31865 library to <1.2 (#18089) 2020-05-25 18:39:51 -05:00
Jason Smith
5fefecc526
Use 'extends' for STM32F1, fix lib versions (#18099) 2020-05-25 18:24:16 -05:00
grauerfuchs
7d7f58c3e3
Fix Mightyboard PIO env (#18098) 2020-05-25 16:24:50 -05:00
Scott Lahteine
a06a0c5b88
Fix SKR/GTR PeripheralPins.c (#17937)
* Add a separate GTR board/variant.
* Revert SKR Pro MOSI (before 248b7dfa59).
2020-05-11 23:56:44 -05:00
Eric Ptak
9d545f1231
Fysetc S6 direct DFU upload (#17943) 2020-05-11 01:07:19 -05:00
Jason Smith
8d3caa9944
Newer TMCStepper better for LPC176x (#17934) 2020-05-10 03:08:01 -05:00
Jason Smith
ba9a9bbe58
Normalize HAL/STM32 targets (#17904) 2020-05-10 01:49:30 -05:00
Jason Smith
703e97b7af
Support TMCStepper with MKS Robin Pro (#17908) 2020-05-08 01:19:28 -05:00
Axel
2acdd2fadc
Add Mightyboard Mega env (#17861) 2020-05-05 02:25:22 -05:00
Scott Lahteine
0080305fa6 Tweaks to platformio.ini 2020-05-04 19:26:46 -05:00
Scott Lahteine
38d1587091
Malyan M200 V2 (#17840) 2020-05-04 14:37:43 -05:00
MigueKun
714df3001a
Fix Fysetc S6 PIO env (#17865) 2020-05-04 13:59:22 -05:00
Jason Smith
208af8cb15
Fix STM32 + SoftwareSerial compile (#17831) 2020-05-02 17:24:51 -05:00
Bob Kuhn
33bb7859d4
Composite USB for STM32 SDIO (experimental) (#17222) 2020-04-22 15:00:10 -05:00
Scott Lahteine
f94ab84dac
Malyan M300 support (#17421) 2020-04-17 09:10:41 -05:00
Scott Lahteine
847ea583f6
STM32F103VE has 512K Flash EEPROM (#17565) 2020-04-16 15:34:44 -05:00
Jason Smith
7d0ea3e2c4
Fix framework-arduinoststm32 minimum version (#17512) 2020-04-16 03:43:32 -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
Ryan
a97ae51cc7
Archim: PIO upload on Windows, Arduino IDE LCD (#17405)
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
2020-04-11 20:39:02 -05:00
Gustavo Alvarez
397fa59eee
Sort out USBComposite for STM32F1 confusion (#17400) 2020-04-09 15:58:45 -05:00
grauerfuchs
293a0997c9
Fix / optimize PCA9533 LED (Mightyboard) (#17381) 2020-04-08 12:53:28 -05:00
thisiskeithb
966e0e4a77
BTT002 release V1 uses STM32F407VGT6 (#17387) 2020-04-06 15:51:09 -05:00
Scott Lahteine
723d4d6f61 Fix Archim 2 build for PIO 2020-04-04 02:18:33 -05:00
thisiskeithb
add34aa286 Fix STM32F1 USB Composite Dependency
Co-authored-by: Lord-Quake <Lord-Quake@users.noreply.github.com>
2020-03-29 13:55:14 -05:00
Giuliano Zaro
129b270628
QSPI EEPROM for SAMD51 (#17292) 2020-03-27 17:29:17 -05:00
Scott Lahteine
7455bb09b3
Add SoftwareSerialM for MKS Robin (#17207) 2020-03-24 16:14:30 -05:00
Scott Lahteine
1674df00b1 Stay at v0.91 of USBComposite for STM32F1 2020-03-21 20:56:14 -05:00
Scott Lahteine
6bead0c1b0
Shorter paths to HAL, ExtUI (#17156) 2020-03-13 16:29:29 -05:00
Jason Smith
4e96a014a8
Use arduinoststm32 3.x for FYSETC S6 (#17131) 2020-03-12 19:20:22 -05:00
Scott Lahteine
631addbbb4
SAMD51 SoftwareSerial (#17041) 2020-03-04 13:15:32 -06:00
Scott Lahteine
736521a3f1 Balance mega tests, shorten some env names 2020-03-01 21:20:22 -06:00
Jason Smith
cc822bf70f
Fix some 8 extruders issues, GTR build (#17043) 2020-03-01 21:19:02 -06:00
InsanityAutomation
ba4f49f4a2
Fix GTR10 overlapping defines (#16976) 2020-02-25 22:56:52 -06:00
Scott Lahteine
72fae2faa5 Require TMCStepper 0.6.2 2020-02-15 22:35:28 -06:00
Scott Lahteine
64b96f3908
Double ADC read frequency (#16864) 2020-02-15 19:10:46 -06:00
vivian-ng
a16f3baecc
Add ESPAsyncTCP to lib_ignore (#16844) 2020-02-13 23:22:52 -06:00
Scott Lahteine
49a66bc4cc Fix ESP32 warning, specify supported version 2020-02-13 19:22:13 -06:00
darksiah
d8b2726fd3
Fix MKS Robin Nano platformio.ini entry (#16826) 2020-02-10 16:49:36 -06:00
Bob Kuhn
78fea4a9ca
Split up MKS_RUMBA32 into two variants (#16781) 2020-02-05 20:28:28 -06:00
yangwenxiong
248b7dfa59 BigTreeTech GTR V1.0 / Support 8 extruders, heaters, temp sensors, fans (#16595) 2020-01-25 02:13:39 -06:00
Artur Petrzak
2ef6b86ccd Enable use of latest TMCStepper on MKS Robin Nano (#16652) 2020-01-22 21:52:16 -06:00
Vertabreaker
6d1f6a9516 Adjust GTM32 build flags (#16582) 2020-01-17 02:46:50 -06:00
Vertabreaker
b310047ded Fix GTM32 environment (to prevent a crash) 2020-01-15 19:25:36 -06:00
Jason Smith
fc773c2784 Fix Fysetc S6 FLASH_PAGE_SIZE and test build (#16560) 2020-01-14 15:36:47 -06:00
InsanityAutomation
ffd8b595d1 Fix PLR cancel with ExtUI (#16556) 2020-01-13 20:52:24 -06:00