255 Commits

Author SHA1 Message Date
Ghostkeeper
5fc89b6053
Merge branch 'patch-1' of https://github.com/inigoml/Cura into inigoml-patch-1 2022-02-16 12:46:47 +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
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
Humsie
21baf90ec8
Add Z Position parameter to FilamentChange (#9658)
* Add Z Position

* PR Comment: Add minimum value for z_position

Co-authored-by: Konstantinos Karmas <konskarm@gmail.com>
2021-05-21 17:02:53 +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
Ghostkeeper
84fc35abc2
Default to using customised configuration rather than firmware
Not all printers support a firmware configuration here. Wouldn't want to ruin some people's old prints by adding unsupported commands in there, nor change the tried-and-true old parameters people already tested with.

Contributes to issue CURA-8219.
2021-05-05 14:52:21 +02:00
Ghostkeeper
bed255ecb9
Simplify if/else statement
This deduplicates some code and makes it generally easier to read.

Contributes to issue CURA-8219.
2021-05-05 14:50:43 +02:00
Ghostkeeper
e1e25d629e
Use more neutral setting and variable names
It may be just Marlin that implements this right now, but that is bound to change.

Contributes to issue CURA-8219.
2021-05-05 14:49:41 +02:00
Ghostkeeper
29e4cf06b3
Merge branch 'master' of https://github.com/Sekisback/Cura into Sekisback-master 2021-05-05 14:44:51 +02:00
Ghostkeeper
0787594a3d
Accept Griffin-style time estimation header
Otherwise it doesn't work for those printers.

Contributes to issue CURA-7787.
2021-03-31 15:08:33 +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
Ghostkeeper
5138466fea
Merge branch 'feature/thumbnail' of https://github.com/Gravedigger7789/Cura into Gravedigger7789-feature/thumbnail 2021-02-04 15:19:07 +01:00
Jaime van Kessel
bc15ca2269
Merge branch 'fix_pause_at_height_default_value' of https://github.com/fieldOfView/Cura 2021-01-15 17:10:23 +01:00
fieldOfView
47723e9823 Fix definition of machine_gcode_flavor setting in PauseAtHeight 2021-01-03 13:22:51 +01:00
Ghostkeeper
ba9e10cfd8
Round temperatures when displaying them
These are long lines for some screens. It'll save a bit of space. No PID controller can really control down to fractional degrees.
Fan speed and flow rates are already integer settings. For speeds and retraction lenghts the fractions can be important.

Done for #8967.
2020-12-24 16:08:12 +01:00
Sekisback
b458005e7e add Marlin Advanced Pause Feature! 2020-12-24 09:46:19 +01:00
Chris Racioppo
4f8c4be34e Added break from loop 2020-12-06 14:08:46 -05:00
Chris Racioppo
cfed67076e Removing unused import 2020-12-06 13:46:37 -05:00
Chris Racioppo
efb79ae650 Create CreateThumbnail.py 2020-12-06 13:40:56 -05:00
Lucas Teske
c4d9edca69
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:37 -03:00
Lucas Teske
62e4baa746
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:30 -03:00
Lucas Teske
0a21cff234
Update plugins/PostProcessingPlugin/scripts/TimeLapse.py
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
2020-11-25 19:33:24 -03:00
Lucas Teske
394fa8f2f2
Add Z-Hop and filament retraction to Timelapse
So less string occurs
2020-11-17 17:05:15 -03:00
Ghostkeeper
3353817e1c
Fix displaying time estimation with Griffin header
Otherwise it can't find the time and then doesn't output any time remaining commands.

Contributes to issue CURA-7787.
2020-10-22 16:26:15 +02:00
Ghostkeeper
9471ad1c32
Split time remaining setting into activation and method
It's a bit more elegant to have two separate settings for it, and show only the method if relevant.

Contributes to issue CURA-7787.
2020-10-22 16:23:56 +02:00
Ghostkeeper
3fce511d67
Merge branch 'postprocess_periodic_progress' of https://github.com/KimmoHop/Cura 2020-10-22 16:15:58 +02:00