GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-22 05:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
34,169 Commits 287 Branches 260 Tags
Commit Graph

323 Commits

Author SHA1 Message Date
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
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
eb9912b924
'M220' doesn't take a 'T' parameter in any format. 2020-10-20 12:36:06 +02: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
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 28f4d8513db7efce17bfd8b80fa7c8b237fd1c18.
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 7f47f12bf0a9cf305542b6c21600ce9b804c1dfd, reversing
changes made to dd42c87da762d2030ee2220bc6f0a3e44cf85c28.
 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
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
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