286 Commits

Author SHA1 Message Date
tastyratz
09d1becf1e
Update InsertAtLayerChange.py
I removed the period from the G-code to insert label for consistency. I also added a third option to this called "Skip layers". This allows you to insert gcode with a specific number of layers skipped (i.e. skip layers 1 will insert gcode every other layer, skip layers 3 will insert every fourth).

As an example, this change allowed me to insert a nozzle cleaning routine in my gcode without having to run it EVERY layer.
2023-03-05 11:48:45 -05:00
Remco Burema
36bb016a9b Merge branch 'CURA-9822_pause_at_height_improvements' 2023-01-26 13:17:32 +01:00
Greg Valiant
725d1026dd Revised PauseAtHeight.py. The changes are:
For non-Repetier and non-Ultimaker printers - Move the prime extrusion so it occurs while the print head is still in the parked position so the blob doesn't happen over the print (GitHub #13584 and #11471 for reference).

Add a user option to use M104 or M109 for the resume temperature to avoid an unnecessary delay if the resume temperature is the same as the standby temperature.

committed as part of CURA-9822
2023-01-26 13:15:09 +01:00
Jaime van Kessel
f0944fd98e
Merge branch 'CURA-10092_fix_relative_retractcontinue' of github.com:Ultimaker/Cura 2023-01-26 13:01:40 +01:00
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
Remco Burema
7e695908cf Rename confusing parameter.
part of CURA-10092
2023-01-25 11:44:46 +01:00
Remco Burema
e2f7ef8b8b Add typing to Retract-Continue script.
part of CURA-10092
2023-01-20 17:58:42 +01:00
Remco Burema
9861e450a0 Fix/rewrite for relative extrusion mode.
For relative mode, not only needs the retractions created to be actually relative, but it also needs to compensate on the next G1 (as opposed to absolute mode, where you'd want to go to the same absolute E position after). Rather than massively complicating the already gnarly code (once it found a G1 retraction, it scanned forwards to find G0 statements (which it rewrote to G1), so it would go over those _again_ in the middle (layer) loop). While this worked for absolute mode, but would be a nightmare to make work for relative mode as-is (if only because the compensation could _also_ potentially involve keeping track of things over the outer loop). As a bonus I think the resulting code is actually easier to read.

part of CURA-10092 -- should fix #14100
2023-01-20 17:34:39 +01:00
Jaime van Kessel
feff96288f
Remove stray comma from json 2023-01-20 11:26:00 +01:00
Jaime van Kessel
e8528e6735
Merge branch 'script' of github.com:brunohenriquy/Cura 2023-01-20 11:20:45 +01:00
Victor
51a6afb58f
Apply suggestions from code review
Co-authored-by: Casper Lamboo <casperlamboo@gmail.com>
2022-12-19 14:42:19 -03:00
victornpb
337ce4caa1 shortened label 2022-11-19 04:06:26 -03:00
victornpb
4459ecb5d7 Added "enable" checkbox consistent with changeAtZ.py. So you don't have to reconfigure it every time 2022-11-19 03:56:20 -03:00
victornpb
ac16659829 support custom gcode macro before and after filament change 2022-11-19 03:53:53 -03:00
victornpb
1160127409 added UI fields 2022-11-19 03:49:15 -03: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
digitalfrost
aed16cf849 PostProcessingPlugin/.../Stretch.py Use enumerate
Use enumerate instead of range(len
2022-08-10 10:47:18 +02:00
4DPrinters
98ed17d2df
Update PauseAtHeight.py
Corrected typo on line 333
2022-06-09 14:34:28 -05:00
Bruno Henrique
5c4669316d Adding option: "Add prefix 'Printing'" 2022-05-07 15:14:05 -03:00
Jaime van Kessel
50954552d2 Fix thumbnail creation
CURA-9120
2022-04-13 16:53:11 +02: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
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
2022-03-24 11:53:44 +01:00
Ghostkeeper
e715017545
Adjust description of Change Retraction for rel. extrusion
A patch-up until we have a real solution, as suggested in #11487.
2022-03-20 19:49:12 +01:00
Ghostkeeper
c7d7dd11d1
Merge branch 'master' into PyQt6_upgrade
Conflicts:
	cura/PlatformPhysics.py -> Removed shapely on master, while QTimer import got updated to Qt6.
	plugins/Toolbox -> Entire folder is deleted in master, but it was updated to Qt6 here. This can all be removed.
2022-02-21 11:52:28 +01:00
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +01:00
Remco Burema
abe7c1bf7f
Search/replace Qt5->Qt6.
part of upgrading Qt to v6.2: CURA-8591
2021-12-28 14:46:02 +01:00
Ghostkeeper
f97f7ca6af
Port relative mode handling to Repetier flavour too
As requested in #9518.
2021-12-24 16:18:13 +01:00
Iñigo Martinez Lasala
e5e774cd33
Update DisplayProgressOnLCD.py
Support for Octoprint via M118 A1 P1 action:notification command when using BTREETECH TFT
- ETA
- % advance
2021-11-30 19:07:35 +01:00
Jaime van Kessel
561d0784f8 Merge branch 'CURA-8522_pause_extrusion_interruption' of github.com:Ultimaker/Cura 2021-11-08 10:23:49 +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
Remco Burema
89ab394dc0
Code-style, revert unilateral descisions.
- Capitalization for camelCase.
- Indentation.
- We don't really even _have_ a concept of what a 'Beta' for a script is, and this was a unilateral descision from a single contributor instead of validated by the proper channels like QA, V&V, etc.
- Pretty sure that while those labels aren't used _within_ Cura proper, other people (and maybe plugins?) rely on them for (further)post-processing. Also the distinction between CAZO and CAZD was lost.

part of CURA-8655
2021-11-02 09:09:02 +01:00
Remco Burema
e286b17bd9
Merge branch 'master' of https://github.com/legend069/Cura into legend069-master 2021-11-02 08:45:27 +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
Jaime van Kessel
bf2b42b0b8 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:29:21 +02:00
Ghostkeeper
a349606fef
Make my name more anonymous
Yes, it's my name. I'm okay with people learning that if they are really looking. I'm less okay with search engines learning that. Removing my name here linked to my nickname will eventually cause search engines to unlink it too.
2021-10-16 11:45:48 +02:00
legend069
3b639d2119 Update ChangeAtZ.py
updated, as suggested by
https://github.com/Ultimaker/Cura/pull/10554#issuecomment-939812755
2021-10-11 19:57:42 +11:00
legend069
35dd43675c Update ChangeAtZ.py
fixed typos and the gcode insert makes it easier to find for others "changeatz"
2021-10-03 20:00:08 +11:00
legend069
4508f60ce5 Update ChangeAtZ.py
PR
2021-10-03 19:43:50 +11:00
Jaime van Kessel
f3e2e7f6ac Merge branch 'filament-change-marlin-unload-fix' of git://github.com/barnybug/Cura 2021-09-27 14:43:07 +02:00
Barnaby Gray
59c8858559 FilamentChange: Fix unload on marlin based printers
See related #10038. This fixes the issue by referencing the gcode flavor set for the machine.
2021-09-16 07:14:52 +01:00
luz paz
9b203c834a Fix source typos 2021-09-07 11:34:22 -04:00
luz paz
d68f375e38 Fix various typos
Found via `codespell -q 3 -S *.po,*.pot -L childs,initialy,lod,ned,te,slicable,sur,tutoriels,wont`
2021-09-07 11:33:54 -04: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