Sync with main branch

This commit is contained in:
WinstonMao 2024-04-28 10:05:31 +08:00
parent a7082fde2b
commit d072c71621
2 changed files with 8 additions and 4 deletions

View File

@ -196,6 +196,10 @@
"machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_heat_up_speed": { "default_value": 1.8 },
"machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 },
"machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" },
"machine_steps_per_mm_e": { "default_value": 96 },
"machine_steps_per_mm_x": { "default_value": 94 },
"machine_steps_per_mm_y": { "default_value": 94 },
"machine_steps_per_mm_z": { "default_value": 400 },
"material_bed_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false },
"material_bed_temperature": { "maximum_value_warning": "96" }, "material_bed_temperature": { "maximum_value_warning": "96" },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
@ -210,15 +214,15 @@
"prime_tower_min_volume": { "default_value": 10.0 }, "prime_tower_min_volume": { "default_value": 10.0 },
"prime_tower_size": { "default_value": 15.0 }, "prime_tower_size": { "default_value": 15.0 },
"raft_airgap": { "default_value": 0.19 }, "raft_airgap": { "default_value": 0.19 },
"raft_base_fan_speed": { "value": 0.0 },
"raft_base_speed": { "value": 20.0 }, "raft_base_speed": { "value": 20.0 },
"raft_base_thickness": { "value": 0.3 },
"raft_interface_speed": { "value": 33.0 }, "raft_interface_speed": { "value": 33.0 },
"raft_interface_thickness": { "value": 0.27 },
"raft_margin": { "default_value": 8.0 }, "raft_margin": { "default_value": 8.0 },
"raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" },
"raft_surface_speed": { "value": 40.0 }, "raft_surface_speed": { "value": 40.0 },
"raft_surface_thickness": { "value": 0.25 }, "raft_surface_thickness": { "value": 0.25 },
"retraction_amount": { "default_value": 3 }, "retraction_amount": { "default_value": 3 },
"retraction_combing": { "value": "off" }, "retraction_combing": { "value": "'off'" },
"retraction_extrusion_window": { "value": 1.0 }, "retraction_extrusion_window": { "value": 1.0 },
"retraction_hop_after_extruder_switch": { "default_value": false }, "retraction_hop_after_extruder_switch": { "default_value": false },
"retraction_min_travel": { "value": 0.8 }, "retraction_min_travel": { "value": 0.8 },

View File

@ -14,6 +14,6 @@
}, },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" },
"machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"}
} }
} }