Merge branch 'master' of github.com:Ultimaker/Cura

plugins/SliceInfoPlugin/SliceInfo.py

@@ -46,9 +46,11 @@ class SliceInfoJob(Job):
         if Platform.isOSX():
             kwoptions["context"] = ssl._create_unverified_context()
 
+        Logger.log("d", "Sending anonymous slice info to [%s]...", self.url)
+
         try:
             f = urllib.request.urlopen(self.url, **kwoptions)
-            Logger.log("i", "Sent anonymous slice info to %s", self.url)
+            Logger.log("i", "Sent anonymous slice info.")
             f.close()
         except urllib.error.HTTPError as http_exception:
             Logger.log("e", "An HTTP error occurred while trying to send slice information: %s" % http_exception)
@@ -59,7 +61,7 @@ class SliceInfoJob(Job):
 #       The data is only sent when the user in question gave permission to do so. All data is anonymous and
 #       no model files are being sent (Just a SHA256 hash of the model).
 class SliceInfo(Extension):
-    info_url = "https://stats.youmagine.com/curastats/slice"
+    info_url = "http://stats.youmagine.com/curastats/slice"
 
     def __init__(self):
         super().__init__()

plugins/VersionUpgrade/VersionUpgrade21to22/MachineInstance.py

@@ -91,12 +91,9 @@ class MachineInstance:
 
         if has_machine_qualities: #This machine now has machine-quality profiles.
             active_material += "_" + variant_materials #That means that the profile was split into multiple.
-            current_settings = "" #The profile didn't know the definition ID when it was upgraded, so it will have been invalid. Sorry, your current settings are lost now.
-        else:
-            current_settings = self._name + "_current_settings"
 
         containers = [
-            current_settings,
+            "", #The current profile doesn't know the definition ID when it was upgraded, only the instance ID, so it will be invalid. Sorry, your current settings are lost now.
             active_quality_changes,
             active_quality,
             active_material,

plugins/VersionUpgrade/VersionUpgrade21to22/Profile.py

@@ -80,7 +80,7 @@ class Profile:
         import VersionUpgrade21to22 # Import here to prevent circular dependencies.
 
         if self._name == "Current settings":
-            self._filename += "_current_settings" #This resolves a duplicate ID arising from how Cura 2.1 stores its current settings.
+            return None #Can't upgrade these, because the new current profile needs to specify the definition ID and the old file only had the machine instance, not the definition.
 
         config = configparser.ConfigParser(interpolation = None)
 

resources/definitions/bq_hephestos.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos" },
         "machine_start_gcode": {
             "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
         },

resources/definitions/bq_hephestos_2.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "BQ Hephestos 2" },
         "machine_start_gcode": { "default_value": "; -- START GCODE --\nM104 S{material_print_temperature} ; Heat up extruder while leveling\nM800 ; Custom GCODE to fire start print procedure\nM109 S{material_print_temperature} ; Makes sure the temperature is correct before printing\n; -- end of START GCODE --" },
         "machine_end_gcode": { "default_value": "; -- END GCODE --\nM801        ; Custom GCODE to fire end print procedure\n; -- end of END GCODE --" },
         "machine_width": { "default_value": 210 },

resources/definitions/bq_hephestos_xl.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "BQ Prusa i3 Hephestos XL" },
         "machine_start_gcode": {
             "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
         },

resources/definitions/bq_witbox.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "BQ Witbox" },
         "machine_start_gcode": {
             "default_value": "; -- START GCODE --\nG21                     ;set units to millimetres\nG90                     ;set to absolute positioning\nM106 S0                 ;set fan speed to zero (turned off)\nG28 X0 Y0               ;move to the X/Y origin (Home)\nG28 Z0                  ;move to the Z origin (Home)\nG1 Z15.0 F1200          ;move Z to position 15.0 mm\nG92 E0                  ;zero the extruded length\nG1 E20 F200             ;extrude 20mm of feed stock\nG92 E0                  ;zero the extruded length again\nG1 F7200                ;set feedrate to 120 mm/s\n; -- end of START GCODE --"
         },

resources/definitions/bq_witbox_2.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "BQ Witbox 2" },
         "machine_start_gcode": {
             "default_value": "; -- START GCODE --\nM800        ; Custom GCODE to fire start print procedure\n; -- end of START GCODE --"
         },

resources/definitions/fdmprinter.def.json

