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

13982 Commits

Author SHA1 Message Date
Victor Oliveira
185e31d322
Fix Menu Mixer for Color UI (#20566) 2020-12-27 23:11:36 -06:00
Victor Oliveira
2ce9fa4b9c
Better defaults, compatibility for SDIO + STM32 (#20570) 2020-12-27 23:08:06 -06:00
Keith Bennett
cfcfc8047a
Small / Large Boot Screen option for TFT_COLOR_UI (#20578) 2020-12-27 21:10:53 -06:00
Scott Lahteine
91c350e793 Remove URL scheme 2020-12-27 21:00:07 -06:00
Scott Lahteine
84a1fff302 Allow define HOMING_FEEDRATE_(XY|Z) 2020-12-27 20:50:38 -06:00
Scott Lahteine
e83b7edefc General cleanup 2020-12-27 20:50:38 -06:00
Jason Smith
81d7bd8f41
Validate defined probe points (#20572) 2020-12-27 20:49:15 -06:00
thinkyhead
31af49e507 [cron] Bump distribution date (2020-12-28) 2020-12-28 00:21:01 +00:00
Scott Lahteine
45996fd20a Init tare pin once 2020-12-27 16:36:35 -06:00
Scott Lahteine
f423edd938 Add probe_switch_activated 2020-12-27 16:36:35 -06:00
Scott Lahteine
d00c89946d Remove CREALITY_TOUCH 2020-12-27 16:29:50 -06:00
Scott Lahteine
198b3ae0f8 Fix some comments 2020-12-27 16:27:15 -06:00
Ashammaru
719404803b
Fix SPINDLE_LASER_FREQUENCY (#20509) 2020-12-26 19:01:54 -06:00
thinkyhead
331ca6a800 [cron] Bump distribution date (2020-12-27) 2020-12-27 00:20:30 +00:00
thinkyhead
e2480d40d1 [cron] Bump distribution date (2020-12-26) 2020-12-26 00:19:22 +00:00
thinkyhead
4b860f1092 [cron] Bump distribution date (2020-12-25) 2020-12-25 00:21:08 +00:00
Mike La Spina
1fc0dcdc97
Cutter Power in percent format (#20410) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
Co-authored-by: Luu Lac <45380455+shitcreek@users.noreply.github.com>
 2020-12-23 22:50:24 -06:00
Vi B-P
820cc69d0a
Apply NO_MOTION_BEFORE_HOMING to joystick motion (#20462) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-23 22:43:33 -06:00
Scott Lahteine
20073246bb Fix, clean up FTDI EVE Touch UI (#20466) 
Co-Authored-By: Marcio T. <mlt4356-github@yahoo.com>
 2020-12-23 22:23:45 -06:00
Jason Smith
57e94fb838
Fix ST7920 timing for Rumba32, Fysetc S6 (#20556) 2020-12-23 21:35:21 -06:00
Victor Oliveira
e6c15eee45
Fix DOGM status message scrolling (#20557) 2020-12-23 21:34:09 -06:00
Scott Lahteine
f0c29afe21 Add "End Repeat Loops" menu item 2020-12-23 20:24:34 -06:00
Victor Oliveira
4d6b6bcffc
LVGL and Classic UI for STM32 (#20552) 2020-12-23 20:01:21 -06:00
Scott Lahteine
f8c6de0cdc Move BTT_SKR_CR6 2020-12-23 19:57:49 -06:00
thinkyhead
9a60f7a793 [cron] Bump distribution date (2020-12-24) 2020-12-24 00:23:59 +00: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
Scott Lahteine
59de35e749 Apply ENABLED in ExiUI / FTDI 2020-12-23 15:34:04 -06:00
Darren Peter
2844086772
Support ANET_FULL_GRAPHICS_LCD_ALT_WIRING on BTT SKR 1.4 (#20427) 2020-12-23 01:21:02 -06:00
Sebastiaan Dammann
2be027f92e
Probe Activation Switch followup (#20550) 2020-12-23 01:02:27 -06:00
BsCmOD
34d9cb6778
Enhanced Italian language (#20551) 2020-12-23 01:01:18 -06:00
LinFor
6af6a35d9d
FTDI EVE: Cyrillic font, some minor fixes (#20517) 2020-12-23 00:51:59 -06:00
yysh12
6ec4e744c0
Improve plan_arc circle detection (#20440) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-23 00:12:20 -06:00
wmariz
c87c354403
Refactor 'Level Corners with Probe' (#20460) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-23 00:10:56 -06:00
thinkyhead
56fac55a39 [cron] Bump distribution date (2020-12-23) 2020-12-23 00:20:43 +00:00
Jan Krajdl
de9c0eda36
Support RGBW on PCA9632 (#20455) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-22 08:27:14 -06:00
Tanguy Pruvot
c559fc8227
Fix G28 leveling state, UBL compile (#20499) 2020-12-22 07:01:24 -06:00
Victor Oliveira
cfad5cb435
Unify FYSETC F6 1.3 / 1.4 (#20507) 
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-12-22 06:57:11 -06:00
Serhiy-K
0b3b4da7d0
STM32F1xx support for TFTGLCD (#20515) 2020-12-22 06:56:00 -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
X-Ryl669
91730d71ff
Improve Touch Calibration screen (#20524) 2020-12-22 06:17:06 -06:00
Jason Smith
5e3be83dbb
Overrides to prevent STM32 timer conflicts (#20545) 2020-12-22 06:02:25 -06:00
Chris Pepper
c1b900aae9
Fix UBL mesh inset Z position (#20538) 2020-12-22 05:59:25 -06:00
Jason Smith
094e822070
Improve STM32 timer conflict messages (#20544) 2020-12-22 05:49:34 -06:00
LinFor
82540be931
FTDI EVE custom user menus (#20518) 2020-12-22 00:31:14 -06:00
LinFor
36aff1e464
12-bit ADC resolution for STM32 (#20519) 2020-12-21 18:30:03 -06:00
thinkyhead
ba1176108a [cron] Bump distribution date (2020-12-22) 2020-12-22 00:19:00 +00:00
LinFor
9b3e16cdd0
Add Tune -> Advanced Settings to FTDI EVE (#20532) 2020-12-21 18:06:27 -06:00
Scott Lahteine
34b6bca006 Tweak FTDI spacing 2020-12-21 17:48:03 -06:00
Scott Lahteine
6429be6efc Robin pins followup 2020-12-21 17:47:22 -06:00
LinFor
ba16c53218
Fix some Russian (#20529) 2020-12-21 17:45:00 -06:00
cr20-123
0d95f67f2e
Fix G34 compile with bed leveling disabled (#20537) 2020-12-21 17:43:45 -06:00
Sebastiaan Dammann
3ec59b36eb Add BTT SKR CR6 board (#20522) 2020-12-21 17:36:43 -06:00
Scott Lahteine
c7ecfe28e7 Clean up some pins 2020-12-21 17:36:43 -06:00
Dick Streefland
7afd274d0c
Apply HOME_AFTER_DEACTIVATE for 'G28 O' (#20525) 2020-12-21 01:49:00 -06:00
Dick Streefland
71bec0824c
Get E3V2 DWIN MACHINE_SIZE from config (#20526) 2020-12-21 01:47:49 -06:00
thinkyhead
4764e2c544 [cron] Bump distribution date (2020-12-21) 2020-12-21 00:17:17 +00:00
Serhiy-K
d8687512b1
Update Russian and Ukrainian languages (#20508) 2020-12-20 00:33:23 -06:00
Scott Lahteine
62cc65cafe Languages cleanup 2020-12-20 00:30:20 -06:00
Foxies
0a99f8feed
Migrate Hispeedv1 (QQS-Pro) to HAL/STM32 (#20354) 2020-12-20 00:17:24 -06:00
Jason Smith
6dfcd491d0
Fix Creality EEPROM watchdog freq. (#20510) 2020-12-19 23:55:57 -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
InsanityAutomation
7a168205eb
Minimum temp options for Probing and G12 Nozzle Clean (#20383) 
Co-authored-by: Jason Smith <jason.inet@gmail.com>
Co-authored-by: Scott Lahteine <github@thinkyhead.com>
 2020-12-19 22:02:38 -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
thinkyhead
57f4d0523e [cron] Bump distribution date (2020-12-20) 2020-12-20 00:14:49 +00:00
Scott Lahteine
45b11553f4 Tweaks for pins_BTT_SKR_common.h 2020-12-18 21:15:48 -06:00
Scott Lahteine
e5d0b27aaf Rename QUIET_PROBING 2020-12-18 21:13:50 -06:00
thinkyhead
a33ae10c56 [cron] Bump distribution date (2020-12-19) 2020-12-19 00:15:28 +00:00
Tanguy Pruvot
017d97fd0e
DOGM: Slow down touchscreen calibration (#20454) 2020-12-18 16:21:00 -06:00
Victor Oliveira
b167cd2427
MKS Robin Nano V3 and STM32F4x0Vx Variant (#20430) 2020-12-18 16:18:04 -06:00
thinkyhead
fae3c860a1 [cron] Bump distribution date (2020-12-18) 2020-12-18 00:15:25 +00:00
grauerfuchs
e9677594ea
Fix and optimize MightyBoard (#20493) 2020-12-17 17:22:59 -06:00
Jason Smith
7b9ff164cc
Balance CI tests (#20485) 2020-12-17 06:18:07 -06:00
nb-rapidia
978d93af88
Make M220 B / R a standard feature (#20355) 2020-12-17 06:13:07 -06:00
ellensp
31337826a3
Fix ZoneStar LCD 2004 buttons (#20489) 2020-12-17 06:05:25 -06:00
rafaljot
fbcc07261d
Homing feedrates as XYZ array (#20426) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-17 06:02:05 -06:00
Scott Lahteine
20b3af1cc2 Use homing_feedrate function 2020-12-16 22:19:04 -06:00
thinkyhead
6d47baee5d [cron] Bump distribution date (2020-12-17) 2020-12-17 00:15:48 +00:00
Tanguy Pruvot
c6dcf9d006
Update French language (#20472) 2020-12-16 00:46:10 -06:00
Scott Lahteine
f934b774a1 Update Hungarian language 
Co-Authored-By: Zs.Antal <45710979+AntoszHUN@users.noreply.github.com>
 2020-12-16 00:42:55 -06:00
Giuliano Zaro
e6fdf530b8
Update Italian language (#20480) 2020-12-16 00:35:13 -06:00
thinkyhead
1c4f125cb0 [cron] Bump distribution date (2020-12-16) 2020-12-16 00:14:09 +00:00
Scott Lahteine
3f93b8baed Trust STM32 gcc versions 2020-12-15 01:06:32 -06:00
Scott Lahteine
637123f340 Update some LCD includes 2020-12-15 01:06:27 -06:00
Scott Lahteine
7243ea549d Update some pins errors 2020-12-15 00:49:55 -06:00
Sebastiaan Dammann
686bb056a4 Creality v4.5.3 (CR-6 SE, CR-6 MAX) (#20468) 2020-12-15 00:33:01 -06:00
JoAnn Manges
1be16e3d8c
Fix RESTORE_LEVELING_AFTER_G28 (#20471) 2020-12-15 00:16:50 -06:00
Scott Lahteine
69999f962a Please install the EditorConfig plugin 2020-12-14 21:27:12 -06:00
Scott Lahteine
5a6fc3e5b7 Auto-check followup 2020-12-14 21:08:09 -06:00
kisslorand
7be57ff9f0
Fix M1001 auto-check logic (#20456) 2020-12-14 21:04:45 -06:00
Scott Lahteine
80bde7b6b5 Always enable leveling after G28 2020-12-14 20:34:22 -06:00
Scott Lahteine
e349a44c60 Preheat before leveling 2020-12-14 20:34:22 -06:00
Scott Lahteine
fbefe55102 Fix formatting 2020-12-14 20:34:22 -06:00
thinkyhead
dee475cee1 [cron] Bump distribution date (2020-12-15) 2020-12-15 00:13:55 +00:00
Chris Pepper
9fd358f10c
LPC176x framework update (#20469) 2020-12-14 22:36:25 +00:00
thinkyhead
8c05053951 [cron] Bump distribution date (2020-12-14) 2020-12-14 00:14:07 +00:00
Scott Lahteine
b0392be4bf SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE 2020-12-13 01:54:31 -06:00
Scott Lahteine
c824086825 Adjust planner debugging 2020-12-13 01:54:31 -06:00
FanDjango
1a9644cef9
Probe Offset Wizard followupBack to PROBE_PT_RAISE/separate STOW, make "PROBING" msg appear (#20439) 
* Go back to always use PROBE_PT_RAISE with a discrete stow. This ensures a raise above the bed, while stowing prior to exiting the wizard.
* Fix issue preventing text while moving to X/Y position
Co-authored-by: FanDjango <FanDjango@users.noreply.github.com>
 2020-12-12 17:18:33 -08:00
thinkyhead
8723440d1d [cron] Bump distribution date (2020-12-13) 2020-12-13 00:14:25 +00:00
qwewer0
ea9b4dc82c
Improve ASSISTED_TRAMMING_WIZARD probe stowing (#20437) 
* When BLTOUCH_HS_MODE enabled, stow pin before user interaction
* For all probes, ensure probe stows at end of wizard
 2020-12-12 11:03:28 -08:00
ellensp
2eab920935
Add HAS_PIN_27_BOARD for CREALITY_V4 (#20446) 
Co-authored-by: ellensp <ellensp@hotmsil.com>
 2020-12-12 10:59:17 -08:00
leodoener
087a6fea13
Fix SDCARD_SORT_ALPHA on Ender 3 V2 (#20443) 2020-12-11 23:20:24 -03:00
Scott Lahteine
9c9113e225 Better animated boot screen 2020-12-11 18:24:27 -06:00
thinkyhead
8f008ac75d [cron] Bump distribution date (2020-12-12) 2020-12-12 00:13:47 +00:00
FanDjango
43222d5879
Probe offset wizard fixes (#20414) 
* STOW probe, reverting incorrect earlier change from #20344
* Adjust soft endstop disables, to ensure travel below bed functions properly

Co-authored-by: FanDjango <FanDjango@users.noreply.github.com>
 2020-12-11 00:06:57 -08:00
elasticdotventures
04a3bd0d34
Z_SENSORLESS sanity checks (#20421) 
Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-12-10 23:33:29 -08:00
thinkyhead
af70e80816 [cron] Bump distribution date (2020-12-11) 2020-12-11 00:13:48 +00:00
ellensp
22de37ad50
Fix UBL Debug Messages (#20423) 
Co-authored-by: ellensp <ellensp@hotmsil.com>
 2020-12-10 15:30:58 -03:00
Keith Bennett
6cf4b888e1
Clarify "not Interrupt-capable" error message (#20419) 2020-12-10 15:27:02 -03:00
thinkyhead
6557751199 [cron] Bump distribution date (2020-12-10) 2020-12-10 00:13:42 +00:00
Victor Oliveira
6e4925e6b6
MKS Robin Pins fixes for STM32 and STM32F1 (#20404) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-09 18:43:49 -03:00
InsanityAutomation
3404cb1fc4
Move ExtUI ABL mesh edit, limit to bilinear (#20381) 
* Move ExtUI call

Co-authored-by: Scott Lahteine <github@thinkyhead.com>
Co-authored-by: Victor Mateus Oliveira <rhapsodyv@gmail.com>
Co-authored-by: Sebastiaan Dammann <sebastiaandammann@outlook.com>
 2020-12-09 09:07:26 -08:00
Marcio T
f3bddc4e4e
Fixes and additions to FTDI EVE Touch UI (#20393) 
- Fixed name conflict with "SUBSCRIPT_TWO"
- Fixed rendering bugs in "Leveling Menu"
- Only show "Bed Mesh Screen" when UBL is enabled
- Removed CocoaPress code from generic "Main Menu"
- Removed CocoaPress code from LulzBot Bio "Status" screen
- Moved generic "Move Axis" functionality into a base class
- Added CocoaPress custom screens:
   - Status Screen
   - Unload Cartridge
   - Load Chocolate
   - Main Menu
   - Advanced Settings
   - XYZ Move (based on "Move Axis" base class)
   - Extrusion Move (based on "Move Axis" base class)
- CocoaPress tweaks to "Temperature" screen
- Fix FTDI EVE Touch UI compilation errors when not using leveling.
 2020-12-09 05:09:31 -06:00
Mike La Spina
3e68e4b418 Fix Spindle/Laser Control menu (#20347) 2020-12-09 04:37:26 -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
Keith Bennett
2a4f8acd62
Clarify Delta & SCARA config location (#20403) 2020-12-08 22:12:42 -08:00
Scott Lahteine
885b0d2ec5 Style, spacing, typo cleanup for recent changes 2020-12-08 20:18:29 -06:00
thinkyhead
66834cf324 [cron] Bump distribution date (2020-12-09) 2020-12-09 00:13:32 +00: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
thinkyhead
af20db4512 [cron] Bump distribution date (2020-12-08) 2020-12-08 00:13:33 +00:00
ellensp
fee375f31f
Allow BTT EXP-MOT be used with Displays that needs only EXP 1 (#20396) 
Co-authored-by: ellensp <ellensp@ellensp-HP-ProBook-6470b.fritz.box>
Co-authored-by: Victor Mateus Oliveira <rhapsodyv@gmail.com>
 2020-12-07 17:57:00 -03:00
ellensp
182fdd95c3
Shorten Filament Load/Unload Strings to Fit on Graphical Displays (#20369) 
Co-authored-by: ellensp <ellensp@ellensp-HP-ProBook-6470b.fritz.box>
Co-authored-by: Victor Mateus Oliveira <rhapsodyv@gmail.com>
 2020-12-07 17:53:53 -03:00
Scott Lahteine
7f20184ebc
Fix auto#.g file handling, add NO_SD_AUTOSTART (#20071) 2020-12-07 05:53:15 -06:00
Scott Lahteine
b04914fb72 More LPC P-string macros 2020-12-07 05:06:24 -06:00
Scott Lahteine
2ecb4fad72 Watch idle() depth over 5 2020-12-07 04:38:14 -06:00
Scott Lahteine
ee4c2b36b8 Fix fileExists, use openFailed 2020-12-07 04:38:14 -06:00
thinkyhead
00143f77d0 [cron] Bump distribution date (2020-12-07) 2020-12-07 00:13:45 +00:00
Scott Lahteine
6f4589b375 G28 followup 2020-12-05 23:06:15 -06:00
Scott Lahteine
139a33c9fc G28 tweaks 2020-12-05 20:14:44 -06:00
Scott Lahteine
a3f6e48eb6 Fix STM32F1 SERIAL_GET_TX_BUFFER_FREE 2020-12-05 20:05:39 -06:00
Scott Lahteine
a8dffdebd4 Move G29 3-point startup earlier 2020-12-05 20:05:39 -06:00
Scott Lahteine
889695b6ba ExtUI homing / leveling additions 2020-12-05 18:29:03 -06:00
Scott Lahteine
bf4c08bce1 Use 'nearby' for 'near' 2020-12-05 18:27:18 -06:00
Scott Lahteine
9e68c9a214 Creality 4.5.2 format and fix 2020-12-05 18:27:18 -06:00
LinFor
7a6b742d12
Fix FYSETC S6 I2C EEPROM size (#20340) 
Both V1.2 and V2.0 boards have a 24LC16, which is a 2kB EEPROM.

Co-authored-by: PingWin <kirill@shashlov.ru>
Co-authored-by: Jason Smith <jason.inet@gmail.com>
 2020-12-05 16:19:17 -08:00
thinkyhead
2dbd2063f8 [cron] Bump distribution date (2020-12-06) 2020-12-06 00:13:51 +00: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
Jason Smith
2c8f566231
Suspend Servos for STM32+NeoPixel (#19963) 2020-12-05 00:02:58 -06:00
Jason Smith
21ee7b1c86
Fix TMC_HOME_PHASE divide by zero (#20368) 2020-12-04 23:58:39 -06: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
Tanguy Pruvot
0a03ef4b6f
Don’t use near keyword as variable name (#20374) 2020-12-04 20:29:55 -08:00
thinkyhead
71db4f0426 [cron] Bump distribution date (2020-12-05) 2020-12-05 00:13:14 +00:00
Belin Fieldson
465840e1fb
Loosen E on pause for fila-manipulation (#20346) 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
 2020-12-04 04:49:30 -06:00
Jason Smith
d17db47775
Fix MESH_BED_LEVELING w/o SEGMENT_LEVELED_MOVES (#20363) 2020-12-03 19:33:46 -08:00
thinkyhead
517bcd2b5d [cron] Bump distribution date (2020-12-04) 2020-12-04 00:12:52 +00:00
Scott Lahteine
a1f319d5b6 Consolidate common pin includes 2020-12-03 05:53:07 -06:00
ellensp
31352f8a8a
Fix up start, monitor baud (#20326) 2020-12-03 04:44:33 -06:00
yysh12
2878876064
Fix circle arc condition (#20322) 2020-12-03 04:40:39 -06:00