Revert "Merge pull request #868 from fr3ak2402/main"

This reverts commit 3ee801be50, reversing
changes made to bbbed5e8c3.
This commit is contained in:
SoftFever 2023-04-27 23:11:47 +08:00
parent 4cab3701a1
commit e87a447479
54 changed files with 0 additions and 4000 deletions

View file

@ -1,109 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "Qidi X-Max 3 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_qidi_common",
"printer_model": "Qidi X-Max 3",
"default_print_profile": "0.20mm Standard @Qidi XMax3",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"325x0",
"325x325",
"0x325"
],
"printable_height": "320",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"1250"
],
"machine_max_acceleration_retracting": [
"5000",
"1250"
],
"machine_max_acceleration_travel": [
"1500",
"1250"
],
"machine_max_acceleration_x": [
"20000",
"1000"
],
"machine_max_acceleration_y": [
"20000",
"1000"
],
"machine_max_acceleration_z": [
"500",
"200"
],
"machine_max_speed_e": [
"30",
"120"
],
"machine_max_speed_x": [
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
],
"machine_max_speed_z": [
"20",
"12"
],
"machine_max_jerk_e": [
"2",
"2.5"
],
"machine_max_jerk_x": [
"10",
"10"
],
"machine_max_jerk_y": [
"10",
"10"
],
"machine_max_jerk_z": [
"3",
"0.4"
],
"max_layer_height": [
"0"
],
"min_layer_height": [
"0.07"
],
"printer_settings_id": "Qidi",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"0%"
],
"retraction_length": [
"0.8"
],
"retract_length_toolchange": [
"10"
],
"deretraction_speed": [
"0"
],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Qidi Generic PLA"
],
"machine_start_gcode": "G28\nM190 S[first_layer_bed_temperature]\nG28 Z\n;G29\nG0 X4 Y5 Z50 F6000\nM109 S[first_layer_temperature]\nM82\nG0 Z0.3 F600\nG92 E-36.45\nG1 Y120 E-27.45 F3000\nG1 X6 E-27.30\nG1 Y5 E-18.30\nG1 X8 E-18.15\nG1 Y120 E-9.15\nG1 X10 E-9\nG1 Y5 E0",
"machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG91\nG0 Z10 F600\nG90\nG0 X0 Y0 F12000\nG0 Z[max_print_height] F600",
"scan_first_layer": "0"
}

View file

@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "Qidi X-Max 3",
"model_id": "Qidi-XMax-3",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Qidi",
"bed_model": "",
"bed_texture": "qidi_buildplate_xmax3.svg",
"hotend_model": "qidi_xseries_gen3_hotend.stl",
"default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PVA;Qidi Generic TPU"
}

View file

@ -1,109 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "Qidi X-Plus 3 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_qidi_common",
"printer_model": "Qidi X-Plus 3",
"default_print_profile": "0.20mm Standard @Qidi XPlus3",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"280x0",
"280x280",
"0x280"
],
"printable_height": "270",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"1250"
],
"machine_max_acceleration_retracting": [
"5000",
"1250"
],
"machine_max_acceleration_travel": [
"1500",
"1250"
],
"machine_max_acceleration_x": [
"20000",
"1000"
],
"machine_max_acceleration_y": [
"20000",
"1000"
],
"machine_max_acceleration_z": [
"500",
"200"
],
"machine_max_speed_e": [
"30",
"120"
],
"machine_max_speed_x": [
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
],
"machine_max_speed_z": [
"20",
"12"
],
"machine_max_jerk_e": [
"2",
"2.5"
],
"machine_max_jerk_x": [
"10",
"10"
],
"machine_max_jerk_y": [
"10",
"10"
],
"machine_max_jerk_z": [
"3",
"0.4"
],
"max_layer_height": [
"0"
],
"min_layer_height": [
"0.07"
],
"printer_settings_id": "Qidi",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"0%"
],
"retraction_length": [
"0.8"
],
"retract_length_toolchange": [
"10"
],
"deretraction_speed": [
"0"
],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Qidi Generic PLA"
],
"machine_start_gcode": "G28\nM190 S[first_layer_bed_temperature]\nG28 Z\n;G29\nG0 X4 Y5 Z50 F6000\nM109 S[first_layer_temperature]\nM82\nG0 Z0.3 F600\nG92 E-36.45\nG1 Y120 E-27.45 F3000\nG1 X6 E-27.30\nG1 Y5 E-18.30\nG1 X8 E-18.15\nG1 Y120 E-9.15\nG1 X10 E-9\nG1 Y5 E0",
"machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG91\nG0 Z10 F600\nG90\nG0 X0 Y0 F12000\nG0 Z[max_print_height] F600",
"scan_first_layer": "0"
}

