214 Commits

Author SHA1 Message Date
novamxd
096198ec9a Revamped ChangeAtZ
Removed some derpug code
2020-04-19 04:47:54 -05:00
Ghostkeeper
33a20fb10b
Merge branch '4.6' 2020-04-15 18:37:24 +02:00
Ghostkeeper
9f38374960
Also track Z coordinates and retract extra for the distance travelled then
Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way.

Fixes #7458.
2020-04-15 18:37:13 +02:00
novamxd
8b206751f8 Revamped ChangeAtZ
Added an enabled flag, allowing users to enable/disable ChangeAtZ layers at will without removing them
Improved performance of GCodeCommand, deferred parsing of arguments to when it is first requested as opposed to all the time
Removed type hints because the supported python version in Cura is too low
2020-04-13 22:22:21 -05:00
Jaime van Kessel
2e9dca71ce
Remove a number of unused imports 2020-04-10 13:58:10 +02:00
Jaime van Kessel
fe27da5e8a
Remove a number of unused variables 2020-04-10 13:46:19 +02:00
Jaime van Kessel
6a6ad6e815
Remove unneeded semicolons 2020-04-10 13:34:57 +02:00
Ghostkeeper
d5166030d7
Don't detect retractions if E is almost equal, but rounding errors
Contributes to issue CURA-7351.
2020-04-09 11:27:40 +02:00
Ghostkeeper
9b997d421b
Keep current_e updated even if not finding retractions
Otherwise the new E is never going to be lower than the current E. I don't know how this ever worked then.

Contributes to issue CURA-7351.
2020-04-09 11:22:05 +02:00
Ghostkeeper
d9649dc3dd
Reduce indentation and complexity by using a pre-check
Contributes to issue CURA-7351.
2020-04-09 11:03:10 +02:00
Aldo Hoeben
7ea3891da0
Merge branch 'master' into feature_unify_pause_at_height 2020-03-30 17:58:25 +02:00
Jaime van Kessel
329c5c5c11
Rename pause duration to disarm timeout and set default to give same behavior as before
The name wasn't really covering what it was doing. It wasn't setting the duration of the
pause, it was setting the timeout for the stepper disarm.
Also, ive set the defaults so that the behavior remains the same, unlesss a user
explicitly enables this