@@ -29,6 +29,16 @@
             "icon": "category_machine",
             "children":
             {
+                "machine_name":
+                {
+                    "label": "Machine Type",
+                    "description": "The name of your 3D printer model.",
+                    "default_value": "Unknown",
+                    "type": "str",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false,
+                    "settable_per_meshgroup": false
+                },
                 "machine_show_variants":
                 {
                     "label": "Show machine variants",

resources/definitions/grr_neo.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "German RepRap Neo" },
         "machine_width": {
             "default_value": 150
         },

resources/definitions/innovo_inventor.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Innovo INVENTOR" },
         "machine_width": {
             "default_value": 340
         },

resources/definitions/m180.def.json

@@ -12,6 +12,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Malyan M180" },
         "machine_width": {
             "default_value": 230
         },

resources/definitions/maker_starter.def.json

@@ -13,6 +13,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "3DMaker Starter" },
         "machine_width": {
             "default_value": 210
         },

resources/definitions/mankati_fullscale_xt_plus.def.json

@@ -12,6 +12,7 @@
         "platform": "mankati_fullscale_xt_plus_platform.stl"
     },
     "overrides": {
+        "machine_name": { "default_value": "Mankati Fullscale XT Plus" },
         "machine_width": { "default_value": 260 },
         "machine_depth": { "default_value": 260 },
         "machine_height": { "default_value": 300 },

resources/definitions/mendel90.def.json

@@ -19,6 +19,7 @@
     ],
 
     "overrides": {
+        "machine_name": { "default_value": "Mendel90" },
         "machine_start_gcode": {
             "default_value": "G21 ;metric values\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\nM107 ;start with the fan off\nG1 X90 Y200 F6000 ;go to the middle of the front\nG1 Z0.05 ;close to the bed\nG1 Z0.3 ;lift Z\n"
         },

resources/definitions/printrbot_simple.def.json

@@ -13,6 +13,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Printrbot Simple" },
         "machine_heated_bed": { "default_value": false },
         "machine_width": { "default_value": 150 },
         "machine_height": { "default_value": 150 },

resources/definitions/prusa_i3.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Prusa i3" },
         "machine_heated_bed": {
             "default_value": true
         },

resources/definitions/prusa_i3_mk2.def.json

@@ -15,6 +15,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Prusa i3 Mk2" },
         "machine_heated_bed": { "default_value": true },
         "machine_width": { "default_value": 250 },
         "machine_height": { "default_value": 200 },

resources/definitions/prusa_i3_xl.def.json

@@ -14,6 +14,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Prusa i3 xl" },
         "machine_heated_bed": {
             "default_value": true
         },

resources/definitions/rigidbot.def.json

@@ -13,6 +13,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "RigidBot" },
         "machine_width": {
             "default_value": 254
         },

resources/definitions/rigidbot_big.def.json

@@ -13,6 +13,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "RigidBotBig" },
         "machine_width": {
             "default_value": 400
         },

resources/definitions/ultimaker2.def.json

@@ -18,6 +18,7 @@
         "supported_actions":["UpgradeFirmware"]
     },
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2" },
         "machine_start_gcode" : {
             "default_value": "",
             "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG1 X10 Y0 F4000;move X/Y to min endstops\\nG28 Z0 ;move Z to bottom endstops\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\""

resources/definitions/ultimaker2_extended.def.json

@@ -16,6 +16,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Extended" },
         "machine_height": {
             "default_value": 305
         }

resources/definitions/ultimaker2_extended_plus.def.json

@@ -16,6 +16,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Extended+" },
         "machine_height": {
             "default_value": 305
         }

resources/definitions/ultimaker2_go.def.json

@@ -17,6 +17,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2 Go" },
         "machine_width": {
             "default_value": 120
         },

resources/definitions/ultimaker2_plus.def.json

@@ -20,6 +20,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker 2+" },
         "speed_infill": {
             "value": "speed_print"
         },

resources/definitions/ultimaker_original.def.json

@@ -18,6 +18,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original" },
         "machine_width": {
             "default_value": 205
         },

resources/definitions/ultimaker_original_dual.def.json

@@ -23,6 +23,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original" },
         "machine_width": {
             "default_value": 205
         },

resources/definitions/ultimaker_original_plus.def.json

@@ -17,6 +17,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Ultimaker Original+" },
         "machine_heated_bed": {
             "default_value": true
         },

resources/definitions/uniqbot_one.def.json

@@ -12,6 +12,7 @@
     },
 
     "overrides": {
+        "machine_name": { "default_value": "Uniqbot" },
         "machine_heated_bed": {
             "default_value": false
         },