Fixed many profile issues and cleaned up some messes. (#10686)

This commit is contained in:
SoftFever
2025-09-11 17:50:53 +08:00
committed by GitHub
parent 5e9570c946
commit 4f50fdc94e
6026 changed files with 187121 additions and 169667 deletions

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM001",
"name": "BLOCKS Pro S100 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM001",
"printer_model": "BLOCKS Pro S100",
"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks",
"max_layer_height": [
@@ -26,4 +26,4 @@
"upward_compatible_machine": [
"BLOCKS Pro S100"
]
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM002",
"name": "BLOCKS Pro S100 0.6 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM002",
"printer_model": "BLOCKS Pro S100",
"default_print_profile": "0.30mm Standard 0.6 nozzle @Blocks",
"max_layer_height": [
@@ -27,4 +27,4 @@
"BLOCKS Pro S100"
],
"printer_variant": "0.6"
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM003",
"name": "BLOCKS Pro S100 0.8 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM003",
"printer_model": "BLOCKS Pro S100",
"default_print_profile": "0.40mm Standard 0.8 nozzle @Blocks",
"max_layer_height": [
@@ -27,4 +27,4 @@
"BLOCKS Pro S100"
],
"printer_variant": "0.8"
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM004",
"name": "BLOCKS Pro S100 1.0 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM004",
"printer_model": "BLOCKS Pro S100",
"default_print_profile": "0.50mm Standard 1.0 nozzle @Blocks",
"max_layer_height": [
@@ -27,4 +27,4 @@
"BLOCKS Pro S100"
],
"printer_variant": "1.0"
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM005",
"name": "BLOCKS Pro S100 1.2 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM005",
"printer_model": "BLOCKS Pro S100",
"default_print_profile": "0.60mm Standard 1.2 nozzle @Blocks",
"max_layer_height": [
@@ -27,4 +27,4 @@
"BLOCKS Pro S100"
],
"printer_variant": "1.2"
}
}

View File

@@ -4,9 +4,9 @@
"model_id": "BLOCKS Pro S100",
"nozzle_diameter": "0.4;0.6;0.8;1.0;1.2",
"machine_tech": "FFF",
"family":"Blocks",
"family": "Blocks",
"bed_model": "PRO S100 HotBed model.stl",
"bed_texture":"PRO S100 HotBed texture.png",
"hotend_model":"BLOCKS PrintCore.stl",
"default_materials":"Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}
"bed_texture": "PRO S100 HotBed texture.png",
"hotend_model": "BLOCKS PrintCore.stl",
"default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM006",
"name": "BLOCKS RD50 V2 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM006",
"printer_model": "BLOCKS RD50 V2",
"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks_RD50_V2",
"max_layer_height": [
@@ -23,16 +23,16 @@
"0x500"
],
"retraction_length": [
"1.2"
"1.2"
],
"retraction_speed": [
"30"
"30"
],
"deretraction_speed": [
"80"
"80"
],
"printable_height": "500",
"upward_compatible_machine": [
"BLOCKS RD50 V2"
]
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM007",
"name": "BLOCKS RD50 V2 0.6 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM007",
"printer_model": "BLOCKS RD50 V2",
"default_print_profile": "0.26mm Standard 0.6 nozzle @Blocks_RD50_V2",
"max_layer_height": [
@@ -27,13 +27,13 @@
"BLOCKS RD50 V2"
],
"retraction_length": [
"1.2"
"1.2"
],
"retraction_speed": [
"30"
"30"
],
"deretraction_speed": [
"80"
"80"
],
"printer_variant": "0.6"
}
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM008",
"name": "BLOCKS RD50 V2 0.8 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM008",
"printer_model": "BLOCKS RD50 V2",
"default_print_profile": "0.38mm Standard 0.8 nozzle @Blocks_RD50_V2",
"max_layer_height": [
@@ -27,13 +27,13 @@
"BLOCKS RD50 V2"
],
"retraction_length": [
"1.2"
"1.2"
],
"retraction_speed": [
"30"
"30"
],
"deretraction_speed": [
"80"
"80"
],
"printer_variant": "0.8"
}
}

View File

