Merge pull request #636 from Ultimaker/feature_um2upgrades

Support UM2 with Olsson block

resources/machines/ultimaker.json

@@ -0,0 +1,15 @@
+{
+    "id": "ultimaker_base",
+    "version": 1,
+    "visible": false,
+    "name": "Ultimaker",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "inherits": "fdmprinter.json",
+
+    "machine_preferences": {
+        "prefered_profile": "Normal Quality",
+        "prefered_variant": "0.4 mm",
+        "prefered_material": "PLA"
+    }
+}

resources/machines/ultimaker2.json

@@ -1,6 +1,6 @@
 {
     "id": "ultimaker2",
-    "version": 1, 
+    "version": 1,
     "name": "Ultimaker 2",
     "manufacturer": "Ultimaker",
     "author": "Ultimaker",
@@ -9,16 +9,19 @@
     "platform_texture": "Ultimaker2backplate.png",
     "file_formats": "text/x-gcode",
 
-    "inherits": "fdmprinter.json",
+    "inherits": "ultimaker.json",
+
+    "pages": [
+        "SelectUpgradedPartsUM2"
+    ],
 
-    
     "machine_extruder_trains": [
         {
-            "machine_nozzle_heat_up_speed": { 
-                "default": 2.0 
+            "machine_nozzle_heat_up_speed": {
+                "default": 2.0
             },
-            "machine_nozzle_cool_down_speed": { 
-                "default": 2.0 
+            "machine_nozzle_cool_down_speed": {
+                "default": 2.0
             },
             "machine_nozzle_tip_outer_diameter": {
                 "default": 1
@@ -29,7 +32,7 @@
             "machine_nozzle_expansion_angle": {
                 "default": 45
             },
-            "machine_heat_zone_length": { 
+            "machine_heat_zone_length": {
                 "default": 16
             }
         }
@@ -77,7 +80,7 @@
             [[ 115.0, -112.5], [ 108.0, -112.5], [ 110.0, -104.5], [ 115.0, -104.5]]
         ]},
         "machine_platform_offset": { "default": [9.0, 0.0, 0.0] },
-        
+
         "machine_nozzle_tip_outer_diameter": { "default": 1.0 },
         "machine_nozzle_head_distance": { "default": 3.0 },
         "machine_nozzle_expansion_angle": { "default": 45 }

resources/machines/ultimaker2_extended.json

@@ -10,6 +10,10 @@
     "file_formats": "text/x-gcode",
     "inherits": "ultimaker2.json",
 
+    "pages": [
+        "SelectUpgradedPartsUM2"
+    ],
+
     "machine_settings": {
         "machine_width": { "default": 230 },
         "machine_depth": { "default": 225 },

resources/machines/ultimaker2_extended_olsson.json

@@ -0,0 +1,19 @@
+{
+    "id": "ultimaker2_extended_olsson_base",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2.json",
+
+    "machine_settings": {
+        "machine_width": { "default": 230 },
+        "machine_depth": { "default": 225 },
+        "machine_height": { "default": 310 },
+        "machine_show_variants": { "default": true },
+        "gantry_height": { "default": 50 }
+    }
+}

resources/machines/ultimaker2_extended_olsson_025.json

@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.25 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.25 }
+    }
+}

resources/machines/ultimaker2_extended_olsson_040.json

@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.4 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.40 }
+    }
+}

resources/machines/ultimaker2_extended_olsson_060.json

@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.6 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.60 }
+    }
+}

resources/machines/ultimaker2_extended_olsson_080.json

@@ -0,0 +1,16 @@
+{
+    "id": "ultimaker2_extended_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 Extended with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+    "inherits": "ultimaker2_extended_olsson.json",
+    "variant": "0.8 mm",
+    "profiles_machine": "ultimaker2_olsson",
+    "machine_settings": {
+        "machine_nozzle_size": { "default": 0.80 }
+    }
+}

resources/machines/ultimaker2_olsson.json

@@ -0,0 +1,39 @@
+{
+    "id": "ultimaker2_olsson_base",
+    "version": 1, 
+    "name": "Ultimaker 2 with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+
+    "inherits": "ultimaker2.json",
+
+    "overrides": {
+        "machine_show_variants": { "default": true },
+        "shell_thickness": { "default": 1.2 },
+        "top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" },
+        "travel_compensate_overlapping_walls_enabled": { "default": true },
+        "skin_alternate_rotation": { "default": true },
+        "skin_outline_count": { "default": 2 },
+        "infill_sparse_density": { "default": 10 },
+        "infill_overlap": { "default": 14, "inherit_function": "14 if infill_sparse_density < 95 else 0" },
+        "infill_wipe_dist": { "default": 0.35, "inherit_function": "wall_line_width_0" },
+        "retraction_amount": { "default": 6 },
+        "retraction_min_travel": { "default": 4.5 },
+        "retraction_count_max": { "default": 6 },
+        "retraction_extrusion_window": { "default": 6.0 },
+        "speed_print": { "default": 50 },
+        "speed_wall": { "inherit_function": "parent_value / 50 * 30" },
+        "speed_wall_x": { "inherit_function": "speed_print / 50 * 40" },
+        "speed_topbottom": { "inherit_function": "parent_value / 50 * 20" },
+        "speed_layer_0": { "default": 20 },
+        "skirt_speed": { "default": 20 },
+        "travel_avoid_distance": { "default": 1.0 },
+        "coasting_enable": { "default": true },
+        "coasting_volume": { "default": 0.4 },
+        "support_angle": { "default": 50 },
+        "adhesion_type": { "default": "brim" }
+    }
+}

resources/machines/ultimaker2_olsson_025.json

@@ -0,0 +1,30 @@
+{
+    "id": "ultimaker2_olsson",
+    "version": 1, 
+    "name": "Ultimaker 2 with Olsson Block",
+    "manufacturer": "Ultimaker",
+    "author": "Ultimaker",
+    "platform": "ultimaker2_platform.obj",
+    "platform_texture": "Ultimaker2backplate.png",
+    "visible": false,
+
+    "inherits": "ultimaker2_olsson.json",
+
+    "variant": "0.25 mm",
+
+    "overrides": {
+        "machine_nozzle_size": { "default": 0.25 },
+
+        "layer_height": { "default": 0.06 },
+        "layer_height_0": { "default": 0.15 },
+
+        "infill_sparse_density": { "default": 12 },
+        "speed_print": { "default": 30 },
+        "speed_wall": { "inherit_function": "parent_value / 30 * 20" },
+        "speed_wall_x": { "inherit_function": "speed_print / 30 * 25" },
+        "speed_topbottom": { "inherit_function": "parent_value / 30 * 20" },
+
+        "coasting_volume": { "default": 0.1 },
+        "coasting_min_volume": { "default": 0.17 }
+    }
+}