diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index 3915da6864..9637f30606 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -9,7 +9,7 @@ "platform_offset": [0, -40, 0], "has_machine_quality": false, "has_materials": true, - "preferred_material": "layer_one_black_pla", + "preferred_material": "layer_one_dark_gray_pla", "has_variants": true, "preferred_variant_name": "PTFE hotend + 0.4mm brass nozzle", "preferred_quality_type": "normal", @@ -21,46 +21,8 @@ } }, - "settings": { - "material": { - "children": { - "_material_print_temperature_maximum_value": { - "label": "Maximum Printing Temperature", - "description": "This setting is used to set the maximum printing temperature value based on the used hot ends", - "unit": "°C", - "type": "float", - "default_value": 245, - "enabled": false, - "settable_per_extruder": true - } - } - }, - "travel": { - "children": { - "_retraction_amount_max_warning": - { - "label": "Maximum suggested retraction distance.", - "description": "Private setting used to set the maximum suggested retraction distance based on used hotend type.", - "unit": "mm", - "type": "float", - "default_value": 3.0, - "enabled": false, - "settable_per_extruder": true - }, - "_retraction_speed_max_warning": - { - "label": "Maximum suggested retraction speed based on used hotend type.", - "description": "Private setting used to set the maximum suggested retraction speed based on used hotend type.", - "unit": "mm/s", - "type": "float", - "default_value": 79, - "enabled": false, - "settable_per_extruder": true - } - } - } - }, + "overrides": { @@ -86,7 +48,6 @@ "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75}, - "extrude_prime_pos_z": { "default_value": 10}, "extrude_prime_pos_abs": { "default_value": true}, "machine_start_gcode": { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" @@ -100,17 +61,16 @@ "layer_height": {"default_value": 0.2 }, "layer_height_0": { - "default_value": 0.3, - "value": "min(round(0.75*machine_nozzle_size,2),0.3) if layer_height < 0.3 else layer_height" + "default_value": 0.2, + "value": "layer_height" }, "line_width": { "value": "machine_nozzle_size"}, - "infill_line_width": { "value":"line_width * 1.6"}, + "infill_line_width": { "value":"line_width"}, "initial_layer_line_width_factor": { "default_value": 100}, - "wall_thickness": { "default_value": 1.2}, "top_bottom_thickness": { "default_value": 1.0}, @@ -129,40 +89,9 @@ - "_material_print_temperature_maximum_value": { - "label": "Maximum Printing Temperature", - "description": "This is a private setting, please ignore. It is used to set the max prinnting and warnning temperatures based on the used hotend.", - "unit": "°C", - "type": "float", - "default_value": 235, - "enabled": false, - "settable_per_extruder": true - }, - "default_material_print_temperature": { - "default_value": 200, - "minimum_value_warning": "0", - "maximum_value_warning": "_material_print_temperature_maximum_value-5", - "maximum_value": "_material_print_temperature_maximum_value", - "minimum_value": "0" - }, - "material_print_temperature": { - "minimum_value": "0", - "minimum_value_warning": "0", - "maximum_value_warning": "_material_print_temperature_maximum_value-5", - "maximum_value": "_material_print_temperature_maximum_value" - }, - "material_print_temperature_layer_0": { - "value": "material_print_temperature + 0", - "minimum_value": "0", - "minimum_value_warning": "material_print_temperature - 10", - "maximum_value_warning": "material_print_temperature + 10", - "maximum_value": "_material_print_temperature_maximum_value" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature_layer_0", - "minimum_value_warning": "material_print_temperature_layer_0 - 10", - "maximum_value_warning": "material_print_temperature_layer_0 + 10" - }, + "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_value": 60, @@ -230,13 +159,11 @@ "retraction_amount": { "default_value": 7, - "maximum_value_warning": "_retraction_amount_max_warning" }, + "maximum_value_warning": 9 }, "retraction_speed": { "default_value": 70, - "maximum_value_warning": "_retraction_speed_max_warning" + "maximum_value_warning": 80 }, - "retraction_retract_speed": { "maximum_value_warning": "_retraction_speed_max_warning"}, - "retraction_prime_speed": { "maximum_value_warning": "_retraction_speed_max_warning"}, "retraction_hop_enabled": { "default_value": true}, "retraction_hop": { "default_value": 0.5}, @@ -257,7 +184,11 @@ "default_value": 0.4, "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_xy_distance_overhang')" }, - "support_bottom_distance": { "default_value": 0.2}, + "support_bottom_distance": + { + "default_value": 0.2, + "value": "layer_height" + }, "support_xy_distance_overhang":{ "default_value": 0.4, "value": "machine_nozzle_size" diff --git a/resources/extruders/atom3_extruder_0.def.json b/resources/extruders/atom3_extruder_0.def.json index 5eac81a9f8..e459eb74f3 100644 --- a/resources/extruders/atom3_extruder_0.def.json +++ b/resources/extruders/atom3_extruder_0.def.json @@ -12,4 +12,4 @@ "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/variants/atom3_all_metal_brass_0.2.inst.cfg b/resources/variants/atom3_all_metal_brass_0.2.inst.cfg index 341f6fbc83..1dbcb9d3fd 100644 --- a/resources/variants/atom3_all_metal_brass_0.2.inst.cfg +++ b/resources/variants/atom3_all_metal_brass_0.2.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 \ No newline at end of file +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_all_metal_brass_0.4.inst.cfg b/resources/variants/atom3_all_metal_brass_0.4.inst.cfg index fdaa0e4986..1137917cd9 100644 --- a/resources/variants/atom3_all_metal_brass_0.4.inst.cfg +++ b/resources/variants/atom3_all_metal_brass_0.4.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_all_metal_brass_0.6.inst.cfg b/resources/variants/atom3_all_metal_brass_0.6.inst.cfg index 04273356eb..ea92584b6b 100644 --- a/resources/variants/atom3_all_metal_brass_0.6.inst.cfg +++ b/resources/variants/atom3_all_metal_brass_0.6.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 \ No newline at end of file +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg index f2c063cf54..75952f266e 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg +++ b/resources/variants/atom3_lite_all_metal_brass_0.2.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 \ No newline at end of file +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg index 487116c3b7..400bc1e1b7 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg +++ b/resources/variants/atom3_lite_all_metal_brass_0.4.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 \ No newline at end of file +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg b/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg index a09266ebbb..5313c86f52 100644 --- a/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg +++ b/resources/variants/atom3_lite_all_metal_brass_0.6.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 3 -retraction_speed = 50 -_material_print_temperature_maximum_value = 300 -_retraction_amount_max_warning = 3.0 -_retraction_speed_max_warning = 69 \ No newline at end of file +retraction_speed = 50 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg index e1a8a506ab..73f239a670 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg +++ b/resources/variants/atom3_lite_ptfe_brass_0.2.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg index 336ff47874..2f98925f2c 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg +++ b/resources/variants/atom3_lite_ptfe_brass_0.4.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg b/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg index 0b25d9a9b8..de566f34f2 100644 --- a/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg +++ b/resources/variants/atom3_lite_ptfe_brass_0.6.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.2.inst.cfg b/resources/variants/atom3_ptfe_brass_0.2.inst.cfg index 74142d93dd..d568cec9a7 100644 --- a/resources/variants/atom3_ptfe_brass_0.2.inst.cfg +++ b/resources/variants/atom3_ptfe_brass_0.2.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.2 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.4.inst.cfg b/resources/variants/atom3_ptfe_brass_0.4.inst.cfg index f9f4bc8804..a7415958eb 100644 --- a/resources/variants/atom3_ptfe_brass_0.4.inst.cfg +++ b/resources/variants/atom3_ptfe_brass_0.4.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.4 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file diff --git a/resources/variants/atom3_ptfe_brass_0.6.inst.cfg b/resources/variants/atom3_ptfe_brass_0.6.inst.cfg index b3a531143d..baae0c4ba8 100644 --- a/resources/variants/atom3_ptfe_brass_0.6.inst.cfg +++ b/resources/variants/atom3_ptfe_brass_0.6.inst.cfg @@ -11,7 +11,4 @@ hardware_type = nozzle [values] machine_nozzle_size = 0.6 retraction_amount = 7 -retraction_speed = 70 -_material_print_temperature_maximum_value = 245 -_retraction_amount_max_warning = 9.0 -_retraction_speed_max_warning = 79 \ No newline at end of file +retraction_speed = 70 \ No newline at end of file