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
24,187 Commits 287 Branches 260 Tags
Commit Graph

58 Commits

Author SHA1 Message Date
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
Ilia Mazlov
5b85dae926 PP-plugin -> PauseAtHeight: steppers disarm timout 2020-03-04 16:49:35 +01:00
fieldOfView
a0a353e33c Add option to set pause method gcode command 
Contributes to #7198
 2020-03-01 16:00:02 +01:00
Remco Burema
432ed02aa6
Fix skip (or late) pause at height. 
Previously, the line after the layer change would also contain the z height.
If not found, the could would break the per-line reading, and skip to the next layer.
However, if the code doesn't contain the Z on the first gcode line of the layer, this would cause it to skip past all layers, until there was a layer with the Z in the first line (so this also explains the 'late' pauses).
I just ignored the optimization and made it a continue.
I checked, and I don't think there's any way this causes the postproc.-gcode to be inserted twice, since it returns the complete data after insering it once.

CURA-6965
 2019-11-21 14:08:51 +01:00
Ghostkeeper
c875252b53
Fix some mistakes indicated by PyCharm's linting 2019-10-15 15:27:58 +02:00
Lipu Fei
af1a03d02f
Merge pull request #6400 from Ultimaker/CURA-6799_pause_at_height_resume_speed 
Cura 6799 pause at height resume speed
 2019-09-25 08:01:13 +02:00
Nino van Hooff
2fa4230d1c Only consider feedrates for extrusions (Pause At Height) 
CURA-6799
 2019-09-24 16:11:00 +02:00
Nino van Hooff
e51efe6cbc Restore feedrate at end of Pause at Height script 
CURA-6799
 2019-09-23 16:10:27 +02:00
Ghostkeeper
b20e5bfd98
Don't display any message if setting is empty 
Contributes to issue CURA-6759.
 2019-09-06 12:42:15 +02:00
Ghostkeeper
c1b4bcebec
Add message while pausing 
This way you can display instructions during the print.

Implements issue CURA-6759.
 2019-09-06 12:41:09 +02:00
B. Perry
6ed57838a9 Fixed PauseAtHeight.py to resume at starting height 2019-09-03 14:02:52 -06:00
Ghostkeeper
8179e1ee90
Add typing 2019-08-01 11:06:22 +02:00
Ghostkeeper
6740c2bee9
Fix offset of initial layer height 
It would detect the height of the raft by looking at what the first Z coordinate is that it encounters on layer 0. This Z coordinate also includes the initial layer height though. If you pause lower than the initial layer height (but higher than 0), you'd expect to pause in the initial layer.
 2018-08-17 11:24:39 +02:00
Ghostkeeper
54b990c0bd
Retract further if we can't set the temperature to stand-by temp 
Because we can't set the temperature and we don't know the correct temperature to set it back to, we will just retract further in order to prevent damage to the material.

Contributes to issue CURA-5491.
 2018-07-09 11:21:34 +02:00
Ghostkeeper
41857338cb
Use firmware retraction and temperature control settings 
Instead of deriving this from the g-code flavour, just use the actual settings that are made to control these two properties.

Contributes to issue CURA-5491.
 2018-07-09 09:27:11 +02:00
Ghostkeeper
b67339c3bf
Merge branch 'CURA-5491-pause-at-height' 
Contributes to issue CURA-5491.
 2018-07-09 09:17:49 +02:00
Ghostkeeper
6977b8de6e
Make getValue return an int if it's an integer number 
This is a more generic solution to what's done in 7058ddbb66084bee9cd507ed69f031ec1262163e.

Contributes to issue CURA-5491.
 2018-07-09 09:01:52 +02:00
Ghostkeeper
96896088c3
Add spaces around equals operators 
As per our code style regulations.
 2018-07-05 16:27:52 +02:00
Jack Ha
b77220b260 Add more ultigcode retract and unretract. CURA-5491 2018-07-03 13:41:14 +02:00
Jack Ha
e61ad750b7 Fixed UM3 Griffin and UM2 UltiGCode for Pause At Height. CURA-5491 2018-07-03 13:13:33 +02:00
Jack Ha
c260078631 Remove temperature commands for pause at height for UM3. CURA-5491 2018-07-03 09:40:42 +02:00
Jack Ha
7058ddbb66 Corrected float/int mixups and allow catching temperature before the layers start. CURA-5491 2018-07-02 16:35:49 +02:00
Jack Ha
17c4b65453 Fix pause at height that uses new latest temperature CURA-5491 2018-07-02 15:13:44 +02:00
Ghostkeeper
d4ca3d144e
Use latest temperature instead of a manual resume temperature 
We don't need the user to fill this in. We can just track the resume temperature ourselves.

Contributes to issue CURA-5491.
 2018-06-21 16:07:29 +02:00
Ghostkeeper
7b82421751
Don't disable E steppers when pausing 
There is no such command to disable only the E stepper drivers. This command M84 gets interpreted as disabling ALL stepper drivers, which on some printers would cause the print bed to fall down.
 2018-06-14 14:57:03 +02:00
ChrisTerBeke
717c11005b Codestyle changes after merge 2018-05-24 10:58:55 +02:00
JPFrancoia
f15680b9ea Cleaning dev instructions. 2018-04-26 09:47:49 +01:00
JPFrancoia
a14d594909 - Solve https://github.com/Ultimaker/Cura/issues/3608. 
- Now account for raft layers when choosing "Pause at layer no".

- Now positions the nozzle at (X, Y) of the next layer when resuming.

- Cleaning code
 2018-04-10 16:09:04 +01:00
Aleksei S
6df4ad3f6d Merge branch 'master' of github.com:Ultimaker/cura 2018-02-26 11:51:56 +01:00
Aleksei S
cd0846fad2 PostProcessing plugi, script Pause at Height redo layers 
gives incorrect E-values
CURA-4670
 2018-02-26 11:49:51 +01:00