Allow easy disable/enable of the cooling fan.

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index 653ae5c20748d468df133ae4675dfdb8b08f9ced..6c97d3c224252aa94216ab8e5a27fa11d41d9f71 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -143,7 +143,7 @@ setting('object_sink',               0.0, float, 'advanced', 'Quality').setLabel
 setting('travel_speed',            150.0, float, 'advanced', 'Speed').setRange(0.1).setLabel('Travel speed (mm/s)', 'Speed at which travel moves are done, a high quality build Ultimaker can reach speeds of 250mm/s. But some machines might miss steps then.')
 setting('bottom_layer_speed',         20, float, 'advanced', 'Speed').setRange(0.1).setLabel('Bottom layer speed (mm/s)', 'Print speed for the bottom layer, you want to print the first layer slower so it sticks better to the printer bed.')
 setting('cool_min_layer_time',         5, float, 'advanced', 'Cool').setRange(0).setLabel('Minimal layer time (sec)', 'Minimum time spend in a layer, gives the layer time to cool down before the next layer is put on top. If the layer will be placed down too fast the printer will slow down to make sure it has spend at least this amount of seconds printing this layer.')
-#setting('fan_enabled',              True, bool,  'advanced', 'Cool').setLabel('Enable cooling fan', 'Enable the cooling fan during the print. The extra cooling from the cooling fan is essensial during faster prints.')
+setting('fan_enabled',              True, bool,  'advanced', 'Cool').setLabel('Enable cooling fan', 'Enable the cooling fan during the print. The extra cooling from the cooling fan is essential during faster prints.')
 
 #setting('max_z_speed',               3.0, float, 'expert',   'Speed').setRange(0.1).setLabel('Max Z speed (mm/s)', 'Speed at which Z moves are done. When you Z axis is properly lubricated you can increase this for less Z blob.')
 #setting('retract_on_jumps_only',    True, bool,  'expert',   'Retraction').setLabel('Retract on jumps only', 'Only retract when we are making a move that is over a hole in the model, else retract on every move. This effects print quality in different ways.')

diff --git a/Cura/util/sliceEngine.py b/Cura/util/sliceEngine.py
index 7d2509289e2188d4b9a5d3a99b94429358631afd..f3069887b703f30a5a552c35494bbfd64ad545a7 100644 (file)
--- a/Cura/util/sliceEngine.py
+++ b/Cura/util/sliceEngine.py
@@ -203,8 +203,8 @@ class Slicer(object):
                        'printSpeed': int(profile.getProfileSettingFloat('print_speed')),
                        'moveSpeed': int(profile.getProfileSettingFloat('travel_speed')),
                        'fanOnLayerNr': int(profile.getProfileSettingFloat('fan_layer')),
-                       'fanSpeedMin': int(profile.getProfileSettingFloat('fan_speed')),
-                       'fanSpeedMax': int(profile.getProfileSettingFloat('fan_speed_max')),
+                       'fanSpeedMin': int(profile.getProfileSettingFloat('fan_speed')) if profile.getProfileSetting('fan_enabled') == 'True' else 0,
+                       'fanSpeedMax': int(profile.getProfileSettingFloat('fan_speed_max')) if profile.getProfileSetting('fan_enabled') == 'True' else 0,
                        'supportAngle': int(-1) if profile.getProfileSetting('support') == 'None' else int(60),
                        'supportEverywhere': int(1) if profile.getProfileSetting('support') == 'Everywhere' else int(0),
                        'retractionAmount': int(profile.getProfileSettingFloat('retraction_amount') * 1000),