bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity
18,526 Commits 1 Branch 4 Tags 151 MiB
4dae5890e9
Commit Graph

1679 Commits

Author SHA1 Message Date
Marcio Teixeira
6a865a6146 Multi-language support (#15453) 2019-10-09 19:46:10 -05:00
Marcio Teixeira
dc14d4a13c Improvements and fixes to Lulzbot UI (#15490) 2019-10-09 19:44:49 -05:00
Scott Lahteine
e6055dce76 Followup to position refactor 2019-10-08 22:08:05 -05:00
Scott Lahteine
af80653f3f Always report all PIDs in M503 
Fix #14474
 2019-10-08 21:07:19 -05:00
Scott Lahteine
914605c89c gcc is forgiving of stray ; 2019-10-08 20:36:39 -05:00
Scott Lahteine
c0005e939c
Enable junction deviation by default (#15481) 2019-10-08 19:42:18 -05:00
Scott Lahteine
1df6c7a46c Work around a compiler bug 
See #15478
 2019-10-08 19:27:03 -05:00
Scott Lahteine
cc822c1a05
Use lambdas in menus, where possible (#15452) 2019-10-07 19:44:33 -05:00
Scott Lahteine
211ff67440 Patch blocking and manual moves 2019-10-06 23:58:19 -05:00
Giuliano Zaro
43aba9f918 Fix compile errors & temp range 2019-10-05 18:27:03 -05:00
InsanityAutomation
438835f6a5 Configurable Max Accel, Max Feedrate, Max Jerk edit limits (#13929) 2019-10-01 19:59:48 -05:00
Scott Lahteine
806d64e1bf X_SENSORLESS includes AXIS_HAS_STALLGUARD 2019-09-30 22:56:22 -05:00
Scott Lahteine
e3fd0519b3 Reduce need for UNUSED 2019-09-30 22:56:22 -05:00
LinFor
98f614ddb1 Use MAX_BED_POWER instead of BANG_MAX to heat outside PID_FUNCTIONAL_RANGE (#15431) 2019-09-30 22:19:12 -05:00
Timm
b198f321c8 Add missing motion inline methods (#15433) 2019-09-30 19:57:22 -05:00
Scott Lahteine
a9c259c77a Patch PrintrboardG2 build (on spec) 2019-09-30 02:47:55 -05:00
Scott Lahteine
139b7196a0
Watchdog cleanup (#15283) 2019-09-29 17:57:29 -05:00
Scott Lahteine
74746c6573 Fix probe_offset EEPROM field test 2019-09-29 16:55:50 -05:00
Bob Kuhn
178dcd6fd8 SPI chaining with TMCStepper simplified interface (#15179) 2019-09-29 05:47:20 -05:00
Frederik Kemner
4564ad2920 Fix build if EXTRUDERS = 0 (#15417) 2019-09-29 04:32:24 -05:00
Scott Lahteine
50e4545255
Add custom types for position (#15204) 2019-09-29 04:25:39 -05:00
Scott Lahteine
81b9c7c6ee No motion constraint before homing 
Sensible approach to soft endstops before the machine is homed.

Ref: https://github.com/MarlinFirmware/Marlin/pull/15027#issuecomment-533301094
Co-Authored-By: comps <comps@nomail.dom>
 2019-09-28 21:35:49 -05:00
Ludy
41ea2d8c31 Fix auto-fan compile error (#15402) 2019-09-28 15:37:41 -05:00
InsanityAutomation
a6b0223eea Revive and improve DELTA probe bounds, LRFB options (#15372) 2019-09-28 01:19:11 -05:00
Scott Lahteine
d683f98019 Return buffer in duration.toString 2019-09-27 04:45:01 -05:00
Marcio Teixeira
a18d16fb8b Do not implicitly concatenate localized strings (#15383) 2019-09-27 04:38:43 -05:00
Scott Lahteine
455dabb183
Add a feedRate_t data type (#15349) 2019-09-26 01:28:09 -05:00
Scott Lahteine
ee7558a622 Tweaks to Z fade behavior 2019-09-26 01:15:47 -05:00
Scott Lahteine
d49d40f7b0 Home XYZ newline 2019-09-25 22:26:16 -05:00
Scott Lahteine
b2e1f77f58 Fix extraneous "Home XYZ First" message 2019-09-25 21:57:20 -05:00
Scott Lahteine
39578a5919 Fix probe without leveling 2019-09-25 19:57:52 -05:00
Robby Candra
c3f09e2b1b Set MAX_OVERSHOOT_PID_AUTOTUNE to 30 (#15257) 2019-09-25 09:43:00 -05:00
Scott Lahteine
661c3cfc99 Fix mesh bounds for MBL 2019-09-25 09:05:46 -05:00
Jason Smith
66d0221077 Fix build with more than 2 Trinamic E steppers (#15329) 2019-09-25 02:30:07 -05:00
Robby Candra
9c288a682d Followup to probe_at_point change (#15342) 2019-09-25 02:29:10 -05:00
Scott Lahteine
5288c399ce Patch probe offset name, defines 2019-09-24 23:39:23 -05:00
Scott Lahteine
4e8d9fe59b zprobe_offset => probe_offset 2019-09-24 23:36:09 -05:00
Scott Lahteine
3819f79945 Fix pid_output declaration 2019-09-24 22:32:13 -05:00
InsanityAutomation
df1e51258a Add M851 X Y probe offsets (#15202) 2019-09-24 21:29:21 -05:00
Scott Lahteine
bd2b44c4ed Require newest TMCStepper 2019-09-24 18:00:06 -05:00
Jason Smith
9aaa056286 Fix SCARA build from Arduino IDE (#15317) 2019-09-24 17:29:25 -05:00
Scott Lahteine
5e13fe989f Rename some feedrate-oriented functions 2019-09-23 22:36:41 -05:00
Jason Smith
514223f960 Fix BACKLASH_COMPENSATION compiler issues (#15307) 2019-09-20 00:48:41 -05:00
InsanityAutomation
6a312fae80 Add before/after dir change delays (#15314) 2019-09-19 23:05:17 -05:00
Jason Smith
252f31b6f1 Fix/improve backoff feedrates (#15300) 2019-09-18 17:04:13 -05:00
Scott Lahteine
c353eaa146
Misc changes from struct refactor (#15289) 2019-09-17 18:16:28 -05:00
Scott Lahteine
f01f0d1956 Drop C-style 'void' argument 2019-09-16 20:31:21 -05:00
Scott Lahteine
d63e0f6d98 Pending refactor tweaks 2019-09-16 15:10:14 -05:00
Scott Lahteine
465c6d9230
Simpler Allen Key config. Fixes, cleanups from refactor (#15256) 2019-09-14 03:05:10 -05:00
Scott Lahteine
c590e8ac05
Improve Power-loss Recovery (#15135) 2019-09-10 18:52:41 -05:00
Scott Lahteine
75927e17dd
Filament Width Sensor singleton (#15191) 2019-09-10 18:48:58 -05:00
Scott Lahteine
584c86bed1
More "zero extruders" changes (#15213) 2019-09-10 02:20:49 -05:00
Scott Lahteine
565a0e11ed Prevent 'current' name conflict, if needed 2019-09-09 03:17:11 -05:00
Luu Lac
8bca3fcf2c Display chamber with HAS_TEMP_CHAMBER (#15194) 2019-09-08 02:20:18 -05:00
Jamie
dbee0e9c54 Analog joystick jogging control (#14648) 2019-09-08 00:55:34 -05:00
Tanguy Pruvot
ec3f29a33a Fix linux_native long to int32 warnings (#15192) 2019-09-07 20:30:47 -05:00
ManuelMcLure
eed7c2fe2f Fix 'echo:' in TMC parameters M503 report (#15193) 2019-09-07 20:29:38 -05:00
AnHardt
b7b0021b5c Fix Thermistor 75 (#15181) 2019-09-06 16:23:27 -05:00
Scott Lahteine
91c3b8e3ca Reformat ADC cases 2019-09-05 20:02:31 -05:00
Scott Lahteine
4cdf7a1b93 Add ADC helpers to temp_info_t 2019-09-05 19:48:52 -05:00
Scott Lahteine
bf3cd8e5aa Tweak var names 2019-09-05 01:40:09 -05:00
Scott Lahteine
7496e1cd67 whitespace 2019-09-04 21:55:41 -05:00
kakou-fr
6b1c4dec46 Touch Mi: Add magnet Y position (#15166) 2019-09-04 18:09:12 -05:00
Ludy
beffcd856b Update German language, (c) (#15164) 2019-09-04 16:59:26 -05:00
Karl Andersson
123ecfe613 Allow MINIMUM_STEPPER_PULSE override with LV8729 (#15162) 2019-09-04 16:57:13 -05:00
AnHardt
89a2161cac MINIMUM_STEPPER_DIR_DELAY in LA (#15154) 
Add missed MINIMUM_STEPPER_DIR_DELAY after dir change in LinearAdvance interrupt.
 2019-09-03 20:01:51 -05:00
Scott Lahteine
12344085c0
Update temperature.cpp 2019-09-02 19:21:47 -05:00
Scott Lahteine
451a942e95 Suspend queue during wait_for_hotend 2019-09-02 01:14:03 -05:00
Scott Lahteine
586b334c2a
Split up stepper indirection (#15111) 2019-08-31 19:44:45 -05:00
Bob Kuhn
ba91bca1eb TMC SPI daisy chain support (experimental) (#15081) 2019-08-30 17:39:45 -05:00
AlexandrZloy
0ebaea94be Add stallGuard threshold for X2 (#15042) 2019-08-29 00:15:31 -05:00
Luu Lac
081e4506ca Fix G53 as prefix, G28 with CNC_COORDINATE_SYSTEMS (#15069) 2019-08-28 04:20:28 -05:00
InsanityAutomation
b7796bcce6 Disable steppers on M112 (#15065) 
And change verbiage to not refer to "Emergency Stop."
 2019-08-28 00:51:01 -05:00
InsanityAutomation
f218405c36 Fix ExtUI invalid speed, timer (#15031) 2019-08-25 04:46:02 -05:00
Tanguy Pruvot
e604f76703 Enable contrast via LCD_CONTRAST_INIT (#15006) 2019-08-21 18:56:39 -05:00
InsanityAutomation
33f6d77281 Adjust homing backoff feedrate (#14972) 2019-08-20 03:44:52 -05:00
MaukCC
8664b8e97b Adding HMS434 machine (#14931) 2019-08-20 03:40:48 -05:00
Ludy
05995d1fd6 Unify buzz methods as MarlinUI::buzz (#14803) 2019-08-20 02:01:37 -05:00
Scott Lahteine
17cd1a4f26 Tweak TOUCH_MI_DEPLOY_XPOS block 2019-08-18 23:38:12 -05:00
Tim Moore
cd09e35f90 Remove extra M503 "M412" report (#14985) 2019-08-18 21:17:00 -05:00
InsanityAutomation
af5a7a2925 Add missing ExtUI user confirmation (#14992) 2019-08-18 21:03:26 -05:00
Marcio Teixeira
8bdb3d9970 Add CONTROLLERFAN_SPEED_Z_ONLY (#14956) 2019-08-16 21:57:19 -05:00
AnHardt
587d4a6373 Repair display throttling (#14960) 2019-08-16 21:17:09 -05:00
Tim Moore
4575978a1f Fix auto power for chamber fan (#14922) 2019-08-16 18:42:24 -05:00
Marcio Teixeira
274934ad81 Add LULZBOT_TOUCH_UI (#14967) 2019-08-16 18:34:13 -05:00
Eric Ptak
9c5086e6af [STM32F1] Simpler Flash EEPROM (#14829) 2019-08-10 19:14:31 -05:00
Fourmi
eb3a3d249e Fix TouchMI probe movement (left side) (#14875) 2019-08-08 02:40:48 -05:00
Ludy
528c9885f2 Fix wait_for_user + PAUSE_BEFORE_DEPLOY_STOW issue (#14831) 2019-08-08 01:52:20 -05:00
Tanguy Pruvot
92c35d14a4 Non-fatal error from ps::access_start (#14845) 2019-08-07 00:43:00 -05:00
Tim Moore
77f637763c Overlord configs. Fix buzzer, redundant temp. (#14833) 2019-08-06 23:25:47 -05:00
Scott Lahteine
fc39c925ca Grace period followup 2019-08-05 22:00:49 -05:00
Robby Candra
5bc2fb022c THERMAL_PROTECTION_GRACE_PERIOD is obsolete (#14798) 2019-08-05 20:33:15 -05:00
teemuatlut
d4974ea719 TMC SPI Endstops and Improved Sensorless Homing (#14044) 2019-08-04 22:22:58 -05:00
Tim Moore
e3660bca25 Overlord printer thermistor (#14815) 2019-08-03 20:57:56 -05:00
mekius
7682751646 Fix HOME_BACKOFF_MM type (#14805) 2019-08-01 20:32:45 -05:00
InsanityAutomation
6f8b8c394d Homing backoff per-axis / delta Z (#14789) 2019-07-31 20:50:23 -05:00
Scott Lahteine
c2b319360d Remove extra pragmas 2019-07-30 20:19:47 -05:00
Eric Ptak
fdbc733376 Return 'false' on EEPROM connection fail (#14776) 2019-07-30 17:43:45 -05:00
InsanityAutomation
0b154c2d71 Enable runout sensor in EEPROM by default (#14771) 2019-07-30 05:01:56 -05:00
Scott Lahteine
eae543adf3 Apply HAS_SPI_LCD as needed 2019-07-29 18:55:05 -05:00
Marcio Teixeira
eefe3f595a New options: Bootscreen as Info, game Easter-egg (#13829) 2019-07-28 22:47:20 -05:00
Ludy
c4bb458763 BUZZ cleanup (#14760) 2019-07-28 19:14:50 -05:00
mikeshub
1579091c20 PID loop improvements (#14746) 
* Fix macro evaluation in `temperature.cpp`
* Improve bed PID, PID debug output
* Add min PID power define
 2019-07-28 15:50:25 -05:00
Ludy
97e9c95f47 Fix & clean up ExtUI (#14748) 2019-07-27 22:44:05 -05:00
Fourmi
d34364a086 Default TOUCH_MI_DEPLOY_XPOS to min X (#14736) 2019-07-26 21:57:13 -05:00
Scott Lahteine
1088846cae Cosmetic updates from 14044 2019-07-24 01:52:36 -05:00
Marcio Teixeira
369fb2806d Fix compilation warnings, errors (#14704) 2019-07-22 20:08:54 -05:00
mikeshub
d9303b2137 Fix MAX6675_SEPARATE_SPI boot loop (#14698) 2019-07-21 21:36:00 -05:00
InsanityAutomation
dc6fa04f68 Fix single nozzle temp change, do slower extra prime (#14696) 2019-07-21 19:33:37 -05:00
InsanityAutomation
9cd66f6f77 Fix missing include & condition (#14682) 2019-07-20 01:55:34 -05:00
wookie666
00e2f6da8f Improve magnetic dock switching toolhead (#14663) 2019-07-19 06:07:26 -05:00
Scott Lahteine
68108789d0 Add'l toolchange syncs 2019-07-18 02:44:21 -05:00
Scott Lahteine
fac0e63058
Clean up tool-change syncs (#14666) 2019-07-18 02:17:46 -05:00
Scott Lahteine
42b5ccafc9 Toss obsolete DEBUG_LEVELING_FEATURE tests 2019-07-17 20:26:48 -05:00
Marcio Teixeira
839255eed4 Fix for M504 changing filament runout value (#14661) 
Fixes #14476
 2019-07-17 19:11:45 -05:00
InsanityAutomation
b8cc61262f Finish G12, update Nozzle::clean (#14642) 2019-07-17 04:23:19 -05:00
Marcio Teixeira
27c487bab7 Print progress enhancements (#14647) 2019-07-17 03:14:44 -05:00
Scott Lahteine
ef2a2eb984 Temp tweak 2019-07-17 02:03:25 -05:00
Tanguy Pruvot
45bde333d5 Initial Longer3D LK1/2 (Alfawise U20/U20+/U30) support (#14597) 2019-07-14 18:05:24 -05:00
Scott Lahteine
eaf1c0954e Update some precompiler tests 2019-07-14 13:09:16 -05:00
InsanityAutomation
ce02c6cee2 Variable tool change purge (#14618) 2019-07-14 11:40:58 -05:00
Ludy
70586d3a6c Update (c) comments (#14584) 2019-07-11 13:48:15 -05:00
Pavel4e5
8babf55b18 Init ADC keypad analog input (#14585) 2019-07-11 13:47:41 -05:00
Scott Lahteine
ad1c061e7b Bring STM32F4/F7 together 2019-07-10 07:07:04 -05:00
Scott Lahteine
ed0e6afacb Apply LIMIT macro 2019-07-10 03:35:39 -05:00
Scott Lahteine
5519054f50
Improve BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE (#13740) 2019-07-09 21:35:07 -05:00
Scott Lahteine
1a349c7522 Add HAS_TMC220x 2019-07-08 23:07:42 -05:00
Tanguy Pruvot
8873c583d3 Prevent extra settings.load on boot (#14499) 2019-07-05 22:25:59 -05:00
Vanessa Dannenberg
4fa8053638 RPW-Ultra thermistor table (#14517) 2019-07-05 20:37:05 -05:00
Scott Lahteine
fe02241044 NONE on combined options 2019-07-05 18:20:24 -05:00
Scott Lahteine
750a16ad38 Fix MIN/MAX function collision with macros 2019-07-05 18:14:02 -05:00
Scott Lahteine
b6546ea33a Add include guards to some headers 2019-07-05 04:02:08 -05:00
Scott Lahteine
f7eeae8424 Indent a line 2019-07-02 21:34:40 -05:00
Scott Lahteine
720bc7c00b
Named indices for Temperature class (#14479) 2019-07-02 08:39:55 -05:00
Scott Lahteine
d4415dcf59 Fix analogWrite ambiguity 2019-07-02 04:36:02 -05:00
Scott Lahteine
c28e08c849 Fix mintemp/maxtemp monitoring for thermocouples 2019-07-01 10:24:53 -05:00
Aliaksei Kvitsinski
2f932a11b3 Park heads with electromagnet (#14023) 2019-07-01 05:55:23 -05:00
Tanguy Pruvot
24655a6bf3 Touch-MI Menu and Manual Deploy option (#14290) 2019-06-30 23:55:27 -05:00
Ludy
dab2f0c89c Mask unused var, update (c) comments (#14455) 2019-06-30 22:29:33 -05:00
Scott Lahteine
d16954dc88
Make KEEPALIVE_STATE a scoped auto-restore (#14446) 2019-06-29 22:49:50 -05:00
Tanguy Pruvot
19aafb9050 Fix STM32F1 motor shocks (stepper timer issue) (#14030) 2019-06-29 04:39:38 -05:00
Scott Lahteine
c9a8db33c3 Fix scaledFanSpeed 2019-06-28 21:24:47 -05:00
Giuliano Zaro
a9445d557e Remove extra #if (#14439) 2019-06-28 18:54:22 -05:00
Scott Lahteine
4d5a1984e2 Simplified fan handling code 2019-06-28 18:50:32 -05:00
Scott Lahteine
a8d68b7c8a Common method for scaled fan speed 2019-06-28 15:34:17 -05:00
Scott Lahteine
9da02d2114 Help syntax highlighting (Sublime, et. al.) 2019-06-28 15:04:17 -05:00
Scott Lahteine
93cd66ac11 Tweaky change from (C) to (c) 2019-06-27 23:58:16 -05:00
Tim Moore
81209f5310 'M105 R' to report redundant temp sensor (#14324) 2019-06-27 21:29:52 -05:00
Tim Moore
8ce84fa44f Add temperature-based auto power options (#14397) 2019-06-27 16:28:07 -05:00
Scott Lahteine
2580104c8b Revert recent probe changes 
- Revert "Fix FIX_MOUNTED_PROBE compile error (#14393)"
- Revert "Fix G28 with non-BLTouch probes (#14381)"
- Revert "Fix BLTOUCH deploy/stow in HS mode (#14352)"
- Revert "Apply needed BLTouch patch (#14233)"

Co-Authored-By: AnHardt <github@kitelab.de>
 2019-06-26 05:33:43 -05:00
Scott Lahteine
49627069a5 Shorthand for home-after-deactivate 2019-06-26 03:47:55 -05:00
oechslein
8c55bd5451 Update "StallGuard threshold" heading (#14395) 2019-06-26 03:33:07 -05:00
Eric Ptak
8934b32f1b Fysetc AIO II / Cheetah STM32F1 (#14407) 2019-06-26 00:40:29 -05:00
InsanityAutomation
aa0383a83b Enhance IDEX toolchange auto-return w/ no park, full control (#14117) 2019-06-23 20:00:48 -05:00
BigIronGuru
f5afaaef5b Fix probe.cpp warning (#14367) 2019-06-22 17:27:33 -05:00
teemuatlut
2247bf1ba5 Add missing dedge init for TMC2209 (#14370) 2019-06-22 17:00:15 -05:00
mikeshub
1db7013e3b Fix and improve PID loops (#14373) 
- Windup guarding was missing. The kludge in place of windup guard is removed. D term filter calculations are simplified to require fewer `float` calculations. Sign change for D term output to make debugging output clearer.
- Use "no overshoot" for bed PID tuning.
 2019-06-22 16:52:56 -05:00
MrMabulous
c41b005f33 Add Extra Probing option, discarding outliers (#14338) 2019-06-21 19:02:26 -05:00
BigIronGuru
8f99d45045 Fix BLTOUCH deploy/stow in HS mode (#14352) 2019-06-21 18:55:27 -05:00
Tanguy Pruvot
52383633e7 STM32F1: M43 PINS_DEBUGGING (#14072) 2019-06-21 01:20:17 -05:00
Scott Lahteine
4df4c47994
Add TMC2209 support (#14249) 2019-06-20 15:47:50 -05:00
Scott Lahteine
4c872a01f2
G-code queue singleton, front injection (#14236) 2019-06-19 00:00:19 -05:00
Ludy
2290b269dc Unused variable (#14301) 2019-06-18 00:15:41 -05:00
Tanguy Pruvot
f2cfa408b7 Touch-MI probe by hotends.fr (#14101) 
A simple Z probe using a magnet to deploy a probe. See https://youtu.be/E7Ik9PbKPl0 for the sensor description...
 2019-06-14 22:19:48 -05:00
teemuatlut
29afd11cbf Updates for TMC2660 init (#14245) 2019-06-13 23:16:10 -05:00
teemuatlut
12a270fd29 Fix TMC5160 and TMC2160 PWMCONF init 2019-06-13 20:57:12 -05:00
Scott Lahteine
fc73a8b004 Add AXIS_HAS_SQUARE_WAVE shorthand 2019-06-13 20:57:12 -05:00
mikeshub
a3f034b95e FFCP updates. Update XY soft endstops on tool_change (#14125) 2019-06-10 18:01:42 -05:00
Scott Lahteine
0ca2073625 ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED => SD_ABORT_ON_ENDSTOP_HIT 2019-06-10 17:28:35 -05:00
teemuatlut
cccc51ee0e TMC Square Wave Stepping mode (#14195) 2019-06-09 05:08:05 -05:00
BigIronGuru
293018f76c Apply needed BLTouch patch (#14233) 2019-06-07 21:43:20 -05:00
Scott Lahteine
858b2fa21a Fix thermistor table 2019-06-05 21:39:39 -05:00
InsanityAutomation
f6ec00d776 Update thermistor and working config 2019-06-04 20:25:00 -04:00
Scott Lahteine
93ab16c6e4 Remove old mixing ISR comment 2019-05-30 17:05:16 -05:00
Scott Lahteine
6572848d7f Fix stepper timing bug 2019-05-30 16:58:53 -05:00
Ludy
bd494a6bd6 Update defines for patched temperature macros (#14161) 2019-05-28 17:43:31 -05:00
doggyfan
e09d8811c1 Apply grace period to thermistor failure testing (#14167) 2019-05-28 15:36:03 -05:00
teemuatlut
bf4a0db97f TMC LCD followup (#14134) 2019-05-27 21:24:20 -05:00
Scott Lahteine
605ec0a478 Fix thermistor table warning 2019-05-26 01:30:20 -05:00
InsanityAutomation
49e83dd7c8 BLTouch V3.1 changes (#14104) 2019-05-25 21:56:47 -05:00
teemuatlut
1c86fbc60b TMC updates, capture LCD changes (#14074) 2019-05-25 18:22:12 -05:00
Scott Lahteine
48d1bd29cb Shift m before compare to 0 2019-05-25 15:22:15 -05:00
doggyfan
594f6b14be Limit user thermistor to 999, fix thermistor table macro (#14080) 2019-05-21 21:31:05 -05:00
Scott Lahteine
aeec9ef76b Update backlash code 2019-05-20 21:34:08 -05:00
Pavel4e5
3cd19a8ec0 Improve Zonestar keypad responsiveness (#14056) 2019-05-18 20:52:55 -05:00
FanDjango
85fb33a060 BLTOUCH tweaks, new v3.1 command (#14015) 2019-05-17 19:10:18 -05:00
InsanityAutomation
06f3273531 Fix DELTA pulse wait bug (#14028) 2019-05-17 16:16:56 -05:00
Scott Lahteine
785c01f2bc Use US spelling of 'behavior' 2019-05-15 01:49:17 -05:00
chai-md
940ff8e7c8 Improve LV8729 stepping (#13776) 2019-05-11 19:02:19 -05:00
InsanityAutomation
5108e4b6aa Cleaner EEPROM auto init (#13975) 2019-05-11 16:54:03 -05:00
Scott Lahteine
ad4ffa1d2f
Use C++ language supported 'nullptr' (#13944) 2019-05-09 11:45:55 -05:00
InsanityAutomation
6811e2921b BLTouch v3 / 3DTouch Interoperability & performance (#13814) 2019-05-07 21:25:54 -05:00
InsanityAutomation
5dcb25664f Option to Auto-Initialize EEPROM (#13935) 2019-05-07 16:30:31 -05:00
Ludy
a504366138 Fix probe fan compiling error (#13930) 2019-05-07 14:14:12 -05:00
Stephan
483822f3aa Fix some THERMAL_PROTECTION_CHAMBER issues (#13678) 2019-05-06 19:55:01 -05:00
doggyfan
23a8707ef1 Configurable Thermistor (#13888) 2019-05-06 18:51:06 -05:00
Scott Lahteine
9853331b34 Fix temp init, loosen ADC grace period 2019-05-05 22:55:03 -05:00
Giuliano Zaro
e2a77ed881 Bring chamber temp to completion (#13837) 2019-05-04 22:51:47 -05:00
Tanguy Pruvot
7da63fa03f Fix NOMORE() sign warning in stepper (#13894) 2019-05-04 15:59:38 -05:00
InsanityAutomation
3fcab8dbf1 Option to disable fans during pause (#13820) 2019-05-04 15:50:44 -05:00
Scott Lahteine
2f32a6612d Clean up Temperature::set_fans_paused 2019-05-04 14:36:59 -05:00
Marcio Teixeira
15357af67c Backlash cleanup (#13659) 
…And save backlash, fil. sensor, ExtUI userdata to EEPROM.
 2019-05-03 23:53:15 -05:00
Tanguy Pruvot
e5438a9a03 settings: store runout sensor on/off (#13876) 2019-05-02 00:47:26 -05:00
Thomas Moore
ee243e4edf Fix mixing extruder filament change (#13803) 2019-05-01 21:55:58 -05:00
Scott Lahteine
5051909c3c
Update do_select_screen for general use (#13800) 2019-04-24 10:13:44 -05:00
InsanityAutomation
c6632925e3 Force no move on IDEX full control mode (#13797) 2019-04-23 15:20:59 -05:00
chai-md
78d7349fd7 Remove extra Z raises in tool change (#13782) 2019-04-21 21:06:46 -05:00
Kajetan Rzepecki
875e673a8c Add HAL-based thermal protection grace period for all heaters (#13778) 2019-04-21 20:50:32 -05:00
Kajetan Rzepecki
5f70c876ae Fix _temp_error-related compile error (#13768) 2019-04-20 13:57:38 -05:00
Scott Lahteine
bddb776ddb Add chamber max-temp check 
Followup to #13756
 2019-04-19 22:18:55 -05:00
Marcio Teixeira
d0c1eee53b Add extra max-temp safety checks (#13756) 2019-04-19 21:37:12 -05:00
Robby Candra
e8dc87a2b7 Fix updated Allen Key pause probe logic (#13723) 2019-04-16 12:35:58 -05:00
Robby Candra
7ca1fea22b Option to pause probe deployment only when triggered, for manually-deployed allen-key probe (#13698) 2019-04-16 01:32:43 -05:00
Stephan
84273557f9 Move and update heated chamber settings (#13671) 
Co-Authored-By: the-real-orca <stephan.veigl@gmail.com>
 2019-04-12 15:38:10 -05:00
chai-md
2adc37becc MAGNETIC_SWITCHING_TOOLHEAD (#13629) 2019-04-11 13:29:17 -05:00
InsanityAutomation
4900c28bf6 Fix IDEX tool-change, and more (#13614) 2019-04-09 18:33:40 -05:00
Scott Lahteine
fae2b7edc3 Update MMU2 code style 2019-04-08 18:13:42 -05:00
Roxy-3D
9cee81d47e Option to show babysteps total since G28 (#13580) 2019-04-06 18:04:34 -05:00
VBen
0dfd76ba55 Fix Z hotend offset broken by parking extruder tool change (#13582) 2019-04-05 15:28:32 -05:00
Scott Lahteine
240ea1bbb3 Split up games into separate files 2019-04-04 03:06:19 -05:00
InsanityAutomation
d44e5b1fde Fix stepper direction macros, multi-nozzle scope (#13569) 2019-04-04 02:44:07 -05:00
Kajetan Rzepecki
2cfa9e9008 Fixed chamber-related compile error (#13552) 2019-04-01 17:53:56 -05:00
Kajetan Rzepecki
c9079165ee Fix MAX6675 readout with Hardware SPI (#13530) 2019-03-30 22:31:49 -05:00
Marcio Teixeira
5679fae11e UltraLCD enhancements (lower fan resolution, backlash menu) (#13519) 2019-03-29 14:07:43 -05:00
Ludy
fe346cd4d1 Fix DEBUG_EEPROM_READWRITE compile error (#13492) 2019-03-26 04:12:22 -05:00
Sam Lane
e3ab54753b Add extra Linear Advance factors (#13490) 2019-03-26 04:02:27 -05:00
Chris Pepper
ffc2c2d7c5 Move FAST_PWM_FAN code to HALs (#13491) 2019-03-26 01:03:23 -05:00
Scott Lahteine
380c771988 Handle word-padded flash-based eeprom (STM32F1) 
Fix #13445
 2019-03-24 19:14:04 -05:00
Sam Lane
a8fa275dc6 Fix Fan 0 responding to all fan speeds (#13444) 2019-03-23 23:00:31 -05:00
InsanityAutomation
691e5c3bb8 BLTouch V3.0 support (#13406) 2019-03-17 05:57:25 -05:00
Scott Lahteine
49cf92dc36
Extended condition macros (#13419) 
Allow `ENABLED`, `DISABLED`, `PIN_EXISTS`, and `BUTTON_EXISTS` to take multiple arguments. Also add:
- Alias `ANY(...)` for `!DISABLED(...)`
- Alias `ANY_PIN(...)` for `PIN_EXISTS(a) || PIN_EXISTS(b) ...`
- Alias `EITHER(A,B)` for `ANY(...)`
- Alias `ALL(...)` and `BOTH(A,B)` for `ENABLED(...)`
- `NONE(...)` for `DISABLED(...)`
 2019-03-16 23:43:06 -05:00
Ludy
59353546e8 Fix BUTTON_EXISTS and misplaced comma (#13411) 
Fixes #13410 and redeclaration of `BUTTON_EXISTS`
 2019-03-16 11:59:12 -05:00
InsanityAutomation
09eb30dc05 IDEX Mirror mode based on Formbot / Vivedino Symmetric mode (#13404) 2019-03-15 22:46:27 -05:00
Scott Lahteine
5c1aa5162d Adjust M206 output in M503 for DELTA 2019-03-15 19:20:40 -05:00
Scott Lahteine
9a515cbd32
Fix Pause Print message and behavior (#13394) 2019-03-14 02:26:07 -05:00
Scott Lahteine
f5bcc00570
Unify debugging output with debug_out.h (#13388) 2019-03-14 02:25:42 -05:00
Scott Lahteine
67bee06e43 No patch needed for non-libmaple analogWrite 
See https://github.com/pinchies/Marlin/pull/1#issuecomment-471388743
 2019-03-13 07:21:10 -05:00
Scott Lahteine
f89b375fb9
Fixes and improvements for PWM pins (#13383) 2019-03-13 06:51:15 -05:00
Scott Lahteine
87162658c4
Fix and improve software endstops (#13386) 2019-03-13 05:48:36 -05:00
Scott Lahteine
a5ea3e2f15 Fix hotend offset on switching toolhead change 
See commentary at #11623
 2019-03-13 05:32:21 -05:00
InsanityAutomation
050eac03af Single X Duplication Extension (#13373) 
* Multi-nozzle selective duplication
* Use a bit-mask, reduce stepper_indirection.h size
* Tweak the multi-nozzle duplication description
* Use 'S' as a bool in M605
* Add HAS_DUPLICATION_MODE conditional
* Remove '_MODE' from the option name
* M605 in the style of Stacker M280
* Also include direct mask style (P)
 2019-03-13 00:42:50 -05:00
Scott Lahteine
11d6a939df Always define axis_unhomed_err 2019-03-11 20:58:27 -05:00
Scott Lahteine
0375e92847 Followup to serial rework 
As mentioned in #13370
 2019-03-11 16:46:04 -05:00
Scott Lahteine
e52bcc9408 Limit top bed temp to BED_MAXTEMP - 10 
The chances of a 10° overshoot is pretty minimal.
 2019-03-11 16:32:34 -05:00
Scott Lahteine
1f7e220387 Make HAL ISR macros function-like 2019-03-10 20:44:27 -05:00
Scott Lahteine
3419099f0a Clean up whitespace 2019-03-10 19:09:28 -05:00
Michiel Baird
b824a517aa Add G38.4 and G38.5 (#13348) 2019-03-10 17:22:09 -05:00
MoellerDi
c36989c39e Fix chamber temperature measurement (#13350) 2019-03-10 09:51:13 -05:00
Scott Lahteine
33a08fc6f7 Fix typos from temperature rework 
Followup to #12201
 2019-03-10 08:28:16 -05:00
Marcio Teixeira
00fc43144a Follow up fixes to various PRs. (#13334) 
- Ensure `MarlinUI:get_progress` is defined for `ExtUI`.
- Fix for `BACKLASH_SMOOTHING` with small segments.
  `BACKLASH_SMOOTHING` with extremely small segments failed to fully correct due to the correction factor being rounded down. Rounding up ensures the entire backlash will converge to zero even for small segments.
- Add pinout for the beta revision `EINSY_RETRO`.
- Update soft endstops with tool offsets (for toolchange et. al. move clamping) (#12568)
 2019-03-09 14:20:37 -06:00
Reece Kibble
dbead66988 Allows user to set (almost) any PWM frequency (#12638) 2019-03-08 02:15:42 -06:00
3dlabsio
645ca7af7a M141 Heated Chamber, Temperature rework (#12201) 2019-03-07 02:09:39 -06:00
Scott Lahteine
44571775bd Further support for 6 extruders 2019-03-07 01:00:56 -06:00
Scott Lahteine
cfdb38eda4
Allow SERIAL_ECHOPAIR to take up to 12 pairs (#13311) 2019-03-05 06:46:19 -06:00
Scott Lahteine
15738ea506 Update a motion comment 2019-03-05 00:50:29 -06:00
Scott Lahteine
bc87e97357 Prevent a tool change move out of bounds 2019-03-05 00:50:29 -06:00
Scott Lahteine
2212da453a
Distinguish between analog/digital auto fans (#13298) 2019-03-05 00:41:31 -06:00
Chris Pepper
38bef9da91 Report auto temp to both serial ports, if available (#13301) 2019-03-03 21:03:48 -06:00
Robert Mendon
367d392880 Init stepper current after stepper pins are set up (#13302) 2019-03-03 20:58:02 -06:00
Scott Lahteine
599cdc3f0f Remove dead code from get_pid_output 
See #12981
 2019-03-03 05:45:20 -06:00
Vasily Evseenko
71773b128d Fix stepper use before init. Add Ultimaker2+ Extended clone config (#13284) 2019-03-02 17:29:02 -06:00
kAdonis
05c2f80826 Fix bug in wait-for-heatup (#13290) 2019-03-02 16:29:10 -06:00
Scott Lahteine
fa236e9718 General cleanup ahead of L64XX 2019-03-01 19:58:07 -06:00
Scott Lahteine
2f1e1dcb42 Gradual step towards EXTRUDERS 0 support 2019-03-01 01:51:24 -06:00
Scott Lahteine
99d0022fae
Drop the Z_MIN_PROBE_ENDSTOP option (#13276) 2019-03-01 00:27:45 -06:00
Scott Lahteine
a2e3226597 Init XYZ to configured home position 2019-02-28 22:10:26 -06:00
InsanityAutomation
e2e2a55d9b Add thermistor type 67 SliceEng (#13275) 2019-02-28 19:44:17 -06:00
Scott Lahteine
7fde3ed915 Skip hysteresis check when temp is already close to target 
To eliminate a long delay during pause, park, and filament change
 2019-02-28 14:35:19 -06:00
InsanityAutomation
eb4bf93ea4 Add more Babystep options (#13262) 2019-02-27 04:38:56 -06:00
Bob Kuhn
ddbe4cfa20 Printrboard G2 support (#13116) 2019-02-26 21:03:13 -06:00
Giuliano Zaro
2616e4d4d9 Remove duplicated 'chitchat' defines (#13258) 2019-02-25 16:13:01 -06:00
Scott Lahteine
5d28575d4d Clean up some motion code 2019-02-25 16:01:42 -06:00
Scott Lahteine
808b076000 Update some ABL/UBL conditionals 2019-02-25 16:01:42 -06:00
Scott Lahteine
64253e1a58 Followup to serial reform 
Reference #13250
 2019-02-25 00:20:36 -06:00
Scott Lahteine
e15354e387
Simplify serial port redirect (#13234) 2019-02-23 22:53:01 -06:00
Scott Lahteine
02fec89a0d Turn fans off in zero_fan_speeds 
Addressing #13231
 2019-02-22 21:00:44 -06:00
Scott Lahteine
3c9a7926c2 Fix compile error with JUNCTION_DEVIATION 
See #13000
 2019-02-20 04:54:26 -06:00
LinFor
ba39186364 TMC_DEBUG optimization and improvements (#13135) 2019-02-20 02:22:42 -06:00
Roman Moravčík
208ab8b366 Fix compilation with one service interval (#13185) 2019-02-17 12:32:47 -06:00
Scott Lahteine
be9a409980 Fix M125 XY parameters, export get_homing_bump_feedrate 2019-02-14 05:25:46 -06:00
Scott Lahteine
ce40c2e87c Use do_blocking_move_to(ref, fr) 2019-02-14 02:22:08 -06:00
Scott Lahteine
7cf9b93f26 Add HAS_FILAMENT_SENSOR ahead of 12962 2019-02-12 20:13:20 -06:00
revilor
e56c13670d Service interval watchdog (#13105) 2019-02-12 15:58:56 -06:00
InsanityAutomation
7f1b69b0c8 Add HOST_PROMPT_SUPPORT (#13039) 2019-02-12 15:55:47 -06:00
Scott Lahteine
0feeef2604 Update copyright in headers 2019-02-12 15:30:11 -06:00
Scott Lahteine
894f5c24a8 Fix trailing whitespace 2019-02-12 14:25:57 -06:00
Giuliano Zaro
773fa5c40f Fix define used when PID is off (#13119) 
Replaced `PID_MAX` with `BANG_MAX` since it should be the correct define to be used when PID is not enabled.
 2019-02-11 17:29:17 -06:00
Simon Jouet
5cd0fa3ce1 Basic GPIO expander using the ESP32 I2S peripheral (#12959) 2019-02-10 05:40:31 -06:00
Scott Lahteine
6de3d34378
M166 Gradients, LCD Menu for 2-channel Mixer (Geeetech A10M/A20M) (#13022) 2019-02-10 04:54:23 -06:00
LinFor
7ee35c2611 PID_MENU option to save PROGMEM in LCD menus (#13095) 2019-02-10 04:03:18 -06:00
AnHardt
0e37fe8776 Apply minimum C in M303 (#13113) 
Apply minimum `C` in `M303`. `PID_autotune()` needs to be called with a 'C'ycles-parameter >2 to give meaningful (different from 0) PID-factors. Therefore silently raise C to 3. Fixing one aspect of #13104
 2019-02-10 03:54:45 -06:00
Marcio Teixeira
e1604198ff G425 — Auto-calibrate Backlash and Nozzle Offsets (#13050) 2019-02-06 17:20:17 -06:00
InsanityAutomation
413e303ad5 More Advanced Pause options (#12984) 2019-02-06 06:39:42 -06:00
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
3c49396370
Fix compile error with DUE + MAX6675 (#13086) 2019-02-05 22:56:13 -06:00
Sam Lane
b35a7c2c87 Fixed closed-loop planner stall (#13005) 2019-02-04 07:43:09 -06:00
Nathan
df1043516e Fix the delta homing issue (#12974) 2019-02-04 05:25:50 -06:00
Scott Lahteine
4200bd2fc1
Report on M92 with no arguments (#12833) 2019-02-04 05:24:15 -06:00
Scott Lahteine
d4d1b28a06 Fix some include paths 2019-02-04 03:57:15 -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
Scott Lahteine
4fa1c52688 Tweak serial output code 2019-02-03 01:09:14 -06:00
Scott Lahteine
a5e3384691 Pre-apply cosmetic changes to mixing 2019-02-03 01:09:14 -06:00
Scott Lahteine
0358ffcd4c Drop E element from homing_feedrate_mm_s 2019-02-02 15:55:00 -06:00
Scott Lahteine
95223cb28e Remove dead code from stepper.h 
These values are always supplied by `Conditionals_post.h`.
 2019-02-02 15:35:05 -06:00
mattfredwill
c3cb449990 TMC2130 dual-stepper Sensorless Homing (#13061) 2019-02-01 18:09:01 -06:00
revilor
6a57d0b381 Prusa MMU2 (#12967) 2019-01-31 19:10:52 -06:00
jeffstaley
0da636e1a3 Set correct stepper direction on reset (#13032) 
On a reset steppers were being initialized to incorrect direction. Original code wasn't respecting `INVERT_Z_DIR` define.
 2019-01-27 23:02:38 -06:00
Jiri
24fffb8d93 Fix undefined lcd_tmpfan_speed on NO_LCD_MENUS (#13006) 2019-01-24 16:34:40 -06:00
InsanityAutomation
f4d1f13358 Warn on cold extrusion, dont error 2019-01-24 00:16:14 -06:00
Bob Kuhn
2f35747f29 L6470 SPI daisy chain support (#12895) 2019-01-23 19:06:54 -06:00
Ludy
dc65d96aca Fix TMC compile error (#12965) 2019-01-20 23:47:28 -06:00
Scott Lahteine
0495fcd475 Minor spacing fix 2019-01-20 00:10:50 -06:00
teemuatlut
8a3f1d6932 Fix chopper timing struct and initialization (#12943) 2019-01-19 18:57:02 -06:00
Ludy
acf266fe78 Fix a compile warning, etc. (#12955) 2019-01-19 18:47:29 -06:00
Scott Lahteine
712e23c383 Fix up some whitespace 2019-01-17 18:05:36 -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
InsanityAutomation
082f6a27de ADAPTIVE_FAN_SLOWING extension to hotend thermal protection (#12853) 2019-01-12 00:41:48 -06:00
Scott Lahteine
459f4fef60 Fix Temperature::init bug with HEATER_4_PIN 2019-01-11 22:54:26 -06:00
Scott Lahteine
19fea772e5 Use E_AXIS_N where it makes sense 2019-01-11 19:42:34 -06:00
HackingGulliver
1fd8e2c649 Fix: Junction Deviation calculates wrong cos(theta) on CoreXY (#12879) 2019-01-11 19:25:48 -06:00
Marcio Teixeira
6a8fb0f25f Simplify backlash compensation code. (#12813) 
- Use `TEST(dm,axis)` to determine directions instead of doing comparisons.
- Remove recomputation of `millimeters` and `delta_mm` since backlash compensation should not affect the distance over which material is extruded.
 2019-01-04 13:30:56 -06:00
Marcio Teixeira
81e753064a Fix ExtUI compile warnings and error (#12799) 2019-01-03 08:36:43 -06:00
TheLongAndOnly
cb643d87df Adding missing code for triple Z-stepper auto-align (#12786) 2019-01-01 18:22:04 -06:00
Marcio Teixeira
60cb36bef3 Misc. improvements (#12747) 
* Make ExtUI respect MAXTEMP limits
  - Temperatures are now clamped by MAXTEMP limits rather than arbitrary values.
* Speed up USB init, add status
  - Speed up USB initialization
  - Show status message if init failed
* Enable status messages for EXTENSIBLE_UI
* Adjust max limit to MAX_TEMP - 15
* Misc. tweaks to formatting, const, etc.
 2019-01-01 15:17:48 -06:00
Scott Lahteine
371d9a1acf Fix line-endings, formatting, whitespace 
Followup to #12770
 2018-12-30 15:38:20 -06:00
Ludy
135c74017c Fix compile DEBUG_EEPROM_READWRITE error (#12746) 2018-12-30 11:37:20 -06:00
Ludy
3877bf9704 Fix compile error with delta and sensorless homing (#12740) 2018-12-27 17:51:22 -06:00
Ludy
cfc5e96b4b Move JD to Config.h (and fix jerk->eeprom bug) (#12720) 2018-12-27 15:29:39 -06:00
Roman Moravčík
594898aea7 Limit hotend / bed temperature to maxtemp-15 (#12713) 2018-12-27 11:46:05 -06:00
InsanityAutomation
367a9f65aa Add Formbot 350c Thermistor (#12661) 2018-12-20 17:04:17 -06:00
Scott Lahteine
9d59a9c840 Followup to #12691 (typo) 2018-12-20 16:38:32 -06:00
Roman Moravčík
98cf546771 Limit set hotend temperature to maxtemp. (#12690) 2018-12-20 15:56:37 -06:00
Roman Moravčík
4dad489a50 [2.0.x] Limit PID autotune target to maxtemp-15 (#12691) 2018-12-20 15:55:30 -06:00
Marcio Teixeira
8dcc28c9ae Squelch warning mentioned in #11061 (#12676) 2018-12-20 15:34:24 -06:00
Luc Van Daele
c6e09c2689 [2.0.x] G33 clean up (#12648) 
Remove obsolete workarounds in G33 for the now fixed zprobe_zoffset bug
 2018-12-18 12:43:38 -06:00
teemuatlut
55144284c2 TMC connection test, spreadCycle parameters, improved debugging (#12616) 2018-12-09 20:54:48 -06:00
Scott Lahteine
6cf8d40f41 Fix some serial echos of pin states 2018-12-09 02:38:32 -06:00
Scott Lahteine
e8bda62d2a Followup to servo angles patch 
Fix #12594
 2018-12-08 15:31:59 -06:00
Marcio Teixeira
b22716e938 M425 Backlash Correction (#11061) 2018-12-08 14:36:46 -06:00
teemuatlut
50b2fbd031 Trinamic: Split stealthChop, improve driver monitoring, etc. (#12582) 2018-12-07 15:34:21 -06:00
Scott Lahteine
e874f9664c Tweaks to endstops code 2018-11-30 14:25:55 -06:00
Scott Lahteine
3c58b16c9f
Move stepper enable/disable to stepper_indirection.h (#12562) 2018-11-30 12:48:46 -06:00
Scott Lahteine
aaf862aef2
Fix angles for disabled EDITABLE_SERVO_ANGLES (#12559) 2018-11-30 12:31:42 -06:00
Scott Lahteine
c986239837
A single SERIAL_ECHO macro type (#12557) 2018-11-29 16:58:58 -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
Scott Lahteine
03ef2d6c82
Fix "paused" message and M125 called by M25 (#12551) 2018-11-28 19:28:31 -06:00
Scott Lahteine
95d154a91f Fans loop macro 2018-11-28 16:45:08 -06:00
Scott Lahteine
09d6db491a Fix wait_for_bed compile error 2018-11-25 18:05:41 -06:00
Scott Lahteine
29c53f2402 Hide some compile warnings 2018-11-23 21:07:38 -06:00
Scott Lahteine
caca3c8503 Use wait_for_bed with WAIT_FOR_BED_HEATER 
Addressing #12517
 2018-11-23 20:39:23 -06:00
Sinisa Culic
8a0992d921 Fast PWM for controller fan (#12485) 2018-11-23 16:03:39 -06:00
Marcio Teixeira
4bcb63b705 Fix for #12482 (#12483) 
Fix Z-move to uninitialized position in SWITCHING_EXTRUDERS tool_change (no_move=true)
 2018-11-20 00:04:11 -06:00
Ludy
90a58488b5 Corrected unused var, default switch, Travis tests (#12477) 2018-11-19 23:59:48 -06:00
Ludy
1f93d2bcf7 Fix LCD compile error, etc. (#12472) 2018-11-18 20:39:49 -06:00
Marcio Teixeira
c1e17037e5 Various fixes for MarlinUI and ExtUI (#12439) 2018-11-17 22:21:44 -06:00
Giuliano Zaro
d3605cfc26 Don't start watching heaters when target is 0 (#12453) 2018-11-17 21:53:52 -06:00
Ludy
22d7fed60a Fix compile error with SD_FIRMWARE_UPDATE (#12462) 2018-11-17 21:13:36 -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
7a075a5dc9 Tweak extruder errors 2018-11-16 01:32:21 -06:00
Scott Lahteine
d2bb53702a
Optimize target_extruder, ignore T with mixing (#12432) 
* Optimize target_extruder, ignore T with mixing
* Give G-code Tn parity with tool_change
 2018-11-14 17:33:04 -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
edfd106bc5
Rejigger Filament Runout class (#12428) 2018-11-14 11:45:57 -06:00
Ryan
052d102ded UltiMachine Archim 1 support (#12404) 2018-11-14 00:27:39 -06:00
Giuliano Zaro
98c2fc4e42 Endstops fix followup (#12423) 
Followup to #12413
 2018-11-13 17:10:07 -06:00
AnHardt
9ad3aed0ef Fix tool-change for MIXING_EXTRUDER with < 2 virtual tools (#12417) 
Fix #12416

Better handling of `ENABLED(MIXING_EXTRUDER) && !MIXING_VIRTUAL_TOOLS > 1` -  to not fall through to the general case. Fix compiler warnings for `#elif EXTRUDERS < 2`.
 2018-11-13 04:56:10 -06:00
Giuliano Zaro
d631267548 Refine endstops fixes (#12413) 
When endstops/probe are enabled `ENDSTOP_NOISE_THRESHOLD` calls to `update` are required to properly re-sync endstops/probe status.
 2018-11-13 04:31:58 -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
Scott Lahteine
9da6809ac3 Adjust some comment spacing 2018-11-11 11:28:50 -06:00
Scott Lahteine
6093df11dc
Allow G26 to use the active extruder (#12387) 
* Make lcd_quick_feedback argument optional
* Add click_to_cancel option to wait_for_hotend/bed
* Have G26 use the active nozzle and wait_for_hotend/bed
* Use wait_for_release in UBL G29
* Add 'T' parameter to G26 for an initial tool-change
 2018-11-10 18:07:38 -06:00
Giuliano Zaro
fd7fd55662 Solve endstops issues (#12382) 
- Partially reverts #11900 and tries to solve #12336
 2018-11-09 14:58:04 -06:00
InsanityAutomation
7665dff58b No error on T0 with single-extruder and fix MIXING_EXTRUDER virtual tools (#12375) 2018-11-09 00:15:07 -06:00
Scott Lahteine
525ea554a1 Remove obsolete comments 2018-11-08 10:55:18 -06:00
Scott Lahteine
ef724edd80 Apply HAS_LCD_MENU in EEPROM code 2018-11-08 10:03:05 -06:00
Scott Lahteine
81b1e9d272 Fix up xdiff, ydiff, zdiff in tool change 
Followup to #12137
 2018-11-06 22:56:33 -06:00
InsanityAutomation
6471a75a22 Combine more tool-change variables (#12137) 2018-11-06 22:22:20 -06:00
Scott Lahteine
4f72e041f2 Use card.stopSDPrint() for completeness 2018-11-06 20:55:17 -06:00
Scott Lahteine
5a470d4a49 Apply some tool-change cleanup 2018-11-06 18:20:01 -06:00
Scott Lahteine
5182eaf661 Fix endstops enable behavior during probing 
Fix a bug introduced in #9582
 2018-11-05 04:17:37 -06:00
Scott Lahteine
e0956bb572 Drop 'register' storage specifier 2018-11-04 16:17:13 -06:00
Scott Lahteine
c04cf127f7 Fix EEPROM servo angles init, section grouping 2018-11-04 16:14:54 -06:00
Scott Lahteine
b7ca93ba37 Remove dead comment 2018-11-04 06:10:35 -06:00
Hannes Brandstätter-Müller
67b22760d9 Return to status to show manual deploy/stow messages (#12324) 2018-11-04 04:51:26 -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
Scott Lahteine
6e3caf23b6 IS_DELTA => ENABLED(DELTA) 2018-11-03 03:57:11 -05:00
Ludy
5ba6607181 Fix keypad-related compile error (#12306) 2018-11-02 22:29:32 -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
Giuliano Zaro
323c088356 Restore LED light color after pid tuning (#12082) 2018-11-01 22:04:19 -05:00
Scott Lahteine
44f2a82a56 Move axis_homed, axis_known_position to motion.* 2018-10-31 17:44:42 -05:00
Scott Lahteine
946cf8b453 EEPROM read code grouping 2018-10-31 16:43:46 -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
2bf18950ab Refactor LCD menus 2018-10-28 15:46:45 -05:00
Scott Lahteine
ac5f2762b7 Use E_AXIS_N where possible 2018-10-28 15:46:45 -05:00
MasterPIC
6fbc87301f 'G29 H' to set a centered square probe area (linear, bilinear) (#12242) 2018-10-27 20:30:21 -05:00
Scott Lahteine
4b7a0a5b39 Require TMCStepper 0.2.2 or newer 
In reference to #12175
 2018-10-27 11:15:28 -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
d015f746cc
Fix some compile warnings (#12220) 2018-10-26 03:53:06 -05:00
Scott Lahteine
53c535a0c1 Remove trailing whitespace 2018-10-25 09:46:33 -05:00
Luc Van Daele
7243101135 z_offset fix for deltas (#12210) 2018-10-25 09:11:26 -05:00
InsanityAutomation
aebbb2359d Fix IDEX homing X0 wrong direction (#12200) 2018-10-24 16:40:06 -05:00
Roman Moravčík
e48cbff10d Fixed redefinition warnings of MSG_HOTEND_TOO_COLD. (#12203) 2018-10-24 15:00:07 -05:00
Scott Lahteine
46360f18b4 Bring thermistor_75.h up to speed 2018-10-23 14:52:16 -05:00
forkoz
3a3ab3391f Return set_directions() to stepper.cpp (#12182) 
Initial manual Z move can be negative if your stepper is inverted. Leads to bad situations for crashed or initially booted printers.
 2018-10-22 19:30:51 -05:00
Roman Moravčík
d801f85963 Correct EEPROM read/write disparities. (#12169) 2018-10-21 02:56:31 -05:00
Scott Lahteine
b641571098 Replace types.h with millis_t.h 2018-10-20 23:07:12 -05:00
Giuliano Zaro
aa9202260d Fix endstop when no interrupt (#12158) 2018-10-19 13:45:39 -05:00
Marcio Teixeira
71e19baf69 Fix kill => disable_all_heaters => print_job_timer.stop (#12146) 
- Remove `print_job_timer.stop()` from `disable_all_heaters`
- Call `print_job_timer.stop()` for relevant `disable_all_heaters()`.
- Split up `kill()` for watchdog interrupt safety
 2018-10-18 21:20:56 -05:00
InsanityAutomation
a768df83cb Remove stale variable (#12136) 2018-10-18 11:26:14 -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
AnHardt
d82bcdeea1 Make PULSE_STOP(E) conditional (#12121) 2018-10-17 09:52:57 -05:00
Chris Pepper
c90e26dfa6 fix normal extruder stepping (#12118) 2018-10-17 02:47:31 -05:00
Scott Lahteine
8bf596bd4c RETRACT_ZLIFT => RETRACT_ZRAISE 2018-10-16 16:46:40 -05:00
Marcio Teixeira
056561df93 [2.0.x] Enhancements to FILAMENT_RUNOUT_SENSOR (#12069) 
- Added FILAMENT_RUNOUT_DISTANCE_MM option
- Added FILAMENT_MOTION_SENSOR option
 2018-10-16 07:28:52 -05:00
Scott Lahteine
2ecb124e42 Fix trailing whitespace 2018-10-16 03:50:16 -05:00
AnHardt
f56968ba0b New Continuous Filament Mixer (#12098) 2018-10-16 03:38:57 -05:00
Christopher Pepper
254b68fe2c servo update 2018-10-14 18:43:48 +01:00
Karl Andersson
a40458405a Fix datasize error when FWRETRACT is disabled (#12086) 2018-10-14 02:14:34 -05:00
Scott Lahteine
951b25163e
Extend M217 with configurable park/raise (#12076) 2018-10-13 23:08:20 -05:00
Scott Lahteine
a44ef27897 Outdent singlenozzle toolchange code 2018-10-12 15:19:03 -05:00
Scott Lahteine
d338e4d875 Fix singlenozzle toolchange cold extrusion test 2018-10-12 15:15:25 -05:00
Scott Lahteine
ddaef1a60c Clean trailing whitespace 2018-10-11 21:40:55 -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
e8d2cf4fb5 EEPROM followup (tmc_stepper_current_t) 2018-10-10 17:25:45 -05:00
InsanityAutomation
3cb5517ddb Make singlenozzle tool-change honor no_move (#12056) 
...Set no move earlier so it applies
 2018-10-10 16:49:59 -05:00
InsanityAutomation
d332fcb8fa Fix firmware-retract compile errors (#12061) 2018-10-10 16:46:08 -05:00
InsanityAutomation
b2c1cd7eda Allow cold change of active extruder (#12055) 
Followup to #11994
 2018-10-10 09:57:48 -05:00
Scott Lahteine
d556dc1865
Fix and improve EEPROM storage (#12054) 
* Clean up Temperature PID
* Improve EEPROM read/write/validate
* Group `SINGLENOZZLE` saved settings
* Group planner saved settings
* Group filament change saved settings
* Group skew saved settings
* Group `FWRETRACT` saved settings
 2018-10-10 09:45:20 -05:00
Scott Lahteine
9b5c1a5e77 Fix EEPROM checksum bug 
Addressing #12048
 2018-10-10 06:14:58 -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
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
dffb4c63dc [2.0.x] TMC2660 followup (#12029) 
* Don't react to s2g on TMC2660. False positives
* Init with sensorless probing as well
 2018-10-07 15:37:44 -05:00
Scott Lahteine
d6b0fbd771
Use uint8_t for all fan speeds (#12032) 2018-10-07 15:34:41 -05:00
Scott Lahteine
65b8f3821b Suppress temperature.h compile warning 2018-10-06 19:29:41 -05:00
teemuatlut
c447d75916 Add support for TMC2660 (#11998) 2018-10-06 17:18:10 -05:00
Scott Lahteine
e8d677620c Use NUM_SERVOS in EEPROM code 
Fix #12015
 2018-10-06 15:11:32 -05:00
Thomas Moore
49823a4939 Fix broken jerk handling (#12019) 
Fix #12004
 2018-10-06 12:02:50 -05:00
Scott Lahteine
c40ea1f0fd Update EEPROM_VERSION 
And set EEPROM_OFFSET to 0, since the historical 100 skipped bytes are never used.
 2018-10-03 11:34:34 -05:00
Scott Lahteine
1358bd9319 Make MAX_EXTRUDERS always 6 2018-10-03 11:32:19 -05:00
teemuatlut
c3229e1b34 Migrate to a new TMC library (#11943) 2018-10-03 02:48:49 -05:00
Scott Lahteine
e3f7b69105
Add PROBING_STEPPERS_OFF (#11984) 
Co-Authored-By: houseofbugs <houseofbugs@gmail.com>
 2018-10-02 05:13:58 -05:00
Thomas Moore
ab4549d2bc [2.0.x] Add simultaneous retraction for mixing extruder (#11941) 2018-10-01 23:32:02 -05:00
Scott Lahteine
11ac75edcb
Use PGM_P for PSTR pointers (#11977) 2018-09-30 23:44:33 -05:00
Scott Lahteine
3c40933713 Remove trailing spaces, old comment 2018-09-30 20:47:06 -05:00
AnoNymous
b30ca652ae Replace MIN# / MAX# with variadic MIN / MAX (#11960) 2018-09-30 04:59:14 -05:00
Scott Lahteine
9903305dda
Merge pull request #9582 from tcm0116/2.0.x-sensorless_probing 
[2.0.x] Add TMC2130 sensorless probing
 2018-09-29 21:02:22 -05:00
Scott Lahteine
14df753086 Correction for block->mix_steps 
Fix #11484
 2018-09-29 19:13:17 -05:00
Thomas Moore
3286325044 Add TMC2130 sensorless probing 2018-09-29 18:54:14 -05:00
Scott Lahteine
d89d8fe852 Fix Busy State in temperature.cpp 
Fix #11954
 2018-09-29 17:03:35 -05:00
Scott Lahteine
e4389f7d23
Standard methods to wait for heating (#11949) 2018-09-29 01:44:47 -05:00
InsanityAutomation
23114aeb81 Fix garbled M119 output. Honor NUM_RUNOUT_SENSORS (#11948) 2018-09-28 19:00:11 -05:00
Victor Tseng
93839e2f73 Add option to enable/disable autoretract altogether (#11904) 2018-09-28 16:52:56 -05:00
InsanityAutomation
f2e630a05e Stow probe on probing failed (#11936) 
Prevents probe from being left down should probing fail and print job continue
 2018-09-27 13:26:14 -04:00
Hannes Brandstätter-Müller
0b602ae101 [2.0.x] Fix Anycubic Kossel with Probe V1, stuck LCD message after stow (#11929) 2018-09-27 13:23:53 -04:00
Giuliano Zaro
dc11131656 [2.0.x] fix possible race condition (#11923) 
Fix some commits done in #11900
 2018-09-25 13:56:57 -04:00
Scott Lahteine
d6b9327c11 Followup for Endstop Noise Threshold 
Followup to #11912
 2018-09-25 13:50:49 -04: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
Giuliano Zaro
18e456d38d [2.0.x] fix home endstop bug (DON'T MERGE, needs discussion) (#11900) 2018-09-24 16:56:01 -04:00
InsanityAutomation
1104054d73 2.0 IDEX Independent z offset and other fixes (#11862) 
* Add Formbot Raptor board

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

* Add a second Z probe Z offset

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

* Modify method to utilize live adjustment of hotend z offset

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

* Move config item and catchup other code to current method
 2018-09-24 09:40:48 -05:00
Scott Lahteine
217e0efd20
General option PAUSE_BEFORE_DEPLOY_STOW (#11905) 2018-09-24 00:43:43 -04:00
Scott Lahteine
a2b0260f0f Update Sublime files 2018-09-23 19:59:08 -04:00
Hannes Brandstätter-Müller
a4cdffdd69 Support for manually deployed fixed probes (#11899) 2018-09-23 19:59:08 -04:00
Marcio Teixeira
c411e7eb0d [2.0.x] Squelch compiler warnings seen with -Wall (#11889) 2018-09-23 12:00:34 -04:00
Roxy-3D
4163c1a514 Fix end stop and Z-probe reporting logic 2018-09-22 03:25:18 -04:00
Scott Lahteine
ea9eb2fc8f Fix servo angles in config-store 2018-09-21 15:41:36 -04:00
Scott Lahteine
beab9733f8 Remove extra clauses in config-store 2018-09-19 17:06:51 -05:00
Scott Lahteine
17494099a9 Fix parking_extruder_tool_change 
Fix #11872
 2018-09-19 03:02:07 -05:00
Scott Lahteine
c5e5cc5e9f Fix some trailing whitespace, macros 2018-09-17 17:30:04 -05:00
Scott Lahteine
09a2bee8aa
Support more filament runout sensors in M119 (#11851) 2018-09-17 03:27:13 -05:00
Roxy-3D
0780913848 IDEX Improvements (#11848) 2018-09-17 01:06:22 -05:00
Scott Lahteine
53bd0b55cb Followup for 6 extruders 2018-09-16 23:57:50 -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
215eee4fe5 Use 'friend' to access set_directions 2018-09-15 20:11:10 -05:00
Cassiano Leal
ff51e7322d Fix for Stepper::set_directions() compilation error (#11838) 2018-09-15 19:31:51 -05:00
Scott Lahteine
809b232fa2 Fix stepper directions after M501/M502 
See https://github.com/MarlinFirmware/Marlin/issues/11103#issuecomment-421387611

Co-Authored-By: tcm0116 <tcm0116@users.noreply.github.com>
 2018-09-14 20:00:55 -05:00
HenningJW
4fb2134f00 Fix non-sensical values for Zonestar themistor table (#11817) 
Values taken from Zonestar firmware for P802QA with a Melzi board. Timestamps from the firmware package are from April 2016.
 2018-09-12 15:36:04 -05:00
Scott Lahteine
b220a825a7 Fix raw_filwidth_value error 2018-09-12 04:31:55 -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
d882717d98
Save some PROGMEM with constexpr (#11798) 
When possible, make `active_extruder` a `constexpr` to save some PROGMEM.
 2018-09-10 23:09:26 -05:00
Sam Lane
4f883d5971 [2.0.x] Extruder-Distinct Linear Advance K Factors (#11789) 2018-09-10 22:37:32 -05:00
Sam Lane
1b6bc19427 Add external closed loop controller support 2018-09-10 03:17:17 -05:00
Sebastianv650
7e8c073fba Fix extruder stops extruding with LA (#11758) 2018-09-09 00:04:14 -05:00
Scott Lahteine
0c01099f17 hop_amount => current_hop 2018-09-08 21:20:37 -05:00
Kevin
e25d2ae4a2 [2.0.x] SWITCHING_TOOLHEAD (#11623) 2018-09-08 01:43:24 -05:00
Scott Lahteine
dcfde2317f
Pass segment length in prepare_kinematic_move_to (#11737) 2018-09-06 01:40:22 -05:00
AnHardt
530a13ab6c [2.0.x] SECURITYFIX missing max temp error when PID is used (#11717) 2018-09-05 01:41:45 -05:00
scott0122
72fdb6bab3 Fix SWITCHING_NOZZLE zdiff (#11683) 2018-09-03 23:24:40 -05:00
Scott Lahteine
d1ceaf5550
[2.0.x] Followup to IDEX changes (#11707) 2018-09-03 23:15:31 -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
Giuliano Zaro
59e76e5fdf [2.0.x] Fix planner computation (#11708) 
Fix #11697
 2018-09-03 00:29:29 -05:00
Roxy-3D
7680b64aa6
IDEX clean up (#11690) 2018-09-02 10:18:59 -05:00
teemuatlut
49e107cea9 Restrict SW serial to AVR (#11696) 2018-09-01 15:24:44 -05:00
Scott Lahteine
d55f44edba
Printcounter improvements (#11689) 2018-08-31 17:40:39 -05:00
scott0122
ada85d5585 Improve HOTEND OFFSET Z display precision to 3 (#11686) 2018-08-31 15:15:40 -05:00
Scott Lahteine
3e81745e81 Fix issues, make optional 2018-08-29 17:58:02 -05:00
Jan
aa80e448e2 Store servo angles in EEPROM 2018-08-29 17:58:02 -05:00
scott0122
6dc9553aa5 Fix SWITCHING_NOZZLE compile error (#11657) 2018-08-27 21:25:25 -05:00
Scott Lahteine
d1c9517903 Followup to hotend_offset[Z] patch 2018-08-24 21:32:00 -05:00
Scott Lahteine
e2b8fc4f17 Reduce some debug strings 2018-08-24 21:11:39 -05:00
Scott Lahteine
acf5ae3083 !ENABLED => DISABLED 2018-08-24 16:36:37 -05:00
Kevin
6483285bc5 HOTEND_OFFSET_Z always available (#11603) 2018-08-22 00:21:29 -05:00
Scott Lahteine
f0dbe61692 Tweaks to motion.h reachable tests 2018-08-21 23:34:29 -05:00
Roxy-3D
cd9868f442
Make position_is_reachable() smarter about IDEX machines` 
On many IDEX machines the allowed travel of the X1 carraige and X2 carraige does not perfectly overlap.

This helps the issue.   But more work needs to be done at the higher level.  (For example the X1_MAX_POS should probably be factored into G26's mesh validation pattern.)
 2018-08-21 19:12:26 -05:00
Scott Lahteine
ad12b9b46b Fix indentation, whitespace, spelling, formbot pins... 2018-08-21 09:47:57 -05:00
Kevin
db30650731 Fix UBL/Homing (#11566) 2018-08-16 08:28:40 -05:00
InsanityAutomation
9de730b2bf Update tool_change.cpp (#11559) 2018-08-15 19:30:52 -05:00
Scott Lahteine
1561e61df7 New TMC2208 constructor 
Co-Authored-By: teemuatlut <teemu.mantykallio@live.fi>
 2018-08-14 18:41:51 -05:00
Nils Hasenbanck
b37bfeffeb [2.0.x] Use the new const functions of the persistentStore api (#11544) 2018-08-14 18:35:36 -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
a4b0148365 Easier to find 'static inline' 2018-08-13 23:55:33 -05:00
Nils Hasenbanck
577aeb4aa9 All EEPROM access uses persistentStore 2018-08-13 17:43:35 -05:00
Scott Lahteine
6a8b906318 Followup for persistent_store_api.h 2018-08-13 17:43:35 -05:00
Chris Pepper
66d2b48b59 Update PersistentStore api (#11538) 
- Clean up the API to use a `static` class instance to adhere to Marlin convention
- Add `const` position data access for read/write
- Add Storage capacity to the interface
 2018-08-13 17:30:25 -05:00
Scott Lahteine
f1347f783d Optimize thermistor table 71 
agData in Table 71 is extremely oversampled (see Issue #11220). I have removed the data points that perform *worse* than linearly interpolating the remaining points, and fixed up two points that were simply rounded incorrectly.

Co-Authored-By: Aaron Griffith <aargri@gmail.com>
 2018-08-13 02:54:55 -05:00
Scott Lahteine
c93538e9f3 UBL/planner patch tweaks 2018-08-11 22:50:45 -05:00
Thomas Moore
fc55f1da01 Account for UBL correction when setting the planner position (#11486) 2018-08-10 13:00:50 -05:00
Giuliano
e85feb2545 [2.0.x] Better timing handling (#11461) 2018-08-06 23:13:36 -05:00
Scott Lahteine
79835590e3
Easier to disable homing validation (#11458) 2018-08-06 23:11:37 -05:00
Scott Lahteine
9c62c47579
[2.0.x] Fix Dual X Carriage tool change crash (#11447) 2018-08-03 20:47:29 -05:00
Scott Lahteine
b826bf4194
Fix initial safe_speed in jerk code (#11417) 2018-07-30 22:50:08 -05:00
Roxy-3D
16432376ab
Revert "[2.0.x]Idex and bl touch fixes" (#11407) 
* Revert "[2.0.x] bltouch home refinements (#11397)"

This reverts commit 74900f7a70.

* Revert "[2.0.x]Idex and bl touch fixes (#11395)"

This reverts commit 6dafb90c01.
 2018-07-28 23:14:46 -05:00
Giuliano
74900f7a70 [2.0.x] bltouch home refinements (#11397) 
Just create  a better functions call logic flow
 2018-07-28 19:30:14 -05:00
silentninja1
6dafb90c01 [2.0.x]Idex and bl touch fixes (#11395) 
* Fix BLTouch homing

Deploy at start, dont call generic stow function at finish or raise goes too high before setting 0

* Update tool_change.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Update motion.cpp

* Change brackets to be more in align of Marlin coding standards
 2018-07-28 10:33:31 -05:00
Giuliano
5ce5ff8e9b [2.0.x] fix bltouch homing (#11379) 
Partially revert. Seems to solve the issue, but one report says G29 still fails.
 2018-07-27 18:30:08 -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
Giuliano
4237c3d9f8 [2.0.x] different bltouch init (#11135) 2018-07-26 05:04:09 -05:00
Andy Shaw
624986d423 Ensure ADC conversion is complete before reading (#11336) 
The current Marlin implementation relies on a timer interrupt to start the ADC conversion and read it. However in some circumstances the interrupt can be delayed resulting in insufficient time being available for the ADC conversion. This results in a bad reading and false temperature fluctuations. These changes make sure that the conversion is complete (by checking the ADC hardware via the HAL) before reading a value.

See: https://github.com/MarlinFirmware/Marlin/issues/11323
 2018-07-26 03:59:19 -05:00
Scott Lahteine
22ebbc091f Tweak some SoftPWM code 2018-07-25 18:09:31 -05:00
teemuatlut
fbcdf5eaeb Simplify stepper driver per-axis selection 2018-07-25 02:47:43 -05:00
Eyal
fbdbe53290 Fix get_period_inverse(0) so it doesn't crash (#11334) 2018-07-25 01:58:40 -05:00
Scott Lahteine
63a146d424 planner.synchronize at start of tool_change 
See https://github.com/MarlinFirmware/Marlin/issues/10949#issuecomment-398540498
 2018-07-18 20:10:55 -05:00
Roxy-3D
71df1f7f57
Don't display M421 information for UBL at startup 
It takes too long to display the mesh data for large mesh's at startup.   We should consider ways to speed this up.
Perhaps it makes sense to display an entire row of the mesh instead of just one mesh point?
 2018-07-17 17:19:52 -05:00
Giuliano
e5ea9d200f [2.0.x] fix kill printer (#11260) 
This will fix kill message on dual printer with 0 alignment offset
 2018-07-13 23:12:43 -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
566d05006d report_state > event_handler 
Make the endstop report method track endstop changes on its own.
 2018-07-11 21:08:07 -05:00
Scott Lahteine
6b521b6df2 Loosen thermistor table size limit 
Co-Authored-By: Aaron Griffith <aargri@gmail.com>
 2018-07-11 21:08:07 -05:00
Scott Lahteine
63f4c9bdb9 Followup to float maths patch 2018-07-06 21:34:09 -05:00
Scott Lahteine
2992112da0 Optimize delta kinematics 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-07-04 22:28:56 -05:00
etagle
1367df2875 Replace double with float, optimize calculation 2018-07-04 22:28:56 -05:00
Scott Lahteine
68e6650df7 Remove Quake Fast Inverse SQRT (it isn't faster) 2018-07-04 22:22:10 -05:00
Scott Lahteine
9c058091e9 No M914 or SGT set for non-sensorless axes 2018-07-03 20:09:13 -05:00
Scott Lahteine
568cfe7caa Add thermistor 501 (100K Zonestar) 2018-07-03 17:52:06 -05:00
Scott Lahteine
c51e27d11d
Do a hard kill for failed homing moves (#11161) 2018-06-30 21:54:07 -05:00
Scott Lahteine
90ba77ea0f Lose the old HOMEAXIS macro 2018-06-30 18:13:13 -05:00
Scott Lahteine
2421f3a47d Detect endstop hits in any direction 2018-06-30 17:27:37 -05:00
Scott Lahteine
8eaac0dab3
Add delta feedrate scaling (#11153) 2018-06-30 13:44:27 -05:00
Scott Lahteine
bd7f5848f1
Remove JUNCTION_DEVIATION_INCLUDE_E option (#11147) 2018-06-29 22:42:05 -05:00
Scott Lahteine
42f9921482 Ignore Z min endstop with separate Z-probe 
To allow for the case where a Z endstop (e.g., hall effect) is higher than the probe trigger point, don't check the Z min endstop during probe moves. See #11134
 2018-06-28 05:06:11 -05:00
Scott Lahteine
aa4cd2e861 Eliminate stepper.* signed/unsigned warnings 2018-06-27 23:10:51 -05:00
Eduardo José Tagle
edb21f349a Fix stepper/planner block handling, race conditions (#11098) 
- Allow planner to alter the deceleration phase of the currently executing block.
- Remove BUSY flag, as it is NON ATOMIC to set bits in the Stepper ISR and Planner at the same time.
 2018-06-27 18:11:16 -05:00
Scott Lahteine
4d3a9930c5 Match ASM comment spacing to 1.1.x 2018-06-27 17:26:48 -05:00
Scott Lahteine
053438a3aa
Poll all endstops, even when stationary (#11123) 2018-06-27 04:18:57 -04:00
Andy Shaw
3b3029c4bf Make max_e_jerk an array to reduce CPU usage (#11118) 2018-06-26 22:38:31 -04:00
Giuliano
8d8f257384 [2.0.x] Fix advanced pause init values (#11095) 
Fixed for cycle used to initialize default values
 2018-06-26 14:37:52 -04:00
etagle
5b49fccf80 Add stepper driver DIR delay configuration option 
...and recommended pulse width configuration for A4988
 2018-06-26 13:28:04 -05:00
etagle
fb4e0b105b Fix endstops compilation error 2018-06-25 12:10:17 -04:00
Eduardo José Tagle
48a15d1c7e [2.0.x] Fix stepper/planner race condition and Stepper pulse timer (#11081) 
* Planner: Removal of some race conditions between Stepper ISR and Planner, some of them pointed out by @AnHardt, some of my own findings
* Fixing timing on stepper pulses adding a compensation for the non-null time required to set ports.
 2018-06-22 09:15:37 -05:00
Scott Lahteine
50b6204079 Fix LIN_ADVANCE max_e_jerk_factor 
According to https://github.com/MarlinFirmware/Marlin/issues/9917#issuecomment-399204568
 2018-06-21 22:02:34 -04:00
Scott Lahteine
99591dc20c
Filter endstops state at all times (#11066) 2018-06-21 20:14:16 -05:00
Scott Lahteine
7406f04029 Use MAX (not max) in stepper.h 2018-06-19 20:51:07 -05:00
Scott Lahteine
da94e0bd27 Unsigned eeprom mesh addresses 2018-06-15 15:51:57 -05:00
Scott Lahteine
4c8d6df13c
Extra insurance against endstop false positives (#11013) 2018-06-13 01:22:02 -05:00
Scott Lahteine
81edbfa665
Merge pull request #11004 from ejtagle/always_honor_maximum_step_rate 
[2.0.x] Fix stepper pulse minimum period and timing calculations
 2018-06-12 22:17:22 -05:00
Scott Lahteine
f3fed52348 Fix coolstep_min_speed / sensorless homing 
Fix #8890
 2018-06-12 22:12:46 -05:00
etagle
a215725df6 Fix stepper pulse timing 
Always honor minimum period on stepper pulse generation, and fix timing calculations

Signed-off-by: etagle <ejtagle@hotmail.com>
 2018-06-12 21:34:24 -05:00
Scott Lahteine
0d79128c8d Localize stepper-specific defines 2018-06-12 21:16:54 -05:00
Scott Lahteine
4dbec774b5 HAL_*_TIMER_RATE => *_TIMER_RATE 2018-06-12 16:39:12 -05:00
Scott Lahteine
9d04f47d98 Improvements for junction_deviation_mm 
- Drop `max_jerk` with `JUNCTION_DEVIATION`
- Add `max_e_jerk_factor` for use by `LIN_ADVANCE`
- Recalculate `max_e_jerk_factor` when `junction_deviation_mm` changes
- Fix LCD editing of `junction_deviation_mm`
 2018-06-11 22:05:16 -05:00
Scott Lahteine
f2c3b0d476 Use bit flags for homed/known 2018-06-11 22:05:16 -05:00
Scott Lahteine
43bdd0bfe4 Fix indent in stepper.h 2018-06-11 19:17:46 -05:00
Scott Lahteine
3fd1f32b73 Fix ADC key and chamber temp 2018-06-10 20:11:40 -05:00
Scott Lahteine
a2f521d34b
Add Junction Deviation mm runtime setting (#10990) 2018-06-10 18:02: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
Giuliano
b64cc9329e [2.0.x] Fix dual enstop home (#10980) 2018-06-10 02:08:47 -05:00
Scott Lahteine
3701869e6c Add HAL_timer_start for AVR, use stepper timer to time pulses 2018-06-09 22:30:13 -05:00
etagle
d82704354f Increase the planner first block HOLD delay to 100mS 2018-06-09 21:12:37 -05:00
Scott Lahteine
334341c632
Hephestos config updates (#10960) 2018-06-07 21:23:55 -05:00
Scott Lahteine
55aedf036b Fix M503 ABL mesh report. (Zero-based IJ indices) 2018-06-07 16:36:50 -05:00
Scott Lahteine
d8b983f624
More concise M503 output for M906, M913, M914 (#10947) 2018-06-06 20:58:28 -05:00
Scott Lahteine
ad8d3150aa Cleanup for dual endstops homing 2018-06-03 00:34:29 -05:00
Eduardo José Tagle
d3c02410a8 [2.0.x] Small assorted collection of fixes and improvements (#10911) 
* Misc fixes and improvements

- Get rid of most critical sections on the Serial port drivers for AVR and DUE. Proper usage of FIFOs should allow interrupts to stay enabled without harm to queuing and dequeuing.
  Also, with 8-bit indices (for AVR) and up to 32-bit indices (for ARM), there is no need to protect reads and writes to those indices.
- Simplify the XON/XOFF logic quite a bit. Much cleaner now (both for AVR and ARM)
- Prevent a race condition (edge case) that could happen when estimating the proper value for the stepper timer (by reading it) and writing the calculated value for the time to the next ISR by disabling interrupts in those critical and small sections of the code - The problem could lead to lost steps.
- Fix dual endstops not properly homing bug (maybe).

* Set position immediately when possible
 2018-06-01 19:02:22 -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
d259070980 Clean up trailing spaces from vim, etc. 2018-05-31 00:09:41 -05:00
Scott Lahteine
b90f54b0fc Improve probe logging 2018-05-29 21:54:13 -05:00
Scott Lahteine
4299e5dc8b
Modify E-stepping macros for use in LINEAR_ADVANCE (#10885) 2018-05-28 19:34:08 -05:00
Scott Lahteine
8f14ef855d More concise commentary in planner.cpp 2018-05-28 19:25:18 -05:00
Scott Lahteine
6919e87656 Minor cleanup of multi-stepping logic 2018-05-28 17:44:33 -05:00
Scott Lahteine
853a9056ac Long thermistor tables need special consideration 2018-05-28 06:28:34 -05:00
Scott Lahteine
a4f9c3373f Tweak thermistor spacing 2018-05-28 03:44:32 -05:00
Scott Lahteine
1ce97f1f6d
Faster (bisect) search in thermistor tables (#10883) 2018-05-27 23:27:51 -05:00
Scott Lahteine
0ca9db7051 Correct HOTENDS for SWITCHING_EXTRUDER 2018-05-27 23:22:48 -05:00
Eduardo José Tagle
7b9f0302d4 Fix Bresenham rounding errors, add link to article (#10871) 2018-05-27 01:49:59 -05:00
Scott Lahteine
2566342979 Adjust some commentary 2018-05-27 00:10:25 -05:00
Scott Lahteine
6775a16c97 Fix switching extruder stepping with LA 2018-05-26 19:07:01 -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
01d37e00af
Fix up stepper ISR with linear advance timing (#10853) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-26 01:00:13 -05:00
Scott Lahteine
7261f48872 Fix reset of endstops and move state 2018-05-24 19:33:36 -05:00
Scott Lahteine
50fa8e01c1 Minor optimization of axis_did_move bits 2018-05-24 19:08:07 -05:00
Scott Lahteine
f28e366b77 Followup for core endstops 2018-05-24 03:02:57 -05:00
Scott Lahteine
9644d56b42 Patches for core motion tests 2018-05-24 00:49:01 -05:00
Scott Lahteine
3e3789da85
Regression: Endstops Core compatibility (#10823) 
Co-Authored-By: ejtagle <ejtagle@hotmail.com>
 2018-05-23 03:45:25 -05:00
Scott Lahteine
4b610b333e Tweak G38 formatting 2018-05-22 01:56:03 -05:00
Scott Lahteine
d2647c1f19 Fix G1 behaviour after tool unpark 
Fix #10777 for 2.0.x

Co-Authored-By: Ante Vukorepa <o.orcinus@gmail.com>
 2018-05-22 00:53:00 -05:00
Scott Lahteine
0c3773d724 Cleanup in stepper_indirection.h 2018-05-22 00:36:03 -05:00
Scott Lahteine
4b2f6e3b2b
[2.0.x] Add endstop noise filter (#10796) 2018-05-21 15:51:38 -05:00
Scott Lahteine
65a004564c Stepper::set_position needed for some applications 2018-05-21 15:21:33 -05:00
Scott Lahteine
435ecb6b67 Followup to stepper/planner refactor 2018-05-20 23:13:38 -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
etagle
569df3fc0c Fix interrupt-based endstop detection 
- Also implemented real endstop reading on interrupt.
 2018-05-20 07:10:24 -05:00
etagle
a4af975873 Fix planner block optimization 
- Fixed the planner incorrectly avoiding optimization of the block following the active one.
- Added extra conditions to terminate planner early and avoid redundant computations.
 2018-05-20 07:10:24 -05:00
etagle
e0ca627033 Planner block HOLD flag 
Allows the Stepper ISR to wait until a given block is free for use. Allows Planner to plan the first move, which is split into two.
 2018-05-20 06:23:58 -05:00
etagle
a11eb50a3e Refactor and optimize Stepper/Planner 
Better encapsulation and considerably reduce stepper jitter
 2018-05-20 06:23:58 -05:00
etagle
0566badcef Add memory barrier, optimal interrupt on-off 
Disabling an ISR on ARM has 3 instructions of latency. A Memory barrier is REQUIRED to ensure proper and predictable disabling. Memory barriers are expensive, so avoid disabling if already disabled (See https://mcuoneclipse.com/2015/10/16/nvic-disabling-interrupts-on-arm-cortex-m-and-the-need-for-a-memory-barrier-instruction/)
 2018-05-20 02:39:34 -05:00
Scott Lahteine
7dc03ce721 Simplified fix for babystep pulse width 
Alternative to the apparently superfluous double delay
 2018-05-19 21:00:08 -05:00
Scott Lahteine
65270d6a96 Fix LIN_ADVANCE + SWITCHING_EXTRUDER 
Followup to #10656
 2018-05-19 18:32:00 -05:00
Bob Kuhn
9ad42d6617 add delay between pulse edges (#10778) 2018-05-19 17:12:16 -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
Giuliano
e1d9046efc [2.0.x] Temperature reading fix (#10774) 2018-05-19 15:39:36 -05:00
Scott Lahteine
50270b53a0 Clear up some more compile warnings 2018-05-17 18:40:49 -05:00
Jiri Jaburek
43ddb29f9e Add FAN_MAX_PWM for M106-controlled fans 2018-05-15 21:18:46 -05:00
Scott Lahteine
836b0bbeee Fix MBL line_to_destination 
Fix #10708
 2018-05-13 16:50:39 -05:00
Scott Lahteine
ba4c32eec5 Followup to _AXIS patch 2018-05-13 10:43:35 -05:00
Scott Lahteine
d9154ebdf6 Followup to math patch 2018-05-13 09:30:27 -05:00
Scott Lahteine
883b0c9880
Convert custom maths to inlines (#10728) 2018-05-13 08:10:08 -05:00
Scott Lahteine
08e36e264e Apply _AXIS macro 2018-05-13 06:51:01 -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
083ec9963e Tweaks to heater / lcd conditions 2018-05-13 04:52:56 -05:00
Scott Lahteine
8f8c6a9bc4
Move get_axis_position_mm to Planner (#10718) 2018-05-12 09:59:11 -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
f5aaa2d6c0 Fix some compiler warnings 2018-05-12 05:28:12 -05:00
Scott Lahteine
3614e6ce0f Fix Switching Extruder with Linear Advance 2018-05-12 02:26:14 -05:00
Scott Lahteine
625035a9ce
Fix M301 access to lpq_len (#10714) 
Co-Authored-By: Zwaubel
 2018-05-12 02:13:40 -05:00