CURA-7331
2020-03-30 17:20:59 +02:00
fieldOfView
fa613c35eb Hide unused temperature for Repetier 2020-03-20 13:39:00 +01:00
fieldOfView
c87ee61e9c Add repetier-specific parking if repetier flavor is selected 2020-03-20 13:35:48 +01:00
fieldOfView
87633e7818 Make Griffin a selectable method instead of snooping it from gcode 2020-03-20 12:56:07 +01:00
fieldOfView
a7e23ba99e Use an appropriate default for the pause method...
based on the machine gcode flavor and machine name
2020-03-20 10:54:43 +01:00
Ilia Mazlov
5b85dae926 PP-plugin -> PauseAtHeight: steppers disarm timout 2020-03-04 16:49:35 +01:00
fieldOfView
bf7d566111 Remove flavor-specific pause scripts 2020-03-01 16:01:20 +01:00
fieldOfView
a0a353e33c Add option to set pause method gcode command
Contributes to #7198
2020-03-01 16:00:02 +01:00
Tim Kuipers
0f4ff1f149 lil: fix naming and spacing to fit code conventions 2020-02-26 15:37:25 +01:00
Tim Kuipers
14d351e185 Merge branch 'master' of https://github.com/Hrybmo/Cura into Hrybmo-master 2020-02-26 15:31:58 +01:00
John Hryb
9aa6887b02 Update ColorMix.py
Updates based on review.
2020-02-22 11:58:19 -05:00
novamxd
943d04a734 * Revamped ChangeAtZ
Added additional option for disabling all retract options
Added more comments.
Added support for firmware based retractions.
Added support for outputting changes to LCD (untested).
Added type hints to most functions and variables.
Created GCodeCommand class for better detection of G1 vs G10 or G11 commands, and accessing arguments.
Fixed issue of properly restoring previous values in single layer option.
Improved wording of Single Layer vs Keep Layer to better reflect what was happening.
Moved most GCode methods to GCodeCommand class.
2020-02-17 22:58:39 -06:00
Matt Jani
81429f8985 Cleaned up timelapse post processing script (issue #6730) 2020-02-03 15:19:11 +01:00
Matt Jani
155408d77d Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b Fixed wrong extrusion (issue #6730) 2020-01-28 15:26:43 +01:00
Kostas Karmas
a720939e64 Fix max layer to correspond to starting layer
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master
Update DisplayFilenameAndLayerOnLCD.py
2020-01-27 14:08:26 +01:00
fieldOfView
6abf916ced Fix typing in __init__ methods to appease MYPY 2020-01-14 21:56:06 +01:00
Johnathan Chu
1f2e079185 Update DisplayFilenameAndLayerOnLCD.py:
- Fixed filename appearing in middle of text when scrolling is disabled and displaying max layer.
- Fixed filename appearing twice when scrolling is enabled and displaying max layers.
2020-01-06 21:45:43 -08:00
novamxd
bcc12030a2 Revamped ChangeAtZ
Adjusted coding style to use spaces instead of tabs
2020-01-03 19:01:33 -06:00
novamxd
6c22a5ed06 * Revamped ChangeAtZ
Fixed a bug where extruder temps for extruder one and two were being applied universally. Now sets individually as expected.
2019-12-26 00:56:57 -06:00
John Hryb
1b976ca636 Update ColorMix.py
Updated colorMix to latest
2019-12-14 14:26:52 -05:00
novamxd
5d832a35cb Revamped ChangeAtZ
Fixed bugs where TargetZ, Bed Temp, Extruder Temps, Retract Feed Rate and Retract Length weren't properly considered as floats. Now capable of properly targeting decimal Z values, and altering others as decimals
Updated debug cases to test for it.
2019-12-12 21:16:27 -06:00
Wes Hanney
ce5ab0aa5f
Merge branch 'master' into master 2019-12-12 20:41:09 -06:00
Lipu Fei
849ac3551d
Merge branch 'master' into master-1 2019-12-11 10:57:50 +01:00
novamxd
0c9b5c6f78 Merge branch 'master' of https://github.com/Ultimaker/Cura 2019-12-09 01:59:32 -06:00
novamxd
f2428ccb52 Revamped ChangeAtZ.
Added comments.
Added support for changing Retract Length and Speed.
Applied code refactoring to clean up various coding styles.
Broke up functions for clarity.
Fixed issue of cumulative ChangeZ mods so they can now properly be stacked on top of each other.
Removed layer spread option in favor for fixing ChangeZ stacking
Split up class so it can be debugged outside of Cura.
2019-12-09 01:56:01 -06:00
Ghostkeeper
250774c4cd
Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master 2019-12-05 11:19:42 +01:00
translucentfocus
4fc32b036e
Fixed typo
Only correcting in master; may want to consider correcting in other branches
2019-11-27 11:46:07 -06:00
Mathias Lyngklip Kjeldgaard
8835a0cb99 Fixed a typo in the title
I noticed a typo in the title of the plugin, so that is fixed. I also
added more info to the description.
2019-11-26 20:20:45 +01:00
Remco Burema
432ed02aa6
Fix skip (or late) pause at height.
Previously, the line after the layer change would also contain the z height.
If not found, the could would break the per-line reading, and skip to the next layer.
However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses).
I just ignored the optimization and made it a continue.
I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once.

CURA-6965
2019-11-21 14:08:51 +01:00
Jaime van Kessel
de13317b9e
Merge pull request #6101 from iLyngklip/master
Create DisplayRemainingTimeOnLCD.py
2019-10-24 15:14:24 +02:00
Ghostkeeper
c875252b53
Fix some mistakes indicated by PyCharm's linting 2019-10-15 15:27:58 +02:00
Lipu Fei
af1a03d02f
Merge pull request #6400 from Ultimaker/CURA-6799_pause_at_height_resume_speed
Cura 6799 pause at height resume speed
2019-09-25 08:01:13 +02:00
Nino van Hooff
2fa4230d1c Only consider feedrates for extrusions (Pause At Height)
CURA-6799
2019-09-24 16:11:00 +02:00
Nino van Hooff
2a488b48e9 Restore feedrate at end of Pause at Height script for Repetier.
CURA-6799
2019-09-23 16:31:24 +02:00
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script
CURA-6799
2019-09-23 16:10:27 +02:00
Ghostkeeper
b34895703b
Merge branch '4.3' 2019-09-17 13:08:49 +02:00
Remco Burema
756c21cd19 Remove extra empty lines in ChangeAtZ-scipt output. 2019-09-13 13:33:06 +02:00