diff --git a/resources/definitions/101Hero.def.json b/resources/definitions/101Hero.def.json index a4f718c5a7..a3ce3354af 100644 --- a/resources/definitions/101Hero.def.json +++ b/resources/definitions/101Hero.def.json @@ -25,7 +25,6 @@ "machine_height": { "default_value": 99.822 }, "machine_center_is_zero": { "default_value": true }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [ 0, 0 ], diff --git a/resources/definitions/3dator.def.json b/resources/definitions/3dator.def.json index e33df5eb75..91d058cd4e 100644 --- a/resources/definitions/3dator.def.json +++ b/resources/definitions/3dator.def.json @@ -34,7 +34,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_depth": { "default_value": 170 }, "machine_width": { "default_value": 180 }, - "material_diameter": { "default_value": 1.75 }, "retraction_speed": {"default_value":100}, "cool_fan_speed_min": {"default_value": 20}, "cool_fan_speed_max": {"default_value": 70}, diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 8dd5cf5664..1ab48b865a 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -58,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index e7dfc3c518..46229ce756 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -58,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/abax_titan.def.json b/resources/definitions/abax_titan.def.json index 7f6a5bcced..9f67117d6c 100644 --- a/resources/definitions/abax_titan.def.json +++ b/resources/definitions/abax_titan.def.json @@ -58,9 +58,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/anycubic_i3_mega.def.json b/resources/definitions/anycubic_i3_mega.def.json index b8d7db5237..f20fb68da2 100644 --- a/resources/definitions/anycubic_i3_mega.def.json +++ b/resources/definitions/anycubic_i3_mega.def.json @@ -49,10 +49,6 @@ { "default_value": 0.4 }, - "material_diameter": - { - "default_value": 1.75 - }, "gantry_height": { "default_value": 0 diff --git a/resources/definitions/bfb.def.json b/resources/definitions/bfb.def.json index 3109d6af88..aa183f9c0a 100644 --- a/resources/definitions/bfb.def.json +++ b/resources/definitions/bfb.def.json @@ -27,7 +27,6 @@ "machine_gcode_flavor": { "default_value": "BFB" }, "machine_depth": { "default_value": 265 }, "speed_infill": { "default_value": 30 }, - "material_diameter": { "default_value": 1.7 }, "machine_center_is_zero": { "default_value": true }, "machine_height": { "default_value": 240 }, "layer_height": { "default_value": 0.25 }, diff --git a/resources/definitions/bq_hephestos.def.json b/resources/definitions/bq_hephestos.def.json index 941f0cba48..8dc67a8cad 100644 --- a/resources/definitions/bq_hephestos.def.json +++ b/resources/definitions/bq_hephestos.def.json @@ -62,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_hephestos_2.def.json b/resources/definitions/bq_hephestos_2.def.json index fd3327cd7d..ca0e66ada2 100644 --- a/resources/definitions/bq_hephestos_2.def.json +++ b/resources/definitions/bq_hephestos_2.def.json @@ -26,7 +26,6 @@ "machine_center_is_zero": { "default_value": false }, "material_print_temperature": { "default_value": 210 }, "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, "wall_line_count": { "default_value": 3 }, diff --git a/resources/definitions/bq_hephestos_xl.def.json b/resources/definitions/bq_hephestos_xl.def.json index 47a1b7b5fe..a8d63cbb41 100644 --- a/resources/definitions/bq_hephestos_xl.def.json +++ b/resources/definitions/bq_hephestos_xl.def.json @@ -62,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_witbox.def.json b/resources/definitions/bq_witbox.def.json index 28d4805f01..0ae1c5e339 100644 --- a/resources/definitions/bq_witbox.def.json +++ b/resources/definitions/bq_witbox.def.json @@ -62,9 +62,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/bq_witbox_2.def.json b/resources/definitions/bq_witbox_2.def.json index 4c40b09c0f..7412647852 100644 --- a/resources/definitions/bq_witbox_2.def.json +++ b/resources/definitions/bq_witbox_2.def.json @@ -47,9 +47,6 @@ "material_bed_temperature": { "default_value": 0 }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index deb1539a9a..155ce8e962 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -26,7 +26,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 600 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index c28c7c5de6..c390c3719b 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -26,7 +26,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 8e2fe44631..ec7bf0a345 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -25,7 +25,6 @@ "machine_width": { "default_value": 215 }, "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 205 }, - "material_diameter": { "default_value": 1.75 }, "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 5ca891d6c5..d2b7242d8c 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -34,7 +34,6 @@ "overrides": { "machine_extruder_count": { "default_value": 2 }, - "material_diameter": { "default_value": 1.75 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "gantry_height": { "default_value": 35 }, diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index 7e36b2a183..9fbceec9aa 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -31,9 +31,6 @@ [30, 34] ] }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 173ec6e66d..9ee4707ff1 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -47,9 +47,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 6dde69eeb3..c95b2c3103 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -54,9 +54,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/delta_go.def.json b/resources/definitions/delta_go.def.json index 5228b559c3..968bf281a5 100644 --- a/resources/definitions/delta_go.def.json +++ b/resources/definitions/delta_go.def.json @@ -16,7 +16,6 @@ }, "overrides": { "machine_name": { "default_value": "Delta Go" }, - "material_diameter": { "default_value": 1.75 }, "default_material_print_temperature": { "default_value": 210 }, "speed_travel": { "default_value": 150 }, "prime_tower_size": { "default_value": 8.66 }, diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index bd4eb0839b..c678571c57 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -24,7 +24,6 @@ "machine_depth": { "default_value": 190 }, "machine_center_is_zero": { "default_value": true }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."}, "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, diff --git a/resources/definitions/easyarts_ares.def.json b/resources/definitions/easyarts_ares.def.json index 34163e8a72..4f1d63b346 100644 --- a/resources/definitions/easyarts_ares.def.json +++ b/resources/definitions/easyarts_ares.def.json @@ -52,9 +52,6 @@ "bottom_thickness": { "default_value": 1 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 545a14b0c2..cc8524c3b0 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -51,7 +51,6 @@ "machine_max_jerk_z": { "default_value": 0.4 }, "machine_max_jerk_e": { "default_value": 1.0 }, "retraction_hop_enabled": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature - 5" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "travel_avoid_distance": { "default_value": 1, "value": 1 }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index dd7206c962..cf0df4b4e1 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2109,20 +2109,6 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, - "material_diameter": - { - "label": "Diameter", - "description": "Adjusts the diameter of the filament used. Match this value with the diameter of the used filament.", - "unit": "mm", - "type": "float", - "default_value": 2.85, - "minimum_value": "0.0001", - "minimum_value_warning": "0.4", - "maximum_value_warning": "3.5", - "enabled": "machine_gcode_flavor != \"UltiGCode\"", - "settable_per_mesh": false, - "settable_per_extruder": true - }, "material_adhesion_tendency": { "label": "Adhesion Tendency", diff --git a/resources/definitions/felixtec4dual.def.json b/resources/definitions/felixtec4dual.def.json index 9747fc74d9..b56601a531 100644 --- a/resources/definitions/felixtec4dual.def.json +++ b/resources/definitions/felixtec4dual.def.json @@ -48,7 +48,6 @@ "adhesion_type": { "default_value": "skirt" }, "skirt_brim_minimal_length": { "default_value": 130}, - "material_diameter": { "default_value": 1.75 }, "machine_start_gcode": { "default_value": "; FELIXprinters | www.FELIXprinters.com | Zeemanlaan 15 3401 MV IJsselstein The Netherlands\n; FELIX Tec 4 | Start Code Dual Extruders v1.0\n; Modified by kerog777@gmail.com\n;================================ \n;Initializing\nM80 ; Turn on the power supply\nM107 ; Turn off fans\nM117 Heating up\nM104 T0 S120\nM104 T1 S120\nM140 S{print_bed_temperature} ; Heatup Bed and continue\nG28 ; Home all\nM109 T0 S{print_temperature} ; Heatup hot-end and continue\nM117 Purging\nT0 ; Select extruder 1\nG92 E0 ; Reset extruder\nG1 X10.0 Y1.1 Z5.0 F15240 ; Move to start-line position\nG1 Z0.3 F15240 ; Move z up\nG1 X127.0 Y1.1 Z0.3 F1500.0 E15 ; Purge 1st line\nG92 E0 ; Reset extruder\n\n;================================ ; Initializing done\nM117 FELIXprinting" }, diff --git a/resources/definitions/folgertech_FT-5.def.json b/resources/definitions/folgertech_FT-5.def.json index bc99adc204..d3d00a9b25 100644 --- a/resources/definitions/folgertech_FT-5.def.json +++ b/resources/definitions/folgertech_FT-5.def.json @@ -18,7 +18,6 @@ "machine_width": { "default_value": 300 }, "machine_height": { "default_value": 400 }, "machine_depth": { "default_value": 300 }, - "material_diameter": { "default_value": 1.75 }, "gantry_height": { "default_value": 55 }, "machine_start_gcode": { diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 1db01312ab..f0930259cb 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -28,7 +28,6 @@ "machine_depth": { "default_value": 406 }, "machine_height": { "default_value": 533 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.5 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 8c57c8af63..6b70dd2eb1 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -28,7 +28,6 @@ "machine_depth": { "default_value": 406 }, "machine_height": { "default_value": 533 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.5 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/helloBEEprusa.def.json b/resources/definitions/helloBEEprusa.def.json index 2699a6c7d7..65716ac175 100644 --- a/resources/definitions/helloBEEprusa.def.json +++ b/resources/definitions/helloBEEprusa.def.json @@ -28,7 +28,6 @@ "machine_center_is_zero": { "default_value": false }, "material_print_temperature": { "default_value": 200 }, "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { "default_value": 1.75 }, "line_width": { "default_value": 0.48 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.2 }, diff --git a/resources/definitions/imade3d_jellybox.def.json b/resources/definitions/imade3d_jellybox.def.json index d4f67fe924..65a56ba03f 100644 --- a/resources/definitions/imade3d_jellybox.def.json +++ b/resources/definitions/imade3d_jellybox.def.json @@ -28,7 +28,6 @@ "machine_height": { "default_value": 145 }, "machine_depth": { "default_value": 160 }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/innovo_inventor.def.json b/resources/definitions/innovo_inventor.def.json index d9a92bfc59..8b14e9a73f 100644 --- a/resources/definitions/innovo_inventor.def.json +++ b/resources/definitions/innovo_inventor.def.json @@ -70,9 +70,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 50 }, diff --git a/resources/definitions/julia.def.json b/resources/definitions/julia.def.json index 16868f6c8c..62e4170c1f 100644 --- a/resources/definitions/julia.def.json +++ b/resources/definitions/julia.def.json @@ -32,7 +32,6 @@ "brim_line_count": { "default_value": 15 }, "skin_overlap": { "default_value": 30 }, "prime_tower_size": { "default_value": 8.660254037844387 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 0.8 }, "retraction_amount": { "default_value": 3 }, "speed_topbottom": { "default_value": 80 }, diff --git a/resources/definitions/kemiq_q2_beta.def.json b/resources/definitions/kemiq_q2_beta.def.json index 19f7ae2b5f..1a4bac233b 100644 --- a/resources/definitions/kemiq_q2_beta.def.json +++ b/resources/definitions/kemiq_q2_beta.def.json @@ -34,9 +34,6 @@ "machine_center_is_zero": { "default_value": false }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/kemiq_q2_gama.def.json b/resources/definitions/kemiq_q2_gama.def.json index b4ad36dc82..341efaa7c5 100644 --- a/resources/definitions/kemiq_q2_gama.def.json +++ b/resources/definitions/kemiq_q2_gama.def.json @@ -35,9 +35,6 @@ "machine_center_is_zero": { "default_value": false }, - "material_diameter": { - "default_value": 1.75 - }, "machine_nozzle_size": { "default_value": 0.4 }, diff --git a/resources/definitions/kossel_mini.def.json b/resources/definitions/kossel_mini.def.json index 6ac053767c..b4b2e5b78f 100644 --- a/resources/definitions/kossel_mini.def.json +++ b/resources/definitions/kossel_mini.def.json @@ -35,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/kossel_pro.def.json b/resources/definitions/kossel_pro.def.json index 7247b6955c..c966a9ff65 100644 --- a/resources/definitions/kossel_pro.def.json +++ b/resources/definitions/kossel_pro.def.json @@ -34,9 +34,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, diff --git a/resources/definitions/makeR_pegasus.def.json b/resources/definitions/makeR_pegasus.def.json index e1b7deac59..68cad7f7b9 100644 --- a/resources/definitions/makeR_pegasus.def.json +++ b/resources/definitions/makeR_pegasus.def.json @@ -36,9 +36,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 2.85 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/makeR_prusa_tairona_i3.def.json b/resources/definitions/makeR_prusa_tairona_i3.def.json index 235ad3d1d6..6cf0e40619 100644 --- a/resources/definitions/makeR_prusa_tairona_i3.def.json +++ b/resources/definitions/makeR_prusa_tairona_i3.def.json @@ -36,9 +36,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/makeit_pro_l.def.json b/resources/definitions/makeit_pro_l.def.json index 2a64a6729c..41b351b47a 100644 --- a/resources/definitions/makeit_pro_l.def.json +++ b/resources/definitions/makeit_pro_l.def.json @@ -69,9 +69,6 @@ "prime_tower_position_y": { "value": "160" }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/makeit_pro_m.def.json b/resources/definitions/makeit_pro_m.def.json index 43a5440165..798bb03318 100644 --- a/resources/definitions/makeit_pro_m.def.json +++ b/resources/definitions/makeit_pro_m.def.json @@ -69,9 +69,6 @@ "prime_tower_position_y": { "value": "160" }, - "material_diameter": { - "default_value": 1.75 - }, "layer_height": { "default_value": 0.2 }, diff --git a/resources/definitions/makerbotreplicator.def.json b/resources/definitions/makerbotreplicator.def.json index a07fb4134f..1770b7a979 100644 --- a/resources/definitions/makerbotreplicator.def.json +++ b/resources/definitions/makerbotreplicator.def.json @@ -18,7 +18,6 @@ "prime_tower_size": { "default_value": 10.0 }, "infill_sparse_density": { "default_value": 10 }, "speed_travel": { "default_value": 150 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.15 }, "material_print_temperature": { "default_value": 220 }, "machine_extruder_count": { "default_value": 1 }, diff --git a/resources/definitions/malyan_m180.def.json b/resources/definitions/malyan_m180.def.json index 37ce5981ff..65e573cdb3 100644 --- a/resources/definitions/malyan_m180.def.json +++ b/resources/definitions/malyan_m180.def.json @@ -66,11 +66,6 @@ }, "machine_end_gcode": { "default_value": "G92 Z0\nG1 Z10 F400\nM18\nM109 S0 T0\nM104 S0 T0\nM73 P100 (end build progress)\nG162 X Y F3000\nM18" - }, - "material_diameter": { - "default_value": 1.75, - "minimum_value_warning": "1.5", - "maximum_value_warning": "2.0" } } -} \ No newline at end of file +} diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 437b1873b6..df852273f6 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -60,7 +60,6 @@ "machine_height": { "default_value": 120 }, "machine_heated_bed": { "default_value": true }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4, "minimum_value": 0.15 diff --git a/resources/definitions/mankati_fullscale_xt_plus.def.json b/resources/definitions/mankati_fullscale_xt_plus.def.json index bf1bfb26ab..bf21eb17ca 100644 --- a/resources/definitions/mankati_fullscale_xt_plus.def.json +++ b/resources/definitions/mankati_fullscale_xt_plus.def.json @@ -44,7 +44,6 @@ "top_bottom_thickness": { "default_value": 0.3 }, "material_print_temperature": { "default_value": 195 }, "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { "default_value": 1.75 }, "retraction_enable": { "default_value": true }, "retraction_speed": { "default_value": 50 }, "retraction_amount": { "default_value": 0.8 }, diff --git a/resources/definitions/mendel90.def.json b/resources/definitions/mendel90.def.json index bc0832ce8f..6974ae5bf7 100644 --- a/resources/definitions/mendel90.def.json +++ b/resources/definitions/mendel90.def.json @@ -73,9 +73,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/ord.def.json b/resources/definitions/ord.def.json index 3238583ceb..c589114fb6 100644 --- a/resources/definitions/ord.def.json +++ b/resources/definitions/ord.def.json @@ -23,7 +23,6 @@ "prime_tower_size": { "default_value": 7.0710678118654755 }, "infill_sparse_density": { "default_value": 15 }, "speed_travel": { "default_value": 150 }, - "material_diameter": { "default_value": 1.75 }, "layer_height": { "default_value": 0.3 }, "machine_nozzle_size": { "default_value": 0.35 }, "material_print_temperature": { "default_value": 240 }, diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index 6351f75a80..1a31257523 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -138,10 +138,6 @@ "material_bed_temperature": { "enabled": false }, - "material_diameter": { - "enabled": false, - "default_value": 1.75 - }, "cool_fan_enabled": { "enabled": false, "value": "False" diff --git a/resources/definitions/printrbot_play.def.json b/resources/definitions/printrbot_play.def.json index 521eeb0f79..990f5b9080 100644 --- a/resources/definitions/printrbot_play.def.json +++ b/resources/definitions/printrbot_play.def.json @@ -21,7 +21,6 @@ "machine_depth": { "default_value": 100 }, "machine_height": { "default_value": 130 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.3 }, diff --git a/resources/definitions/printrbot_simple.def.json b/resources/definitions/printrbot_simple.def.json index d71fdd8df6..b20168deff 100644 --- a/resources/definitions/printrbot_simple.def.json +++ b/resources/definitions/printrbot_simple.def.json @@ -23,7 +23,6 @@ "machine_depth": { "default_value": 140 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [-49, 20], diff --git a/resources/definitions/printrbot_simple_extended.def.json b/resources/definitions/printrbot_simple_extended.def.json index 7899710464..02c58171c1 100644 --- a/resources/definitions/printrbot_simple_extended.def.json +++ b/resources/definitions/printrbot_simple_extended.def.json @@ -23,7 +23,6 @@ "machine_depth": { "default_value": 150 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_with_fans_polygon": { "default_value": [ [ 55, -20 ], diff --git a/resources/definitions/printrbot_simple_makers_kit.def.json b/resources/definitions/printrbot_simple_makers_kit.def.json index 7f2863256f..001ee887f3 100644 --- a/resources/definitions/printrbot_simple_makers_kit.def.json +++ b/resources/definitions/printrbot_simple_makers_kit.def.json @@ -19,7 +19,6 @@ "machine_width": { "default_value": 100 }, "machine_depth": { "default_value": 100 }, "machine_height": { "default_value": 115 }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_size": { "default_value": 0.4 }, "machine_head_with_fans_polygon": { "default_value": [ diff --git a/resources/definitions/prusa_i3.def.json b/resources/definitions/prusa_i3.def.json index 3358e6fb30..603b2822f0 100644 --- a/resources/definitions/prusa_i3.def.json +++ b/resources/definitions/prusa_i3.def.json @@ -35,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/prusa_i3_mk2.def.json b/resources/definitions/prusa_i3_mk2.def.json index db969d3328..033fbc6a48 100644 --- a/resources/definitions/prusa_i3_mk2.def.json +++ b/resources/definitions/prusa_i3_mk2.def.json @@ -23,7 +23,6 @@ "machine_height": { "default_value": 200 }, "machine_depth": { "default_value": 210 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "material_bed_temperature": { "default_value": 55 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height": { "default_value": 0.1 }, diff --git a/resources/definitions/prusa_i3_xl.def.json b/resources/definitions/prusa_i3_xl.def.json index af18917db6..b1233f6df7 100644 --- a/resources/definitions/prusa_i3_xl.def.json +++ b/resources/definitions/prusa_i3_xl.def.json @@ -35,9 +35,6 @@ "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-75, -18], diff --git a/resources/definitions/punchtec_connect_xl.def.json b/resources/definitions/punchtec_connect_xl.def.json index 02d3562b41..1efdd226fd 100644 --- a/resources/definitions/punchtec_connect_xl.def.json +++ b/resources/definitions/punchtec_connect_xl.def.json @@ -21,7 +21,6 @@ "prime_tower_size": { "default_value": 8.660254037844387 }, "speed_wall_x": { "default_value": 40 }, "speed_wall_0": { "default_value": 40 }, - "material_diameter": { "default_value": 1.75 }, "speed_topbottom": { "default_value": 40 }, "layer_height": { "default_value": 0.2 }, "material_print_temperature": { "default_value": 195 }, diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index fe0a2bf3b8..ea5a998a5a 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -54,9 +54,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index bddb2587e2..78a91d0f96 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -54,9 +54,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index 68e1cc8790..25a263ab5f 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -53,9 +53,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index 0dae261901..62b756b7da 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -53,9 +53,6 @@ "machine_min_cool_heat_time_window": { "default_value": 3600 }, - "material_diameter": { - "default_value": 1.75 - }, "retraction_amount": { "default_value": 1.0 }, diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 2ca8a7b0b7..41549fb531 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -80,9 +80,6 @@ "material_bed_temperature": { "enabled": false }, - "material_diameter": { - "default_value": 1.75 - }, "material_flow": { "value": "110" }, diff --git a/resources/definitions/rigid3d.def.json b/resources/definitions/rigid3d.def.json index 44c5b75fb9..43ffd6924a 100644 --- a/resources/definitions/rigid3d.def.json +++ b/resources/definitions/rigid3d.def.json @@ -28,7 +28,6 @@ "speed_wall_x": { "default_value": 40 }, "speed_travel": { "default_value": 100 }, "bottom_thickness": { "default_value": 0.75 }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, "material_bed_temperature": { "default_value": 100 }, diff --git a/resources/definitions/rigid3d_3rdgen.def.json b/resources/definitions/rigid3d_3rdgen.def.json index b2c1ee8566..bb3414b75d 100644 --- a/resources/definitions/rigid3d_3rdgen.def.json +++ b/resources/definitions/rigid3d_3rdgen.def.json @@ -27,7 +27,6 @@ "skirt_gap": { "default_value": 5.0 }, "speed_travel": { "default_value": 120 }, "bottom_thickness": { "default_value": 0.75 }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "support_angle": { "default_value": 45 }, "material_bed_temperature": { "default_value": 100 }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 594b95fa44..db48195fe0 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -21,7 +21,6 @@ "skirt_gap": { "default_value": 5.0 }, "cool_min_layer_time": { "default_value": 15 }, "support_pattern": { "default_value": "grid" }, - "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "default_value": 0.25 }, "speed_wall_x": { "default_value": 30 }, "skirt_line_count": { "default_value": 2 }, diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index ea083e22c4..9f1ac294e5 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -39,9 +39,6 @@ "material_print_temperature": { "value": "205" }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 785979646a..f55f913a56 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -34,7 +34,6 @@ "prime_tower_size": { "default_value": 7.745966692414834 }, "skirt_line_count": { "default_value": 2 }, "speed_wall_x": { "default_value": 30 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 0.75 }, "layer_height_0": { "default_value": 0.25 }, "top_thickness": { "default_value": 0.75 }, diff --git a/resources/definitions/rigid3d_zero2.def.json b/resources/definitions/rigid3d_zero2.def.json index 330855baf2..7d49ccc72f 100644 --- a/resources/definitions/rigid3d_zero2.def.json +++ b/resources/definitions/rigid3d_zero2.def.json @@ -47,9 +47,6 @@ "material_bed_temperature": { "default_value": 100 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 40 }, diff --git a/resources/definitions/rigidbot.def.json b/resources/definitions/rigidbot.def.json index 0db095757b..5eb346c7ca 100644 --- a/resources/definitions/rigidbot.def.json +++ b/resources/definitions/rigidbot.def.json @@ -55,9 +55,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/rigidbot_big.def.json b/resources/definitions/rigidbot_big.def.json index 444286792c..5128408b15 100644 --- a/resources/definitions/rigidbot_big.def.json +++ b/resources/definitions/rigidbot_big.def.json @@ -58,9 +58,6 @@ "material_bed_temperature": { "default_value": 60 }, - "material_diameter": { - "default_value": 1.75 - }, "speed_print": { "default_value": 60 }, diff --git a/resources/definitions/robo_3d_r1.def.json b/resources/definitions/robo_3d_r1.def.json index 9113fb8411..8d7698e198 100644 --- a/resources/definitions/robo_3d_r1.def.json +++ b/resources/definitions/robo_3d_r1.def.json @@ -34,7 +34,6 @@ "prime_tower_size": { "default_value": 8.660254037844387 }, "support_enable": { "default_value": true }, "cool_fan_full_at_height": { "default_value": 0.1 }, - "material_diameter": { "default_value": 1.75 }, "bottom_thickness": { "default_value": 1.2 }, "raft_airgap": { "default_value": 0.2 }, "layer_height_0": { "default_value": 0.15 }, diff --git a/resources/definitions/seemecnc_artemis.def.json b/resources/definitions/seemecnc_artemis.def.json index c5b45c62dd..731fec5975 100644 --- a/resources/definitions/seemecnc_artemis.def.json +++ b/resources/definitions/seemecnc_artemis.def.json @@ -29,7 +29,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 290 }, - "material_diameter": { "default_value": 1.75 }, "relative_extrusion": { "default_value": false }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, diff --git a/resources/definitions/seemecnc_v32.def.json b/resources/definitions/seemecnc_v32.def.json index 3ea0785e4b..6580ee0172 100644 --- a/resources/definitions/seemecnc_v32.def.json +++ b/resources/definitions/seemecnc_v32.def.json @@ -29,7 +29,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, "machine_shape": { "default_value": "elliptic" }, "machine_width": { "default_value": 265 }, - "material_diameter": { "default_value": 1.75 }, "relative_extrusion": { "default_value": false }, "retraction_amount": { "default_value": 3.2 }, "retraction_combing": { "default_value": "off" }, diff --git a/resources/definitions/tam.def.json b/resources/definitions/tam.def.json index ae614442f0..9865abedda 100644 --- a/resources/definitions/tam.def.json +++ b/resources/definitions/tam.def.json @@ -47,7 +47,6 @@ "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, - "material_diameter": { "default_value": 1.75 }, "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, "machine_nozzle_head_distance": { "default_value": 3 }, "machine_nozzle_expansion_angle": { "default_value": 45 }, diff --git a/resources/definitions/tevo_blackwidow.def.json b/resources/definitions/tevo_blackwidow.def.json index 60b46fbc04..dc4feae6f9 100644 --- a/resources/definitions/tevo_blackwidow.def.json +++ b/resources/definitions/tevo_blackwidow.def.json @@ -47,10 +47,6 @@ { "default_value": 0.4 }, - "material_diameter": - { - "default_value": 1.75 - }, "gantry_height": { "default_value": 0 diff --git a/resources/definitions/tevo_tarantula.def.json b/resources/definitions/tevo_tarantula.def.json index 84aabccf13..6953dab63a 100644 --- a/resources/definitions/tevo_tarantula.def.json +++ b/resources/definitions/tevo_tarantula.def.json @@ -25,7 +25,6 @@ "machine_depth": { "default_value": 200 }, "machine_center_is_zero": { "default_value": false }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, "machine_head_polygon": { "default_value": diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 7716384253..768c261785 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -26,7 +26,6 @@ "machine_height": { "default_value": 275 }, "machine_depth": { "default_value": 275 }, "machine_center_is_zero": { "default_value": false }, - "material_diameter": { "default_value": 1.75 }, "material_bed_temperature": { "default_value": 70 }, "machine_nozzle_size": { "default_value": 0.4 }, "layer_height_0": { "default_value": 0.1 }, diff --git a/resources/definitions/uniqbot_one.def.json b/resources/definitions/uniqbot_one.def.json index 75d5efad8c..b277e78925 100644 --- a/resources/definitions/uniqbot_one.def.json +++ b/resources/definitions/uniqbot_one.def.json @@ -33,9 +33,6 @@ "machine_nozzle_size": { "default_value": 0.5 }, - "material_diameter": { - "default_value": 1.75 - }, "gantry_height": { "default_value": 55 }, diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index 40dd9216ff..9add22b902 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -15,9 +15,6 @@ } }, "overrides": { - "material_diameter": { - "default_value": 1.75 - }, "machine_width": { "default_value": 200 }, diff --git a/resources/definitions/vertex_k8400.def.json b/resources/definitions/vertex_k8400.def.json index cd8fcec8ec..42d94e7723 100644 --- a/resources/definitions/vertex_k8400.def.json +++ b/resources/definitions/vertex_k8400.def.json @@ -45,9 +45,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-60, -18], diff --git a/resources/definitions/vertex_k8400_dual.def.json b/resources/definitions/vertex_k8400_dual.def.json index e4b4f609c1..f5c5668390 100644 --- a/resources/definitions/vertex_k8400_dual.def.json +++ b/resources/definitions/vertex_k8400_dual.def.json @@ -46,9 +46,6 @@ "machine_nozzle_size": { "default_value": 0.35 }, - "material_diameter": { - "default_value": 1.75 - }, "machine_head_polygon": { "default_value": [ [-60, -18], diff --git a/resources/definitions/zone3d_printer.def.json b/resources/definitions/zone3d_printer.def.json index 0338302e37..328505e18a 100644 --- a/resources/definitions/zone3d_printer.def.json +++ b/resources/definitions/zone3d_printer.def.json @@ -15,7 +15,6 @@ }, "overrides": { - "material_diameter": { "default_value": 1.75 }, "prime_tower_size": { "default_value": 10.350983390135314 }, "material_print_temperature": { "default_value": 260 }, "layer_height": { "default_value": 0.14 },