View file

@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "Qidi X-Plus 3",
"model_id": "Qidi-XPlus-3",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Qidi",
"bed_model": "",
"bed_texture": "qidi_buildplate_xplus3.svg",
"hotend_model": "qidi_xseries_gen3_hotend.stl",
"default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PVA;Qidi Generic TPU"
}

View file

@ -1,109 +0,0 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "Qidi X-Smart 3 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_qidi_common",
"printer_model": "Qidi X-Smart 3",
"default_print_profile": "0.20mm Standard @Qidi XSmart3",
"nozzle_diameter": [
"0.4"
],
"printable_area": [
"0x0",
"180x0",
"180x180",
"0x180"
],
"printable_height": "170",
"nozzle_type": "hardened_steel",
"auxiliary_fan": "0",
"machine_max_acceleration_extruding": [
"20000",
"1250"
],
"machine_max_acceleration_retracting": [
"5000",
"1250"
],
"machine_max_acceleration_travel": [
"1500",
"1250"
],
"machine_max_acceleration_x": [
"20000",
"1000"
],
"machine_max_acceleration_y": [
"20000",
"1000"
],
"machine_max_acceleration_z": [
"500",
"200"
],
"machine_max_speed_e": [
"30",
"120"
],
"machine_max_speed_x": [
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
],
"machine_max_speed_z": [
"20",
"12"
],
"machine_max_jerk_e": [
"2",
"2.5"
],
"machine_max_jerk_x": [
"10",
"10"
],
"machine_max_jerk_y": [
"10",
"10"
],
"machine_max_jerk_z": [
"3",
"0.4"
],
"max_layer_height": [
"0"
],
"min_layer_height": [
"0.07"
],
"printer_settings_id": "Qidi",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"0%"
],
"retraction_length": [
"0.8"
],
"retract_length_toolchange": [
"10"
],
"deretraction_speed": [
"0"
],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"machine_pause_gcode": "M0",
"default_filament_profile": [
"Qidi Generic PLA"
],
"machine_start_gcode": "G28\nM190 S[first_layer_bed_temperature]\nG28 Z\n;G29\nG0 X4 Y5 Z50 F6000\nM109 S[first_layer_temperature]\nM82\nG0 Z0.3 F600\nG92 E-36.45\nG1 Y120 E-27.45 F3000\nG1 X6 E-27.30\nG1 Y5 E-18.30\nG1 X8 E-18.15\nG1 Y120 E-9.15\nG1 X10 E-9\nG1 Y5 E0",
"machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG91\nG0 Z10 F600\nG90\nG0 X0 Y0 F12000\nG0 Z[max_print_height] F600",
"scan_first_layer": "0"
}

View file

@ -1,12 +0,0 @@
{
"type": "machine_model",
"name": "Qidi X-Smart 3",
"model_id": "Qidi-XSmart-3",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "Qidi",
"bed_model": "",
"bed_texture": "qidi_buildplate_xsmart3.svg",
"hotend_model": "qidi_xseries_gen3_hotend.stl",
"default_materials": "Qidi Generic ASA;Qidi Generic ABS;Qidi Generic PA-CF;Qidi Generic PA;Qidi Generic PC;Qidi Generic PETG-CF;Qidi Generic PETG;Qidi Generic PLA Silk;Qidi Generic PLA;Qidi Generic PVA;Qidi Generic TPU"
}

View file

