87 Commits

Author SHA1 Message Date
Remco Burema
1b12e99869 Merge remote-tracking branch 'easygo/EasyG0ing1' into CURA-9822_pause_at_height_improvements 2023-01-26 10:05:17 +01:00
Remco Burema
883a3039e5 Remove old 'newline' solution. Will be fixed in the next commit(s).
In retrospect, using ';' for the newline seperation was a bit daft, given that comments also start with that.

done as part of CURA-9822
2023-01-25 17:48:36 +01:00
Joey de l'Arago
ebbefb5439
Merge pull request #13718 from discip/patch-2
minor fixes + layer_no instead of height
2022-11-11 11:17:22 +01:00
Remco Burema
997b6f830d Manually revert part of PR.
It shouldn't really be nescesary, but you _can_ put any gcode flavour in relative or absolute, so we should also deal with that in the pause-at-height script.
2022-11-04 09:12:47 +01:00
Remco Burema
b1138e12d9 Merge branch 'main' 2022-11-04 08:47:50 +01:00
discip
d5099111bb
minor fixes + layer_no instead of height 2022-11-03 00:45:42 +01:00
Michael Sims
7a3aa87232 Added ability to have multiple gcode commands before and after pausing print job 2022-09-09 15:44:48 -07:00
4DPrinters
98ed17d2df
Update PauseAtHeight.py
Corrected typo on line 333
2022-06-09 14:34:28 -05:00
Dragos Circa
c8e33a5188
Update PauseAtHeight.py
Enable disarm only if hold steppers is disabled
2022-03-28 13:14:08 +03:00
Dragos Circa
2ef4836802
Update PauseAtHeight.py
Change M18 to M84, add beep option and allow newlines in "Additional GCODE" fields
2022-03-28 13:04:24 +03:00
Ghostkeeper
f97f7ca6af
Port relative mode handling to Repetier flavour too
As requested in #9518.
2021-12-24 16:18:13 +01:00
Ghostkeeper
74ff28cbea
Only unretract/retract when necessary for priming
Otherwise this is quite a useless move and would only cause blobs on the print.

Found during work on CURA-8522.
2021-11-05 21:03:03 +01:00
Jaime van Kessel
00a01569be Add clarifying comment to pause at height
It was a bit confusing what was happening, so i've added an extra comment to clarify
what was going on.

CURA-7292
2021-10-21 15:30:32 +02:00
Konstantinos Karmas
e5374ada3b Merge branch '4.11' 2021-08-17 15:59:53 +02:00
Jelle Spijker
d87c7a70cb
Switch return order for Repetier pauseAtHeight
While testing I noticed that the movement after the pause will
first move the head down and then move to the position before
the pause. This could result in noticeable artifacts or
accidentally push thin towers from the bed.) See the code below.

```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F300 Z5
G1 F9000 X30.759 Y30.759
G1 F1800 ; restore extrusion feedrate
```
I have switched the lines in the script such that it will first move to the correct X, Y and then move down
```python
prepend_gcode += self.putValue(G = 1, X = x, Y = y, F = 9000) + "\n"
prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
```
As shown in the code below
```gcode
;TYPE:CUSTOM
;added code by post processing
;script: PauseAtHeight.py
;current z: 5
;current height: 5.0
M83 ; switch to relative E values for any needed retraction
G1 F300 Z6 ; move up a millimeter to get out of the way
G1 F9000 X190 Y190
G1 F300 Z20.0
M84 E0
@pause now change filament and press ; Do the actual pause
G1 F9000 X30.759 Y30.759
G1 F300 Z5
G1 F1800 ; restore extrusion feedrate
```
2021-08-17 13:38:50 +02:00
fieldOfView
91b2a9b325 Fix typo 2021-08-16 21:07:55 +02:00
fieldOfView
e4a04c186f Merge branch 'master' into feature_pause_at_height_optional_parking
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
2021-08-16 12:19:49 +02:00
fieldOfView
6c585deb1e Make parking optional
Not adding parking gcode makes the repetier @pause method suitable for use with OctoPrint.

Contributes to #7842
2021-08-16 12:15:38 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
2021-08-16 11:15:30 +02:00
Ghostkeeper
9a470f639d
Only add G92 for Griffin if redoing layer
Also, don't add it twice for the Repetier flavour.
This way the code is separated better into if-else cases to make it easier to read, even though it has this line in there 3 times.

Fixes issue CURA-8331.
2021-06-22 16:29:28 +02:00
Ewald Kleefstra
94871a32e3
Update plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
Get extrusion mode from global container stack instead of first extruder

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2021-06-14 15:26:57 +02:00
Ewald Kleefstra
76da7768e8
Added relative extrusion mode support for PauseAtHeight.py script 2021-06-14 15:26:41 +02:00
Remco Burema
4d4427ce79
Extrusion should be retraction.
Should fix #9752 aka internal ticket CURA-8246 -- This makes the repetier case completely analogous to the other 'not-griffin' flavours (at least what concerns retraction amounts), and also neatly dove-tails with the first point things start to go wrong in the bug-report.
2021-05-18 13:21:34 +02:00
pnt103
2ed40fe2c6
Get last position from previous layer instead.
Old code was next-next layer, which is actually the layer _after_ the one that is meant.

Fixes #9430
CURA-8116
2021-03-25 09:19:45 +01:00
Ghostkeeper
91fe9e8ebf
Merge branch 'patch-1' of https://github.com/EGOiST1991/Cura into EGOiST1991-patch-1 2021-03-23 13:57:00 +01:00
fieldOfView
47723e9823 Fix definition of machine_gcode_flavor setting in PauseAtHeight 2021-01-03 13:22:51 +01:00
Pascal
17514b2a6a
Head was 1mm to high after the pause
The wrong line starts here:
458: prepend_gcode += self.putValue(G = 1, Z = current_z + 1, F = 300) + "\n"
The correct line:
458: prepend_gcode += self.putValue(G = 1, Z = current_z, F = 300) + "\n"
2020-10-20 11:36:11 +02:00
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
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
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
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
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