diff --git a/BuildLinux.sh b/BuildLinux.sh index 1a217c683..9b4709b6e 100755 --- a/BuildLinux.sh +++ b/BuildLinux.sh @@ -79,6 +79,11 @@ then fi DISTRIBUTION=$(awk -F= '/^ID=/ {print $2}' /etc/os-release) +# treat ubuntu as debian +if [ "${DISTRIBUTION}" == "ubuntu" ] +then + DISTRIBUTION="debian" +fi if [ ! -f ./linux.d/${DISTRIBUTION} ] then echo "Your distribution does not appear to be currently supported by these build scripts" diff --git a/linux.d/ubuntu b/linux.d/debian similarity index 100% rename from linux.d/ubuntu rename to linux.d/debian diff --git a/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json index 5b4f750c9..9528472e4 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG @K1-all.json @@ -44,6 +44,9 @@ "nozzle_temperature": [ "250" ], + "reduce_fan_stop_start_freq": [ + "0" + ], "compatible_printers": [ "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json b/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json index 2d6ae3d26..50ed25372 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA @K1-all.json @@ -35,6 +35,9 @@ "textured_plate_temp_initial_layer": [ "55" ], + "reduce_fan_stop_start_freq": [ + "0" + ], "compatible_printers": [ "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json b/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json index b3d572cc8..a19eec76e 100644 --- a/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json +++ b/resources/profiles/Creality/filament/Creality Generic TPU @K1-all.json @@ -29,6 +29,9 @@ "slow_down_layer_time": [ "5" ], + "reduce_fan_stop_start_freq": [ + "0" + ], "compatible_printers": [ "Creality K1C 0.4 nozzle", "Creality K1C 0.6 nozzle", diff --git a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json index 5683fdb62..707fb2504 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json @@ -1,58 +1,133 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 (0.4 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Creality K1 (0.4 nozzle)", - "nozzle_diameter": ["0.4"], - "printer_variant": "0.4", - "printable_area": ["0x0", "220x0", "220x220", "0x220"], - "printable_height": "250", - "nozzle_type": "brass", - "auxiliary_fan": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["9000", "9000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.3"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.6"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 (0.4 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @Creality K1 (0.4 nozzle)", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "250", + "nozzle_type": "brass", + "auxiliary_fan": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.6" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json index c3080ab4d..f5b4464a8 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json @@ -1,58 +1,133 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 (0.6 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1", - "gcode_flavor": "klipper", - "default_print_profile": "0.30mm Standard @Creality K1 (0.6 nozzle)", - "nozzle_diameter": ["0.6"], - "printer_variant": "0.6", - "printable_area": ["0x0", "220x0", "220x220", "0x220"], - "printable_height": "250", - "nozzle_type": "brass", - "auxiliary_fan": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["9000", "9000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.4"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.5"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1", + "gcode_flavor": "klipper", + "default_print_profile": "0.30mm Standard @Creality K1 (0.6 nozzle)", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6", + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "250", + "nozzle_type": "brass", + "auxiliary_fan": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.5" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json index 61649c930..2c980a66a 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json @@ -1,58 +1,133 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 (0.8 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1", - "gcode_flavor": "klipper", - "default_print_profile": "0.40mm Standard @Creality K1 (0.8 nozzle)", - "nozzle_diameter": ["0.8"], - "printer_variant": "0.8", - "printable_area": ["0x0", "220x0", "220x220", "0x220"], - "printable_height": "250", - "nozzle_type": "brass", - "auxiliary_fan": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["9000", "9000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.5"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.5"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1", + "gcode_flavor": "klipper", + "default_print_profile": "0.40mm Standard @Creality K1 (0.8 nozzle)", + "nozzle_diameter": [ + "0.8" + ], + "printer_variant": "0.8", + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "250", + "nozzle_type": "brass", + "auxiliary_fan": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.5" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.5" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json index 524131fb0..bb772a0bd 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json @@ -1,59 +1,134 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 Max (0.4 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1 Max", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Creality K1Max (0.4 nozzle)", - "nozzle_diameter": ["0.4"], - "printer_variant": "0.4", - "printable_area": ["0x0", "300x0", "300x300", "0x300"], - "printable_height": "300", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["9000", "9000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.3"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.6"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 Max (0.4 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1 Max", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @Creality K1Max (0.4 nozzle)", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "300", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.3" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.6" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json index 21abf7ec8..d19a20ace 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json @@ -1,59 +1,134 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 Max (0.6 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1 Max", - "gcode_flavor": "klipper", - "default_print_profile": "0.30mm Standard @Creality K1Max (0.6 nozzle)", - "nozzle_diameter": ["0.6"], - "printer_variant": "0.6", - "printable_area": ["0x0", "300x0", "300x300", "0x300"], - "printable_height": "300", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["9000", "9000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.4"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.5"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 Max (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1 Max", + "gcode_flavor": "klipper", + "default_print_profile": "0.30mm Standard @Creality K1Max (0.6 nozzle)", + "nozzle_diameter": [ + "0.6" + ], + "printer_variant": "0.6", + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "300", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "9000", + "9000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.5" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json index 8a65bf915..e31c18808 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json @@ -1,59 +1,134 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Creality K1 Max (0.8 nozzle)", - "from": "system", - "instantiation": "true", - "inherits": "fdm_creality_common", - "printer_model": "Creality K1 Max", - "gcode_flavor": "klipper", - "default_print_profile": "0.40mm Standard @Creality K1Max (0.8 nozzle)", - "nozzle_diameter": ["0.8"], - "printer_variant": "0.8", - "printable_area": ["0x0", "300x0", "300x300", "0x300"], - "printable_height": "300", - "nozzle_type": "hardened_steel", - "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", - "machine_max_acceleration_e": ["5000", "5000"], - "machine_max_acceleration_extruding": ["20000", "20000"], - "machine_max_acceleration_retracting": ["5000", "5000"], - "machine_max_acceleration_travel": ["20000", "20000"], - "machine_max_acceleration_x": ["20000", "20000"], - "machine_max_acceleration_y": ["20000", "20000"], - "machine_max_acceleration_z": ["500", "500"], - "machine_max_speed_e": ["100", "100"], - "machine_max_speed_x": ["800", "800"], - "machine_max_speed_y": ["800", "800"], - "machine_max_speed_z": ["20", "20"], - "machine_max_jerk_e": ["2.5", "2.5"], - "machine_max_jerk_x": ["12", "12"], - "machine_max_jerk_y": ["12", "12"], - "machine_max_jerk_z": ["2", "2"], - "max_layer_height": ["0.5"], - "min_layer_height": ["0.08"], - "printer_settings_id": "Creality", - "retraction_minimum_travel": ["2"], - "retract_before_wipe": ["70%"], - "retraction_length": ["0.5"], - "retract_length_toolchange": ["1"], - "retraction_speed": ["40"], - "deretraction_speed": ["40"], - "extruder_clearance_height_to_lid": "101", - "extruder_clearance_height_to_rod": "45", - "extruder_clearance_radius": "45", - "z_hop": ["0.2"], - "single_extruder_multi_material": "1", - "manual_filament_change": "1", - "change_filament_gcode": "PAUSE", - "machine_pause_gcode": "PAUSE", - "default_filament_profile": ["Creality HF Generic PLA"], - "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", - "machine_end_gcode": "END_PRINT", - "scan_first_layer": "0", - "thumbnails": [ - "100x100", - "320x320" - ] -} + "type": "machine", + "setting_id": "GM001", + "name": "Creality K1 Max (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality K1 Max", + "gcode_flavor": "klipper", + "default_print_profile": "0.40mm Standard @Creality K1Max (0.8 nozzle)", + "nozzle_diameter": [ + "0.8" + ], + "printer_variant": "0.8", + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "300", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", + "machine_max_acceleration_e": [ + "5000", + "5000" + ], + "machine_max_acceleration_extruding": [ + "20000", + "20000" + ], + "machine_max_acceleration_retracting": [ + "5000", + "5000" + ], + "machine_max_acceleration_travel": [ + "20000", + "20000" + ], + "machine_max_acceleration_x": [ + "20000", + "20000" + ], + "machine_max_acceleration_y": [ + "20000", + "20000" + ], + "machine_max_acceleration_z": [ + "500", + "500" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "800", + "800" + ], + "machine_max_speed_y": [ + "800", + "800" + ], + "machine_max_speed_z": [ + "20", + "20" + ], + "machine_max_jerk_e": [ + "2.5", + "2.5" + ], + "machine_max_jerk_x": [ + "12", + "12" + ], + "machine_max_jerk_y": [ + "12", + "12" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "max_layer_height": [ + "0.5" + ], + "min_layer_height": [ + "0.08" + ], + "printer_settings_id": "Creality", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "0%" + ], + "retraction_length": [ + "0.5" + ], + "retract_length_toolchange": [ + "1" + ], + "retraction_speed": [ + "40" + ], + "deretraction_speed": [ + "40" + ], + "extruder_clearance_height_to_lid": "101", + "extruder_clearance_height_to_rod": "45", + "extruder_clearance_radius": "45", + "z_hop": [ + "0.2" + ], + "wipe_distance": [ + "2" + ], + "single_extruder_multi_material": "1", + "manual_filament_change": "1", + "change_filament_gcode": "PAUSE", + "machine_pause_gcode": "PAUSE", + "default_filament_profile": [ + "Creality HF Generic PLA" + ], + "machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]", + "machine_end_gcode": "END_PRINT", + "scan_first_layer": "0", + "thumbnails": [ + "100x100", + "320x320" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1 Max.json b/resources/profiles/Creality/machine/Creality K1 Max.json index b74f86b5f..10df2e7b5 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max.json +++ b/resources/profiles/Creality/machine/Creality K1 Max.json @@ -9,4 +9,4 @@ "bed_texture": "creality_k1max_buildplate_texture.png", "hotend_model": "", "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1.json b/resources/profiles/Creality/machine/Creality K1.json index dedfc1603..73e10d77a 100644 --- a/resources/profiles/Creality/machine/Creality K1.json +++ b/resources/profiles/Creality/machine/Creality K1.json @@ -9,4 +9,4 @@ "bed_texture": "creality_k1_buildplate_texture.png", "hotend_model": "", "default_materials": "Creality Generic ABS;Creality Generic ASA;Creality Generic PC @K1-all;Creality Generic PLA;Creality HF Generic PLA;Creality HF Generic Speed PLA;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PETG;Creality Generic TPU" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json index ff0a88777..d4deca8aa 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.4 nozzle.json @@ -21,8 +21,8 @@ "printable_height": "250", "nozzle_type": "hardened_steel", "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", "machine_max_acceleration_e": [ "5000", "5000" @@ -94,7 +94,7 @@ "2" ], "retract_before_wipe": [ - "70%" + "0%" ], "retraction_length": [ "0.6" @@ -114,6 +114,9 @@ "z_hop": [ "0.2" ], + "wipe_distance": [ + "2" + ], "single_extruder_multi_material": "1", "manual_filament_change": "1", "change_filament_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json index 1cb4effc6..46b2ae946 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.6 nozzle.json @@ -21,8 +21,8 @@ "printable_height": "250", "nozzle_type": "hardened_steel", "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", "machine_max_acceleration_e": [ "5000", "5000" @@ -94,7 +94,7 @@ "2" ], "retract_before_wipe": [ - "70%" + "0%" ], "retraction_length": [ "0.5" @@ -114,6 +114,9 @@ "z_hop": [ "0.2" ], + "wipe_distance": [ + "2" + ], "single_extruder_multi_material": "1", "manual_filament_change": "1", "change_filament_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json index 3b41fbd72..6788e0c5e 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json @@ -21,8 +21,8 @@ "printable_height": "250", "nozzle_type": "hardened_steel", "auxiliary_fan": "1", - "support_air_filtration": "1", - "support_multi_bed_types": "1", + "support_air_filtration": "1", + "support_multi_bed_types": "1", "machine_max_acceleration_e": [ "5000", "5000" @@ -94,7 +94,7 @@ "2" ], "retract_before_wipe": [ - "70%" + "0%" ], "retraction_length": [ "0.5" @@ -114,6 +114,9 @@ "z_hop": [ "0.2" ], + "wipe_distance": [ + "2" + ], "single_extruder_multi_material": "1", "manual_filament_change": "1", "change_filament_gcode": "PAUSE", diff --git a/resources/profiles/Creality/machine/Creality K1C.json b/resources/profiles/Creality/machine/Creality K1C.json index 673856d38..610866a1c 100644 --- a/resources/profiles/Creality/machine/Creality K1C.json +++ b/resources/profiles/Creality/machine/Creality K1C.json @@ -9,4 +9,4 @@ "bed_texture": "creality_k1c_buildplate_texture.png", "hotend_model": "", "default_materials": "Creality Generic ABS @K1-all;Creality Generic ASA @K1-all;Creality Generic PA-CF @K1-all;Creality Generic PC @K1-all;Creality Generic PETG @K1-all;Creality Generic PLA @K1-all;Creality Generic PLA High Speed @K1-all;Creality Generic PLA Matte @K1-all;Creality Generic PLA Silk @K1-all;Creality Generic PLA-CF @K1-all;Creality Generic TPU @K1-all" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json index a37823ac3..f292c68bb 100644 --- a/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1 (0.4 nozzle).json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -54,9 +54,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json index f6c496173..f36ef1fb7 100644 --- a/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1C 0.4 nozzle.json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -54,9 +54,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json index 1d6328dda..976197fc3 100644 --- a/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality K1Max (0.4 nozzle).json @@ -12,8 +12,8 @@ "bottom_shell_layers": "5", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", @@ -51,9 +51,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -62,6 +62,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json index 63ea8d7a5..95bcfd2ee 100644 --- a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1 (0.4 nozzle).json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -54,9 +54,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -113,4 +116,4 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json index e9c190d94..404f77212 100644 --- a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1C 0.4 nozzle.json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -54,9 +54,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json index d3a62ef79..43be3e0f1 100644 --- a/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality K1Max (0.4 nozzle).json @@ -1,19 +1,19 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.16mm Optimal @Creality K1Max (0.4 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality K1Max (0.4 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", @@ -51,9 +51,9 @@ "reduce_infill_retraction": "1", "filename_format": "{input_filename_base}_{filament_type[initial_tool]}_{print_time}.gcode", "detect_overhang_wall": "1", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", + "overhang_1_4_speed": "60", + "overhang_2_4_speed": "30", + "overhang_3_4_speed": "10", "overhang_4_4_speed": "10", "only_one_wall_top": "1", "inner_wall_line_width": "0.45", @@ -62,6 +62,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -85,7 +88,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -110,7 +113,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.4 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.4 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json index eeb0412b1..89e199b06 100644 --- a/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1 (0.4 nozzle).json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -88,7 +91,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -113,4 +116,4 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json index 1f6accc5c..9497a842e 100644 --- a/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1C 0.4 nozzle.json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json index 1a78a1647..6b4ebe477 100644 --- a/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality K1Max (0.4 nozzle).json @@ -1,19 +1,19 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @Creality K1Max (0.4 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality K1Max (0.4 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", @@ -62,6 +62,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -85,7 +88,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -110,7 +113,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.4 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.4 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json index b72764cba..b84835786 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1 (0.4 nozzle).json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -88,7 +91,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -113,4 +116,4 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0" -} +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json index cd29aeac4..4c862e272 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1C 0.4 nozzle.json @@ -12,8 +12,8 @@ "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed": "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers": [ @@ -65,6 +65,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json index c285e9abd..7375e35ee 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality K1Max (0.4 nozzle).json @@ -1,19 +1,19 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @Creality K1Max (0.4 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality K1Max (0.4 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bridge_flow": "1", - "bridge_speed": "25", - "internal_bridge_speed" : "70", + "bridge_speed": "50", + "internal_bridge_speed": "150%", "brim_width": "5", "brim_object_gap": "0.1", "compatible_printers_condition": "", @@ -62,6 +62,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -85,7 +88,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -110,7 +113,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.4 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.4 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1 (0.6 nozzle).json index 021ffef87..38ec7ecd8 100644 --- a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1 (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Optimal @Creality K1 (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Optimal @Creality K1 (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json index b9a5cfbb6..b0d52c4fa 100644 --- a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1C 0.6 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1Max (0.6 nozzle).json b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1Max (0.6 nozzle).json index 659e4b978..71523cc4d 100644 --- a/resources/profiles/Creality/process/0.24mm Optimal @Creality K1Max (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.24mm Optimal @Creality K1Max (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Optimal @Creality K1Max (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Optimal @Creality K1Max (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.30mm Standard @Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/process/0.30mm Standard @Creality K1 (0.6 nozzle).json index 904ff17eb..c9a69fb99 100644 --- a/resources/profiles/Creality/process/0.30mm Standard @Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.30mm Standard @Creality K1 (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.30mm Standard @Creality K1 (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Standard @Creality K1 (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json index 4bd1b2400..d56645b25 100644 --- a/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/process/0.30mm Standard @Creality K1C 0.6 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.30mm Standard @Creality K1Max (0.6 nozzle).json b/resources/profiles/Creality/process/0.30mm Standard @Creality K1Max (0.6 nozzle).json index 8cd8ff9a2..3280057fd 100644 --- a/resources/profiles/Creality/process/0.30mm Standard @Creality K1Max (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.30mm Standard @Creality K1Max (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.30mm Standard @Creality K1Max (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Standard @Creality K1Max (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1 (0.8 nozzle).json index c9bc775be..9ee4f69e9 100644 --- a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1 (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.32mm Optimal @Creality K1 (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Optimal @Creality K1 (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json index b5ecf953c..b5645bf4e 100644 --- a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1C 0.8 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1Max (0.8 nozzle).json b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1Max (0.8 nozzle).json index 548aac9fa..0e7533f7d 100644 --- a/resources/profiles/Creality/process/0.32mm Optimal @Creality K1Max (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.32mm Optimal @Creality K1Max (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.32mm Optimal @Creality K1Max (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Optimal @Creality K1Max (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Draft @Creality K1 (0.6 nozzle).json b/resources/profiles/Creality/process/0.36mm Draft @Creality K1 (0.6 nozzle).json index 826e8349c..fadb5b0f5 100644 --- a/resources/profiles/Creality/process/0.36mm Draft @Creality K1 (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.36mm Draft @Creality K1 (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.36mm Draft @Creality K1 (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Draft @Creality K1 (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json b/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json index c312c12ca..3111169c9 100644 --- a/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json +++ b/resources/profiles/Creality/process/0.36mm Draft @Creality K1C 0.6 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.36mm Draft @Creality K1Max (0.6 nozzle).json b/resources/profiles/Creality/process/0.36mm Draft @Creality K1Max (0.6 nozzle).json index 261b31086..0d9a8d151 100644 --- a/resources/profiles/Creality/process/0.36mm Draft @Creality K1Max (0.6 nozzle).json +++ b/resources/profiles/Creality/process/0.36mm Draft @Creality K1Max (0.6 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.36mm Draft @Creality K1Max (0.6 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Draft @Creality K1Max (0.6 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.6 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.40mm Standard @Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/process/0.40mm Standard @Creality K1 (0.8 nozzle).json index f246ca94b..96e481e7b 100644 --- a/resources/profiles/Creality/process/0.40mm Standard @Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.40mm Standard @Creality K1 (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.40mm Standard @Creality K1 (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Standard @Creality K1 (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json index e956dadee..d84aea05e 100644 --- a/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/process/0.40mm Standard @Creality K1C 0.8 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.40mm Standard @Creality K1Max (0.8 nozzle).json b/resources/profiles/Creality/process/0.40mm Standard @Creality K1Max (0.8 nozzle).json index 3d526219a..6eaf18e02 100644 --- a/resources/profiles/Creality/process/0.40mm Standard @Creality K1Max (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.40mm Standard @Creality K1Max (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.40mm Standard @Creality K1Max (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Standard @Creality K1Max (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.48mm Draft @Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/process/0.48mm Draft @Creality K1 (0.8 nozzle).json index cf3145d3a..28f226f4c 100644 --- a/resources/profiles/Creality/process/0.48mm Draft @Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.48mm Draft @Creality K1 (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.48mm Draft @Creality K1 (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.48mm Draft @Creality K1 (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json index 4e275a212..95839ac90 100644 --- a/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/process/0.48mm Draft @Creality K1C 0.8 nozzle.json @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Creality/process/0.48mm Draft @Creality K1Max (0.8 nozzle).json b/resources/profiles/Creality/process/0.48mm Draft @Creality K1Max (0.8 nozzle).json index ba460aef6..58fc8ffcc 100644 --- a/resources/profiles/Creality/process/0.48mm Draft @Creality K1Max (0.8 nozzle).json +++ b/resources/profiles/Creality/process/0.48mm Draft @Creality K1Max (0.8 nozzle).json @@ -1,11 +1,11 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.48mm Draft @Creality K1Max (0.8 nozzle)", - "from": "system", - "inherits": "fdm_process_common_klipper", - "instantiation": "true", - "adaptive_layer_height": "0", + "type": "process", + "setting_id": "GP004", + "name": "0.48mm Draft @Creality K1Max (0.8 nozzle)", + "from": "system", + "inherits": "fdm_process_common_klipper", + "instantiation": "true", + "adaptive_layer_height": "0", "reduce_crossing_wall": "0", "max_travel_detour_distance": "0", "bottom_surface_pattern": "monotonic", @@ -61,6 +61,9 @@ "print_settings_id": "", "raft_layers": "0", "seam_position": "aligned", + "seam_slope_conditional": "1", + "seam_slope_inner_walls": "1", + "seam_slope_entire_loop": "1", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -84,7 +87,7 @@ "support_interface_top_layers": "2", "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", - "support_expansion": "0", + "support_expansion": "0", "support_interface_speed": "80", "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", @@ -109,7 +112,7 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "gcode_label_objects": "0", - "compatible_printers": [ - "Creality K1 Max (0.8 nozzle)" - ] -} + "compatible_printers": [ + "Creality K1 Max (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Flashforge.json b/resources/profiles/Flashforge.json index 852015703..b58dbefe0 100644 --- a/resources/profiles/Flashforge.json +++ b/resources/profiles/Flashforge.json @@ -56,6 +56,22 @@ "sub_path": "process/0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle.json" }, { + "name": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", + "sub_path": "process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json" + }, + { + "name": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "sub_path": "process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json" + }, + { + "name": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle", + "sub_path": "process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json" + }, + { + "name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", + "sub_path": "process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json" + }, + { "name": "0.20mm Standard @Flashforge AD3 0.4 Nozzle", "sub_path": "process/0.20mm Standard @Flashforge AD3 0.4 Nozzle.json" }, @@ -101,14 +117,26 @@ "name": "Flashforge Generic ABS", "sub_path": "filament/Flashforge Generic ABS.json" }, + { + "name": "Flashforge ABS @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic PETG", "sub_path": "filament/Flashforge Generic PETG.json" }, + { + "name": "Flashforge PETG @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic PLA", "sub_path": "filament/Flashforge Generic PLA.json" }, + { + "name": "Flashforge PLA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic PLA-CF10", "sub_path": "filament/Flashforge Generic PLA-CF10.json" @@ -117,14 +145,26 @@ "name": "Flashforge Generic PLA-Silk", "sub_path": "filament/Flashforge Generic PLA-Silk.json" }, + { + "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic HS PLA", "sub_path": "filament/Flashforge Generic HS PLA.json" }, + { + "name": "Flashforge HS PLA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic ASA", "sub_path": "filament/Flashforge Generic ASA.json" }, + { + "name": "Flashforge ASA @FF AD5M 0.25 Nozzle", + "sub_path": "filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json" + }, { "name": "Flashforge Generic PETG-CF10", "sub_path": "filament/Flashforge Generic PETG-CF10.json" @@ -214,6 +254,14 @@ { "name": "fdm_flashforge_common", "sub_path": "machine/fdm_flashforge_common.json" + }, + { + "name": "fdm_adventurer5m_common", + "sub_path": "machine/fdm_adventurer5m_common.json" + }, + { + "name": "Flashforge Adventurer 5M 0.25 Nozzle", + "sub_path": "machine/Flashforge Adventurer 5M 0.25 Nozzle.json" }, { "name": "Flashforge Adventurer 5M 0.4 Nozzle", @@ -222,6 +270,14 @@ { "name": "Flashforge Adventurer 5M 0.6 Nozzle", "sub_path": "machine/Flashforge Adventurer 5M 0.6 Nozzle.json" + }, + { + "name": "Flashforge Adventurer 5M 0.8 Nozzle", + "sub_path": "machine/Flashforge Adventurer 5M 0.8 Nozzle.json" + }, + { + "name": "Flashforge Adventurer 5M Pro 0.25 Nozzle", + "sub_path": "machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json" }, { "name": "Flashforge Adventurer 5M Pro 0.4 Nozzle", @@ -230,6 +286,10 @@ { "name": "Flashforge Adventurer 5M Pro 0.6 Nozzle", "sub_path": "machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json" + }, + { + "name": "Flashforge Adventurer 5M Pro 0.8 Nozzle", + "sub_path": "machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json" }, { "name": "fdm_flashforge_common", diff --git a/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..44387098e --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ABS @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,32 @@ +{ + "type": "filament", + "name": "Flashforge ABS @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic ABS", + "from": "system", + "setting_id": "GFSA04_02", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_id": "GFB99", + "filament_settings_id": [ + "Flashforge ABS @FF AD5M 0.25 Nozzle" + ], + "fan_max_speed": [ + "50" + ], + "filament_cost": [ + "40" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "pressure_advance": [ + "0.1" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..1faf1a055 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge ASA @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,35 @@ +{ + "type": "filament", + "name": "Flashforge ASA @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic ASA", + "from": "system", + "setting_id": "GFSA04_05", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_id": "GFL99", + "filament_settings_id": [ + "Flashforge ASA @FF AD5M 0.25 Nozzle" + ], + "fan_max_speed": [ + "50" + ], + "filament_cost": [ + "40" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "filament_start_gcode": [ + "; filament start gcode\n;right_extruder_material: ASA\n" + ], + "pressure_advance": [ + "0.1" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json index 1055037bb..acb764bee 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS @G3U.json @@ -20,8 +20,6 @@ "2" ], "compatible_printers": [ - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json index f038a2148..d0560d5e8 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ABS.json @@ -50,6 +50,7 @@ ], "compatible_printers": [ "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json index 21c8408a8..457a13c2f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA @G3U.json @@ -20,8 +20,6 @@ "2" ], "compatible_printers": [ - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json index 2b5abb54a..5fe7a2172 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic ASA.json @@ -17,7 +17,9 @@ "2" ], "compatible_printers": [ - "Flashforge Adventurer 5M Pro 0.4 Nozzle" + "Flashforge Adventurer 5M Pro 0.4 Nozzle", + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json index 8dd83f0a4..aa5c61337 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HIPS.json @@ -20,8 +20,12 @@ "2" ], "compatible_printers": [ + "Flashforge Adventurer 5M 0.4 Nozzle", + "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json index 07658bcd9..e9c3659a6 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic HS PLA.json @@ -17,9 +17,11 @@ ], "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M 0.8 Nozzle", + "Flashforge Adventurer 5M Pro 0.4 Nozzle", + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json index 808fe5983..38bacfca7 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG @G3U.json @@ -20,10 +20,6 @@ "1" ], "compatible_printers": [ - "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json index 74f50d8bd..29774632d 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF @G3U.json @@ -20,10 +20,6 @@ "1" ], "compatible_printers": [ - "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json index 257c6edad..0ae33101b 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG-CF10.json @@ -18,9 +18,11 @@ ], "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M 0.8 Nozzle", + "Flashforge Adventurer 5M Pro 0.4 Nozzle", + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json index 3c68f52cb..643b4c10c 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PETG.json @@ -84,7 +84,9 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json index 40ab738ac..a20515286 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA @G3U.json @@ -20,10 +20,6 @@ "1" ], "compatible_printers": [ - "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json index 074f4671e..bb851c86f 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF @G3U.json @@ -20,10 +20,6 @@ "1" ], "compatible_printers": [ - "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json index d48b9bbe9..9889e78ce 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-CF10.json @@ -20,9 +20,11 @@ ], "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M 0.8 Nozzle", + "Flashforge Adventurer 5M Pro 0.4 Nozzle", + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json index 340a685a1..2536d54da 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA-Silk.json @@ -60,7 +60,9 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json index 1f91f1294..1eb9c62f5 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PLA.json @@ -60,7 +60,9 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ] } diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json index bc2961109..6e74e7bc9 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic PVA.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json index 268e9c66b..0639e20d0 100644 --- a/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json +++ b/resources/profiles/Flashforge/filament/Flashforge Generic TPU.json @@ -19,8 +19,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", - "Flashforge Adventurer 5M Pro 0.6 Nozzle" + "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle" ], "compatible_printers_condition": "", "compatible_prints": [], diff --git a/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..553b5f4be --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge HS PLA @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,50 @@ +{ + "type": "filament", + "name": "Flashforge HS PLA @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic HS PLA", + "from": "system", + "setting_id": "GFSA04_09", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_id": "GFL99", + "filament_settings_id": [ + "Flashforge HS PLA @FF AD5M 0.25 Nozzle" + ], + "activate_air_filtration": [ + "1" + ], + "complete_print_exhaust_fan_speed": [ + "100" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "2" + ], + "filament_start_gcode": [ + "; filament start gcode\n;right_extruder_material: HS PLA\n" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "nozzle_temperature": [ + "210" + ], + "pressure_advance": [ + "0.1" + ], + "slow_down_min_speed": [ + "15" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..0ebd69f10 --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PETG @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,29 @@ +{ + "type": "filament", + "name": "Flashforge PETG @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic PETG", + "from": "system", + "setting_id": "GFSA04_12", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_id": "GFG99", + "filament_settings_id": [ + "Flashforge PETG @FF AD5M 0.25 Nozzle" + ], + "fan_max_speed": [ + "80" + ], + "filament_max_volumetric_speed": [ + "1.5" + ], + "pressure_advance": [ + "0.1" + ], + "slow_down_min_speed": [ + "15" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..e3e8d5e3a --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,49 @@ +{ + "type": "filament", + "name": "Flashforge PLA @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic PLA", + "from": "system", + "setting_id": "GFSA04_19", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_settings_id": [ + "Flashforge PLA @FF AD5M 0.25 Nozzle" + ], + "activate_air_filtration": [ + "1" + ], + "complete_print_exhaust_fan_speed": [ + "100" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "overhang_fan_threshold": [ + "25%" + ], + "pressure_advance": [ + "0.1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "15" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..41122b34a --- /dev/null +++ b/resources/profiles/Flashforge/filament/Flashforge PLA-SILK @FF AD5M 0.25 Nozzle.json @@ -0,0 +1,53 @@ +{ + "type": "filament", + "name": "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle", + "inherits": "Flashforge Generic PLA-Silk", + "from": "system", + "setting_id": "GFSA04_25", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle", + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "filament_id": "GFL99", + "filament_settings_id": [ + "Flashforge PLA-SILK @FF AD5M 0.25 Nozzle" + ], + "activate_air_filtration": [ + "1" + ], + "complete_print_exhaust_fan_speed": [ + "100" + ], + "during_print_exhaust_fan_speed": [ + "100" + ], + "filament_flow_ratio": [ + "1" + ], + "filament_max_volumetric_speed": [ + "2.8" + ], + "filament_start_gcode": [ + "; filament start gcode\n;right_extruder_material: PLA-Silk\n" + ], + "hot_plate_temp": [ + "45" + ], + "hot_plate_temp_initial_layer": [ + "50" + ], + "nozzle_temperature": [ + "217" + ], + "pressure_advance": [ + "0.1" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_min_speed": [ + "15" + ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json b/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json index 88259d7a3..44df1f319 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic NexPA-CF25.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json index a58a757e6..ceeb2e7db 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic PAHT-CF.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json b/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json index f7d520689..7239d7d22 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic PET-CF.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json b/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json index afedac099..d63badb6f 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic S-Multi.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json b/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json index b897d2ed4..74b7f88dd 100644 --- a/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json +++ b/resources/profiles/Flashforge/filament/FusRock Generic S-PAHT.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json b/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json index 4c9993997..fff9c3e72 100644 --- a/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json +++ b/resources/profiles/Flashforge/filament/Polymaker Generic CoPA.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/filament/Polymaker Generic S1.json b/resources/profiles/Flashforge/filament/Polymaker Generic S1.json index d41b46f78..e6ae0afcf 100644 --- a/resources/profiles/Flashforge/filament/Polymaker Generic S1.json +++ b/resources/profiles/Flashforge/filament/Polymaker Generic S1.json @@ -22,8 +22,10 @@ "compatible_printers": [ "Flashforge Adventurer 5M 0.4 Nozzle", "Flashforge Adventurer 5M 0.6 Nozzle", + "Flashforge Adventurer 5M 0.8 Nozzle", "Flashforge Adventurer 5M Pro 0.4 Nozzle", "Flashforge Adventurer 5M Pro 0.6 Nozzle", + "Flashforge Adventurer 5M Pro 0.8 Nozzle", "Flashforge Guider 3 Ultra 0.4 Nozzle" ], "compatible_printers_condition": "", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.25 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.25 Nozzle.json new file mode 100644 index 000000000..02d4534ca --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.25 Nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "setting_id": "GM006", + "name": "Flashforge Adventurer 5M 0.25 Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_adventurer5m_common", + "printer_model": "Flashforge Adventurer 5M", + "default_print_profile": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", + "nozzle_diameter": [ "0.25" ], + "printer_variant": "0.25", + "max_layer_height": [ "0.14" ], + "min_layer_height": [ "0.08" ], + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG90 E0\nM83\nG1 E-1 F600\nG1 E8 F300\nG1 X85 Y110 Z0.2 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "retraction_length": [ "1" ], + "z_hop": [ "0.3" ], + "nozzle_type": "stainless_steel" +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json index d8504dde9..5d8d6652d 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json @@ -4,62 +4,13 @@ "name": "Flashforge Adventurer 5M 0.4 Nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_flashforge_common", + "inherits": "fdm_adventurer5m_common", "printer_model": "Flashforge Adventurer 5M", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", + "default_print_profile": "0.20mm Standard @Flashforge AD5M 0.4 Nozzle", "nozzle_diameter": [ "0.4" ], "printer_variant": "0.4", - "printable_area": [ - "-110x-110", - "110x-110", - "110x110", - "-110x110" - ], - "printable_height": "220", - "auxiliary_fan": "1", - "machine_max_acceleration_e": [ "5000", "5000" ], - "machine_max_acceleration_extruding": [ "20000", "20000" ], - "machine_max_acceleration_retracting": [ "5000", "5000" ], - "machine_max_acceleration_travel": [ "20000", "20000" ], - "machine_max_acceleration_x": [ "20000", "20000" ], - "machine_max_acceleration_y": [ "20000", "20000" ], - "machine_max_acceleration_z": [ "500", "500" ], - "machine_max_speed_e": [ "30", "30" ], - "machine_max_speed_x": [ "600", "600" ], - "machine_max_speed_y": [ "600", "600" ], - "machine_max_speed_z": [ "20", "20" ], - "machine_max_jerk_e": [ "2.5", "2.5" ], - "machine_max_jerk_x": [ "9", "9" ], - "machine_max_jerk_y": [ "9", "9" ], - "machine_max_jerk_z": [ "3", "3" ], "max_layer_height": [ "0.28" ], "min_layer_height": [ "0.08" ], - "printer_settings_id": "Flashforge", - "retraction_minimum_travel": [ "1" ], - "retract_before_wipe": [ "100%" ], "retraction_length": [ "0.8" ], - "retract_length_toolchange": [ "2" ], - "deretraction_speed": [ "35" ], - "z_hop": [ "0.4" ], - "single_extruder_multi_material": "0", - "change_filament_gcode": "", - "machine_pause_gcode": "M25", - "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", - "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "scan_first_layer": "0", - "thumbnails": [ - "140x110" - ], - "use_relative_e_distances": "1", - "z_hop_types": "Auto Lift", - "retraction_speed": [ "35" ], - "wipe_distance": "2", - "extruder_clearance_radius": [ "76" ], - "extruder_clearance_height_to_rod": [ "27" ], - "extruder_clearance_height_to_lid": [ "150" ], "nozzle_type": "stainless_steel" } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json index ebd4b9d7f..34694b32b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json @@ -4,63 +4,14 @@ "name": "Flashforge Adventurer 5M 0.6 Nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_flashforge_common", + "inherits": "fdm_adventurer5m_common", "printer_model": "Flashforge Adventurer 5M", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Flashforge AD5M 0.6 Nozzle", + "default_print_profile": "0.30mm Standard @Flashforge AD5M 0.6 Nozzle", "nozzle_diameter": [ "0.6" ], "printer_variant": "0.6", - "printable_area": [ - "-110x-110", - "110x-110", - "110x110", - "-110x110" - ], - "printable_height": "220", - "auxiliary_fan": "1", - "machine_max_acceleration_e": [ "5000", "5000" ], - "machine_max_acceleration_extruding": [ "20000", "20000" ], - "machine_max_acceleration_retracting": [ "5000", "5000" ], - "machine_max_acceleration_travel": [ "20000", "20000" ], - "machine_max_acceleration_x": [ "20000", "20000" ], - "machine_max_acceleration_y": [ "20000", "20000" ], - "machine_max_acceleration_z": [ "500", "500" ], - "machine_max_speed_e": [ "30", "30" ], - "machine_max_speed_x": [ "600", "600" ], - "machine_max_speed_y": [ "600", "600" ], - "machine_max_speed_z": [ "20", "20" ], - "machine_max_jerk_e": [ "2.5", "2.5" ], - "machine_max_jerk_x": [ "9", "9" ], - "machine_max_jerk_y": [ "9", "9" ], - "machine_max_jerk_z": [ "3", "3" ], "max_layer_height": [ "0.4" ], "min_layer_height": [ "0.15" ], - "printer_settings_id": "Flashforge", - "retraction_minimum_travel": [ "1" ], - "retract_before_wipe": [ "100%" ], "retraction_length": [ "1.2" ], - "retract_length_toolchange": [ "2" ], - "deretraction_speed": [ "35" ], - "z_hop": [ "0.4" ], - "single_extruder_multi_material": "0", - "change_filament_gcode": "", - "machine_pause_gcode": "M25", - "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", - "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "scan_first_layer": "0", - "thumbnails": [ - "140x110" - ], - "use_relative_e_distances": "1", - "z_hop_types": "Auto Lift", - "retraction_speed": [ "35" ], - "wipe_distance": "2", - "extruder_clearance_radius": [ "76" ], - "extruder_clearance_height_to_rod": [ "27" ], - "extruder_clearance_height_to_lid": [ "150" ], "nozzle_type": "hardened_steel" diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.8 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.8 Nozzle.json new file mode 100644 index 000000000..2eef780d8 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.8 Nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "setting_id": "GM005", + "name": "Flashforge Adventurer 5M 0.8 Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_adventurer5m_common", + "printer_model": "Flashforge Adventurer 5M", + "default_print_profile": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle", + "nozzle_diameter": [ "0.8" ], + "printer_variant": "0.8", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.3 F1200\nG1 X-110 E30 F2400\nG1 Y0 E8 F2400\nG1 X-109.6 F2400\nG1 Y110 E10 F2400\nG92 E0", + "max_layer_height": [ "0.56" ], + "min_layer_height": [ "0.15" ], + "retraction_length": [ "1.5" ], + "nozzle_type": "hardened_steel", + "z_hop": ["0"] +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json new file mode 100644 index 000000000..021520222 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.25 Nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "setting_id": "GM010", + "name": "Flashforge Adventurer 5M Pro 0.25 Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_adventurer5m_common", + "printer_model": "Flashforge Adventurer 5M Pro", + "default_print_profile": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "nozzle_diameter": [ "0.25" ], + "printer_variant": "0.25", + "max_layer_height": [ "0.14" ], + "min_layer_height": [ "0.08" ], + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG90 E0\nM83\nG1 E-1 F600\nG1 E8 F300\nG1 X85 Y110 Z0.2 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "retraction_length": [ "1" ], + "z_hop": [ "0.3" ], + "nozzle_type": "stainless_steel" +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json index 4d8d58dcd..eaad7c2df 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json @@ -4,63 +4,13 @@ "name": "Flashforge Adventurer 5M Pro 0.4 Nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_flashforge_common", + "inherits": "fdm_adventurer5m_common", "printer_model": "Flashforge Adventurer 5M Pro", - "gcode_flavor": "klipper", "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", "nozzle_diameter": [ "0.4" ], "printer_variant": "0.4", - "printable_area": [ - "-110x-110", - "110x-110", - "110x110", - "-110x110" - ], - "printable_height": "220", - "auxiliary_fan": "1", - "machine_max_acceleration_e": [ "5000", "5000" ], - "machine_max_acceleration_extruding": [ "20000", "20000" ], - "machine_max_acceleration_retracting": [ "5000", "5000" ], - "machine_max_acceleration_travel": [ "20000", "20000" ], - "machine_max_acceleration_x": [ "20000", "20000" ], - "machine_max_acceleration_y": [ "20000", "20000" ], - "machine_max_acceleration_z": [ "500", "500" ], - "machine_max_speed_e": [ "30", "30" ], - "machine_max_speed_x": [ "600", "600" ], - "machine_max_speed_y": [ "600", "600" ], - "machine_max_speed_z": [ "20", "20" ], - "machine_max_jerk_e": [ "2.5", "2.5" ], - "machine_max_jerk_x": [ "9", "9" ], - "machine_max_jerk_y": [ "9", "9" ], - "machine_max_jerk_z": [ "3", "3" ], "max_layer_height": [ "0.28" ], "min_layer_height": [ "0.08" ], - "printer_settings_id": "Flashforge", - "retraction_minimum_travel": [ "1" ], - "retract_before_wipe": [ "100%" ], "retraction_length": [ "0.8" ], - "retract_length_toolchange": [ "2" ], - "deretraction_speed": [ "35" ], - "z_hop": [ "0.4" ], - "single_extruder_multi_material": "0", - "change_filament_gcode": "", - "machine_pause_gcode": "M25", - "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", - "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "scan_first_layer": "0", - "thumbnails": [ - "140x110" - ], - "use_relative_e_distances": "1", - "z_hop_types": "Auto Lift", - "retraction_speed": [ "35" ], - "wipe_distance": "2", - "extruder_clearance_radius": [ "76" ], - "extruder_clearance_height_to_rod": [ "27" ], - "extruder_clearance_height_to_lid": [ "150" ], "nozzle_type": "stainless_steel" - } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json index c0a024542..7ee9c093a 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json @@ -4,63 +4,15 @@ "name": "Flashforge Adventurer 5M Pro 0.6 Nozzle", "from": "system", "instantiation": "true", - "inherits": "fdm_flashforge_common", + "inherits": "fdm_adventurer5m_common", "printer_model": "Flashforge Adventurer 5M Pro", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Flashforge AD5M Pro 0.6 Nozzle", + "default_print_profile": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", "nozzle_diameter": [ "0.6" ], "printer_variant": "0.6", - "printable_area": [ - "-110x-110", - "110x-110", - "110x110", - "-110x110" - ], - "printable_height": "220", - "auxiliary_fan": "1", - "machine_max_acceleration_e": [ "5000", "5000" ], - "machine_max_acceleration_extruding": [ "20000", "20000" ], - "machine_max_acceleration_retracting": [ "5000", "5000" ], - "machine_max_acceleration_travel": [ "20000", "20000" ], - "machine_max_acceleration_x": [ "20000", "20000" ], - "machine_max_acceleration_y": [ "20000", "20000" ], - "machine_max_acceleration_z": [ "500", "500" ], - "machine_max_speed_e": [ "30", "30" ], - "machine_max_speed_x": [ "600", "600" ], - "machine_max_speed_y": [ "600", "600" ], - "machine_max_speed_z": [ "20", "20" ], - "machine_max_jerk_e": [ "2.5", "2.5" ], - "machine_max_jerk_x": [ "9", "9" ], - "machine_max_jerk_y": [ "9", "9" ], - "machine_max_jerk_z": [ "3", "3" ], "max_layer_height": [ "0.4" ], "min_layer_height": [ "0.15" ], - "printer_settings_id": "Flashforge", - "retraction_minimum_travel": [ "1" ], - "retract_before_wipe": [ "100%" ], "retraction_length": [ "1.2" ], - "retract_length_toolchange": [ "2" ], - "deretraction_speed": [ "35" ], - "z_hop": [ "0.4" ], - "single_extruder_multi_material": "0", - "change_filament_gcode": "", - "machine_pause_gcode": "M25", - "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", - "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", - "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", - "scan_first_layer": "0", - "thumbnails": [ - "140x110" - ], - "use_relative_e_distances": "1", - "z_hop_types": "Auto Lift", - "retraction_speed": [ "35" ], - "wipe_distance": "2", - "extruder_clearance_radius": [ "76" ], - "extruder_clearance_height_to_rod": [ "27" ], - "extruder_clearance_height_to_lid": [ "150" ], "nozzle_type": "hardened_steel" + } diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json new file mode 100644 index 000000000..b638a1824 --- /dev/null +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.8 Nozzle.json @@ -0,0 +1,18 @@ +{ + "type": "machine", + "setting_id": "GM009", + "name": "Flashforge Adventurer 5M Pro 0.8 Nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_adventurer5m_common", + "printer_model": "Flashforge Adventurer 5M Pro", + "default_print_profile": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", + "nozzle_diameter": [ "0.8" ], + "printer_variant": "0.8", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.3 F1200\nG1 X-110 E30 F2400\nG1 Y0 E8 F2400\nG1 X-109.6 F2400\nG1 Y110 E10 F2400\nG92 E0", + "max_layer_height": [ "0.56" ], + "min_layer_height": [ "0.15" ], + "retraction_length": [ "1.5" ], + "nozzle_type": "hardened_steel", + "z_hop": ["0"] +} diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json index 6e4d1e81e..a9e9fc036 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Flashforge Adventurer 5M Pro", "model_id": "Flashforge Adventurer 5M Pro", - "nozzle_diameter": "0.4;0.6", + "nozzle_diameter": "0.25;0.4;0.6;0.8", "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json index bd95c9a1f..2211a634b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Flashforge Adventurer 5M", "model_id": "Flashforge-Adventurer-5M", - "nozzle_diameter": "0.4;0.6", + "nozzle_diameter": "0.25;0.4;0.6;0.8", "machine_tech": "FFF", "family": "Flashforge", "bed_model": "flashforge_adventurer5m_series_buildplate_model.STL", diff --git a/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json b/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json new file mode 100644 index 000000000..bf5b7ebd2 --- /dev/null +++ b/resources/profiles/Flashforge/machine/fdm_adventurer5m_common.json @@ -0,0 +1,57 @@ +{ + "type": "machine", + "name": "fdm_adventurer5m_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_flashforge_common", + "gcode_flavor": "klipper", + "printable_area": [ + "-110x-110", + "110x-110", + "110x110", + "-110x110" + ], + "printable_height": "220", + "auxiliary_fan": "1", + "machine_max_acceleration_e": [ "5000", "5000" ], + "machine_max_acceleration_extruding": [ "20000", "20000" ], + "machine_max_acceleration_retracting": [ "5000", "5000" ], + "machine_max_acceleration_travel": [ "20000", "20000" ], + "machine_max_acceleration_x": [ "20000", "20000" ], + "machine_max_acceleration_y": [ "20000", "20000" ], + "machine_max_acceleration_z": [ "500", "500" ], + "machine_max_speed_e": [ "30", "30" ], + "machine_max_speed_x": [ "600", "600" ], + "machine_max_speed_y": [ "600", "600" ], + "machine_max_speed_z": [ "20", "20" ], + "machine_max_jerk_e": [ "2.5", "2.5" ], + "machine_max_jerk_x": [ "9", "9" ], + "machine_max_jerk_y": [ "9", "9" ], + "machine_max_jerk_z": [ "3", "3" ], + "printer_settings_id": "Flashforge", + "retraction_minimum_travel": [ "1" ], + "retract_before_wipe": [ "100%" ], + "retract_length_toolchange": [ "2" ], + "deretraction_speed": [ "35" ], + "z_hop": [ "0.4" ], + "single_extruder_multi_material": "0", + "change_filament_gcode": "", + "machine_pause_gcode": "M25", + "default_filament_profile": [ "Flashforge Generic PLA" ], + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", + "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nM104 S0 ; turn off temperature", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "scan_first_layer": "0", + "thumbnails": [ + "140x110" + ], + "use_relative_e_distances": "1", + "z_hop_types": "Auto Lift", + "retraction_speed": [ "35" ], + "wipe_distance": "2", + "extruder_clearance_radius": [ "76" ], + "extruder_clearance_height_to_rod": [ "27" ], + "extruder_clearance_height_to_lid": [ "150" ], + "version": "1.8.0.0" +} diff --git a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json new file mode 100644 index 000000000..efc3b98d3 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M 0.25 Nozzle.json @@ -0,0 +1,45 @@ +{ + "type": "process", + "name": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", + "inherits": "0.20mm Standard @Flashforge AD5M 0.4 Nozzle", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.25 Nozzle" + ], + "setting_id": "GP012", + "print_settings_id": "0.12mm Standard @Flashforge AD5M 0.25 Nozzle", + "bottom_shell_layers": "4", + "brim_width": "3", + "elefant_foot_compensation": "0", + "gap_infill_speed": "150", + "initial_layer_acceleration": "1000", + "initial_layer_infill_speed": "70", + "initial_layer_line_width": "0.3", + "initial_layer_print_height": "0.15", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.3", + "inner_wall_speed": "150", + "internal_solid_infill_line_width": "0.3", + "internal_solid_infill_speed": "150", + "layer_height": "0.12", + "line_width": "0.25", + "outer_wall_line_width": "0.25", + "outer_wall_speed": "60", + "skirt_loops": "0", + "sparse_infill_line_width": "0.3", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.12", + "support_interface_spacing": "0.25", + "support_line_width": "0.25", + "support_object_xy_distance": "0.2", + "support_speed": "80", + "support_top_z_distance": "0.12", + "top_shell_layers": "7", + "top_shell_thickness": "0.8", + "top_surface_line_width": "0.3", + "top_surface_speed": "150", + "tree_support_tip_diameter": "1.2", + "version": "1.8.0.0", + "wipe_speed": "80%" +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json new file mode 100644 index 000000000..2ea5c5c4e --- /dev/null +++ b/resources/profiles/Flashforge/process/0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle.json @@ -0,0 +1,45 @@ +{ + "type": "process", + "name": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "inherits": "0.20mm Standard @Flashforge AD5M Pro 0.4 Nozzle", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M Pro 0.25 Nozzle" + ], + "setting_id": "GP011", + "print_settings_id": "0.12mm Standard @Flashforge AD5M Pro 0.25 Nozzle", + "bottom_shell_layers": "4", + "brim_width": "3", + "elefant_foot_compensation": "0", + "gap_infill_speed": "150", + "initial_layer_acceleration": "1000", + "initial_layer_infill_speed": "70", + "initial_layer_line_width": "0.3", + "initial_layer_print_height": "0.15", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.3", + "inner_wall_speed": "150", + "internal_solid_infill_line_width": "0.3", + "internal_solid_infill_speed": "150", + "layer_height": "0.12", + "line_width": "0.25", + "outer_wall_line_width": "0.25", + "outer_wall_speed": "60", + "skirt_loops": "0", + "sparse_infill_line_width": "0.3", + "sparse_infill_speed": "100", + "support_bottom_z_distance": "0.12", + "support_interface_spacing": "0.25", + "support_line_width": "0.25", + "support_object_xy_distance": "0.2", + "support_speed": "80", + "support_top_z_distance": "0.12", + "top_shell_layers": "7", + "top_shell_thickness": "0.8", + "top_surface_line_width": "0.3", + "top_surface_speed": "150", + "tree_support_tip_diameter": "1.2", + "version": "1.8.0.0", + "wipe_speed": "80%" +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json new file mode 100644 index 000000000..4c5075106 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M 0.8 Nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "process", + "name": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle", + "inherits": "0.30mm Standard @Flashforge AD5M 0.6 Nozzle", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M 0.8 Nozzle" + ], + "setting_id": "GP002", + "print_settings_id": "0.40mm Standard @Flashforge AD5M 0.8 Nozzle", + "elefant_foot_compensation": "0", + "initial_layer_infill_speed": "55", + "initial_layer_line_width": "0.85", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.85", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_line_width": "0.82", + "layer_height": "0.4", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "skirt_loops": "0", + "sparse_infill_line_width": "0.85", + "support_bottom_interface_spacing": "0.4", + "support_bottom_z_distance": "0.22", + "support_interface_spacing": "0.4", + "support_line_width": "0.82", + "support_object_xy_distance": "0.4", + "support_top_z_distance": "0.22", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "top_surface_line_width": "0.82", + "tree_support_tip_diameter": "1.2", + "version": "1.8.0.0", + "wipe_speed": "60%" +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json new file mode 100644 index 000000000..28323aba7 --- /dev/null +++ b/resources/profiles/Flashforge/process/0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle.json @@ -0,0 +1,36 @@ +{ + "type": "process", + "name": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", + "inherits": "0.30mm Standard @Flashforge AD5M Pro 0.6 Nozzle", + "from": "system", + "instantiation": "true", + "compatible_printers": [ + "Flashforge Adventurer 5M Pro 0.8 Nozzle" + ], + "setting_id": "GP001", + "print_settings_id": "0.40mm Standard @Flashforge AD5M Pro 0.8 Nozzle", + "elefant_foot_compensation": "0", + "initial_layer_infill_speed": "55", + "initial_layer_line_width": "0.85", + "initial_layer_speed": "35", + "inner_wall_line_width": "0.85", + "internal_solid_infill_acceleration": "5000", + "internal_solid_infill_line_width": "0.82", + "layer_height": "0.4", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "skirt_loops": "0", + "sparse_infill_line_width": "0.85", + "support_bottom_interface_spacing": "0.4", + "support_bottom_z_distance": "0.22", + "support_interface_spacing": "0.4", + "support_line_width": "0.82", + "support_object_xy_distance": "0.4", + "support_top_z_distance": "0.22", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "top_surface_line_width": "0.82", + "tree_support_tip_diameter": "1.2", + "version": "1.8.0.0", + "wipe_speed": "60%" +} \ No newline at end of file diff --git a/resources/profiles/Qidi/machine/fdm_machine_common.json b/resources/profiles/Qidi/machine/fdm_machine_common.json index 94bcd6b7e..995c22940 100644 --- a/resources/profiles/Qidi/machine/fdm_machine_common.json +++ b/resources/profiles/Qidi/machine/fdm_machine_common.json @@ -114,6 +114,7 @@ "default_print_profile": "", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "machine_start_gcode": "G28\nG0 Z50 F600\nM190 S[first_layer_bed_temperature]\nG28 Z\nG29 ; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[first_layer_temperature]\nM83\nG0 Z5 F1200\nG0 X{first_layer_print_min[0]} Y{max(0, first_layer_print_min[1] - 2)} F12000\nG0 Z0.2 F600\nG1 E3 F1800\nG0 Z0.3 F600\nG1 X{min(first_layer_print_min[0] + 30,print_bed_max[0])} E6 F600", - "machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG90\n{if max_layer_z < max_print_height / 2}\nG1 Z{max_print_height / 2 + 10} F600\n{else}\nG1 Z{min(max_print_height, max_layer_z + 10)}\n{endif}\nG0 X5 Y{print_bed_max[1]-11} F12000\nM141 S0" + "machine_end_gcode": "M104 S0\nM140 S0\nG92 E0\nG1 E-3 F1800\nG90\n{if max_layer_z < max_print_height / 2}\nG1 Z{max_print_height / 2 + 10} F600\n{else}\nG1 Z{min(max_print_height, max_layer_z + 10)}\n{endif}\nG0 X5 Y{print_bed_max[1]-11} F12000\nM141 S0", + "time_lapse_gcode":";TIMELAPSE_TAKE_FRAME\n" } diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 09cf851f7..c5e4ac642 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2273,9 +2273,7 @@ bool GUI_App::on_init_inner() BOOST_LOG_TRIVIAL(info) << "begin to show the splash screen..."; //BBS use BBL splashScreen scrn = new SplashScreen(bmp, wxSPLASH_CENTRE_ON_SCREEN | wxSPLASH_TIMEOUT, 1500, splashscreen_pos); -#ifndef __linux__ wxYield(); -#endif scrn->SetText(_L("Loading configuration")+ dots); } diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 1f3ae959e..25a18d2c6 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -1347,6 +1347,7 @@ void ObjectList::show_context_menu(const bool evt_context_menu) const ModelVolume *volume = object(obj_idx)->volumes[vol_idx]; menu = volume->is_text() ? plater->text_part_menu() : + volume->is_svg() ? plater->svg_part_menu() : // ORCA fixes missing "Edit SVG" item for Add/Negative/Modifier SVG objects in object list plater->part_menu(); } else @@ -5024,8 +5025,17 @@ void ObjectList::change_part_type() } } - const wxString names[] = { _L("Part"), _L("Negative Part"), _L("Modifier"), _L("Support Blocker"), _L("Support Enforcer") }; - SingleChoiceDialog dlg(_L("Type:"), _L("Choose part type"), wxArrayString(5, names), int(type)); + // ORCA: Fix crash when changing type of svg / text modifier + wxArrayString names; + names.Add(_L("Part")); + names.Add(_L("Negative Part")); + names.Add(_L("Modifier")); + if (!volume->is_svg() && !volume->is_text()) { + names.Add(_L("Support Blocker")); + names.Add(_L("Support Enforcer")); + } + + SingleChoiceDialog dlg(_L("Type:"), _L("Choose part type"), names, int(type)); auto new_type = ModelVolumeType(dlg.GetSingleChoiceIndex()); if (new_type == type || new_type == ModelVolumeType::INVALID) @@ -5697,9 +5707,6 @@ void ObjectList::on_plate_deleted(int plate_idx) void ObjectList::reload_all_plates(bool notify_partplate) { m_prevent_canvas_selection_update = true; -#ifdef __WXOSX__ - AssociateModel(nullptr); -#endif // Unselect all objects before deleting them, so that no change of selection is emitted during deletion. @@ -5729,9 +5736,6 @@ void ObjectList::reload_all_plates(bool notify_partplate) update_selections(); -#ifdef __WXOSX__ - AssociateModel(m_objects_model); -#endif m_prevent_canvas_selection_update = false; // update scene