Fix incorrectly setting material_print_temperature

If this is set to an absolute value, the material settings wont have any effect anymore.
A much better way is to just set the default temperature, which is what the intent is
This commit is contained in:
Jaime van Kessel 2022-09-01 17:51:25 +02:00
parent ccdbc3e06f
commit 89fbac74f9
No known key found for this signature in database
GPG key ID: C85F7A3AF1BAA7C4
15 changed files with 18 additions and 33 deletions

View file

@ -28,7 +28,7 @@
"retraction_speed": { "default_value": 50}, "retraction_speed": { "default_value": 50},
"gantry_height": { "value": "30" }, "gantry_height": { "value": "30" },
"speed_print": { "default_value": 50 }, "speed_print": { "default_value": 50 },
"material_print_temperature": { "value": 195 }, "default_material_print_temperature": { "value": 195 },
"material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": 195 }, "material_final_print_temperature": { "value": 195 },
@ -41,11 +41,9 @@
"machine_max_acceleration_z": { "value": 100 }, "machine_max_acceleration_z": { "value": 100 },
"machine_max_acceleration_e": { "value": 500 }, "machine_max_acceleration_e": { "value": 500 },
"machine_acceleration": { "value": 500 }, "machine_acceleration": { "value": 500 },
"machine_max_jerk_xy": { "value": 8 },
"machine_max_jerk_z": { "value": 0.4 },
"machine_max_jerk_e": { "value": 5 },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"infill_overlap": { "default_value": 15 },
"acceleration_print": { "value": 500 }, "acceleration_print": { "value": 500 },
"acceleration_travel": { "value": 500 }, "acceleration_travel": { "value": 500 },
"acceleration_travel_layer_0": { "value": "acceleration_travel" }, "acceleration_travel_layer_0": { "value": "acceleration_travel" },

View file

@ -36,9 +36,8 @@
"min_infill_area": { "default_value": 2.0 }, "min_infill_area": { "default_value": 2.0 },
"retract_at_layer_change": { "default_value": true }, "retract_at_layer_change": { "default_value": true },
"default_material_print_temperature": { "default_value": 210 }, "default_material_print_temperature": { "default_value": 210 },
"material_print_temperature": { "value": 210 },
"material_final_print_temperature": { "value": 210 }, "material_final_print_temperature": { "value": 210 },
"material_bed_temperature": { "value": 70 }, "default_material_bed_temperature": { "value": 70 },
"material_bed_temperature_layer_0": { "value": 70 }, "material_bed_temperature_layer_0": { "value": 70 },
"material_flow_layer_0": {"value": 140}, "material_flow_layer_0": {"value": 140},
"retraction_amount": { "default_value": 10 }, "retraction_amount": { "default_value": 10 },

View file

@ -14,8 +14,8 @@
"infill_sparse_density": { "value": "10"}, "infill_sparse_density": { "value": "10"},
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"}, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"},
"infill_overlap":{"value": 10}, "infill_overlap":{"value": 10},
"material_print_temperature":{"value": 220}, "default_material_print_temperature":{"value": 220},
"material_bed_temperature":{"value": 50}, "default_material_bed_temperature":{"value": 50},
"retraction_amount":{"value": 10}, "retraction_amount":{"value": 10},
"speed_travel": { "value": 80.0 }, "speed_travel": { "value": 80.0 },
"coasting_enable": { "value": true}, "coasting_enable": { "value": true},

View file

@ -24,7 +24,6 @@
"xy_offset": { "value": 0.1 }, "xy_offset": { "value": 0.1 },
"xy_offset_layer_0": { "value": -0.1 }, "xy_offset_layer_0": { "value": -0.1 },
"hole_xy_offset": { "value": 0.15 }, "hole_xy_offset": { "value": 0.15 },
"material_print_temperature": { "value": 200 },
"speed_travel": { "value": 100 }, "speed_travel": { "value": 100 },
"speed_layer_0": { "value": 25 }, "speed_layer_0": { "value": 25 },
"acceleration_enabled": { "value": true }, "acceleration_enabled": { "value": true },

View file

