Scott Lahteine
aaaf09bda2
BEZIER_JERK_CONTROL => S_CURVE_ACCELERATION
2018-05-26 18:33:51 -05:00
Scott Lahteine
4b2f6e3b2b
[2.0.x] Add endstop noise filter ( #10796 )
2018-05-21 15:51:38 -05:00
Scott Lahteine
b7dfc79988
Disable SERIAL_PORT_2 by default and sanity-check it ( #10748 )
2018-05-14 21:38:24 -05:00
Scott Lahteine
e978e6e782
[2.0.x] Arrange LCD options by type ( #10630 )
2018-05-06 19:16:55 -05:00
nightdemonx
e911635fb1
Add thermocouple with AD8495 support
2018-05-02 08:43:16 -05:00
Scott Lahteine
b7e938a9fb
LCD_BED_LEVELING enables a sub-menu for ABL
2018-05-01 07:13:56 -05:00
Scott Lahteine
c87b0e21be
Add units to probe speed comments
2018-04-30 23:50:28 -05:00
Scott Lahteine
05c33833e7
[2.0.x] Add NO_LCD_MENUS option ( #10582 )
2018-04-30 21:16:31 -05:00
Scott Lahteine
9e07df5c1b
Extra options for LEVEL_BED_CORNERS ( #10483 )
2018-04-22 02:50:48 -05:00
Scott Lahteine
a90cbc6339
[2.0.x] Wait for bed heaters between probing ( #10472 )
2018-04-21 15:43:21 -05:00
KangDroid
6c535081ec
[2.0.x] Add optional menu item to toggle software endstops ( #10389 )
2018-04-13 00:24:09 -05:00
Yunhui Fu
c96412a78f
[2.0.x] UTF-8 language translation support ( #10213 )
2018-04-12 20:14:01 -05:00
Scott Lahteine
8b8ad14178
Add Z_PROBE_LOW_POINT to prevent damage
2018-04-09 17:23:03 -05:00
Scott Lahteine
dca69efc11
Update Bed PID comments
2018-04-08 06:44:47 -05:00
etagle
a29adde5c0
Implement BEZIER_JERK_CONTROL
...
Enable 6th-order jerk-controlled motion planning in real-time.
Only for 32bit MCUs. (AVR simply does not have enough processing power for this!)
2018-04-07 21:03:28 -05:00
Lenbok
0e8242180d
Chamber temperature monitoring and auto fan control.
...
This is an initial cut for feedback, updated for 2.0.x.
Chamber temperature is currently reported along with hot end and bed
temperatures to serial. The format is just like that used for hot end
and bed temperatures, but using 'C' prefix. As there is no heater,
target is always 0. Is this appropriate, is there a better way to report
chamber temperatures?
Chamber temperatures are not reported on the LCD in any way.
When auto chamber fan is enabled, it currently just uses the same
temperature threshold as the other auto controlled fans.
As the chamber temperature is not connected to any heater, it doesn't
undergo mintemp/maxtemp monitoring. This would need to change in the
future if chamber heating became a feature.
2018-04-06 23:09:06 -05:00
Scott Lahteine
adcb87f0db
Z Endstop Servo => Z Probe Servo
2018-04-01 23:54:21 -05:00
Scott Lahteine
dd2949922b
Consolidate 3-point leveling point options
2018-03-19 04:12:20 -05:00
Scott Lahteine
c6ff39cc14
Spacing cleanup
2018-03-17 16:49:08 -05:00
Scott Lahteine
14c03cb6f4
[2.0.x] Make MIN_PROBE_EDGE a general option (for electronic probes) ( #10069 )
...
Some probes don't work near the edges of the bed. This change promotes MIN_PROBE_EDGE to a general setting that applies to all probing functions.
2018-03-13 01:15:22 -05:00
Scott Lahteine
28f1276286
[2.0.x] Add Z_AFTER_PROBING option ( #10058 )
...
Some "fix-mounted" probes need manual stowing. And after probing some may prefer to raise or lower the nozzle. This restores an old option but tailors it to allow raise or lower as preferred.
2018-03-11 13:07:55 -05:00
Scott Lahteine
419d12ca1b
Add UNKNOWN_Z_NO_RAISE option
...
With this option enabled, Z won't ever be raised until after `G28` has been completed, and it won't raise if Z becomes unknown. This is good for machines whose beds fall when Z is powered off.
2018-03-10 00:17:34 -06:00
Scott Lahteine
a2a672449a
Updated boot screen description
2018-03-03 20:04:17 -06:00
Scott Lahteine
4953fb1c88
Standardize encoder defaults
2018-02-24 22:34:45 -06:00
Scott Lahteine
5684beae90
Bring some configs up to speed
2018-02-24 21:56:27 -06:00
Scott Lahteine
2024775e07
Spanish (UTF8) Language ( #9786 )
...
From #7314 by @MrAmericanMike
2018-02-23 20:24:02 -06:00
Scott Lahteine
b2cf253a13
Add RESTORE_LEVELING_AFTER_G28 option
2018-02-23 13:38:54 -06:00
Marcio Teixeira
13176dfe2f
Merge remote-tracking branch 'origin/pr-lite-st7920-status' into pr-lite-st7920-status
2018-02-22 08:02:31 -07:00
Marcio Teixeira
716a22498f
Changed temp type from uint8_t to int16_t
...
- Also deleted old implementation files which had been renamed.
2018-02-21 10:15:55 -07:00
Scott Lahteine
7d8c6b3f3c
Add 20x4 option for Sainsmart LCD ( #9740 )
2018-02-21 00:46:25 -06:00
Marcio Teixeira
aada1e698f
Removed unused configuration options.
2018-02-19 16:14:33 -07:00
Marcio Teixeira
c7513eb032
Merge branch 'pr-lite-st7920-status' of github.com:marcio-ao/Marlin into pr-lite-st7920-status
2018-02-19 15:38:13 -07:00
Studiodyne
d3ca82d8c2
Support for multiple filament runout sensors
2018-02-19 07:02:50 -06:00
Scott Lahteine
ca55f2927a
Pulldown pin mode support ( #9701 )
...
Implemented for LPC1768.
2018-02-18 19:26:23 -06:00
Scott Lahteine
79272f98fc
Proposed changes to ST7920 lightweight status screen
2018-02-18 02:47:31 -06:00
Marcio Teixeira
24eb275b99
Added a light-weight status screen for the ST7920
...
- The status screen uses the ST7920 character generator to greatly
reduce SPI traffic and MCU load when updating the status screen.
- Has been tested with the RepRapDiscount Full Graphics Smart Controller
but should work with any LCD that uses an ST7920 or fully compatible
controller.
2018-02-18 02:29:45 -06:00
Scott Lahteine
08d685c97a
Followup to 21e60fd
2018-02-16 02:09:17 -06:00
Roxy-3D
21e60fd3ed
Allow user to control Z-Height correction for off mesh movements ( #9661 )
2018-02-15 15:07:42 -06:00
Marcio Teixeira
4880ac6533
Added a light-weight status screen for the ST7920
...
- The status screen uses the ST7920 character generator to greatly
reduce SPI traffic and MCU load when updating the status screen.
- Has been tested with the RepRapDiscount Full Graphics Smart Controller
but should work with any LCD that uses an ST7920 or fully compatible
controller.
2018-02-14 14:43:54 -07:00
Scott Lahteine
2ec65051fd
Fix serial comment sp.
2018-02-13 22:40:56 -06:00
Scott Lahteine
2014d38e10
NEOPIXEL_BRIGHTNESS parity
2018-02-08 18:55:19 -06:00
Scott Lahteine
b5e92f4f90
[2.0.x] Enable / disable PSU automatically ( #9503 )
2018-02-06 00:22:30 -06:00
Scott Lahteine
16739264d3
Add UltiController v2.1 support
...
Add compatibility with the original screen bord from Ultimaker 2 printer (UltiController v2.1 with the PG-2864ALBP I2C display)
2018-02-05 22:30:03 -06:00
Scott Lahteine
4925f60cff
Add MALYAN_LCD to configs
2018-02-04 18:52:44 -06:00
Scott Lahteine
7d6c009104
Add thermistor 15 tuned for JGAurora A5
2018-01-22 01:27:11 -06:00
Scott Lahteine
348b454401
Probe bounds based on bed size
2018-01-22 01:05:11 -06:00
Scott Lahteine
58ed9901d7
Consistent NEOPIXEL_TYPE options
2018-01-21 17:19:38 -06:00
Scott Lahteine
fa432508b0
Followup to Ender config
2018-01-15 06:00:21 -06:00
Scott Lahteine
048486390e
Bring some configs up to date
2018-01-11 01:10:17 -06:00
Thomas Moore
f7efac57b7
Multi-host support
2018-01-10 00:14:47 -06:00
GMagician
5295b4713d
[2.0.x] add semitec 104NT-4 ( #9119 )
...
Table is very very similar to old 104-GT2 so I added only the name and recycled old ID
2018-01-09 16:53:12 -06:00
Scott Lahteine
0b4a46fa6c
Bring configs up to date with 1.1.x
2017-12-30 23:28:53 -06:00
Thomas Moore
f0a8a1a853
[2.0.x] Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE ( #8866 )
...
* Use NOZZLE_PARK_FEATURE for ADVANCED_PAUSE_FEATURE
2017-12-25 01:38:06 -06:00
Scott Lahteine
28fc8741d6
Reduce default jerk. XY by half. Z by 1/4
2017-12-24 19:54:11 -06:00
Even
ea1a8d1223
add original RADDS LCD + Controller
...
adds setup for the original Radds Display+Controller+SD Card Reader PCB
http://doku.radds.org/dokumentation/lcd-display/
2017-12-24 19:00:23 -06:00
Dan Delaney
b055d8c39c
[2.0.x] Adding support for using the MKS_12864OLED with the SSD1306 controller ( #8814 )
...
* Adding support for using the MKS_12864OLED with the SSD1306 controller
* Update comment for correct controller type
2017-12-16 18:47:04 -06:00
Scott Lahteine
15d05748df
Adding support for the Tronxy and Zonestar LCD
2017-12-15 19:13:52 -06:00
Scott Lahteine
69d49a2438
Shorter segments may be better
2017-12-09 06:29:14 -06:00
Scott Lahteine
ae663a4198
PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING
2017-12-07 16:44:13 -06:00
Richard Wackerbarth
c1184552ac
Change K1 to required option PID_K1
2017-12-05 19:59:59 -06:00
Scott Lahteine
aa7efb96bf
Bring configurations up to date
2017-12-02 21:50:51 -06:00
Scott Lahteine
0154e3480c
New feature: BED_SKEW_CORRECTION
2017-12-01 19:39:49 -06:00
Scott Lahteine
ef2531558c
Add an option to segment leveled moves
2017-11-29 16:57:30 -06:00
Scott Lahteine
5926c9c97b
Followup for MESH_EDIT_GFX_OVERLAY
2017-11-24 15:53:25 -06:00
Scott Lahteine
5ce7f23afa
Config option G26_MESH_VALIDATION for all meshes
2017-11-23 21:43:23 -06:00
Scott Lahteine
3f0a982b8c
Move Filament Width Sensor to Configuration_adv.h
2017-11-13 21:05:57 -06:00
Scott Lahteine
b76e173205
Move test extrusion options under G26
2017-11-13 21:05:57 -06:00
Scott Lahteine
81b91b3f9d
Clean up some trailing white-space
2017-11-10 02:31:04 -06:00
Roxy-3D
967104e1ce
Default Extrusion Settings were off a few lines in some of the example config files. ( #8333 )
2017-11-08 11:56:00 -06:00
Roxy-3D
ed62c621d7
Fix G26 Circle Drawing. Add Default Extrusion Settings ( #8313 )
...
- Fix G26 Circle Drawing.
- Add default extrusion settings so machine can print lines on print bed
- Yet to be done: Get LCD Menu's to use these settings.
2017-11-07 17:13:53 -06:00
Scott Lahteine
2c099fd4c2
Update Thermal Protection Documentation
2017-11-07 15:46:44 -06:00
Scott Lahteine
d83a9a53e8
Merge pull request #8220 from thinkyhead/bf2_serial_port_-1
...
[2.0] Add SERIAL_PORT -1 option for configurators
2017-11-03 15:25:12 -05:00
Scott Lahteine
93ba72ea83
Add SERIAL_PORT -1, set on SBASE, STM32F103RET6
2017-11-03 15:22:45 -05:00
Scott Lahteine
7e43dd1d23
Fix probes configuration url
...
Based on #8241 by @machaj
2017-11-03 13:35:40 -05:00
android444
9cc1d8e312
[2.0.x] Support for SilverGate Board
2017-10-31 15:27:26 -05:00
Scott Lahteine
34be5d33c0
The plural of 'axis' is 'axes'
2017-10-30 14:21:43 -05:00
Scott Lahteine
7fad26549b
Concise SD_REPRINT_LAST_SELECTED_FILE description
2017-10-26 23:33:02 -05:00
Scott Lahteine
46e9eae159
Tweak to M100 config comment
2017-10-26 17:25:44 -05:00
Scott Lahteine
7f55d82fd1
Move UBL_SAVE_ACTIVE_ON_M500 to Configuration.h
2017-10-24 18:26:43 -05:00
Scott Lahteine
580b6e9089
Apply physical limits to mesh bounds
2017-10-24 16:54:07 -05:00
Scott Lahteine
5f87324536
Fix some config verbiage
2017-10-24 14:53:42 -05:00
cdedwards
6296ab2173
Add GFX overlay to UBL mesh edit ( #8038 )
...
* Add GFX overlay to UBL mesh edit
Fixed misplaced HAS_TEMP_BED in dogm_bitmaps.h
rename _lcd_babystep_zoffset_overlay to _lcd_zoffset_overlay_gfx and move it out of BABYSTEP_ZPROBE_OFFSET to we can use it for over things. Add this function into UBL mesh edit screen.
update all Configuration.h to add ENABLE_MESH_EDIT_GFX_OVERLAY
* Add Sanity to UBL insanity
Need to check for DOGLCD otherwise error out.
2017-10-24 14:14:03 -05:00
Roxy-3D
572cf0ec95
UBL able to generate mesh and save and load it on 32-bit platforms ( #8015 )
...
* Get UBL Mesh Generation, Mesh Save & Mesh Load working with 32-Bit platforms
* clean up read_data() and write_data() for non-LPC1768 HAL's
* Get read_data() and write_data() return codes consistent
All HAL's read_data() and write_data() return false if they succeed.
* Get read_data() and write_data() return codes to be consistent
Make read_data() and write_data() return true if an error happens.
* Say UBL is now checked out on machine types in default Configuration.h file.
2017-10-18 14:00:29 -05:00
Jeffrey Li
eeb4611606
Add proper support for the AZSMZ 12864 LCD on a SMART RAMPS
2017-10-16 00:33:07 -07:00
Scott Lahteine
014a83fe09
Merge pull request #7984 from thinkyhead/bf2_micromake_c1
...
[2.0.x] Micromake C1 Configurations, Unaccented French
2017-10-14 21:19:32 -05:00
Scott Lahteine
34a261416f
Add unaccented French language
2017-10-14 20:28:12 -05:00
Jeff Eberl
b206f70693
Split the software endstop capability by axis.
2017-10-14 18:44:20 -05:00
Slawomir Ciunczyk
a11e6a1022
Different NEOPIXEL types
...
Same as #7728 but for 2.0.x,
Lot of cleanup and remove references in whole code to other "LED files" than leds.h. Now will be much easier to add next drivers/libraries. e.g. FastLED. But bad news, currently FastLED is suporting only RGB devices (no RGBW)
2017-10-10 02:17:36 -05:00
Scott Lahteine
e9bcb9d048
Add 4 new LCD displays
2017-10-09 15:58:02 -05:00
Scott Lahteine
9fe7f53216
Misc general spacing cleanup
2017-10-06 15:14:01 -05:00
Scott Lahteine
508d764d63
Add serial XON/XOFF handshaking
...
From @ejtagle, originally #7459
2017-10-02 04:12:30 -05:00
Scott Lahteine
90af1fe5ee
Implement NO_MOTION_BEFORE_HOMING option
2017-10-01 21:58:50 -05:00
Christopher Pepper
bea3ec2724
M355 S0, S1 fixes & faster LCD, SD card
...
fix Travis error
2017-09-27 19:26:00 -05:00
Scott Lahteine
7cd5eb6d42
Update LEVEL_BED_CORNERS config option
2017-09-27 00:48:59 -05:00
Scott Lahteine
4c5be9bb05
Fix a PARKING_EXTRUDER comment
2017-09-27 00:48:58 -05:00
Scott Lahteine
494b0eba2d
Config spacing fix
2017-09-27 00:48:47 -05:00
Scott Lahteine
f37ed314e0
Friendly layout for Arduino IDE
2017-09-21 16:27:13 -05:00
Scott Lahteine
f536c4dccb
Move configs
2017-09-06 06:28:30 -05:00
Scott Lahteine
e4fcf460e7
Marlin bugfix-2.0.x Version/README
2017-08-31 17:56:08 -05:00
Michal Holes
54d48130f3
Slovak UTF-8 translation
...
Slovak UTF-8 translation
2017-08-23 19:14:35 -05:00
Vben
4817b39d98
Added new feature for AutoParking Extruder (APE)
2017-08-16 17:33:11 -05:00
Scott Lahteine
385f1bb9e5
Merge pull request #7504 from thinkyhead/bf1_servo_delays
...
Individual servo delays
2017-08-16 16:05:22 -05:00
Scott Lahteine
a1878cd1c0
Add "Level Corners" menu option
2017-08-16 02:54:33 -05:00
GMagician
e9c72978c7
Implement SERVO_DELAY as array
...
This modify give SERVO_DELAY x servo basis
2017-08-15 00:28:47 -05:00
Jozsef Kiraly
97c21e9007
Support for Geeetech GT2560 Rev.A/Rev.A+
2017-08-06 00:42:54 -05:00
Scott Lahteine
804818b4d9
Bring configs up to date
2017-08-05 03:48:52 -05:00
teemuatlut
936d00dda8
Implement probing delay for piezo sensors
2017-07-29 21:46:40 -05:00
Scott Lahteine
51864fd365
Add bed size as a configuration option
2017-07-26 23:04:54 -05:00
C. Scott Ananian
890e7a16a9
Add support for Printrbot Neopixel RGBW strip.
...
Connected as described at http://printrbot.com/shop/led-strip/
Based on patch by Kelly Anderson <kelly@xilka.com> at
http://www.xilka.com/printrbot/marlin/1.1.4/20170707/
2017-07-22 16:07:55 -05:00
Scott Lahteine
fc9ce65095
Add BUSY_WHILE_HEATING
for hosts that need it
2017-07-06 16:28:57 -05:00
Petr Zahradník
8c34233452
UTF-8 mapper for Czech
2017-07-04 15:51:23 -05:00
Scott Lahteine
69297b2d7b
Make all EEPROM optimization options available
2017-07-02 20:47:03 -05:00
Scott Lahteine
232a10410d
LCD_FOR_MELZI
2017-07-01 22:32:20 -05:00
Scott Lahteine
dcec7178d1
Expose DISABLE_M503 option as a test option
2017-07-01 21:31:28 -05:00
Scott Lahteine
5b03f23fa2
Bring configurations up to date, fix some comments
2017-06-28 16:41:49 -05:00
Scott Lahteine
5b11b33854
Add support for Průša MK2 Multiplexer
2017-06-27 04:55:30 -05:00
Scott Lahteine
afbc6e3e2f
Update DELTA/SCARA config comments
2017-06-24 12:47:17 -05:00
Bob-the-Kuhn
325f09ea6c
Add link to custom LiquidCrystal library by F. Malpartida
2017-06-22 13:07:08 -05:00
Scott Lahteine
907cafcbfd
Support for two switching extruders
2017-06-19 17:20:59 -05:00
dot-bob
0bc66bf22c
PCA9632 PWM color LED support
...
Add support for the PCA9632 PWM color LED driver used on the Ultimaker 2 and Wanhao Duplicator 6.
2017-06-12 01:09:24 -05:00
Bob-the-Kuhn
1c107b3949
delete problem line
2017-06-09 11:53:36 -05:00
Scott Lahteine
e556ab1dff
Find three-point leveling points on Delta
2017-06-07 16:07:38 -05:00
Scott Lahteine
1919cb0d1e
Config cleanups
2017-06-01 19:26:16 -05:00
Roxy-3D
364f8fb613
Update Configuration.h files to better names ( #6814 )
...
Changed UBL_G26_MESH_EDITING to UBL_G26_MESH_VALIDATION
Added UBL_MESH_EDIT_MOVES_Z to prepare for that change (coming next)
2017-05-21 11:10:22 -05:00
Scott Lahteine
99c4900a98
SPINDLE/LASER config changes
2017-05-17 04:23:06 -05:00
fixoid
c2321b1cdd
Separate SWITCHING_NOZZLE and SWITCHING_EXTRUDER
2017-05-16 19:25:17 -05:00
Scott Lahteine
1c4ed8b106
Note 5 extruders in config comments
2017-05-07 21:28:54 -05:00
Brian
faa270071d
Improve BLTOUCH_HEATERS_OFF functionality
...
- rename to PROBING_HEATERS_OFF
- move heater pausing functionality into thermalManager
- add variables, pause(), ispaused(), other functions
- add fan pausing functionality -> PROBING_FANS_OFF
- add probing_pause() wrapper
- move pausing into do_homing_move() and do_probe_move() to minimize quiet time and so other probe types can benefit
- example configs
2017-05-07 16:22:08 -04:00
Scott Lahteine
77769e284f
Edit configuration comments
2017-05-05 13:32:31 -05:00
Scott Lahteine
da08e11acd
Add EXTRAPOLATE_BEYOND_GRID option to bilinear leveling
2017-05-04 00:19:07 -05:00
Scott Lahteine
54751e8557
Put DISTINCT_E_FACTORS adjacent to the affected settings
2017-04-30 15:30:31 -05:00
Scott Lahteine
0dbe4b3e54
Edit configurations to reduce verbosity, arrange logically
2017-04-30 15:30:31 -05:00
Scott Lahteine
d7d4378481
Remove inaccurate version description
2017-04-30 14:57:19 -05:00
Scott Lahteine
7db805930a
Cleanup configurations
2017-04-28 18:32:39 -05:00
Roxy-3D
4075b95519
Allow BL-Touch users to control heaters during probe event ( #6485 )
...
The Configuration.h file entries for BL-Touch have been updated to:
```cpp
//#define BLTOUCH
//#define BLTOUCH_DELAY 375 // (ms) Enable and increase if needed
//#define BLTOUCH_HEATERS_OFF // if defined the printer's heaters are
turned off during probe event
```
2017-04-28 09:19:55 -05:00
Scott Lahteine
959566cf0a
Update note about M163 / M164
2017-04-22 16:23:15 -05:00
Scott Lahteine
0e97b3d6d0
Fix some configuration spacing
2017-04-14 22:36:10 -05:00
Scott Lahteine
1bd25fd2b3
Clean up config spacing, section headings, etc.
2017-04-14 19:06:31 -05:00
Scott Lahteine
fd2a0784ba
Add support for SOLENOID_PROBE
2017-04-14 17:24:36 -05:00
Scott Lahteine
dac21ec680
Add support for an RGBW LED
2017-04-11 12:58:55 -05:00
Scott Lahteine
e7746ffee4
Extend RGB LED support, adding Printer Events
2017-04-11 12:15:41 -05:00
Scott Lahteine
9343f6a95f
Put TOSHIBA with other stepper driver options
2017-04-09 20:52:49 -05:00
Scott Lahteine
1855534f20
Config files cleanup
2017-04-09 06:44:52 -05:00
Scott Lahteine
c26a315d0b
Additional missed patches
2017-04-09 04:24:23 -05:00
Scott Lahteine
c54f6cf23d
Updates to support 5 extruders
2017-04-09 03:49:16 -05:00
Scott Lahteine
824f3c1c0d
Fix up configuration comments
2017-04-08 18:59:56 -05:00
Scott Lahteine
995ed90248
Clean up Filament Width Sensor comments
2017-04-08 18:59:56 -05:00
Scott Lahteine
2a84122edd
Configuration changes to support 5 extruders
2017-04-07 10:46:35 -05:00
Bob-the-Kuhn
3b8926bd09
improved wording, consolidation of info, BLTouch warning
...
==============================================
clarified BLTouch calculation & changed comment delimitters/flags
I found it hard to pickout the various sections in this area so I
changed most comments from // style to /** ... */
Made the BLTouch calculation simpler and clarified the units of measure
for the result.
============================================
add changes to example configurations
============================================
add TinyBoy2 to this PR & add BLTouch Delay
2017-04-06 16:06:01 -05:00
Scott Lahteine
d13991ae18
Use same config name for all mesh dimensions
2017-04-06 16:05:59 -05:00