999 Commits

Author SHA1 Message Date
Lipu Fei
293c1690c6 Change to use machine_nozzle_id
CURA-3872

We cannot assume that all nozzles will have IDs like "<type> <size>"
such as "AA 0.4", so we should use a complete string as the nozzle IDs.
2017-06-22 14:00:04 +02:00
Lipu Fei
46b6e5b0a1 Add machine_nozzle_type and set them in UM3 and UM3XL variants
CURA-3872

We add a new setting "machine_nozzle_type" to give the engine
information about the nozzle type, such as "AA" and "BB". This is
applicable to UM3 and UM3XL.
2017-06-22 14:00:04 +02:00
Jaime van Kessel
80cb0e5aac Merge pull request #1961 from fieldOfView/feature_moai_updates
Update Peopoly Moai definition
2017-06-19 11:21:33 +02:00
Ghostkeeper
8c5c28d399
Convert tabs to spaces
Contributes to issue CURA-3916.
2017-06-16 13:23:54 +02:00
Ghostkeeper
a060cfbc66
Merge branch 'master' of https://github.com/beeverycreative/Cura into beeverycreative-master 2017-06-16 13:18:30 +02:00
Ghostkeeper
107b47ef18
Merge branch 'maukcc-master' 2017-06-16 12:57:24 +02:00
Ghostkeeper
e11a52b4ac
Fix infill pattern
Since the value is interpreted as Python code, it needs to have an extra set of quotes to be interpreted as a string instead of a variable.

Contributes to issue CURA-3907.
2017-06-16 12:46:52 +02:00
Ghostkeeper
a1cbdc10df
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-16 12:43:29 +02:00
Lipu Fei
5647800aec Merge pull request #1978 from Ultimaker/feature_sanding_horizontal
Horizontal Ironing
2017-06-16 11:55:45 +02:00
Ghostkeeper
d6baf98632
Merge branch 'Rigid3D-master' 2017-06-16 11:54:09 +02:00
Ghostkeeper
a488bbe392
Merge branch 'master' of https://github.com/Rigid3D/Cura into Rigid3D-master 2017-06-16 11:53:26 +02:00
Ghostkeeper
6c02c46168
Merge branch 'patch-1' of https://github.com/nliaudat/Cura into nliaudat-patch-1 2017-06-16 09:23:19 +02:00
Ghostkeeper
b4559eba2d
Rename forgotten sanding settings to ironing
Oops.

Contributes to issue CURA-3903.
2017-06-15 16:38:12 +02:00
Ghostkeeper
092483cac5
Rename setting ids for sanding to ironing
This makes the code easier to follow since we consistently use the same terms for things in our code as what is user-visible.

Contributes to issue CURA-3903.
2017-06-15 15:19:45 +02:00
Ghostkeeper
a7ed0d011a
Rename speed settings for sanding to ironing
This is consistent with the rest. I had forgotten these since they are in a different category.

Contributes to issue CURA-3903.
2017-06-15 15:17:42 +02:00
Ghostkeeper
0c9556a48c
Rename Sanding to Ironing
Just the user-visible name.

Contributes to issue CURA-3903.
2017-06-15 08:54:44 +02:00
Ghostkeeper
8302819310
Merge branch '2.6' 2017-06-12 09:23:41 +02:00
Ghostkeeper
38a2685681
Take the maximum of line widths for minimising prime tower thickness
Otherwise you get layers where the prime tower isn't printed because it is less than twice the line width, and then the prime tower falls away. I'm sure this was the whole intent of this 'max()' clause but it was executed wrongly.
2017-06-12 09:23:23 +02:00
fieldOfView
c3dcee7f14 Update Peopoly Moai definition infill overlap and adhesion type 2017-06-11 12:18:16 +02:00
Ghostkeeper
0d0ae1efc2
More consistent capital letter usage
The machine settings aren't visible, but sometimes we make some of them visible for an issue or just for a colleague. Anyway it's best to stay consistent even under water.
2017-06-09 11:54:28 +02:00
Marcos Gomes
e37a3c48f5
Updated helloBEEprusa printer profiles 2017-06-07 13:28:26 +01:00
Ghostkeeper
d705ca1b1d
Only enable sanding line spacing when sanding is enabled
Forgot this one.

Contributes to issue CURA-3903.
2017-06-06 11:13:24 +02:00
Ghostkeeper
5eab3191af
Limit sanding settings to top/bottom extruder
Makes sense that whether you need to sand is based on the material used for most of the material that you're sanding over. You're also sanding over the walls, but the skin is hopefully more telling for the types of surfaces you're sanding.

Contributes to issue CURA-3903.
2017-06-06 11:09:36 +02:00
Ghostkeeper
7135a26c1b
Adjust default for sanding inset to half line width
This way it ends up at the very top of the outer wall, which may work better.

Contributes to issue CURA-3903.
2017-06-06 11:03:32 +02:00
Ghostkeeper
f9b792ef76
Set default for sanding flow to 10%
30% is way too much. 10% is a bit much too I think but it produces nice results in the long run. 5% is too little.