@ -53,7 +53,7 @@
"machine_end_gcode": { "machine_end_gcode": {
"default_value": "G91 ;Relative positioning\nG1 Z5 F720 ;Raise Z\nG1 E-5 F300 ;Retract a bit to protect nozzle\nM104 S0 ;Turn off extruder\nM140 S0 ;Turn off bed\nM107 ;Turn off all fans\nG90 ;Absolute positioning\nG1 X230 Y200 F4800 ;Parking the hotend\nM84 X Y E ;All steppers off but left Z\n" "default_value": "G91 ;Relative positioning\nG1 Z5 F720 ;Raise Z\nG1 E-5 F300 ;Retract a bit to protect nozzle\nM104 S0 ;Turn off extruder\nM140 S0 ;Turn off bed\nM107 ;Turn off all fans\nG90 ;Absolute positioning\nG1 X230 Y200 F4800 ;Parking the hotend\nM84 X Y E ;All steppers off but left Z\n"
}, },
"material_print_temperature": { "default_material_print_temperature": {
"value": 205 "value": 205
}, },
"material_print_temperature_layer_0": { "material_print_temperature_layer_0": {
@ -103,7 +103,7 @@
"infill_before_walls": { "infill_before_walls": {
"value": false "value": false
}, },
"material_bed_temperature": { "default_material_bed_temperature": {
"value": 60 "value": 60
}, },
"material_bed_temperature_layer_0": { "material_bed_temperature_layer_0": {

View file

@ -138,7 +138,6 @@
"value": "material_print_temperature" "value": "material_print_temperature"
}, },
"material_bed_temperature": { "material_bed_temperature": {
"value": "default_material_bed_temperature",
"maximum_value_warning": 100 "maximum_value_warning": 100
}, },
"material_bed_temperature_layer_0": { "material_bed_temperature_layer_0": {

View file

@ -113,7 +113,6 @@
"material_initial_print_temperature": {"value": "material_print_temperature", "material_initial_print_temperature": {"value": "material_print_temperature",
"maximum_value_warning": "material_print_temperature + 15", "maximum_value_warning": "material_print_temperature + 15",
"maximum_value": "401" }, "maximum_value": "401" },
"material_initial_print_temperature": {"maximum_value": "401" },
"material_final_print_temperature": {"value": "material_print_temperature", "material_final_print_temperature": {"value": "material_print_temperature",
"maximum_value": "401" }, "maximum_value": "401" },
"material_break_preparation_temperature": {"maximum_value": "401" }, "material_break_preparation_temperature": {"maximum_value": "401" },

View file

@ -58,7 +58,7 @@
"infill_sparse_density": { "value": "15" }, "infill_sparse_density": { "value": "15" },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
"material_print_temperature": { "value": "195" }, "default_material_print_temperature": { "value": "195" },
"material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" },

View file

@ -75,12 +75,11 @@
"infill_sparse_density": { "value": "15" }, "infill_sparse_density": { "value": "15" },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
"material_print_temperature": { "value": "195" }, "default_material_print_temperature": { "value": "195" },
"material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" },
"material_bed_temperature": { "value": "55" }, "default_material_bed_temperature": { "value": "55" },
"material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
"material_flow": { "value": 100 }, "material_flow": { "value": 100 },
"material_standby_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" },

View file

@ -77,13 +77,12 @@
"infill_sparse_density": { "value": "15" }, "infill_sparse_density": { "value": "15" },
"infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
"material_print_temperature": { "value": "195" }, "default_material_print_temperature": { "value": "195" },
"material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_print_temperature_layer_0": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" },
"material_final_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" },
"material_standby_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" },
"material_bed_temperature": { "value": "45" }, "default_material_bed_temperature": { "value": "45" },
"material_bed_temperature_layer_0": { "value": "material_bed_temperature" },
"material_flow": { "value": 100 }, "material_flow": { "value": 100 },
"speed_print": { "value": 50.0 } , "speed_print": { "value": 50.0 } ,

View file

@ -68,7 +68,6 @@
"infill_support_enabled": {"value": false }, "infill_support_enabled": {"value": false },
"max_skin_angle_for_expansion": {"value": 90}, "max_skin_angle_for_expansion": {"value": 90},
"default_material_print_temperature": {"value": 220}, "default_material_print_temperature": {"value": 220},
"material_print_temperature": {"value": 220},
"material_print_temperature_layer_0": {"value": 220}, "material_print_temperature_layer_0": {"value": 220},
"material_initial_print_temperature": {"value": 220}, "material_initial_print_temperature": {"value": 220},
"material_final_print_temperature": {"value": 220}, "material_final_print_temperature": {"value": 220},

View file

@ -104,7 +104,7 @@
"material_flow": { "material_flow": {
"value": "110" "value": "110"
}, },
"material_print_temperature": { "default_material_print_temperature": {
"value": "210.0" "value": "210.0"
}, },
"ooze_shield_enabled": { "ooze_shield_enabled": {

View file

@ -104,9 +104,6 @@
"material_flow": { "material_flow": {
"value": "110" "value": "110"
}, },
"material_print_temperature": {
"value": "210.0"
},
"ooze_shield_enabled": { "ooze_shield_enabled": {
"value": "True" "value": "True"
}, },

View file

@ -92,9 +92,6 @@
"material_bed_temperature": { "material_bed_temperature": {
"value": "70" "value": "70"
}, },
"material_print_temperature": {
"value": "210.0"
},
"ooze_shield_enabled": { "ooze_shield_enabled": {
"value": "True" "value": "True"
}, },

View file

@ -30,8 +30,11 @@
"support_skip_zag_per_mm": { "support_skip_zag_per_mm": {
"default_value": 10 "default_value": 10
}, },
"default_material_bed_temperature":
{
"value": "50"
},
"material_bed_temperature": { "material_bed_temperature": {
"value": "50",
"minimum_value_warning": "30", "minimum_value_warning": "30",
"resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))" "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))"
}, },
@ -366,9 +369,6 @@
"z_seam_x": { "z_seam_x": {
"value": "115" "value": "115"
}, },
"material_print_temperature": {
"value": "195"
},
"material_bed_temperature_layer_0": { "material_bed_temperature_layer_0": {
"value": "50", "value": "50",
"minimum_value_warning": "30", "minimum_value_warning": "30",