teemuatlut
d81342254a
Support new TMC drivers ( #13026 )
2019-02-06 06:33:14 -06:00
Rolf Werum
524c6c10bf
MAGNETIC_PARKING_EXTRUDER ( #12351 )
2019-02-06 06:30:53 -06:00
Scott Lahteine
1bd9a63049
Add HAS_EXTRA_ENDSTOPS macro
2019-02-06 05:10:05 -06:00
Scott Lahteine
10d855cb21
Sanity check USER_GCODE formatting
2019-02-04 06:36:41 -06:00
Marcio Teixeira
5cfc1cdacc
Support SWITCHING_NOZZLE with 2 servos ( #13054 )
2019-02-04 00:19:56 -06:00
Nicolas G
6fb4001b58
Add option to disable fan speed slowing in M303 ( #13066 )
2019-02-04 00:12:41 -06:00
Mark Zachmann
4d1093b386
Fix init of last_direction_bits ( #13067 )
2019-02-03 01:29:00 -06:00
revilor
6a57d0b381
Prusa MMU2 ( #12967 )
2019-01-31 19:10:52 -06:00
teemuatlut
f0503372d9
Revert E_AXIS_N cast ( #13055 )
2019-01-30 20:55:05 -06:00
InsanityAutomation
48a3502656
Remote streamer improvements ( #12982 )
2019-01-27 22:43:13 -06:00
Bob Kuhn
2f35747f29
L6470 SPI daisy chain support ( #12895 )
2019-01-23 19:06:54 -06:00
teemuatlut
e6805582a6
M569 to change stepping mode. Add new TMC section to LCD. ( #12884 )
2019-01-17 13:17:16 -06:00
mikeshub
7fde8d9d1e
Add CreatorPro / Makerbot / QIDI / etc and Mightboard RevE support ( #12855 )
...
- Fix a bug in MAXxxxx thermocouple temp reporting.
- Add support for 3-wire HD44780.
- Add support for PCA9533 RGB driver.
- Add configuration examples for FlashForge CreatorPro.
2019-01-14 14:29:55 -06:00
teemuatlut
1a79878dff
Remove TMC_Z_CALIBRATION in favor of Z_STEPPER_AUTO_ALIGN
2019-01-12 18:07:28 -06:00
Scott Lahteine
b402040059
Split bed size sanity check into two
2019-01-11 15:49:57 -06:00
jmz52
813a4ea107
Add support for Mks Robin TFT display ( #12706 )
...
* Add support for MKS Robin TFT display
- Add support for MKS Robin TFT display and encoder for MKS Robin board.
- Generic 128x64 UI with x2 upscale is used (for now).
- Tested on MKS Robin TFT V2.0 with ST7789V controller.
2019-01-03 10:38:39 -06:00
Giuliano Zaro
54ba44ee37
Fix bad sanitycheck ( #12748 )
2018-12-30 10:44:15 -06:00
Ludy
cfc5e96b4b
Move JD to Config.h (and fix jerk->eeprom bug) ( #12720 )
2018-12-27 15:29:39 -06:00
Marcio Teixeira
902d5b0f8b
Allow ExtUI to use LCD_SET_PROGRESS_MANUALLY ( #12628 )
2018-12-12 17:21:37 -06:00
Dave Johnson
9a4a463ec4
Sanity-check LIGHTWEIGHT_UI, move comment up ( #12630 )
2018-12-12 16:59:20 -06:00
Marcio Teixeira
b22716e938
M425 Backlash Correction ( #11061 )
2018-12-08 14:36:46 -06:00
Scott Lahteine
fa47ce369a
Sanity-check for negative steps, feedrate, accel
2018-12-07 19:38:15 -06:00
teemuatlut
50b2fbd031
Trinamic: Split stealthChop, improve driver monitoring, etc. ( #12582 )
2018-12-07 15:34:21 -06:00
Scott Lahteine
aaf862aef2
Fix angles for disabled EDITABLE_SERVO_ANGLES ( #12559 )
2018-11-30 12:31:42 -06:00
Jacob Jordan
8be91677df
Fix Skew factors ( #12555 )
...
- Ensure Skew factors are calculated from test square measurements
2018-11-29 11:39:31 -06:00
Marcio Teixeira
439a3e8463
Improve runout sensor, fix LIGHTWEIGHT_UI screen size ( #12544 )
2018-11-27 13:45:25 -06:00
Scott Lahteine
fd2998efd5
Revert ADC_KEYPAD direction behavior ( #12508 )
2018-11-22 06:00:00 -06:00
Scott Lahteine
d29cb09b3e
Fix a minor compile warning
2018-11-22 05:35:38 -06:00
Scott Lahteine
c5642a894f
Fix ADC_KEYPAD middle button ( #12493 )
2018-11-20 21:39:30 -06:00
Ludy
1f93d2bcf7
Fix LCD compile error, etc. ( #12472 )
2018-11-18 20:39:49 -06:00
Ludy
93e958f695
Fix compile error with ZONESTAR_LCD+NO_LCD_MENUS ( #12466 )
2018-11-17 21:21:30 -06:00
Scott Lahteine
7ee5894360
Allow float XY probe offsets
...
Responding to #12383
XY probe offsets should be integers because adding decimal points makes the code larger. But if decimals are very much wanted, this commit removes the old restriction.
2018-11-17 07:44:47 -06:00
Scott Lahteine
d97e31db4c
Optimize Power-Loss Recovery ( #12440 )
2018-11-16 20:47:07 -06:00
Mateusz Krawczuk
ca21ac6b9b
Support two MAX6675 thermocouples ( #8686 )
2018-11-16 18:20:33 -06:00
Scott Lahteine
d82c350de7
Miscellaneous LCD code renaming, reordering ( #12430 )
...
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
2018-11-14 13:13:51 -06:00
Scott Lahteine
ebf585b673
Fix an old sanity check
2018-11-14 01:15:35 -06:00
Scott Lahteine
0ee1a92971
Group status methods, share reset_status with Extensible UI ( #12414 )
...
* Group status methods, share reset_status with Extensible UI
* Move common DOGM code to headers
2018-11-13 01:47:45 -06:00
Scott Lahteine
a3923424c7
Clean up LCD width/height determination
2018-11-12 02:37:40 -06:00
Scott Lahteine
a0c795b097
Encapsulate common display code in a singleton ( #12395 )
...
* Encapsulate common LCD code in a singleton
* Depend more UBL code on UBL_DEVEL_DEBUGGING
- Since most users don't need the debugging on at all times, this helps reduce the default build size for UBL by over 2K, a little closer to fitting on 128K boards.
2018-11-11 12:16:24 -06:00
revilor
b60abc7c37
[2.0.x] Macro G-codes ( #9365 )
2018-11-09 05:25:08 -06:00
Scott Lahteine
4ed6397e5d
More comprehensive NO_LCD_MENUS ( #12367 )
2018-11-09 00:07:16 -06:00
Scott Lahteine
b169320a03
Clean trailing whitespace
2018-11-07 02:40:18 -06:00
InsanityAutomation
6471a75a22
Combine more tool-change variables ( #12137 )
2018-11-06 22:22:20 -06:00
Scott Lahteine
e574f01568
More advanced pause tweaks ( #12356 )
...
* Followup to LCD_TIMEOUT_TO_STATUS=0
* Make continuous purge screen fit 20x4
* Unify purge message modes
* Preserve last-set pause header mode
2018-11-06 19:25:57 -06:00
Scott Lahteine
427bc64ba1
G28 O respects HOME_AFTER_DEACTIVATE
...
Addressing #11271
2018-11-05 04:17:37 -06:00
Scott Lahteine
498dfa291e
Update and fix CHDK
2018-11-05 04:17:37 -06:00
Scott Lahteine
d5ab4cd22a
Provide a default for Z_PROBE_LOW_POINT
2018-11-05 04:17:37 -06:00
KangDroid
82ff7c6542
Add a mesh edit menu for MBL / ABL-Bilinear
2018-11-04 19:07:47 -06:00
Scott Lahteine
44fa7fb18c
Cleanups for leveling-related code
2018-11-04 19:07:47 -06:00
Scott Lahteine
cd066bfeba
Extend error messages for E factors sanity-checks
2018-11-04 18:42:56 -06:00
Ludy
c10edb0998
Update, correct sanity-checks for up to 6 extruders ( #12333 )
2018-11-04 18:36:45 -06:00
Scott Lahteine
f5eab912ed
Apply #pragma once, misc cleanup ( #12322 )
...
* Apply #pragma once in headers
* Adjust some thermistors formatting
* Misc cleanup and formatting
2018-11-04 02:25:55 -06:00
Scott Lahteine
d1ff22b983
Revive SCARA's home offset (unimplemented)
2018-11-03 06:24:41 -05:00
Scott Lahteine
2c9586be0c
Clear up HAS_WORKSPACE_OFFSET meaning
2018-11-03 04:06:37 -05:00
Ludy
5ba6607181
Fix keypad-related compile error ( #12306 )
2018-11-02 22:29:32 -05:00
Scott Lahteine
3eb9838dca
Simplify TMC sanity-checks
2018-11-02 01:15:49 -05:00
Scott Lahteine
31c28d0dd2
Drop pgm_read_*_near and let headers choose ( #12301 )
...
- Drop `pgm_read_*_near` and let headers choose.
- Define `USE_EXECUTE_COMMANDS_IMMEDIATE` as a conditional.
- Add `process_subcommands_now` for SRAM-based commands.
2018-11-02 00:42:16 -05:00
Ludy
9f77df2590
Followup to menu refactor. TMC warnings, sanity. ( #12288 )
...
- Followup fixes for menu refactor
- Fix TMC sanity checks, unused var warnings
2018-11-01 16:13:33 -05:00
Scott Lahteine
3583e2b449
Followup to Menu Refactor ( #12275 )
2018-10-30 16:34:45 -05:00
TheLongAndOnly
5536228359
G34 Auto-align multi-stepper Z axis ( #11302 )
2018-10-29 14:01:36 -05:00
Scott Lahteine
182b1405d9
LCD conditionals in configurations
2018-10-28 15:46:45 -05:00
Scott Lahteine
2bf18950ab
Refactor LCD menus
2018-10-28 15:46:45 -05:00
Scott Lahteine
ab8425f1b5
Clean up PROBE_TRIGGERED_WHEN_STOWED_TEST ( #12232 )
2018-10-26 19:18:20 -05:00
Chris Rigter
3028a620af
Add RACK_AND_PINION_PROBE ( #12218 )
2018-10-26 18:24:24 -05:00
Scott Lahteine
e8031b1152
Add Custom Microstepping options
2018-10-25 11:26:32 -05:00
TheSFReader
a07ac6312f
G0 feedrate may be fixed or variable ( #12172 )
2018-10-25 10:35:16 -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
b641571098
Replace types.h with millis_t.h
2018-10-20 23:07:12 -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
Hannes Brandstätter-Müller
c36773bffb
Update the Ender-4 example config ( #12131 )
...
- Enable filament change menu
- Enable bed-PID
- Enable s-curve acceleration
- Enable some menu items
- Update from Skorpi's new version
- Fix extruder steps, deactivate nozzle clean feature
2018-10-17 15:49:52 -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
8bf596bd4c
RETRACT_ZLIFT => RETRACT_ZRAISE
2018-10-16 16:46:40 -05:00
Scott Lahteine
0139762a96
Fix a sanity check
2018-10-16 05:46:33 -05:00
AnHardt
f56968ba0b
New Continuous Filament Mixer ( #12098 )
2018-10-16 03:38:57 -05:00
Scott Lahteine
951b25163e
Extend M217 with configurable park/raise ( #12076 )
2018-10-13 23:08:20 -05:00
Scott Lahteine
1407afad73
Move SENSITIVE_PINS to its own file
2018-10-11 01:10:11 -05:00
Scott Lahteine
45e738876a
Add stepper MS3 support
...
Co-Authored-By: TheLongAndOnly <thelongandonly@users.noreply.github.com>
2018-10-11 01:10:11 -05:00
Giuliano Zaro
d43d4e4219
Refactor PRINTER_EVENT_LEDS, apply to M303 ( #12038 )
...
Co-Authored-By: Giuliano Zaro <gmagician@users.noreply.github.com>
2018-10-10 21:25:43 -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
906a24fa81
Extensible user interface API ( #11193 )
2018-10-08 15:44:05 -05:00
InsanityAutomation
ee253991d4
Various fixups for single-nozzle filament swap ( #12036 )
2018-10-08 15:39:55 -05:00
Scott Lahteine
7db0113b53
Improve E_AXIS_N macro
2018-10-07 18:22:05 -05:00
InsanityAutomation
74cd6cb4fc
Single nozzle filament change ( #11994 )
2018-10-07 17:06:14 -05:00
teemuatlut
c447d75916
Add support for TMC2660 ( #11998 )
2018-10-06 17:18:10 -05:00
Marcio Teixeira
2067619a26
Add USB_FLASH_DRIVE_SUPPORT
2018-10-04 19:54:12 -05:00
teemuatlut
c3229e1b34
Migrate to a new TMC library ( #11943 )
2018-10-03 02:48:49 -05:00
Scott Lahteine
ee53f7d813
Revert header reorg.
2018-10-02 22:09:41 -05:00
Scott Lahteine
0dedb3e139
Reorganize some core headers ( #11983 )
2018-10-02 04:25:46 -05:00
Scott Lahteine
f4c625d3a1
Ensure MIN/MAX overrides
2018-10-01 05:32:55 -05:00
AnoNymous
b30ca652ae
Replace MIN# / MAX# with variadic MIN / MAX ( #11960 )
2018-09-30 04:59:14 -05:00
Scott Lahteine
e2ab78d876
Fix SERIAL_PORT_2 sanity check
2018-09-30 00:24:10 -05:00
Thomas Moore
3286325044
Add TMC2130 sensorless probing
2018-09-29 18:54:14 -05:00
Scott Lahteine
bdc9889d3a
Fix a sanity check
2018-09-29 00:24:25 -05:00
Scott Lahteine
5490a664f5
Expose: Homing Validation and Endstop Noise Threshold ( #11912 )
2018-09-24 21:59:12 -04:00
Scott Lahteine
cee34f7290
Followup for BABYSTEP_HOTEND_Z_OFFSET ( #11916 )
2018-09-24 21:46:56 -04:00
Scott Lahteine
10590c2f80
Fix some fan conditionals
2018-09-18 21:23:33 -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
Holger Müller
1a6f2b29b8
Add support for Triple-Z steppers/endstops
2018-09-16 00:35:58 -05:00
Scott Lahteine
8584d3697d
Fix servo count define conflict
...
`MAX_SERVOS` => `NUM_SERVO_PLUGS`
2018-09-11 16:20:31 -05:00
Scott Lahteine
eafd62308e
Use TMC2208Stepper v0.2.5 ( #11714 )
2018-09-08 20:41:21 -05:00
Kevin
e25d2ae4a2
[2.0.x] SWITCHING_TOOLHEAD ( #11623 )
2018-09-08 01:43:24 -05:00
Scott Lahteine
b213a89ef5
Sanity-check NOZZLE_PARK_POINT
2018-09-05 06:18:08 -05:00
Scott Lahteine
8e18e48d49
Merge pull request #11610 from Freeviv/bugfix-2.0.x
...
[2.0.x] Editable servo angles
2018-09-03 03:55:38 -05:00
teemuatlut
49e107cea9
Restrict SW serial to AVR ( #11696 )
2018-09-01 15:24:44 -05:00
Scott Lahteine
18f1af2dca
Fix up Teensy tests, servo sanity
2018-09-01 01:10:20 -05:00
Scott Lahteine
d55f44edba
Printcounter improvements ( #11689 )
2018-08-31 17:40:39 -05:00
Scott Lahteine
136860e8bb
Sanity-check SERVO pin for servo probes
2018-08-31 15:47:47 -05:00
Scott Lahteine
3e81745e81
Fix issues, make optional
2018-08-29 17:58:02 -05:00
Scott Lahteine
d1c9517903
Followup to hotend_offset[Z] patch
2018-08-24 21:32:00 -05:00
Scott Lahteine
acf5ae3083
!ENABLED => DISABLED
2018-08-24 16:36:37 -05:00
Chris Pepper
5573ef62c6
[2.0.x] PersistentStore update followup ( #11549 )
2018-08-14 17:54:12 -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
b328fb4dc9
Treat TMC2660 like non-TMC ( #11508 )
2018-08-10 00:30:28 -05:00
Greg Nutt
a1a5367380
Smoothieboard V1.0/1.1 and A5984 support
2018-08-09 23:03:17 -05:00
Scott Lahteine
131d216afa
Fix drivers.h dependency, defer macro evaluation ( #11450 )
2018-08-03 21:49:04 -05:00
Scott Lahteine
9c62c47579
[2.0.x] Fix Dual X Carriage tool change crash ( #11447 )
2018-08-03 20:47:29 -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
Bo Herrmannsen
67b205fd45
Add support for board RuRAMPS4D v1.3 ( #11363 )
2018-07-25 19:32:27 -05:00
teemuatlut
fbcdf5eaeb
Simplify stepper driver per-axis selection
2018-07-25 02:47:43 -05:00
Scott Lahteine
bf7d0ba859
Assert that XY probe offsets are integers
2018-07-12 22:48:07 -05:00
Scott Lahteine
25e2ca8896
Add Z_CLEARANCE_MULTI_PROBE
...
Co-Authored-By: nightgryphon <ngryph@gmail.com>
2018-07-12 22:46:34 -05:00
Scott Lahteine
68e6650df7
Remove Quake Fast Inverse SQRT (it isn't faster)
2018-07-04 22:22:10 -05:00
Scott Lahteine
480a3d3d0c
Apply sensorless homing requirements only for specified axes
2018-07-03 19:16:09 -05:00
Scott Lahteine
1ea222e6fc
Turn off DISABLE_INACTIVE_EXTRUDER with SWITCHING_NOZZLE
...
Fix #11183
2018-07-02 17:26:53 -05:00
Scott Lahteine
8eaac0dab3
Add delta feedrate scaling ( #11153 )
2018-06-30 13:44:27 -05:00
Colin Gilgenbach
0fff79c24b
Fixes G29_with_retry behavior ( #11045 )
...
* Fix G29 (ABL) retry behavior
2018-06-29 20:48:11 -05:00
Scott Lahteine
1b8973eb1c
Fix up microsteps conditionals
2018-06-27 23:41:32 -05:00
Scott Lahteine
053438a3aa
Poll all endstops, even when stationary ( #11123 )
2018-06-27 04:18:57 -04:00
Scott Lahteine
7a84b03796
Use MIN/MAX in post-conditionals
2018-06-20 03:15:19 -05:00
Scott Lahteine
d4795e5b8e
[2.0.x] Tweaks and additions for MAX7219 ( #11034 )
2018-06-18 22:04:03 -05:00
Scott Lahteine
0d79128c8d
Localize stepper-specific defines
2018-06-12 21:16:54 -05:00
etagle
6f14bcaa3e
Add MAXIMUM_STEPPER_RATE, enforce in multi-stepping
...
The timing value should be properly set for ALL boards. The compiler will check and set maximum step rate calculations based on those values.
2018-06-10 16:02:47 -05:00
etagle
39a7e7720d
Adaptive multiaxis step smoothing
...
- Stepper bugs fixed
- Support MIXING_EXTRUDER with Linear Advance
- Miscellaneous cleanup
2018-06-10 16:02:47 -05:00
Scott Lahteine
bbf80440bf
Add sanity-check for MOTHERBOARD
2018-06-10 04:03:33 -05:00
Scott Lahteine
2deff0d9b9
Fix/Improve junction deviation
...
- Respect axis max acceleration limits instead of forcing a fixed acceleration value.
- The `junction_unit_vec` ensures proper handling of entry and exit speeds even when the axes involved have different limits.
2018-05-31 20:09:53 -05:00
Scott Lahteine
9713538427
HOTENDS for Switching Nozzle with Switching Extruder
2018-05-29 11:05:52 -05:00
Scott Lahteine
0ca9db7051
Correct HOTENDS for SWITCHING_EXTRUDER
2018-05-27 23:22:48 -05:00
Scott Lahteine
1b200f3312
Sanity check SWITCHING_EXTRUDER with SINGLENOZZLE
2018-05-26 23:26:23 -05:00
Scott Lahteine
931ab4ec40
Rename Junction Deviation options
2018-05-26 18:33:51 -05:00
Scott Lahteine
aaaf09bda2
BEZIER_JERK_CONTROL => S_CURVE_ACCELERATION
2018-05-26 18:33:51 -05:00
Scott Lahteine
cf7d5a642a
Fix manual moves for switching tools ( #10868 )
2018-05-26 18:30:53 -05:00
Scott Lahteine
4118199ddd
Tweaks to core headers
2018-05-21 20:32:18 -05:00
Bob Kuhn
d557c84a71
[2.0.x] Error for FAST_PWM_FAN with 32 bit CPU ( #10798 )
2018-05-20 11:37:55 -05:00
Scott Lahteine
83d42f33e1
Add HAS_HOTEND_OFFSET_Z conditional
2018-05-19 17:05:15 -05:00
GMagician
3c76bda2d8
Fix switching extruder
...
`DONT_SWITCH` got lost along the way. Replace it with `DO_SWITCH_EXTRUDER` and adjust the code.
2018-05-19 17:05:15 -05:00
Jiri Jaburek
43ddb29f9e
Add FAN_MAX_PWM for M106-controlled fans
2018-05-15 21:18:46 -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
99ecdf59af
Smarter MIN, MAX, ABS macros
...
Use macros that explicitly avoid double-evaluation and can be used for any datatype, replacing `min`, `max`, `abs`, `fabs`, `labs`, and `FABS`.
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-13 04:52:56 -05:00
Scott Lahteine
a1062eec5b
Better handling of DELAY_NS and DELAY_US ( #10716 )
...
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
2018-05-12 08:34:04 -05:00
Scott Lahteine
325bbbc8c2
[2.0.x] Enable AD595 and AD8495 in concert ( #10693 )
...
* Allow both AD595 and AD8495 in concert
* General temperature code tweaks
2018-05-11 01:01:51 -05:00
Scott Lahteine
19f189b4e5
Add UBL support for G2/G3 and G5 ( #10648 )
2018-05-08 11:10:45 -05:00
Giuliano
4e16e699c1
Fix sanity checks for dual axes ( #10633 )
2018-05-07 03:34:26 -05:00
Scott Lahteine
e978e6e782
[2.0.x] Arrange LCD options by type ( #10630 )
2018-05-06 19:16:55 -05:00
Scott Lahteine
8c5bc77fb9
Fix the sanity-check for config versions
2018-05-06 09:37:00 -05:00
Scott Lahteine
81b632c255
Additional temp-oriented improvements
2018-05-02 08:43:22 -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
05c33833e7
[2.0.x] Add NO_LCD_MENUS option ( #10582 )
2018-04-30 21:16:31 -05:00
Scott Lahteine
616651ff23
Add sanity check for LED_CONTROL_MENU
...
Addressing #10569
2018-04-29 18:34:57 -05:00
Scott Lahteine
f790b4bc0a
Reorganize some conditionals
2018-04-27 02:23:11 -05:00
Scott Lahteine
df6bc812b5
Fix disable of Z_HOMING_SENSITIVITY for HOMING_Z_WITH_PROBE
...
As pointed out in #10532
2018-04-27 02:23:10 -05:00
Scott Lahteine
299c4fed42
Undefine PIDTEMPBED without a bed heater
2018-04-26 01:30:10 -05:00
Scott Lahteine
cb46cb8480
Add HAS_HEATED_BED conditional ( #10495 )
2018-04-23 17:13:01 -05:00
Scott Lahteine
9e07df5c1b
Extra options for LEVEL_BED_CORNERS ( #10483 )
2018-04-22 02:50:48 -05:00
Scott Lahteine
11ab017dd0
Creality3D Power-Loss Recovery
2018-04-21 21:56:50 -05:00
Scott Lahteine
a0dac95d25
Merge pull request #10460 from thinkyhead/bf2_trigorilla_14
...
[2.0.x] Split TRIGORILLA into 1.3 and 1.4
2018-04-20 18:25:40 -05:00
Scott Lahteine
f0cbf3d432
Correction to sanity check
2018-04-20 18:16:27 -05:00
Scott Lahteine
80e29492c6
TRIGORILLA => TRIGORILLA_13
2018-04-20 16:12:25 -05:00
Marcio Teixeira
5cc7916e69
Add G29_RETRY_AND_RECOVER feature
...
- Add an option to retry G29, optionally executing a G-code procedure after each failed probe.
2018-04-19 19:45:53 -05:00
Scott Lahteine
4f184ba5da
[2.0.x] Add BOARD_MKS_BASE_15 with digital micro-stepping ( #10454 )
...
* Add BOARD_MKS_BASE_15 with digital micro-stepping
* Rename MKS_13 to MKS_GEN_13
2018-04-18 22:58:43 -05:00
Scott Lahteine
39c6f65ce7
Ignore LCD_BED_LEVELING with UBL
2018-04-17 15:57:44 -05:00
Chris Pepper
c9aed73987
Fix missed includes from HAL macro patch ( #10416 )
2018-04-15 18:27:34 -05:00
Chris Pepper
cc6d41e1d3
Use a macro for HAL header redirection ( #10380 )
2018-04-12 20:25:08 -05:00
Luc Van Daele
12785583d0
[2.0.x] G33 MIN_STEPS_PER_SEGMENT ( #10386 )
2018-04-12 20:22:29 -05:00
Yunhui Fu
c96412a78f
[2.0.x] UTF-8 language translation support ( #10213 )
2018-04-12 20:14:01 -05:00
Eduardo José Tagle
57a899a412
[2.0.x] 6th-order jerk-controlled motion planning in real-time for AVR ( #10373 )
2018-04-11 18:13:42 -05:00
Sean
2d9b0a66fe
Add Filament Change accelerations
2018-04-09 23:57:27 -05:00
Scott Lahteine
8b8ad14178
Add Z_PROBE_LOW_POINT to prevent damage
2018-04-09 17:23:03 -05:00
Scott Lahteine
e02fc4f1d6
Better RESTORE_LEVELING_AFTER_G28 sanity-check
...
As suggested by @GMagician
2018-04-08 03:24:15 -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
Marcio Teixeira
75037493fa
Default active low for TMC2130 DIAG1 ( #10294 )
...
- Added sanity check to inform users to set the endstop to inverting
when using SENSORLESS_HOMING
2018-04-06 19:48:46 -05:00
Karl Andersson
7cbbc2af7a
[2.0.x] Optional heater signal inversion ( #10260 )
2018-04-02 19:37:41 -05:00
Scott Lahteine
adcb87f0db
Z Endstop Servo => Z Probe Servo
2018-04-01 23:54:21 -05:00
Scott Lahteine
49f384a2ab
Note about MKS_MINI_12864 in sanitycheck
2018-03-31 22:52:23 -05:00
Scott Lahteine
f6d13e2295
Allow Z_SAFE_HOMING sanity checks to handle floats
2018-03-31 19:01:56 -05:00
Scott Lahteine
1be955e52a
Alert users about low Z jerk values
2018-03-28 23:08:33 -05:00
Scott Lahteine
a891af2f7a
Enforce minimum TMC2130 / TMC2208 libs
2018-03-24 15:57:22 -04:00
Bob-the-Kuhn
433e984d1f
move comment to fix compile error
2018-03-24 13:44:54 -05:00
Bob-the-Kuhn
b756a15aba
another needs to be deleted
2018-03-24 10:22:03 -05:00
Bob-the-Kuhn
50c81ebe0d
remove check that always fails
2018-03-24 09:36:50 -05:00
Scott Lahteine
3ac135cef3
Enforce minimum TMC2130 / TMC2208 libs
2018-03-23 18:05:23 -04:00
Eduardo José Tagle
97e8a6ebd9
Various fixes for DUE... ( #10152 )
...
- Watchdog reset during SD Card initialization.
- Move `DebugMonitor` to `DebugMonitor_Due.cpp`.
- Since the watchdog is enabled on boot do extra resets during init.
- Have `thermalManager` do watchdog reset before its ISR starts to prevent reset.
- Ensure that timers are stopped before reprogramming them to address tone issues.
- Improve SAM3XE reset when reflashed through the native port.
2018-03-21 19:04:45 -05:00
Scott Lahteine
987597532c
For MK2_MULTIPLEXER undef DISABLE_INACTIVE_EXTRUDER
...
Fix #10098
2018-03-21 04:34:50 -05:00
Scott Lahteine
dd2949922b
Consolidate 3-point leveling point options
2018-03-19 04:12:20 -05:00
Scott Lahteine
1d22609473
MIN_PROBE_EDGE replaces DELTA_PROBEABLE_RADIUS
2018-03-19 04:11:46 -05:00
Scott Lahteine
d603e655d3
Fix SWITCHING_EXTRUDER manual movement
2018-03-16 03:22:56 -05:00
Scott Lahteine
5f77816772
Reduce size of "only one" sanity checks
2018-03-16 02:43:02 -05:00
Scott Lahteine
e7570f3195
Improve TMC config organization, naming
2018-03-14 00:18:41 -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
Bob-the-Kuhn
0d8c15c01f
restore PR 9661 files & V1 fix
2018-03-10 22:46:32 -06:00
Bob-the-Kuhn
bf59a4a6df
Revert "[2.0.x] DUE compatibility with shared SPI LCDs, USB mass storage, add pin defs & update examples\MakerParts\Configuration.h"
2018-03-10 17:22:20 -06:00
Bob-the-Kuhn
914bb80bde
removed SDSS init
...
added device & comm drivers for shared SPI LCDs
mistyped some updates in ultralcd_impl_DOGM.h
remove unwanted changes in onfiguration.h
still can't type
Update HAL_LCD_class_defines.h
include USB mass storage & misc
2018-03-09 23:06:11 -06:00
Scott Lahteine
eb212ae073
Add suspend_auto_report flag to suppress auto-report
2018-03-07 01:57:09 -06:00
Scott Lahteine
ffbf63e6af
Add HAS_TEMP_SENSOR conditional
2018-03-07 01:53:50 -06:00
Scott Lahteine
6d7f4f84e2
Add board MKS_BASE_HEROIC ( #9926 )
...
Followup to #9008
- Don't define micro-stepping pins for boards that lack them.
- Allow setting of 128 microsteps with `M350`.
2018-03-03 23:14:52 -06:00
Scott Lahteine
c37b3f995a
Sanity-check some graphical LCD-only options
2018-03-03 20:31:59 -06:00
Bob-the-Kuhn
c1f4112bdc
[2.0.x] Add 1284 support & misc. bug fixes ( #9864 )
2018-03-01 03:07:39 -06:00
Scott Lahteine
118899357d
Add sanity checks to Linear Advance 1.5 ( #9873 )
2018-03-01 02:10:43 -06:00
Scott Lahteine
a446433c87
Fix SENSORLESS_HOMING for Core Kinematics ( #9868 )
2018-03-01 01:37:31 -06:00
Scott Lahteine
8c03ce4d80
Fix Z safe homing sanity check for no probe
...
Fix #9851
2018-02-28 05:28:35 -06:00
Scott Lahteine
3f89bbeab5
Drop a conditional only used once
2018-02-24 16:35:31 -06:00
Scott Lahteine
b2cf253a13
Add RESTORE_LEVELING_AFTER_G28 option
2018-02-23 13:38:54 -06:00
Scott Lahteine
2bd252b501
[2.0.x] LIN_ADVANCE v1.5 ( #9712 )
2018-02-23 00:53:29 -06:00
Scott Lahteine
7d8c6b3f3c
Add 20x4 option for Sainsmart LCD ( #9740 )
2018-02-21 00:46:25 -06:00
Scott Lahteine
c4ec01d59b
Conditionals for SWITCHING_EXTRUDER
...
In reference to #5367 . SWITCHING_EXTRUDER was not fully implemented for EXTRUDERS > 2.
2018-02-19 10:59:47 -06: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
Kevin
9019ea0fce
Option to force X or Y to home first when homing the other axis
2018-02-18 01:11:41 -06:00
Scott Lahteine
f6cc89ec7c
LCD_PROGRESS_BAR w/out SDSUPPORT for character LCD
2018-02-17 08:17:22 -06:00
Roxy-3D
3d74ff3c87
Cartesian UBL systems should not use SEGMENT_LEVELED_MOVES
...
There is significant downside to breaking up the long line segments on UBL Cartesian machines. It adds a lot of extra computation but worse... It cuts out all of UBL's off mesh Z-Height correction checks. There have been a large number of people complaining about the nozzle going to infinity or crashing into the bed lately. They are being caused by
```
void unified_bed_leveling::line_to_destination_cartesian()
```
not watching over the segments being queued up for movement.
2018-02-14 14:16:12 -06:00
Scott Lahteine
5dc04c5201
Fix #9361
2018-02-14 07:48:20 -06:00
Scott Lahteine
8e0c107545
Have Kossel Pro use Z_MIN_PROBE_ENDSTOP ( #9586 )
2018-02-11 01:41:40 -06:00
Scott Lahteine
f64d300cfd
Sanity check SERIAL_PORT
...
Addressing #7400
2018-02-09 00:44:15 -06:00
Thomas Moore
1541224a81
Enable Z axis and delta sensorless homing ( #9516 )
2018-02-08 04:20:44 -06:00
Scott Lahteine
b2f8b4ada5
I2C position encoders update ( #9533 )
...
Updating I2C position encoders to enable babystepping and Babystep XY when using the ecm microstep correction method. Also changed default method to ECM microstep.
2018-02-08 03:57:11 -06:00
Scott Lahteine
704d33c374
Special override of LCD_WIDTH
2018-02-08 01:30:56 -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
GMagician
f27c89980a
[2.0.x] Simplify bltouch configuration ( #9488 )
2018-02-05 14:38:09 -06:00
Scott Lahteine
3a1225e438
Sanity check SENSORLESS_HOMING
2018-02-04 18:52:44 -06:00
Scott Lahteine
db031d5d76
Add missing SoftwareSerial begin for TMC2208
...
Based on #9299
2018-01-22 10:43:24 -06:00
Thomas Moore
3db35ba9be
[2.0.x] Fix change filament for delta machines ( #9295 )
2018-01-22 10:21:42 -06:00
Scott Lahteine
2ebf52e57d
Fix Skew Correction pre-calculation overflow error
2018-01-22 08:20:21 -06:00
Scott Lahteine
582d073de1
Patch up digital microstepping and SPI CS pins
2018-01-22 01:27:11 -06:00
Scott Lahteine
8190fdb260
[2.0.x] Option to use Neopixel as case light ( #9270 )
...
* Add option to use Neopixel as case light
* Apply CASE_LIGHT_USE_NEOPIXEL to example configs
2018-01-20 16:58:41 -06:00
Scott Lahteine
4bc4351250
Date refresh
2018-01-20 09:17:57 -06:00
Scott Lahteine
f2ea8a0529
Merge pull request #9197 from p3p/pr_bf2_operation_freemem
...
[2.0.x] LPC1768: Free up some RAM
2018-01-19 22:35:45 -06:00
Roxy-3D
9d0cf02fef
Correct mesh size calculations
2018-01-17 09:36:12 -06:00
Roxy-3D
acb1e31374
Fix UBL Mesh Size regression
2018-01-16 17:58:15 -06:00
Christopher Pepper
6f1bf5d212
LPC1768: Config: default to SDSORT_LIMIT = 64 instead of 256
2018-01-15 22:02:21 +00:00
Scott Lahteine
6a043eee55
Various updates for TMC support
2018-01-10 23:04:48 -06:00
Thomas Moore
f7efac57b7
Multi-host support
2018-01-10 00:14:47 -06:00
Scott Lahteine
a94104dbb5
Merge pull request #9113 from teemuatlut/TMC_followup
...
[2.0.x]TMC followup
2018-01-09 18:46:35 -06:00
Dave Johnson
554e577676
SERIAL_STATS_* features not supported on USBCON targets ( #9127 )
2018-01-09 18:42:55 -06:00
teemuatlut
9d923c6c03
Fix TMC gcode commands
2018-01-08 18:45:05 +02:00
Scott Lahteine
1c41de16d4
Trailing whitespace clean
2018-01-05 10:11:31 -06:00
Scott Lahteine
7541316bb4
Add M701/M702 Filament Load/Unload, M603
2018-01-04 15:07:37 -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
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
Scott Lahteine
5bc2acc072
Restore position_float to fix LIN_ADVANCE
2017-12-21 16:45:46 -06:00
Scott Lahteine
fdc5e72720
A single setting to validate filament width
2017-12-19 21:33:25 -06:00
Scott Lahteine
933f76fda3
Option to disable all volumetric extrusion
2017-12-19 19:51:25 -06:00
Scott Lahteine
fc9ee1a4de
Fix up serial sanity check
2017-12-19 19:11:43 -06:00
Scott Lahteine
957bbab57f
Update inc files for parity with 1.1.x
2017-12-16 20:20:06 -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
teemuatlut
0cd1e91056
[2.0.x] TMC driver update ( #8769 )
2017-12-15 15:03:14 -06:00
Scott Lahteine
a71d2f3f40
UBL_DELTA => UBL_SEGMENTED
2017-12-11 00:27:06 -06:00
Scott Lahteine
ae663a4198
PROBE_DOUBLE_TOUCH => MULTIPLE_PROBING
2017-12-07 16:44:13 -06:00
Scott Lahteine
f206b81cf7
Sanity check skew+UBL
2017-12-06 22:56:58 -06:00
Scott Lahteine
2fde60da12
Changes for parity with 1.1.x
2017-12-06 21:50:54 -06:00
Richard Wackerbarth
c1184552ac
Change K1 to required option PID_K1
2017-12-05 19:59:59 -06:00
Unknown
91b63f6d69
SERIAL_XON_XOFF not supported on USB-native AVR devices
...
User could enable SERIAL_XON_XOFF on USB-native devices and it would not be enabled without warning, but M115 would report the capability as available.
2017-12-04 03:57:01 -08:00
Scott Lahteine
f9327534f8
Merge pull request #8634 from fiveangle/bf2_report_xonxoff
...
[2.0.x] Report SERIAL_XON_XOFF in M115
2017-12-03 02:18:50 -06:00
Scott Lahteine
24437de591
Use custom segment length for UBL Cartesian
2017-12-03 00:10:54 -06:00
Unknown
4c5ffd2349
[2.0.x] Report SERIAL_XON_XOFF in M115
...
-Report SERIAL_XON_XOFF in Extended Capabilites M115 report for hosts
-Remove outdated 256 size limitation from comments on RX_BUFFER_SIZE defines
-Update error message conditions
2017-12-02 21:08:06 -08:00
Scott Lahteine
0154e3480c
New feature: BED_SKEW_CORRECTION
2017-12-01 19:39:49 -06:00
Scott Lahteine
8f90642eea
LED_CONTROL_MENU config changes
2017-11-29 21:02:56 -06:00
Scott Lahteine
ef2531558c
Add an option to segment leveled moves
2017-11-29 16:57:30 -06:00
Scott Lahteine
94cb412e45
Allow override of probe bounds
2017-11-26 20:55:27 -06:00
Scott Lahteine
7be4857ab9
Tweak BLOCK_BUFFER_SIZE description
2017-11-26 17:36:40 -06:00
Scott Lahteine
d06e29846d
Loosen HAS_BED_PROBE definition
2017-11-25 20:11:21 -06:00
Scott Lahteine
7576ad7fc2
Merge pull request #8554 from tcm0116/2.0.x-cleanup
...
[2.0.x] Fix for #8525 and other cleanup
2017-11-25 18:19:54 -06:00
Thomas Moore
2ea779e560
Allow bed probe sanity checks to run
2017-11-24 21:59:01 -06:00
Scott Lahteine
d24b1190bd
Don't use Z_MIN_PROBE_ENDSTOP on DELTA
2017-11-24 18:24:22 -06:00
oliver
92a0dc552a
MK2_MULTIPLEXER does not require E2/E3 stepper pins
2017-11-24 23:56:39 +01:00
Scott Lahteine
5926c9c97b
Followup for MESH_EDIT_GFX_OVERLAY
2017-11-24 15:53:25 -06:00
Scott Lahteine
c6b0c104bb
Adapt G26 to work for all meshes
2017-11-23 22:31:37 -06:00
Scott Lahteine
5ce7f23afa
Config option G26_MESH_VALIDATION for all meshes
2017-11-23 21:43:23 -06:00
Scott Lahteine
3066655727
Try port*100+pin, fix config dependency
2017-11-20 13:58:23 -06:00
Scott Lahteine
b9327a4d16
Misc. general cleanup
2017-11-19 15:43:39 -06:00
Scott Lahteine
1d4571b88d
Dependency adjustments
2017-11-19 15:43:38 -06:00
Roxy-3D
9729528d13
Update UBL's Delta Probable locations
...
This is a non-intuitive change. @oldmcg says in this post https://github.com/MarlinFirmware/Marlin/issues/7572#issuecomment-340641207 that using DELTA_PRINTABLE_RADIUS is better than DELTA_PROBABLE_RADIUS for setting the probe limits. This is because the automatic probe code checks all locations for being reachable by the probe prior to doing the probe.
2017-11-17 16:44:57 -06:00
Dave Johnson
c009a990e4
[2.0.x] Fix some 8-bit Teensyduino compile warnings ( #8385 )
...
* Fix some 8-bit Teensyduino compile warnings
-Override Teensyduino legacy NOT_A_PIN 127 define
-some fixups for Printrboard_RevF pins
* Proper cleanup of Printrboard Rev.F pins
* Apply LCD fixes to Printrboard v1
2017-11-13 01:07:59 -06:00
Scott Lahteine
c66696c507
Merge pull request #8344 from tcm0116/2.0.x-delta_height
...
[2.0.x] Add delta_height variable in lieu of using home_offset
2017-11-09 01:21:53 -06:00
Scott Lahteine
0cfb936dd1
Clarify some motion code
2017-11-08 22:15:55 -06:00
Thomas Moore
f34c3597dc
Add delta_height variable in lieu of using home_offset
2017-11-08 22:10:08 -06:00
Scott Lahteine
82f45c3e6a
Patch G33 misuse of PROBE_MANUALLY
2017-11-08 00:36:06 -06:00
Scott Lahteine
1b40e9c464
Implement CNC_COORDINATE_SYSTEMS
2017-11-04 22:28:46 -05:00
Scott Lahteine
ca7d36d9ed
RAMPS pins for ANET_KEYPAD_LCD
2017-11-04 21:22:53 -05:00
Colten Edwards
e0a6ee8da5
[2.0] Fix up G33, LPC1768 + SDCARD_SORT_ALPHA ( #8250 )
...
* Update Conditionals_post.h
* Add a cast to round() to convert to a unsigned int
Add's a cast to round() so that it will compile properly. round() returns a float which must be cast to a integer for the following % operation. Use a unsigned int as a negative index to an array is wrong. Should never be more than 255 points allowing us to use a 8 bit cast.
* Update G33.cpp
2017-11-04 18:04:18 -05:00
Scott Lahteine
93ba72ea83
Add SERIAL_PORT -1, set on SBASE, STM32F103RET6
2017-11-03 15:22:45 -05:00
android444
9cc1d8e312
[2.0.x] Support for SilverGate Board
2017-10-31 15:27:26 -05:00
Scott Lahteine
571ced712d
Add SDCARD_SORT_ALPHA options for LPC1768
2017-10-31 14:05:40 -05:00
Scott Lahteine
9f89b5d876
Fix for MAX_VFAT_ENTRIES sanity check
2017-10-30 15:11:47 -05:00
Scott Lahteine
2cdde08339
Apply items specified in code review
...
Followup to #8122
2017-10-30 15:03:07 -05:00