Contributes to issue CURA-3903.
2017-06-06 10:54:53 +02:00
Ghostkeeper
762dbe44b5
Fix default for sanding pattern
The previous default wasn't even in the options.

Contributes to issue CURA-3903.
2017-06-06 10:54:01 +02:00
Ghostkeeper
600b855037
Add sanding inset setting
This performs an inset of the area which is sanded, so it doesn't sand all the way to the edge.

Contributes to issue CURA-3903.
2017-06-06 10:53:05 +02:00
Ghostkeeper
e7c49fa1af
Remove non-existing setting
This was giving warnings in the log.
2017-06-06 10:33:15 +02:00
Ghostkeeper
a739973939
Fix indenting
Some tab usage here and erroneous spaces.
2017-06-06 10:32:52 +02:00
Ghostkeeper
a1b10ea528
Add sanding acceleration and jerk settings
These are the same as the top/bottom acceleration and jerk. Perhaps it could be set a bit higher because quality isn't an issue here, but the jerk basically accounts for every acceleration we make at the low default speeds we're using right now.

Contributes to issue CURA-3903.
2017-06-06 10:29:57 +02:00
Ghostkeeper
c30d529240
Make sanding speed scale with top/bottom speed
The default stays the same.

Contributes to issue CURA-3903.
2017-06-06 10:26:01 +02:00
Ghostkeeper
5560fd2b11
Move sanding speed to the speed category
With the rest of the speeds.

Contributes to issue CURA-3903.
2017-06-06 10:24:33 +02:00
Ghostkeeper
ec7081d95a
Add sanding speed setting
The acceleration and jerk aren't adjustable yet (it uses top/bottom acceleration and jerk). Later, maybe.

Contributes to issue CURA-3903.
2017-06-02 17:15:02 +02:00
Ghostkeeper
c69b3110be
Add line spacing setting
This determines the distance between the passes of the sanding nozzle over the surface.

Contributes to issue CURA-3903.
2017-06-02 15:53:17 +02:00
Ghostkeeper
d9f03790dc
Remove lines pattern from sanding
The lines pattern is essentially the same as zigzag if you're extruding nothing or very little.

Contributes to issue CURA-3903.
2017-06-02 15:29:23 +02:00
Ghostkeeper
afb5dd7582
Merge branch '2.6' 2017-06-02 10:27:51 +02:00
Ghostkeeper
e57a39b028
Move prime tower 1mm down again
Otherwise the combination of 0.8mm PVA and 0.8mm CPE causes the prime tower brim to be placed off the build plate.
2017-06-02 10:25:58 +02:00
maukcc
88e761e1be Cartesio acc. and jerk control
Added acceleration and jerk control for normal opperation, for special
materials, and for multi material jobs.
2017-06-02 09:41:04 +02:00
Ghostkeeper
a58926263c
Add flow rate for sanding
Let's see how this works out.

Contributes to issue CURA-3903.
2017-06-02 09:27:05 +02:00
Ghostkeeper
33dccc1340
Add sanding pattern setting
I should probably remove Lines or Zig Zag as option, since they are basically the same.

Contributes to issue CURA-3903.
2017-06-01 21:57:26 +02:00
Ghostkeeper
5400e87548
Add setting to enable sanding
Contributes to issue CURA-3903.
2017-06-01 17:15:37 +02:00
Mehmet Sutas
4244c60665 Update rigid3d_zero2.def.json
Updated start_gcode
2017-06-01 15:06:26 +03:00
Ghostkeeper
d3ebb95734
Merge remote-tracking branch 'origin/master' 2017-05-31 15:22:19 +02:00
Tim Kuipers
384fd45d7f JSON fix: only enable feature extruder nr settings for multi-extrusion printers (CURA-292) 2017-05-31 13:00:44 +02:00
Ghostkeeper
2ad68f6ebd
Clarify description of wall thickness
There was some confusion about whether this was the thickness of the outer walls or just the thickness of walls in general. I've removed 'outside' from the description, because hopefully that is implicit enough.
2017-05-31 11:02:53 +02:00
Ghostkeeper
fc7a32ca7f
Merge branch '2.6' 2017-05-31 09:23:01 +02:00
Ghostkeeper
5392b8f65c
Remove commented-out temperature commands from start g-code
Even though it was commented-out, it was still being detected and made Cura think that the start g-code was heating up the nozzles by itself. I've removed the lines so that the normal temperature commands get inserted by Cura automatically.
2017-05-31 09:22:49 +02:00
Tim Kuipers
aa3379fd7e fix: limit_to_extruder got merged into the wrong place 2017-05-30 15:57:58 +02:00
Tim Kuipers
a91d6478be Merge branch '2.6' 2017-05-30 15:32:49 +02:00
Tim Kuipers
14e85d7b6b refactor: move spaghetti infill options to experimental category 2017-05-30 15:22:03 +02:00