diff --git a/resources/definitions/orion_ht.def.json b/resources/definitions/orion_ht.def.json index 16b9f77151..65dac5f41e 100644 --- a/resources/definitions/orion_ht.def.json +++ b/resources/definitions/orion_ht.def.json @@ -14,7 +14,7 @@ "machine_width": { "default_value": 500 }, "machine_depth": { "default_value": 500 }, "machine_height": { "default_value": 600 }, - "material_print_temperature": { "maximum value": 500 } + "material_print_temperature": { "maximum_value_warning": 500 } } } diff --git a/resources/definitions/signal_pro_base.def.json b/resources/definitions/signal_pro_base.def.json index 84355dc584..fa18a08331 100644 --- a/resources/definitions/signal_pro_base.def.json +++ b/resources/definitions/signal_pro_base.def.json @@ -201,16 +201,16 @@ "machine_extruder_count": { "default_value": 2 }, "machine_heated_bed": { "default_value": true }, "machine_heated_build_volume": { "default_value": true }, - "build_volume_temperature": { "maximum_value": 50 }, - "material_print_temperature": { "maximum value": 295 }, - "material_bed_temperature": { "maximum value": 140 }, + "build_volume_temperature": { "maximum_value_warning": 45 }, + "material_print_temperature": { "maximum_value_warning": 295 }, + "material_bed_temperature": { "maximum_value_warning": 140 }, "machine_max_acceleration_x": { "default_value": 1500 }, "machine_max_acceleration_y": { "default_value": 1500 }, "machine_max_acceleration_z": { "default_value": 250 }, "machine_acceleration": { "default_value": 1500 }, - "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_xy": { "default_value": 15 }, "machine_max_jerk_z": { "default_value": 1 }, - "machine_max_jerk_e": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 15 }, "machine_head_with_fans_polygon": { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] }, "machine_max_feedrate_z": { "default_value": 10 }, "machine_max_feedrate_e": { "default_value": 120 }, @@ -218,18 +218,18 @@ "machine_start_gcode": { "default_value": "G21 ; set units to millimeters\nG90 ; use absolute positioning\nM82 ; absolute extrusion mode\nG28 ; home all without mesh bed level\nM420 S1\nG92 E0.0 ; reset extruder distance position\nG1 Z0.25\nG1 X60.0 E9.0 F1000.0 ; intro line\nG1 X100.0 E21.5 F1000.0 ; intro line\nG92 E0.0 ; reset extruder distance position" }, "machine_end_gcode": { "default_value": "M104 T0 S0 ;extruder heater off\nM104 T1 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nG91\nG1 Z1 F420 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+1 E-1 F300 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y300 F6000 ;move the head out of the way\nM84 ;steppers off" }, "adhesion_type": { "default_value": "skirt" }, - "skirt_brim_minimal_length": { "default_value": 550 }, + "skirt_brim_minimal_length": { "value": "550" }, "retraction_amount": { "value": "1" }, - "retraction_speed": { "default_value": 50, "maximum_value_warning": 130 }, - "retraction_retract_speed": { "default_value": "retraction_speed", "maximum_value_warning": 130 }, - "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, - "retraction_hop_enabled": { "default_value": true }, - "retraction_hop": { "default_value": 0.5 }, - "retraction_combing": { "default_value": "noskin" }, - "retraction_combing_max_distance": { "default_value": 10 }, - "travel_avoid_other_parts": { "default_value": true }, - "travel_avoid_supports": { "default_value": true }, - "speed_travel": { "maximum_value": 150, "value": 150, "maximum_value_warning": 151 }, + "retraction_speed": { "value": "50", "maximum_value_warning": "130" }, + "retraction_retract_speed": { "value": "retraction_speed", "maximum_value_warning": "130" }, + "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" }, + "retraction_hop_enabled": { "value": "True" }, + "retraction_hop": { "value": "0.5" }, + "retraction_combing": { "value": "noskin" }, + "retraction_combing_max_distance": { "value": "10" }, + "travel_avoid_other_parts": { "value": "True" }, + "travel_avoid_supports": { "value": "True" }, + "speed_travel": { "maximum_value": "150", "value": "150", "maximum_value_warning": "151" }, "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)" }, "speed_wall": { "value": "math.ceil(speed_print * 0.50)" }, @@ -237,34 +237,34 @@ "speed_wall_x": { "value": "math.ceil(speed_print * 0.75)" }, "speed_topbottom": { "value": "math.ceil(speed_print * 0.45)" }, "speed_roofing": { "value": "math.ceil(speed_print * 0.45)" }, - "speed_slowdown_layers": { "default_value": 2 }, - "roofing_layer_count": { "value": 1 }, - "optimize_wall_printing_order": { "default_value": true }, - "infill_enable_travel_optimization": { "default_value": true }, - "minimum_polygon_circumference": { "default_value": 0.2 }, - "wall_overhang_angle": { "default_value": 75 }, - "wall_overhang_speed_factor": { "default_value": 50 }, - "bridge_settings_enabled": { "default_value": true }, - "bridge_wall_coast": { "default_value": 10 }, - "bridge_fan_speed": { "default_value": 100 }, + "speed_slowdown_layers": { "value": "2" }, + "roofing_layer_count": { "value": "1" }, + "optimize_wall_printing_order": { "value": "True" }, + "infill_enable_travel_optimization": { "value": "True" }, + "minimum_polygon_circumference": { "value": "0.2" }, + "wall_overhang_angle": { "value": "75" }, + "wall_overhang_speed_factor": { "value": "50" }, + "bridge_settings_enabled": { "value": "True" }, + "bridge_wall_coast": { "value": "10" }, + "bridge_fan_speed": { "value": "100" }, "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, - "alternate_extra_perimeter": { "default_value": true }, - "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, - "cool_min_layer_time": { "default_value": 15 }, + "alternate_extra_perimeter": { "value": "True" }, + "cool_min_layer_time_fan_speed_max": { "value": "20" }, + "cool_min_layer_time": { "value": "15" }, "cool_fan_speed_min": { "value": "cool_fan_speed" }, "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, - "cool_fan_full_layer": { "value": 4 }, + "cool_fan_full_layer": { "value": "4" }, "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, "line_width": { "value": "machine_nozzle_size * 1.125" }, "wall_line_width": { "value": "machine_nozzle_size" }, - "fill_perimeter_gaps": { "default_value": "everywhere" }, - "fill_outline_gaps": { "default_value": true }, - "meshfix_maximum_resolution": { "default_value": 0.01 }, + "fill_perimeter_gaps": { "value": "everywhere" }, + "fill_outline_gaps": { "value": "True" }, + "meshfix_maximum_resolution": { "value": "0.01" }, "meshfix_maximum_deviation": { "value": "layer_height / 2" }, - "infill_before_walls": { "default_value": false }, - "zig_zaggify_infill": { "value": true }, - "min_infill_area": { "default_value": 5.0 }, + "infill_before_walls": { "value": "False" }, + "zig_zaggify_infill": { "value": "True" }, + "min_infill_area": { "value": "5.0" }, "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "250" }, "acceleration_prime_tower": { "value": "1000" }, @@ -275,7 +275,7 @@ "acceleration_topbottom": { "value": "750" }, "acceleration_wall": { "value": "750" }, "acceleration_wall_0": { "value": "500" }, - "jerk_enabled": { "default_value": true }, + "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "5" }, "jerk_prime_tower": { "value": "jerk_print" }, "jerk_print": { "value": "10" }, @@ -286,27 +286,27 @@ "jerk_wall_0": { "value": "jerk_print" }, "jerk_travel": { "value": "jerk_layer_0" }, "jerk_travel_layer_0": { "value": "jerk_layer_0" }, - "prime_tower_position_x": { "default_value": 270 }, - "prime_tower_position_y": { "default_value": 270 }, - "extruder_prime_pos_abs": { "default_value": true }, + "prime_tower_position_x": { "value": "270" }, + "prime_tower_position_y": { "value": "270" }, + "extruder_prime_pos_abs": { "value": "True" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "2" }, "support_xy_distance": { "value": "wall_line_width_0 * 2.5" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, - "support_angle": { "value": 60 }, + "support_angle": { "value": "60" }, "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_pattern": { "default_value": "zigzag" }, + "support_pattern": { "value": "zigzag" }, "support_top_distance": { "value": "support_z_distance" }, - "support_use_towers": { "value": true }, + "support_use_towers": { "value": "True" }, "support_z_distance": { "value": "layer_height" }, - "support_interface_enable": { "value": true }, - "support_interface_height": { "value": 1 }, + "support_interface_enable": { "value": "True" }, + "support_interface_height": { "value": "1" }, "support_interface_skip_height": { "value": "layer_height" }, - "support_bottom_enable": { "value": false }, - "support_join_distance": { "value": 1 }, - "support_offset": { "value": 1.5 }, - "support_infill_rate": { "value": 20 }, - "support_brim_enable": { "value": true }, + "support_bottom_enable": { "value": "False" }, + "support_join_distance": { "value": "1" }, + "support_offset": { "value": "1.5" }, + "support_infill_rate": { "value": "20" }, + "support_brim_enable": { "value": "True" }, "prime_tower_enable": { "value": "True" } } } \ No newline at end of file diff --git a/resources/variants/signal_pro_500_v1_v6_0.40.inst.cfg b/resources/variants/signal_pro_500_v1_v6_0.40.inst.cfg index 9e8117bd20..9d6616d610 100644 --- a/resources/variants/signal_pro_500_v1_v6_0.40.inst.cfg +++ b/resources/variants/signal_pro_500_v1_v6_0.40.inst.cfg @@ -1,7 +1,7 @@ [general] name = V6 0.40mm version = 4 -definition = signal_pro_500_old +definition = signal_pro_500_v1 [metadata] setting_version = 10 diff --git a/resources/variants/signal_pro_500_v1_v6_0.80.inst.cfg b/resources/variants/signal_pro_500_v1_v6_0.80.inst.cfg index b770bf9943..cb3d7fbec4 100644 --- a/resources/variants/signal_pro_500_v1_v6_0.80.inst.cfg +++ b/resources/variants/signal_pro_500_v1_v6_0.80.inst.cfg @@ -1,7 +1,7 @@ [general] name = V6 0.80mm version = 4 -definition = signal_pro_500_old +definition = signal_pro_500_v1 [metadata] setting_version = 10