diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index 352cd23394..b718f19a9a 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -28,7 +28,7 @@ "retraction_speed": { "default_value": 50}, "gantry_height": { "value": "30" }, "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_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": 195 }, @@ -41,11 +41,9 @@ "machine_max_acceleration_z": { "value": 100 }, "machine_max_acceleration_e": { "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 }, - "infill_overlap": { "default_value": 15 }, + "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, diff --git a/resources/definitions/crazy3dprint_cz_300.def.json b/resources/definitions/crazy3dprint_cz_300.def.json index 56d3d69757..2748b39b53 100644 --- a/resources/definitions/crazy3dprint_cz_300.def.json +++ b/resources/definitions/crazy3dprint_cz_300.def.json @@ -36,9 +36,8 @@ "min_infill_area": { "default_value": 2.0 }, "retract_at_layer_change": { "default_value": true }, "default_material_print_temperature": { "default_value": 210 }, - "material_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_flow_layer_0": {"value": 140}, "retraction_amount": { "default_value": 10 }, diff --git a/resources/definitions/creality_ender6.def.json b/resources/definitions/creality_ender6.def.json index 56ceab88b2..1df152b7ca 100644 --- a/resources/definitions/creality_ender6.def.json +++ b/resources/definitions/creality_ender6.def.json @@ -14,8 +14,8 @@ "infill_sparse_density": { "value": "10"}, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"}, "infill_overlap":{"value": 10}, - "material_print_temperature":{"value": 220}, - "material_bed_temperature":{"value": 50}, + "default_material_print_temperature":{"value": 220}, + "default_material_bed_temperature":{"value": 50}, "retraction_amount":{"value": 10}, "speed_travel": { "value": 80.0 }, "coasting_enable": { "value": true}, diff --git a/resources/definitions/cremaker_common.def.json b/resources/definitions/cremaker_common.def.json index 6fd339f58f..48b7d4042c 100644 --- a/resources/definitions/cremaker_common.def.json +++ b/resources/definitions/cremaker_common.def.json @@ -24,7 +24,6 @@ "xy_offset": { "value": 0.1 }, "xy_offset_layer_0": { "value": -0.1 }, "hole_xy_offset": { "value": 0.15 }, - "material_print_temperature": { "value": 200 }, "speed_travel": { "value": 100 }, "speed_layer_0": { "value": 25 }, "acceleration_enabled": { "value": true }, diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json index 2f5f02d7db..c19a8b1035 100644 --- a/resources/definitions/eryone_er20.def.json +++ b/resources/definitions/eryone_er20.def.json @@ -53,7 +53,7 @@ "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" }, - "material_print_temperature": { + "default_material_print_temperature": { "value": 205 }, "material_print_temperature_layer_0": { @@ -103,7 +103,7 @@ "infill_before_walls": { "value": false }, - "material_bed_temperature": { + "default_material_bed_temperature": { "value": 60 }, "material_bed_temperature_layer_0": { diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index 33c96f45ca..e2dbd44215 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -138,7 +138,6 @@ "value": "material_print_temperature" }, "material_bed_temperature": { - "value": "default_material_bed_temperature", "maximum_value_warning": 100 }, "material_bed_temperature_layer_0": { diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 80466d45bd..bf5a601dbd 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -113,7 +113,6 @@ "material_initial_print_temperature": {"value": "material_print_temperature", "maximum_value_warning": "material_print_temperature + 15", "maximum_value": "401" }, - "material_initial_print_temperature": {"maximum_value": "401" }, "material_final_print_temperature": {"value": "material_print_temperature", "maximum_value": "401" }, "material_break_preparation_temperature": {"maximum_value": "401" }, diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index bb984d6650..c2713c7a44 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -58,7 +58,7 @@ "infill_sparse_density": { "value": "15" }, "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_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index dc0c40837d..485190958d 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -75,12 +75,11 @@ "infill_sparse_density": { "value": "15" }, "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_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "value": "55" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "default_material_bed_temperature": { "value": "55" }, "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "material_print_temperature" }, diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index 9870c85eb6..8b517a232a 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -77,13 +77,12 @@ "infill_sparse_density": { "value": "15" }, "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_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "value": "45" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "default_material_bed_temperature": { "value": "45" }, "material_flow": { "value": 100 }, "speed_print": { "value": 50.0 } , diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index 70479856e3..0be2112bed 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -68,7 +68,6 @@ "infill_support_enabled": {"value": false }, "max_skin_angle_for_expansion": {"value": 90}, "default_material_print_temperature": {"value": 220}, - "material_print_temperature": {"value": 220}, "material_print_temperature_layer_0": {"value": 220}, "material_initial_print_temperature": {"value": 220}, "material_final_print_temperature": {"value": 220}, diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 7ad092ce8f..f241df9a44 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -104,7 +104,7 @@ "material_flow": { "value": "110" }, - "material_print_temperature": { + "default_material_print_temperature": { "value": "210.0" }, "ooze_shield_enabled": { diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 05907a1c20..881b5c94ca 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -104,9 +104,6 @@ "material_flow": { "value": "110" }, - "material_print_temperature": { - "value": "210.0" - }, "ooze_shield_enabled": { "value": "True" }, diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index f0e8644ae4..f0e26487f1 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -92,9 +92,6 @@ "material_bed_temperature": { "value": "70" }, - "material_print_temperature": { - "value": "210.0" - }, "ooze_shield_enabled": { "value": "True" }, diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index dbcf140585..7bb6968865 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -30,8 +30,11 @@ "support_skip_zag_per_mm": { "default_value": 10 }, + "default_material_bed_temperature": + { + "value": "50" + }, "material_bed_temperature": { - "value": "50", "minimum_value_warning": "30", "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": { "value": "115" }, - "material_print_temperature": { - "value": "195" - }, "material_bed_temperature_layer_0": { "value": "50", "minimum_value_warning": "30",