Revert several messy/imcomplete changes I made

diff --git a/Cura/util/settings/__init__.py b/Cura/util/settings/__init__.py
index b6700a059719b3017926178351185749ec5c296f..a4aa91e0189a75287a30150f9f4b959a14e26319 100644 (file)
--- a/Cura/util/settings/__init__.py
+++ b/Cura/util/settings/__init__.py
@@ -1,3 +1,3 @@
 from lulzbotMini import lulzbot_mini_settings
 from lulzbotTAZ4 import lulzbot_taz4_settings
-from lulzbotTAZ5_nozzle35 import lulzbot_taz5_nozzle35_settings
+from lulzbotTAZ5 import lulzbot_taz5_settings

diff --git a/Cura/util/settings/lulzbotTAZ5_nozzle35.py b/Cura/util/settings/lulzbotTAZ5_nozzle35.py
deleted file mode 100644 (file)
index a04445b..0000000
--- a/Cura/util/settings/lulzbotTAZ5_nozzle35.py
+++ /dev/null
@@ -1,75 +0,0 @@
-hips_low_settings = [('infill_speed', '70'),
-                                        ('inset0_speed', '40'),
-                                        ('insetx_speed', '45')]
-hips_normal_settings = [('infill_speed', '50'),
-                                               ('inset0_speed', '30'),
-                                               ('insetx_speed', '35')]
-hips_high_settings = [('infill_speed', '30'),
-                                         ('inset0_speed', '20'),
-                                         ('insetx_speed', '25')]
-
-abs_low_settings = [('infill_speed', '60'),
-                                       ('inset0_speed', '50'),
-                                       ('insetx_speed', '55'),
-                                       ('cool_min_layer_time', '15')]
-abs_normal_settings = [('infill_speed', '55'),
-                                          ('inset0_speed', '45'),
-                                          ('insetx_speed', '50'),
-                                          ('cool_min_layer_time', '15')]
-abs_high_settings = [('infill_speed', '40'),
-                                        ('inset0_speed', '30'),
-                                        ('insetx_speed', '35'),
-                                        ('cool_min_layer_time', '20')]
-
-pla_low_settings = [('infill_speed', '80'),
-                                       ('inset0_speed', '60'),
-                                       ('insetx_speed', '70'),
-                                       ('cool_min_layer_time', '15'),
-                                       ('cool_min_feedrate', '15')]
-pla_normal_settings = [('infill_speed', '60'),
-                                          ('inset0_speed', '50'),
-                                          ('insetx_speed', '55'),
-                                          ('cool_min_layer_time', '15'),
-                                          ('cool_min_feedrate', '10')]
-pla_high_settings = [('infill_speed', '50'),
-                                        ('inset0_speed', '40'),
-                                        ('insetx_speed', '45'),
-                                        ('cool_min_layer_time', '20'),
-                                        ('cool_min_feedrate', '5')]
-
-# LulzBot TAZ 5 slice settings for use with the simple slice selection.
-lulzbot_taz5_nozzle35_settings = [{'Ini': 'taz5_nozzle35'},
-                                                {'Material': '1_hips', 'Profile': '1_low',
-                                                 'Settings': hips_low_settings},
-                                                {'Material': '1_hips', 'Profile': '2_normal',
-                                                 'Settings': hips_normal_settings},
-                                                {'Material': '1_hips', 'Profile': '3_high',
-                                                 'Settings': hips_high_settings},
-
-                                                {'Material': '2_abs', 'Profile': '1_low',
-                                                 'Settings': abs_low_settings},
-                                                {'Material': '2_abs', 'Profile': '2_normal',
-                                                 'Settings': abs_normal_settings},
-                                                {'Material': '2_abs', 'Profile': '3_high',
-                                                 'Settings': abs_high_settings},
-
-                                                {'Material': '3_pla', 'Profile': '1_low',
-                                                 'Settings': pla_low_settings},
-                                                {'Material': '3_pla', 'Profile': '2_normal',
-                                                 'Settings': pla_normal_settings},
-                                                {'Material': '3_pla', 'Profile': '3_high',
-                                                 'Settings': pla_high_settings},
-
-                                                {'Profile': '2_normal',
-                                                 'Settings': [('layer_height', '0.22'),
-                                                                          ('solid_layer_thickness', '0.88')]},
-                                                {'Material': '3_pla', 'Profile': '2_normal',
-                                                 'Settings': [('layer_height', '0.21'),
-                                                                          ('solid_layer_thickness', '0.84')]},
-
-                                                {'Profile': '3_high',
-                                                 'Settings': [('layer_height', '0.14'),
-                                                                          ('solid_layer_thickness', '0.7')]},
-                                                {'Material': '2_abs', 'Profile': '3_high',
-                                                 'Settings': [('layer_height', '0.16'),
-                                                                          ('solid_layer_thickness', '0.74')]}]

diff --git a/Cura/util/simpleModeSettings.py b/Cura/util/simpleModeSettings.py
index dd0349d9034cf7f6be9d557b7fd91d7a2a0a225a..4b97755a8cbe7cc5e9d6788e0dc06c53b44f389d 100644 (file)
--- a/Cura/util/simpleModeSettings.py
+++ b/Cura/util/simpleModeSettings.py
@@ -1,6 +1,6 @@
 from Cura.util.settings import lulzbot_mini_settings, \
                lulzbot_taz4_settings, \
-               lulzbot_taz5_nozzle35_settings
+               lulzbot_taz5_settings
 
 import ConfigParser as configparser
 from Cura.util import profile
@@ -44,7 +44,7 @@ class SimpleModeSettings(object):
 
        settings = {"lulzbot_mini": lulzbot_mini_settings,
                                "lulzbot_TAZ_4": lulzbot_taz4_settings,
-                               "lulzbot_TAZ_5_nozzle35": lulzbot_taz5_nozzle35_settings,
+                               "lulzbot_TAZ_5": lulzbot_taz5_settings,
                                None: {}}