@@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "BLOCKS RD50 V2",
"model_id": "BLOCKS RD50 V2",
"nozzle_diameter": "0.4;0.6;0.8",
"machine_tech": "FFF",
"family":"Blocks",
"bed_model": "RD50 V2 HotBed model.stl",
"bed_texture":"RD50 V2 HotBed texture.png",
"hotend_model":"BLOCKS PrintCore.stl",
"default_materials":"Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}
"type": "machine_model",
"name": "BLOCKS RD50 V2",
"model_id": "BLOCKS RD50 V2",
"nozzle_diameter": "0.4;0.6;0.8",
"machine_tech": "FFF",
"family": "Blocks",
"bed_model": "RD50 V2 HotBed model.stl",
"bed_texture": "RD50 V2 HotBed texture.png",
"hotend_model": "BLOCKS PrintCore.stl",
"default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM009",
"name": "BLOCKS RF50 0.4 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM009",
"printer_model": "BLOCKS RF50",
"default_print_profile": "0.20mm Standard 0.4 nozzle @Blocks_RF50",
"max_layer_height": [
@@ -23,48 +23,61 @@
"0x500"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_z": [
"200",
"200"
"200",
"200"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_speed_e": [
"60"
],
"machine_max_speed_x": [
"500"
],
"machine_max_speed_y": [
"500"
],
"machine_max_speed_z": [
"12"
],
"machine_max_speed_e": ["60"],
"machine_max_speed_x": ["500"],
"machine_max_speed_y": ["500"],
"machine_max_speed_z": ["12"],
"retraction_length": [
"1"
"1"
],
"retraction_speed": [
"60"
"60"
],
"deretraction_speed": [
"30"
"30"
],
"z_hop": [
"0.4"
"0.4"
],
"z_hop_types": [
"Slope Lift"
],
"z_hop_types": ["Slope Lift"],
"auxiliary_fan": "1",
"support_air_filtration": "1",
"support_air_filtration": "1",
"printable_height": "500",
"extruder_clearance_radius": "106",
"extruder_clearance_height_to_rod": "30",
"extruder_clearance_height_to_lid": "185",
"upward_compatible_machine": [
"BLOCKS RF50"
],
"wipe_distance": ["2"],
"retract_before_wipe": ["0"]
}
],
"wipe_distance": [
"2"
],
"retract_before_wipe": [
"0"
]
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM010",
"name": "BLOCKS RF50 0.6 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM010",
"printer_model": "BLOCKS RF50",
"default_print_profile": "0.26mm Standard 0.6 nozzle @Blocks_RF50",
"max_layer_height": [
@@ -23,40 +23,50 @@
"0x500"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_z": [
"200",
"200"
"200",
"200"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_speed_e": [
"60"
],
"machine_max_speed_x": [
"500"
],
"machine_max_speed_y": [
"500"
],
"machine_max_speed_z": [
"12"
],
"machine_max_speed_e": ["60"],
"machine_max_speed_x": ["500"],
"machine_max_speed_y": ["500"],
"machine_max_speed_z": ["12"],
"retraction_length": [
"1"
"1"
],
"retraction_speed": [
"60"
"60"
],
"deretraction_speed": [
"30"
"30"
],
"z_hop": [
"0.4"
"0.4"
],
"z_hop_types": [
"Slope Lift"
],
"z_hop_types": ["Slope Lift"],
"auxiliary_fan": "1",
"support_air_filtration": "1",
"support_air_filtration": "1",
"printable_height": "500",
"extruder_clearance_radius": "106",
"extruder_clearance_height_to_rod": "30",
@@ -64,12 +74,15 @@
"upward_compatible_machine": [
"BLOCKS RF50"
],
"machine_start_gcode":[
"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]",
"SET_PRESSURE_ADVANCE ADVANCE=0.046"
"machine_start_gcode": [
"PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]",
"SET_PRESSURE_ADVANCE ADVANCE=0.046"
],
"printer_variant": "0.6",
"wipe_distance": ["2"],
"retract_before_wipe": ["0"]
}
"printer_variant": "0.6",
"wipe_distance": [
"2"
],
"retract_before_wipe": [
"0"
]
}

View File

@@ -1,10 +1,10 @@
{
"type": "machine",
"settings_id": "GM011",
"name": "BLOCKS RF50 0.8 nozzle",
"inherits": "fdm_klipper_common",
"from": "system",
"instantiation": "true",
"inherits": "fdm_klipper_common",
"settings_id": "GM011",
"printer_model": "BLOCKS RF50",
"default_print_profile": "0.38mm Standard 0.8 nozzle @Blocks_RF50",
"max_layer_height": [
@@ -23,40 +23,50 @@
"0x500"
],
"machine_max_acceleration_x": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_y": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_z": [
"200",
"200"
"200",
"200"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_speed_e": [
"60"
],
"machine_max_speed_x": [
"500"
],
"machine_max_speed_y": [
"500"
],
"machine_max_speed_z": [
"12"
],
"machine_max_speed_e": ["60"],
"machine_max_speed_x": ["500"],
"machine_max_speed_y": ["500"],
"machine_max_speed_z": ["12"],
"retraction_length": [
"1"
"1"
],
"retraction_speed": [
"60"
"60"
],
"deretraction_speed": [
"30"
"30"
],
"z_hop": [
"0.4"
"0.4"
],
"z_hop_types": [
"Slope Lift"
],
"z_hop_types": ["Slope Lift"],
"auxiliary_fan": "1",
"support_air_filtration": "1",
"support_air_filtration": "1",
"printable_height": "500",
"extruder_clearance_radius": "106",
"extruder_clearance_height_to_rod": "30",
@@ -64,7 +74,11 @@
"upward_compatible_machine": [
"BLOCKS RF50"
],
"printer_variant": "0.8",
"wipe_distance": ["2"],
"retract_before_wipe": ["0"]
}
"printer_variant": "0.8",
"wipe_distance": [
"2"
],
"retract_before_wipe": [
"0"
]
}

