Browse Source

Updated inheritance functions for um2+

Tom Heijmans 9 years ago
parent
commit
00305f1c53

+ 6 - 0
resources/machines/ultimaker2plus.json

@@ -11,6 +11,12 @@
     "inherits": "ultimaker2.json",
 
     "overrides": {
+        "speed_infill": { "inherit_function": "speed_print"  },
+        "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)"  },
+        "retraction_min_travel": { "inherit_function": "machine_nozzle_size * 2"  },
+        "line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)"  },
+        "speed_layer_0": { "default": "20" },
+        "speed_support": { "inherit_function": "speed_wall_0"  },
         "machine_height": { "default": 203 },
         "machine_show_variants": { "default": true },
         "gantry_height": { "default": 52 },

+ 4 - 0
resources/machines/ultimaker2plus_025.json

@@ -12,6 +12,10 @@
     "variant": "0.25 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.2, 0)"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
+        "speed_wall_0": { "inherit_function": "speed_wall - 5"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 1.5, 0)" },
         "machine_nozzle_size": { "default": 0.25 },
         "machine_nozzle_tip_outer_diameter": { "default": 0.8 },
         "coasting_volume": { "default": 0.1 },

+ 4 - 0
resources/machines/ultimaker2plus_040.json

@@ -12,6 +12,10 @@
     "variant": "0.4 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.25, 0)"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
+        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2.25, 0)" },
         "machine_nozzle_size": { "default": 0.40 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.05 }
     }

+ 4 - 0
resources/machines/ultimaker2plus_060.json

@@ -12,6 +12,10 @@
     "variant": "0.6 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
+        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" },
         "machine_nozzle_size": { "default": 0.60 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.25 },
         "coasting_volume": { "default": 1.36 }

+ 4 - 0
resources/machines/ultimaker2plus_080.json

@@ -12,6 +12,10 @@
     "variant": "0.8 mm",
 
     "overrides": {
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
+        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" },
         "machine_nozzle_size": { "default": 0.80 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.35 },
         "coasting_volume": { "default": 3.22 }