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
Jaime van Kessel
10ed7c1288
Merge branch '4.8' of github.com:Ultimaker/Cura
2020-10-22 13:41:44 +02:00
Kostas Karmas
03dc8d00fe
Up the SDK version to 7.4.0
...
In preparation for release of the 4.8.
CURA-7795
2020-10-22 11:29:25 +02:00
Jaime van Kessel
257a661ef1
Ensure changeAtZ script sees speed 100 as default
...
The speed is asumed to be default at 100%. This is so much assumed
that the g-code doesn't even put a m220 s100 command as the basis anymore
CURA-7773
2020-10-21 16:52:39 +02:00
Remco Burema
a8acdd01e4
Merge branch 'master' of https://github.com/Ultimaker/Cura
2020-10-20 12:36:41 +02:00
Remco Burema
eb9912b924
'M220' doesn't take a 'T' parameter in any format.
2020-10-20 12:36:06 +02:00
Ghostkeeper
6abfa38838
More fixes for PyCapsule_GetPointer race condition
...
One of the weirdest errors out there, and as far as I know we're the only ones suffering from it, due to having multiple packages of Python bindings created with Sip as well as having PyQt and different threads.
2020-10-16 14:26:27 +02:00
Ghostkeeper
87eca6f46a
Raise error if there is a syntax error in stored post-processing scripts
...
Instead of just crashing the entire application.
Fixes Sentry issue CURA-19W.
2020-10-05 17:59:25 +02:00
Kimmo Toivanen
ad79cf878f
Added M73 remaining time option and option to output remaining time more often
2020-09-09 22:43:54 +03:00
Ghostkeeper
9ea418c0a1
Revert "Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7""
...
This reverts commit 28f4d8513d
.
The original revert was to revert an accidental merge from master to 4.7. This now reverts the revert on Master, so that we still have those changes on Master.
2020-08-20 16:35:52 +02:00
Ghostkeeper
a757dc7fa0
Merge branch '4.7'
2020-08-20 16:34:58 +02:00
Ghostkeeper
28f4d8513d
Revert "Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7"
...
This reverts commit 7f47f12bf0
, reversing
changes made to dd42c87da7
.
2020-08-20 16:01:46 +02:00
Ghostkeeper
74b9771c7d
Code style: Fields have lower camel casing
...
As specified in the Ultimaker/Meta repository.
2020-08-19 15:46:08 +02:00
Ghostkeeper
9145a7e9e6
Remove unused import
...
Done during investigation of #8075 .
2020-08-19 15:35:57 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7'
2020-08-10 11:26:25 +02:00
Ghostkeeper
cc99c481af
Don't apply printspeed to travel moves
...
As the documentation says, only apply it to extrusion moves.
Done as a 5 minute fix.
2020-08-07 16:07:42 +02:00
Ghostkeeper
8b522a8a58
Fix crash when processLinearMove gets called on something else than G0 or G1
...
Return the original line then.
2020-08-07 15:29:55 +02:00
Kostas Karmas
bd54ef8d5a
Update the SDK version to 7.3.0 for 4.7
...
CURA-7641
2020-08-07 11:12:27 +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
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
Louis Wouters
c87bd83618
Improved readability of putValue
2020-06-23 21:46:40 +02:00
Louis Wouters
3b4833a7e6
Fixed double ";" when using putValue on a line with a comment
2020-06-19 11:38: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
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
Ghostkeeper
9c78178561
Fix running automated tests from source with different SIP version
...
This prevents the PyCapsule_GetPointer error when running the tests for this plug-in.
Done during Turbo Testing and Tooling.
2020-05-29 17:31:58 +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