61 Commits

Author SHA1 Message Date
Diego Prado Gesto
8086adf9ba
Update plugins/PostProcessingPlugin/scripts/ColorMix.py
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
2019-03-09 20:41:54 -05:00
Diego Prado Gesto
ad820ad1e9
Update plugins/PostProcessingPlugin/scripts/ColorMix.py
Okay

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
2019-03-09 20:41:35 -05:00
Diego Prado Gesto
986f9aa248
Update plugins/PostProcessingPlugin/scripts/ColorMix.py
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
2019-03-09 20:41:00 -05:00
Diego Prado Gesto
7921b89f3e
Update plugins/PostProcessingPlugin/scripts/ColorMix.py
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
2019-03-09 20:40:36 -05:00
Diego Prado Gesto
9fae1f29b1
Update plugins/PostProcessingPlugin/scripts/ColorMix.py
Sure

Co-Authored-By: Hrybmo <john.hryb.4@gmail.com>
2019-03-09 20:40:11 -05:00
John Hryb IV
3a979903aa
PostProcessingPlugin Script for 2-1 Dual Extruders - ColorMix 2-1
Marlin Commands:
M163 - Set Mix Factor
M164 - Save Mix
Ability to set a mix ratio or blend at a defined layer or distance.
Based on Geeetech's Color mixing software.
2019-02-19 23:40:36 -05:00
Ghostkeeper
5592d4fa60
Don't make retraction distance negative
Apparently this got changed accidentally because of a merge in an unfortunate time.
2019-02-04 08:25:35 +01:00
Ghostkeeper
3018b1b3d4
Merge branch 'master' of https://github.com/griehsler/Cura into griehsler-master 2019-02-04 08:22:55 +01:00
Nico Salvador
39cdb3ed0a
Fixed typo in ChangeAtZ.py 2019-01-06 10:19:21 +08:00
griehsler
9bc63fb1f9 Merge remote-tracking branch 'upstream/master' 2019-01-04 23:57:58 +01:00
Mark
90aa8c1264 point people to a good example 2018-11-29 15:29:51 +01:00
griehsler
3a84a5868f
Merge branch 'master' into master 2018-10-31 21:44:44 +01:00
Ghostkeeper
c7b146c9fc
Don't make retract distances negative
People are reporting that the retraction is reversed. We can't test it since we have no firmware that supports the command at all. So we'll just not make the retract distance negative. That seems more logical anyway if you read the documentation of M600 to the letter.

Fixes #4249.
2018-10-25 13:54:00 +02:00
griehsler
5ae5dfd3ad added x_position and y_position to postprocessing filamentchange parameters 2018-10-20 01:28:48 +02:00
Ghostkeeper
2eb9b111fc
Fix changing flow rate in dual extrusion
This potentially set the flow rate to -1, since it was changing the flow rate to the old['flowrateTwo'] which was left at -1 since initialisation because it didn't update here.
2018-10-19 09:55:23 +02:00
Jaime van Kessel
13ab9ba384 Merge branch 'patch-1' of https://github.com/adecastilho/Cura 2018-10-02 13:15:48 +02:00
Amanda de Castilho
7e7f2aab6b
Update DisplayFilenameAndLayerOnLCD.py 2018-08-29 09:48:37 -07:00
Amanda de Castilho
f7fbc685d8
Update DisplayFilenameAndLayerOnLCD.py
changed so that actual filename is displayed (or alternatively user can enter text to display) to LCD during print
2018-08-29 08:43:16 -07:00
Amanda de Castilho
a5baa90086
Rename DisplayFilenameAndLayerOnLCD to DisplayFilenameAndLayerOnLCD.py
added the .py extention
2018-08-29 08:09:57 -07:00
Amanda de Castilho
6dbf0a5fb7
Create DisplayFilenameAndLayerOnLCD
This plugin inserts M117 into the g-code so that the filename is displayed on the LCD and updates at each layer to display the current layer
2018-08-29 00:39:13 -07:00
Thomas Kriechbaumer
afb4440d64 add PauseAtHeight post-processing script for RRF 2018-08-22 13:46:49 +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
Jack Ha
b8ec1d0fa7 In relative mode, the feedback is still absolute and not relative. CURA-5480 2018-08-01 10:52:31 +02:00
Aleksei S
fca51ac41f Set relative after getting to line G91 2018-07-25 13:44:58 +02:00
Lipu Fei
952bc54452 Make stretch script work with relative movements
CURA-5480
2018-07-24 15:59:02 +02:00
Diego Prado Gesto
296b74b032 Set negative values to retraction in the filament change script.
Fixes #4114
2018-07-24 10:48:52 +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
Diego Prado Gesto
dfd20e1362 CURA-5335 Looking for the actual line number in the gcode when using the filament change script. 2018-06-14 14:35:46 +02:00
ChrisTerBeke
717c11005b Codestyle changes after merge 2018-05-24 10:58:55 +02:00
ChrisTerBeke
7d0b664c53
Merge pull request #3648 from JPFrancoia/master
Bug fixes and improvements for PauseAtHeight plugin
2018-05-24 10:56:16 +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
Ghostkeeper
4226f3641b
Better defaults for filament change
And better descriptions.
2018-03-21 17:12:54 +01:00
Ghostkeeper
363166bbb7
Merge branch 'post_stretch' of https://github.com/electrocbd/Cura into electrocbd-post_stretch 2018-03-20 16:01:24 +01:00
Ghostkeeper
ecfb62b69e
Rename ColorChange to FilamentChange
I think this is more clear to the users what this should actually do.
2018-03-07 11:01:00 +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
Ghostkeeper
6934c3f881
Use self.putValue to write g-code
Mostly as a test of this function. Seems to work.
2018-02-26 09:54:42 +01:00
Ghostkeeper
d0cc9ba8a6
Remove debugging prints 2018-02-26 09:42:29 +01:00