diff --git a/resources/profiles/Ratrig.json b/resources/profiles/Ratrig.json index 3519738f1e..a3e6fe1fa3 100644 --- a/resources/profiles/Ratrig.json +++ b/resources/profiles/Ratrig.json @@ -235,6 +235,18 @@ { "name": "RatRig Generic PA-CF", "sub_path": "filament/RatRig Generic PA-CF.json" + }, + { + "name": "RatRig PunkFil ABS", + "sub_path": "filament/RatRig PunkFil ABS.json" + }, + { + "name": "RatRig PunkFil PETG CF", + "sub_path": "filament/RatRig PunkFil PETG CF.json" + }, + { + "name": "RatRig PunkFil PETG", + "sub_path": "filament/RatRig PunkFil PETG.json" } ], "machine_list": [ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 300_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 300_cover.png index 8490bf74a0..d1ed3b3437 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 300_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 300_cover.png differ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 400_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 400_cover.png index 8490bf74a0..d1ed3b3437 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 400_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 400_cover.png differ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 500_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 500_cover.png index 8490bf74a0..d1ed3b3437 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 500_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 500_cover.png differ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 300_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 300_cover.png index 8490bf74a0..d4a3fb4015 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 300_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 300_cover.png differ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 400_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 400_cover.png index 8490bf74a0..d4a3fb4015 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 400_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 400_cover.png differ diff --git a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 500_cover.png b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 500_cover.png index 8490bf74a0..d4a3fb4015 100644 Binary files a/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 500_cover.png and b/resources/profiles/Ratrig/RatRig V-Core 4 HYBRID 500_cover.png differ diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json new file mode 100644 index 0000000000..c8affa0ab3 --- /dev/null +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil ABS.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "RatRig PunkFil ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.92" + ], + "filament_max_volumetric_speed": [ + "40" + ], + "filament_z_hop": [ + "nil" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.022" + ], + "hot_plate_temp_initial_layer" : [ + "110" + ], + "hot_plate_temp" : [ + "110" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "nozzle_temperature": [ + "260" + ], + "close_fan_the_first_x_layers": [ + "2" + ], + "fan_cooling_layer_time": [ + "7" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "30" + ], + "overhang_fan_speed": [ + "60" + ], + "overhang_fan_threshold": [ + "25%" + ], + "slow_down_min_speed": [ + "50" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_cost": [ + "25.5" + ], + "filament_vendor": [ + "RatRig" + ], + "compatible_printers": [ + "RatRig V-Core 3 200 0.4 nozzle", + "RatRig V-Core 3 300 0.4 nozzle", + "RatRig V-Core 3 400 0.4 nozzle", + "RatRig V-Core 3 500 0.4 nozzle", + "RatRig V-Minion 0.4 nozzle", + "RatRig V-Cast 0.4 nozzle", + "RatRig V-Cast 0.6 nozzle", + "RatRig V-Core 4 300 0.4 nozzle", + "RatRig V-Core 4 400 0.4 nozzle", + "RatRig V-Core 4 500 0.4 nozzle", + "RatRig V-Core 4 HYBRID 300 0.4 nozzle", + "RatRig V-Core 4 HYBRID 400 0.4 nozzle", + "RatRig V-Core 4 HYBRID 500 0.4 nozzle", + "RatRig V-Core 4 300 0.5 nozzle", + "RatRig V-Core 4 400 0.5 nozzle", + "RatRig V-Core 4 500 0.5 nozzle", + "RatRig V-Core 4 HYBRID 300 0.5 nozzle", + "RatRig V-Core 4 HYBRID 400 0.5 nozzle", + "RatRig V-Core 4 HYBRID 500 0.5 nozzle", + "RatRig V-Core 4 300 0.6 nozzle", + "RatRig V-Core 4 400 0.6 nozzle", + "RatRig V-Core 4 500 0.6 nozzle", + "RatRig V-Core 4 HYBRID 300 0.6 nozzle", + "RatRig V-Core 4 HYBRID 400 0.6 nozzle", + "RatRig V-Core 4 HYBRID 500 0.6 nozzle" + ] +} diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json new file mode 100644 index 0000000000..8150ef9d53 --- /dev/null +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG CF.json @@ -0,0 +1,99 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "RatRig PunkFil PETG CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "20" + ], + "filament_z_hop": [ + "nil" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.038" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "hot_plate_temp" : [ + "80" + ], + "nozzle_temperature_initial_layer": [ + "230" + ], + "nozzle_temperature": [ + "230" + ], + "close_fan_the_first_x_layers": [ + "2" + ], + "fan_cooling_layer_time": [ + "10" + ], + "fan_max_speed": [ + "30" + ], + "fan_min_speed": [ + "0" + ], + "overhang_fan_speed": [ + "40" + ], + "overhang_fan_threshold": [ + "50%" + ], + "slow_down_min_speed": [ + "30" + ], + "slow_down_layer_time": [ + "8" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_cost": [ + "48" + ], + "filament_type": [ + "PETG-CF10" + ], + "filament_vendor": [ + "RatRig" + ], + "compatible_printers": [ + "RatRig V-Core 3 200 0.4 nozzle", + "RatRig V-Core 3 300 0.4 nozzle", + "RatRig V-Core 3 400 0.4 nozzle", + "RatRig V-Core 3 500 0.4 nozzle", + "RatRig V-Minion 0.4 nozzle", + "RatRig V-Cast 0.4 nozzle", + "RatRig V-Cast 0.6 nozzle", + "RatRig V-Core 4 300 0.4 nozzle", + "RatRig V-Core 4 400 0.4 nozzle", + "RatRig V-Core 4 500 0.4 nozzle", + "RatRig V-Core 4 HYBRID 300 0.4 nozzle", + "RatRig V-Core 4 HYBRID 400 0.4 nozzle", + "RatRig V-Core 4 HYBRID 500 0.4 nozzle", + "RatRig V-Core 4 300 0.5 nozzle", + "RatRig V-Core 4 400 0.5 nozzle", + "RatRig V-Core 4 500 0.5 nozzle", + "RatRig V-Core 4 HYBRID 300 0.5 nozzle", + "RatRig V-Core 4 HYBRID 400 0.5 nozzle", + "RatRig V-Core 4 HYBRID 500 0.5 nozzle", + "RatRig V-Core 4 300 0.6 nozzle", + "RatRig V-Core 4 400 0.6 nozzle", + "RatRig V-Core 4 500 0.6 nozzle", + "RatRig V-Core 4 HYBRID 300 0.6 nozzle", + "RatRig V-Core 4 HYBRID 400 0.6 nozzle", + "RatRig V-Core 4 HYBRID 500 0.6 nozzle" + ] +} diff --git a/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json new file mode 100644 index 0000000000..aff5fa4c6d --- /dev/null +++ b/resources/profiles/Ratrig/filament/RatRig PunkFil PETG.json @@ -0,0 +1,96 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "RatRig PunkFil PETG", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "40" + ], + "filament_z_hop": [ + "nil" + ], + "enable_pressure_advance": [ + "1" + ], + "pressure_advance": [ + "0.025" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "hot_plate_temp" : [ + "80" + ], + "nozzle_temperature_initial_layer": [ + "235" + ], + "nozzle_temperature": [ + "235" + ], + "close_fan_the_first_x_layers": [ + "2" + ], + "fan_cooling_layer_time": [ + "8" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "30" + ], + "overhang_fan_speed": [ + "50" + ], + "overhang_fan_threshold": [ + "50%" + ], + "slow_down_min_speed": [ + "50" + ], + "slow_down_layer_time": [ + "2" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "filament_cost": [ + "24.5" + ], + "filament_vendor": [ + "RatRig" + ], + "compatible_printers": [ + "RatRig V-Core 3 200 0.4 nozzle", + "RatRig V-Core 3 300 0.4 nozzle", + "RatRig V-Core 3 400 0.4 nozzle", + "RatRig V-Core 3 500 0.4 nozzle", + "RatRig V-Minion 0.4 nozzle", + "RatRig V-Cast 0.4 nozzle", + "RatRig V-Cast 0.6 nozzle", + "RatRig V-Core 4 300 0.4 nozzle", + "RatRig V-Core 4 400 0.4 nozzle", + "RatRig V-Core 4 500 0.4 nozzle", + "RatRig V-Core 4 HYBRID 300 0.4 nozzle", + "RatRig V-Core 4 HYBRID 400 0.4 nozzle", + "RatRig V-Core 4 HYBRID 500 0.4 nozzle", + "RatRig V-Core 4 300 0.5 nozzle", + "RatRig V-Core 4 400 0.5 nozzle", + "RatRig V-Core 4 500 0.5 nozzle", + "RatRig V-Core 4 HYBRID 300 0.5 nozzle", + "RatRig V-Core 4 HYBRID 400 0.5 nozzle", + "RatRig V-Core 4 HYBRID 500 0.5 nozzle", + "RatRig V-Core 4 300 0.6 nozzle", + "RatRig V-Core 4 400 0.6 nozzle", + "RatRig V-Core 4 500 0.6 nozzle", + "RatRig V-Core 4 HYBRID 300 0.6 nozzle", + "RatRig V-Core 4 HYBRID 400 0.6 nozzle", + "RatRig V-Core 4 HYBRID 500 0.6 nozzle" + ] +} diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.4 nozzle.json index bee5029db6..9aa5e17c45 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.4 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,23 +26,28 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.5 nozzle.json index 94c11a1bbe..4a69198bb7 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.5 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,23 +26,28 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.6 nozzle.json index b603367869..bf8af7c54b 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 300 0.6 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,23 +26,28 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.4 nozzle.json index f01c8a7c82..f95218ddb2 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.4 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,25 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "400", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.5 nozzle.json index a43e8c82d5..7a69713f1b 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.5 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,25 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "400", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.6 nozzle.json index b47ecf033b..8a2c557b01 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 400 0.6 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,26 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["2"], "retraction_speed": ["40"], - "deretraction_speed": ["0"], - "retraction_minimum_travel": ["2"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "deretraction_speed": ["120"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "400", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.4 nozzle.json index b1d3c11ff3..d89467a3b4 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.4 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,25 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "500", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.5 nozzle.json index 46643c68c8..96618aa218 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.5 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,25 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.25"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "500", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.6 nozzle.json index aef0823eac..adb004f782 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 500 0.6 nozzle.json @@ -18,7 +18,7 @@ ], "machine_max_speed_x": ["400", "400"], "machine_max_speed_y": ["400", "400"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["10000", "10000"], "machine_max_acceleration_y": ["10000", "10000"], @@ -26,25 +26,30 @@ "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["10000", "10000"], "machine_max_acceleration_retracting": ["10000", "10000"], + "machine_max_acceleration_travel": ["10000", "10000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", - "printable_height": "500", + "printable_height": "300", "thumbnails": [ "64x64/PNG", "400x300/PNG" diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.4 nozzle.json index a568701371..19592514fd 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.4 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.5 nozzle.json index d4277f7761..5f3449a306 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.5 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.6 nozzle.json index 9f5d69299a..951606077f 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 300 0.6 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "300", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.4 nozzle.json index 40c56a1db0..84f7796e4d 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.4 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "400", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.5 nozzle.json index ca97393502..9adc92b1e0 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.5 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "400", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.6 nozzle.json index f26750c4f4..7af4004b0d 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 400 0.6 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "400", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.4 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.4 nozzle.json index 08eae27e32..845752dee6 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.4 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.4 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.06"], "max_layer_height": ["0.3"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.2"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "500", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.5 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.5 nozzle.json index 58a7ef937e..9eb0716da3 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.5 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.5 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.07"], "max_layer_height": ["0.32"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.25"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "500", "thumbnails": [ diff --git a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.6 nozzle.json b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.6 nozzle.json index 05c5c9c075..d606c82b54 100644 --- a/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.6 nozzle.json +++ b/resources/profiles/Ratrig/machine/RatRig V-Core 4 HYBRID 500 0.6 nozzle.json @@ -18,31 +18,36 @@ ], "machine_max_speed_x": ["500", "500"], "machine_max_speed_y": ["500", "500"], - "machine_max_speed_z": ["50", "50"], + "machine_max_speed_z": ["200", "200"], "machine_max_speed_e": ["120", "120"], "machine_max_acceleration_x": ["20000", "20000"], "machine_max_acceleration_y": ["20000", "20000"], "machine_max_acceleration_z": ["200", "200"], - "machine_max_acceleration_e": ["20000", "20000"], + "machine_max_acceleration_e": ["5000", "5000"], "machine_max_acceleration_extruding": ["20000", "20000"], "machine_max_acceleration_retracting": ["20000", "20000"], + "machine_max_acceleration_travel": ["20000", "20000"], "machine_max_jerk_x": ["5", "5"], "machine_max_jerk_y": ["5", "5"], "machine_max_jerk_z": ["0.4", "0.4"], "machine_max_jerk_e": ["5", "5"], "min_layer_height": ["0.1"], "max_layer_height": ["0.4"], + "extruder_clearance_radius": "45", + "extruder_clearance_height_to_rod": "25", + "extruder_clearance_height_to_lid": "140", "retract_lift_below": ["0.3"], "retraction_length": ["0.8"], "retraction_speed": ["120"], "deretraction_speed": ["120"], - "wipe": ["0"], - "retract_before_wipe": ["0%"], + "wipe": ["1"], + "retract_before_wipe": ["70%"], + "z_hop": ["0.2"], "machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single] TOTAL_LAYER_COUNT={total_layer_count} X0={first_layer_print_min[0]} Y0={first_layer_print_min[1]} X1={first_layer_print_max[0]} Y1={first_layer_print_max[1]}", - "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", - "before_layer_change_gcode": ";[layer_z]", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n_ON_LAYER_CHANGE LAYER={layer_num + 1}", "change_filament_gcode": "M600", - "machine_pause_gcode": "M601", + "machine_pause_gcode": "PAUSE", "printing_by_object_gcode": ";BETWEEN_OBJECTS\nG92 E0", "printable_height": "500", "thumbnails": [ diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 5dbf78c0da..0360848b36 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -2125,6 +2125,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PETG"); def->enum_values.push_back("PETG-CF"); + def->enum_values.push_back("PETG-CF10"); def->enum_values.push_back("PHA"); def->enum_values.push_back("PLA"); def->enum_values.push_back("PLA-AERO"); diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index bb784e567d..6606d5f5f5 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -47,20 +47,20 @@ static const std::vector filament_vendors = "Duramic", "ELEGOO", "Eryone", "Essentium", "eSUN", "Extrudr", "Fiberforce", "Fiberlogy", "FilaCube", "Filamentive", "Fillamentum", "FLASHFORGE", "Formfutura", "Francofil", "FilamentOne", - "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", + "Fil X", "GEEETECH", "Giantarm", "Gizmo Dorks", "GreenGate3D", "HATCHBOX", "Hello3D", "IC3D", "IEMAI", "IIID Max", "INLAND", "iProspect", "iSANMATE", "Justmaker", "Keene Village Plastics", "Kexcelled", "MakerBot", "MatterHackers", "MIKA3D", "NinjaTek", "Nobufil", "Novamaker", "OVERTURE", "OVVNYXE", "Polymaker", "Priline", "Printed Solid", "Protopasta", "Prusament", "Push Plastic", - "R3D", "Re-pet3D", "Recreus", "Regen", "Sain SMART", - "SliceWorx", "Snapmaker", "SnoLabs", "Spectrum", "SUNLU", - "TTYT3D", "Tianse", "UltiMaker", "Valment", "Verbatim", - "VO3D", "Voxelab", "VOXELPLA", "YOOPAI", "Yousu", - "Ziro", "Zyltech"}; + "R3D", "Re-pet3D", "Recreus", "Regen", "RatRig", + "Sain SMART", "SliceWorx", "Snapmaker", "SnoLabs", "Spectrum", + "SUNLU", "TTYT3D", "Tianse", "UltiMaker", "Valment", + "Verbatim", "VO3D", "Voxelab", "VOXELPLA", "YOOPAI", + "Yousu", "Ziro", "Zyltech"}; static const std::vector filament_types = {"PLA", "rPLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", - "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG", + "NYLON", "PVA", "PVB", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc", "TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber", "SBS"};