@ -1,117 +0,0 @@
{
"type": "machine",
"name": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"printer_technology": "FFF",
"deretraction_speed": [
"40"
],
"extruder_colour": [
"#FCE94F"
],
"extruder_offset": [
"0x0"
],
"gcode_flavor": "marlin",
"silent_mode": "0",
"machine_max_acceleration_e": [
"5000"
],
"machine_max_acceleration_extruding": [
"10000"
],
"machine_max_acceleration_retracting": [
"1000"
],
"machine_max_acceleration_x": [
"10000"
],
"machine_max_acceleration_y": [
"10000"
],
"machine_max_acceleration_z": [
"100"
],
"machine_max_speed_e": [
"60"
],
"machine_max_speed_x": [
"500"
],
"machine_max_speed_y": [
"500"
],
"machine_max_speed_z": [
"10"
],
"machine_max_jerk_e": [
"5"
],
"machine_max_jerk_x": [
"8"
],
"machine_max_jerk_y": [
"8"
],
"machine_max_jerk_z": [
"0.4"
],
"machine_min_extruding_rate": [
"0"
],
"machine_min_travel_rate": [
"0"
],
"max_layer_height": [
"0.28"
],
"min_layer_height": [
"0.08"
],
"printable_height": "250",
"extruder_clearance_radius": "65",
"extruder_clearance_height_to_rod": "36",
"extruder_clearance_height_to_lid": "140",
"nozzle_diameter": [
"0.4"
],
"printer_settings_id": "",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"70%"
],
"retract_when_changing_layer": [
"1"
],
"retraction_length": [
"5"
],
"retract_length_toolchange": [
"1"
],
"z_hop": [
"0"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"60"
],
"single_extruder_multi_material": "0",
"change_filament_gcode": "",
"wipe": [
"1"
],
"z_lift_type": "NormalLift",
"default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle",
"machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up",
"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end"
}

View file

@ -1,139 +0,0 @@
{
"type": "machine",
"name": "fdm_qidi_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "marlin",
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"500",
"500"
],
"machine_max_acceleration_retracting": [
"1000",
"1000"
],
"machine_max_acceleration_travel": [
"500",
"500"
],
"machine_max_acceleration_x": [
"3000",
"3000"
],
"machine_max_acceleration_y": [
"3000",
"3000"
],
"machine_max_acceleration_z": [
"100",
"100"
],
"machine_max_speed_e": [
"60",
"60"
],
"machine_max_speed_x": [
"500",
"500"
],
"machine_max_speed_y": [
"500",
"500"
],
"machine_max_speed_z": [
"10",
"10"
],
"machine_max_jerk_e": [
"5",
"5"
],
"machine_max_jerk_x": [
"8",
"8"
],
"machine_max_jerk_y": [
"8",
"8"
],
"machine_max_jerk_z": [
"0.4",
"0.4"
],
"machine_min_extruding_rate": [
"0",
"0"
],
"machine_min_travel_rate": [
"0",
"0"
],
"max_layer_height": [
"0.32"
],
"min_layer_height": [
"0.08"
],
"printable_height": "250",
"extruder_clearance_radius": "47",
"extruder_clearance_height_to_rod": "34",
"extruder_clearance_height_to_lid": "34",
"printer_settings_id": "",
"printer_technology": "FFF",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"2"
],
"retract_before_wipe": [
"70%"
],
"retract_when_changing_layer": [
"1"
],
"retraction_length": [
"5"
],
"retract_length_toolchange": [
"2"
],
"z_hop": [
"0.4"
],
"retract_restart_extra": [
"0"
],
"retract_restart_extra_toolchange": [
"0"
],
"retraction_speed": [
"60"
],
"deretraction_speed": [
"40"
],
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "",
"machine_pause_gcode": "M25 ;pause print",
"wipe": [
"1"
],
"default_filament_profile": [
"Generic PLA @QIDI"
],
"default_print_profile": "0.20mm Standard @QIDI",
"bed_exclude_area": [
"0x0"
],
"machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0",
"machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < printable_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors",
"layer_change_gcode": "",
"scan_first_layer": "0",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}