diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index b718f19a9a..ab2ad8439e 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -29,7 +29,6 @@ "gantry_height": { "value": "30" }, "speed_print": { "default_value": 50 }, "default_material_print_temperature": { "value": 195 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": 195 }, "machine_max_feedrate_x": { "value": 500 }, diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index 2483b81155..62d6c23577 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Atom 3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Daniel Kurth", "manufacturer": "Layer One", @@ -22,10 +23,8 @@ }, - - - "overrides": { - + "overrides": + { "machine_name": { "default_value": "Atom 3" }, "machine_show_variants": { "default_value": true}, "machine_shape": { "default_value": "elliptic" }, @@ -48,45 +47,36 @@ "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75}, - "machine_start_gcode": { + "machine_start_gcode": + { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, - "machine_end_gcode": { + "machine_end_gcode": + { "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300 ;retract filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" }, - - - "layer_height": {"default_value": 0.2 }, - "layer_height_0": { + "layer_height_0": + { "default_value": 0.2, "value": "layer_height" }, "line_width": { "value": "machine_nozzle_size"}, - "infill_line_width": { "value":"line_width"}, + "initial_layer_line_width_factor": { "default_value": 100}, - - - "top_bottom_thickness": { "default_value": 1.0}, - - - "infill_sparse_density": { "default_value": 17}, "infill_before_walls": { "value": false}, "zig_zaggify_infill": { "value": true}, - - - "default_material_print_temperature": { "default_value": 200 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 0"}, "material_initial_print_temperature": { "value": "material_print_temperature_layer_0"}, "material_final_print_temperature": { "value": "material_print_temperature"}, - "default_material_bed_temperature": { + "default_material_bed_temperature": + { "default_value": 60, "minimum_value": "0", "minimum_value_warning": "build_volume_temperature", @@ -95,16 +85,13 @@ }, "material_bed_temperature": { - "value": "round(default_material_bed_temperature-((-0.202*default_material_bed_temperature)+7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature", + "value": "round(default_material_bed_temperature-(-0.202 * default_material_bed_temperature + 7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature", "minimum_value": "0", "minimum_value_warning": "build_volume_temperature", "maximum_value_warning": "115", "maximum_value": "120" }, - - - "speed_print": { "default_value": 40}, "speed_wall": { "value": "speed_print * 0.75"}, "speed_wall_0": { "value": "speed_print * 0.5"}, @@ -112,48 +99,42 @@ "speed_layer_0": { "value": "20"}, "speed_slowdown_layers": { "default_value": 1}, - - - - "retraction_amount": { + "retraction_amount": + { "default_value": 7, - "maximum_value_warning": 9 }, - "retraction_speed": { + "maximum_value_warning": 9 + }, + "retraction_speed": + { "default_value": 70, "maximum_value_warning": 80 }, "retraction_hop_enabled": { "default_value": true}, "retraction_hop": { "default_value": 0.5}, - - - "cool_min_layer_time": { "default_value": 5}, "cool_min_speed": { "default_value": 10}, "cool_lift_head": { "default_value": false}, - - - "support_type": { "default_value": "everywhere"}, "support_angle": { "default_value": 60}, "support_z_distance": { "value": "layer_height"}, "support_xy_distance_overhang":{"value": "machine_nozzle_size"}, - - "adhesion_type": { "default_value": "skirt"}, - "skirt_brim_minimal_length": { + "skirt_brim_minimal_length": + { "default_value": 750, - "value": "60/(layer_height_0*line_width)", + "value": "60 / (layer_height_0 * line_width)", "minimum_value": "0", "minimum_value_warning": "25", "maximum_value_warning": "4000" }, - "skirt_gap": { - "default_value": "1`", - "value": "3*wall_line_width_0" + "skirt_gap": + { + "default_value": 1, + "value": "3 * wall_line_width_0" } } } \ No newline at end of file diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index bf5a601dbd..584a642ceb 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -108,8 +108,7 @@ "default_material_print_temperature": {"maximum_value": "401" }, "material_print_temperature": {"maximum_value": "401" }, - "material_print_temperature_layer_0": {"value": "material_print_temperature", - "maximum_value": "401" }, + "material_print_temperature_layer_0": {"maximum_value": "401" }, "material_initial_print_temperature": {"value": "material_print_temperature", "maximum_value_warning": "material_print_temperature + 15", "maximum_value": "401" }, diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index c2713c7a44..3b3ab06fff 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -59,7 +59,6 @@ "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "default_material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature": { "value": "55" }, diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index 485190958d..c67209805d 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -76,7 +76,6 @@ "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "default_material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "default_material_bed_temperature": { "value": "55" }, diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index 8b517a232a..7cd82a61aa 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -78,7 +78,6 @@ "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "default_material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, diff --git a/resources/definitions/mp_mini_delta.def.json b/resources/definitions/mp_mini_delta.def.json index eda45bb413..b003bb3853 100644 --- a/resources/definitions/mp_mini_delta.def.json +++ b/resources/definitions/mp_mini_delta.def.json @@ -48,7 +48,6 @@ }, "material_bed_temperature": { "value": 40 }, "line_width": { "value": "round(machine_nozzle_size, 2)" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_max_feedrate_x": { "default_value": 150 }, diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 8d180872d6..b205f03cc8 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -112,7 +112,7 @@ "retraction_combing": { "value": "'noskin'" }, "travel_avoid_other_parts": { "value": "False" }, - "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, + "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, "support_interface_enable": { "value": "True" }, "support_interface_density": { "value": 70 }, "minimum_interface_area": { "value": 5.0 }, diff --git a/resources/definitions/tank_m_base.def.json b/resources/definitions/tank_m_base.def.json index e4f465d39e..41387fad7e 100644 --- a/resources/definitions/tank_m_base.def.json +++ b/resources/definitions/tank_m_base.def.json @@ -58,8 +58,7 @@ "infill_sparse_density": { "value": "15" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, - "material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "material_print_temperature": { "value": "195" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature": { "value": "55" },