194 Commits

Author SHA1 Message Date
Ghostkeeper
db15bc84cf
Correct and consistent spelling of g-code
This spelling is in Ultimaker's style guide.
We use g-code, and capitalise the G if it's at the start of a sentence or header.
Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura.
2020-07-20 13:36:49 +02:00
Ghostkeeper
a84598a8c9
Remove default value for g-code before pause
It's best to just leave it as is. Not everyone appreciates bleeps.

Contributes to issue CURA-7599.
2020-07-20 13:24:18 +02:00
Ghostkeeper
13ff186c8e
Correct spelling of 'g-code'
This is the convention we're holding in this application.
2020-07-20 13:23:24 +02:00
Ghostkeeper
ededb2a8d2
Merge branch 'master' of https://github.com/rodrigosclosa/Cura into rodrigosclosa-master
Conflicts:
	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py -> Merging other pausing scripts into this one
	plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py -> Has been removed upstream
2020-07-20 13:17:27 +02:00
Konstantinos Karmas
79a816db6b
Merge pull request #7726 from Bostwickenator/master
Add PostProcessingPlugin script DisplayProgressOnLCD
2020-07-08 17:30:05 +02:00
Alexander Gee
0a97511d3a
Apply suggestions from code review
Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2020-07-08 00:30:19 -05:00
Nino van Hooff
c810ae97a7
Merge pull request #7919 from adripo/patch-2
Fixed next XY return position after pause
2020-06-18 11:27:32 +02:00
adripo
2fc06069ba
Added whitelist G0..G4 instead of blacklist 2020-06-11 17:38:06 +02:00
adripo
d568531aed
Fixed next XY return position after pause 2020-06-11 17:14:53 +02:00
adripo
8c369a79fa
Adjusted correct pause_method for FlyingBear Ghost 4S 2020-06-11 14:56:13 +02:00
Nino van Hooff
8ea6908935
Merge pull request #7775 from sgtnoodle/fix_stretch_feed
Fix extruder and feed rate after extruder-only moves in post stretch …
2020-06-09 17:46:17 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
2020-05-28 17:31:24 +02:00
Alexander Gee
e807a086b4 Refactor setting names for consistancy, migration script 2020-05-23 16:42:01 -05:00
Alexander Gee
91199c8501 Add line_set to avoid infinte loops 2020-05-22 17:45:32 -05:00
Alexander Gee
17d6321eff Extract method 2020-05-22 17:45:32 -05:00
Alexander Gee
1519b05cdb Incorperate percentage and time remaining scripts 2020-05-22 17:45:32 -05:00
Alexander Gee
63b4c47095 Rename to DisplayProgressOnLCD 2020-05-22 17:45:32 -05:00
Alexander Gee
93fdd9151b Add PostProcessingPlugin script DisplayPercentCompleteOnLCD 2020-05-22 17:45:32 -05:00
Jeff Rogers
a232e12cc3 Fix extruder and feed rate after extruder-only moves in post stretch script (issue 7755) 2020-05-16 14:37:57 -07:00
Nino van Hooff
c6e6c76962 Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments
# Conflicts:
#	cura/API/Account.py
#	plugins/SimulationView/SimulationView.py
2020-05-15 13:38:37 +02:00
fieldOfView
172e6a0759 Merge branch 'master' into feature_unify_pause_at_height
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/BQ_PauseAtHeight.py
2020-05-14 08:45:38 +02:00
Ghostkeeper
aff28d821f
Also reset extrusion for Griffin printers
The rest may not be necessary but the G92 is crucial if redo layer is activated.

Contributes to issue CURA-7413.
2020-05-11 18:35:27 +02:00
Ghostkeeper
05b0bf5988
Turn 'Redo Layers' into a boolean for at most 1 layer
We've deemed it irresponsible to redo multiple layers. This will dig the nozzle back down into the layers that were printed before the pause.

This doesn't include a version upgrade yet.

Contributes to issue CURA-7413.
2020-05-11 18:34:41 +02:00
Nino van Hooff
a4fe3d7685 Convert doxygen to rst for POS, MonitorStage, PostProcessing 2020-05-08 16:28:07 +02:00
Rodrigo Sclosa
d354c9f8ca Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-30 16:37:20 -03:00
Rodrigo Sclosa
f9868a5aa4 Revert "Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code."
This reverts commit 323c374cc4477a3a143b932fefb77929c70da7ec.
2020-04-30 16:34:20 -03:00
Rodrigo Sclosa
323c374cc4 Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. 2020-04-23 20:15:10 -03:00
Nino van Hooff
971d8cd8e2 Remove leftover debug code from ChangeAtZ.py
CURA-7146
2020-04-23 11:48:50 +02:00
Nino van Hooff
ec334e0891
Merge pull request #6778 from novamxd/master
ChangeAtZ 5.2.0
2020-04-22 16:18:27 +02:00
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