View File

@@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "BLOCKS RF50",
"model_id": "BLOCKS RF50",
"nozzle_diameter": "0.4;0.6;0.8",
"machine_tech": "FFF",
"family":"Blocks",
"bed_model": "RF50 HotBed model.stl",
"bed_texture":"RF50 HotBed texture.png",
"hotend_model":"BLOCKS PrintCore.stl",
"default_materials":"Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}
"type": "machine_model",
"name": "BLOCKS RF50",
"model_id": "BLOCKS RF50",
"nozzle_diameter": "0.4;0.6;0.8",
"machine_tech": "FFF",
"family": "Blocks",
"bed_model": "RF50 HotBed model.stl",
"bed_texture": "RF50 HotBed texture.png",
"hotend_model": "BLOCKS PrintCore.stl",
"default_materials": "Blocks Generic PLA;Blocks Generic PETG;Blocks Generic TPU"
}

View File

@@ -1,83 +1,83 @@
{
"type": "machine",
"name": "fdm_klipper_common",
"inherits": "fdm_machine_common",
"from": "system",
"instantiation": "false",
"inherits": "fdm_machine_common",
"gcode_flavor": "klipper",
"machine_max_acceleration_e": [
"5000",
"5000"
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"20000",
"20000"
"20000",
"20000"
],
"machine_max_acceleration_retracting": [
"5000",
"5000"
"5000",
"5000"
],
"machine_max_acceleration_travel": [
"5000",
"5000"
"5000",
"5000"
],
"machine_max_acceleration_x": [
"5000",
"5000"
"5000",
"5000"
],
"machine_max_acceleration_y": [
"5000",
"5000"
"5000",
"5000"
],
"machine_max_acceleration_z": [
"500",
"200"
"500",
"200"
],
"machine_max_speed_e": [
"25",
"25"
"25",
"25"
],
"machine_max_speed_x": [
"500",
"200"
"500",
"200"
],
"machine_max_speed_y": [
"500",
"200"
"500",
"200"
],
"machine_max_speed_z": [
"12",
"12"
"12",
"12"
],
"machine_max_jerk_e": [
"0",
"0"
"0",
"0"
],
"machine_max_jerk_x": [
"0",
"0"
"0",
"0"
],
"machine_max_jerk_y": [
"0",
"0"
"0",
"0"
],
"machine_max_jerk_z": [
"0",
"0"
"0",
"0"
],
"machine_min_extruding_rate": [
"0",
"0"
"0",
"0"
],
"machine_min_travel_rate": [
"0",
"0"
"0",
"0"
],
"max_layer_height": [
"1.2"
"1.2"
],
"min_layer_height": [
"0.08"
"0.08"
],
"printable_height": "900",
"extruder_clearance_radius": "74",
@@ -87,34 +87,34 @@
"printer_technology": "FFF",
"printer_variant": "0.4",
"retraction_minimum_travel": [
"1"
"1"
],
"retract_before_wipe": [
"70%"
"70%"
],
"retract_when_changing_layer": [
"1"
"1"
],
"retraction_length": [
"0.8"
"0.8"
],
"retract_length_toolchange": [
"2"
"2"
],
"z_hop": [
"0.4"
"0.4"
],
"retract_restart_extra": [
"0"
"0"
],
"retract_restart_extra_toolchange": [
"0"
"0"
],
"retraction_speed": [
"35"
"35"
],
"deretraction_speed": [
"35"
"35"
],
"z_hop_types": "Normal Lift",
"silent_mode": "0",
@@ -122,13 +122,13 @@
"change_filament_gcode": "CHANGE_FILAMENT",
"machine_pause_gcode": "PAUSE",
"wipe": [
"1"
"1"
],
"default_filament_profile": [
"Blocks Generic PLA"
"Blocks Generic PLA"
],
"bed_exclude_area": [
"0x0"
"0x0"
],
"machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer]",
"machine_end_gcode": "M400\nPRINT_END",
@@ -137,4 +137,4 @@
"scan_first_layer": "0",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}
}

View File

@@ -113,6 +113,4 @@
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"machine_start_gcode": "PRINT_START EXTRUDER=[nozzle_temperature_inital_layer] BED=[bed_temperature_initial_layer]",
"machine_end_gcode": "M400; wait for buffer to clear\nPRINT_END"
}
}