From ff53f401be68cece5f4cae7a45d0c0116753ffbf Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 8 Jun 2024 10:17:30 +0800 Subject: [PATCH 1/7] Take filament flow ratio into account when displaying flow in gcode legend --- src/libslic3r/GCode/GCodeProcessor.cpp | 19 +++++++++++++++++-- src/libslic3r/GCode/GCodeProcessor.hpp | 2 ++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp index ebe3947008..648b570d82 100644 --- a/src/libslic3r/GCode/GCodeProcessor.cpp +++ b/src/libslic3r/GCode/GCodeProcessor.cpp @@ -45,6 +45,7 @@ static const float DEFAULT_FILAMENT_DIAMETER = 1.75f; static const int DEFAULT_FILAMENT_HRC = 0; static const float DEFAULT_FILAMENT_DENSITY = 1.245f; static const float DEFAULT_FILAMENT_COST = 29.99f; +static const float DEFAULT_FILAMENT_FLOW_RATIOS = 1.0f; static const int DEFAULT_FILAMENT_VITRIFICATION_TEMPERATURE = 0; static const Slic3r::Vec3f DEFAULT_EXTRUDER_OFFSET = Slic3r::Vec3f::Zero(); @@ -945,6 +946,7 @@ void GCodeProcessorResult::reset() { required_nozzle_HRC = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_HRC); filament_densities = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_DENSITY); filament_costs = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_COST); + filament_flow_ratios = std::vector(MIN_EXTRUDERS_COUNT, DEFAULT_FILAMENT_FLOW_RATIOS); custom_gcode_per_print_z = std::vector(); spiral_vase_layers = std::vector>>(); bed_match_result = BedMatchResult(true); @@ -1057,6 +1059,7 @@ void GCodeProcessor::apply_config(const PrintConfig& config) m_result.filament_densities.resize(extruders_count); m_result.filament_vitrification_temperature.resize(extruders_count); m_result.filament_costs.resize(extruders_count); + m_result.filament_flow_ratios.resize(extruders_count); m_extruder_temps.resize(extruders_count); m_result.nozzle_hrc = static_cast(config.nozzle_hrc.getInt()); m_result.nozzle_type = config.nozzle_type; @@ -1068,6 +1071,7 @@ void GCodeProcessor::apply_config(const PrintConfig& config) m_result.filament_densities[i] = static_cast(config.filament_density.get_at(i)); m_result.filament_vitrification_temperature[i] = static_cast(config.temperature_vitrification.get_at(i)); m_result.filament_costs[i] = static_cast(config.filament_cost.get_at(i)); + m_result.filament_flow_ratios[i] = static_cast(config.filament_flow_ratio.get_at(i)); } if (m_flavor == gcfMarlinLegacy || m_flavor == gcfMarlinFirmware || m_flavor == gcfKlipper || m_flavor == gcfRepRapFirmware) { @@ -1245,6 +1249,15 @@ void GCodeProcessor::apply_config(const DynamicPrintConfig& config) m_result.filament_costs.emplace_back(DEFAULT_FILAMENT_COST); } + // Orca: filament flow ratio + const ConfigOptionFloats* filament_flow_ratios = config.option("filament_flow_ratio"); + if (filament_flow_ratios != nullptr) { + m_result.filament_flow_ratios.clear(); + m_result.filament_flow_ratios.resize(filament_flow_ratios->values.size()); + for (size_t i = 0; i < filament_flow_ratios->values.size(); ++i) + m_result.filament_flow_ratios[i]=static_cast(filament_flow_ratios->values[i]); + } + //BBS const ConfigOptionInts* filament_vitrification_temperature = config.option("temperature_vitrification"); if (filament_vitrification_temperature != nullptr) { @@ -2917,6 +2930,7 @@ void GCodeProcessor::process_G0(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) { float filament_diameter = (static_cast(m_extruder_id) < m_result.filament_diameters.size()) ? m_result.filament_diameters[m_extruder_id] : m_result.filament_diameters.back(); + float filament_flowratio = (static_cast(m_extruder_id) < m_result.filament_flow_ratios.size()) ? m_result.filament_flow_ratios[m_extruder_id] : m_result.filament_flow_ratios.back(); float filament_radius = 0.5f * filament_diameter; float area_filament_cross_section = static_cast(M_PI) * sqr(filament_radius); auto absolute_position = [this, area_filament_cross_section](Axis axis, const GCodeReader::GCodeLine& lineG1) { @@ -2994,7 +3008,7 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) m_used_filaments.increase_model_caches(volume_extruded_filament); } // volume extruded filament / tool displacement = area toolpath cross section - m_mm3_per_mm = area_toolpath_cross_section; + m_mm3_per_mm = area_toolpath_cross_section * filament_flowratio; #if ENABLE_GCODE_VIEWER_DATA_CHECKING m_mm3_per_mm_compare.update(area_toolpath_cross_section, m_extrusion_role); #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING @@ -3344,6 +3358,7 @@ void GCodeProcessor::process_G1(const GCodeReader::GCodeLine& line) void GCodeProcessor::process_G2_G3(const GCodeReader::GCodeLine& line) { float filament_diameter = (static_cast(m_extruder_id) < m_result.filament_diameters.size()) ? m_result.filament_diameters[m_extruder_id] : m_result.filament_diameters.back(); + float filament_flowratio = (static_cast(m_extruder_id) < m_result.filament_flow_ratios.size()) ? m_result.filament_flow_ratios[m_extruder_id] : m_result.filament_flow_ratios.back(); float filament_radius = 0.5f * filament_diameter; float area_filament_cross_section = static_cast(M_PI) * sqr(filament_radius); auto absolute_position = [this, area_filament_cross_section](Axis axis, const GCodeReader::GCodeLine& lineG2_3) { @@ -3472,7 +3487,7 @@ void GCodeProcessor::process_G2_G3(const GCodeReader::GCodeLine& line) m_used_filaments.increase_model_caches(volume_extruded_filament); } //BBS: volume extruded filament / tool displacement = area toolpath cross section - m_mm3_per_mm = area_toolpath_cross_section; + m_mm3_per_mm = area_toolpath_cross_section * filament_flowratio; #if ENABLE_GCODE_VIEWER_DATA_CHECKING m_mm3_per_mm_compare.update(area_toolpath_cross_section, m_extrusion_role); #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp index 0a56ce2b0e..a1fd5237e3 100644 --- a/src/libslic3r/GCode/GCodeProcessor.hpp +++ b/src/libslic3r/GCode/GCodeProcessor.hpp @@ -212,6 +212,7 @@ namespace Slic3r { std::vector required_nozzle_HRC; std::vector filament_densities; std::vector filament_costs; + std::vector filament_flow_ratios; std::vector filament_vitrification_temperature; PrintEstimatedStatistics print_statistics; std::vector custom_gcode_per_print_z; @@ -247,6 +248,7 @@ namespace Slic3r { filament_diameters = other.filament_diameters; filament_densities = other.filament_densities; filament_costs = other.filament_costs; + filament_flow_ratios = other.filament_flow_ratios; print_statistics = other.print_statistics; custom_gcode_per_print_z = other.custom_gcode_per_print_z; spiral_vase_layers = other.spiral_vase_layers; From 68d2a9eedf3ea6d5969f6e4215ad2ad68d9c681c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 8 Jun 2024 10:55:32 +0800 Subject: [PATCH 2/7] =?UTF-8?q?Fixed=20a=20minor=20bug=20where=20the=20max?= =?UTF-8?q?imum=20volumetric=20speed=20cap=20was=20slightly=E2=80=A6=20(#5?= =?UTF-8?q?629)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed a minor bug where the maximum volumetric speed cap was slightly off for the PA pattern calibration. --- src/libslic3r/calib.cpp | 2 +- src/slic3r/GUI/Plater.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libslic3r/calib.cpp b/src/libslic3r/calib.cpp index e5e0923c7d..f3890dd6dc 100644 --- a/src/libslic3r/calib.cpp +++ b/src/libslic3r/calib.cpp @@ -37,7 +37,7 @@ double CalibPressureAdvance::e_per_mm( const Flow line_flow = Flow(line_width, layer_height, nozzle_diameter); const double filament_area = M_PI * std::pow(filament_diameter / 2, 2); - return line_flow.mm3_per_mm() / filament_area * print_flow_ratio; + return line_flow.mm3_per_mm() * print_flow_ratio / filament_area ; } std::string CalibPressureAdvance::convert_number_to_string(double num) const diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 4820003d94..ca8ed6a755 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -9360,11 +9360,6 @@ void Plater::_calib_pa_pattern(const Calib_Params& params) new ConfigOptionFloat(opt.second) ); } - print_config.set_key_value( - "outer_wall_speed", - new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed( - wxGetApp().preset_bundle->full_config(), (fabs(print_config.get_abs_value("line_width", nozzle_diameter)) <= DBL_EPSILON)? (nozzle_diameter*1.125) : print_config.get_abs_value("line_width", nozzle_diameter), - print_config.get_abs_value("layer_height"), 0))); for (const auto opt : SuggestedConfigCalibPAPattern().nozzle_ratio_pairs) { print_config.set_key_value( @@ -9385,6 +9380,14 @@ void Plater::_calib_pa_pattern(const Calib_Params& params) new ConfigOptionEnum(SuggestedConfigCalibPAPattern().brim_pair.second) ); + // Orca: Set the outer wall speed to the optimal speed for the test, cap it with max volumetric speed + print_config.set_key_value("outer_wall_speed", new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed( + wxGetApp().preset_bundle->full_config(), + (fabs(print_config.get_abs_value("line_width", nozzle_diameter)) <= DBL_EPSILON) ? + (nozzle_diameter * 1.125) : + print_config.get_abs_value("line_width", nozzle_diameter), + print_config.get_abs_value("layer_height"), 0))); + wxGetApp().get_tab(Preset::TYPE_PRINT)->update_dirty(); wxGetApp().get_tab(Preset::TYPE_FILAMENT)->update_dirty(); wxGetApp().get_tab(Preset::TYPE_PRINTER)->update_dirty(); From d49c8911ab43fb2e84d74745c6869f9971ace601 Mon Sep 17 00:00:00 2001 From: HYzd766 <108379794+HYzd766@users.noreply.github.com> Date: Sat, 8 Jun 2024 11:14:38 +0800 Subject: [PATCH 3/7] Tweak some settings for Qidi Q1 Pro and X3 serials printers (#5603) * Update fdm_filament_abs.json Modification based on chamber temperature * Update fdm_filament_asa.json Modification based on chamber temperature * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json Modification based on chamber temperature * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json Modification based on chamber temperature * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json Modification based on chamber temperature * Update QIDI ASA @Qidi Q1 Pro 0.2 nozzle.json Modification based on chamber temperature * Update Qidi Generic ABS.json Modification based on chamber temperature * Update Qidi Generic ASA.json Modification based on chamber temperature * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json Sorry, there is still a parameter that needs to be modified for this type of consumable * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json Sorry, there is still a parameter that needs to be modified for this type of consumable * Update QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json Sorry, there is still a parameter that needs to be modified for this type of consumable * Update Qidi Q1 Pro 0.4 nozzle.json Parameter modification * Update fdm_qidi_x3_common.json Parameter modification * Update Qidi Q1 Pro 0.4 nozzle.json Gcode Change * Update fdm_qidi_x3_common.json Gcode Change * Merge branch 'main' into main --- .../filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json | 2 +- .../filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json | 2 +- .../filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json | 2 +- resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json | 4 ++-- resources/profiles/Qidi/machine/fdm_qidi_x3_common.json | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json index c17e501b93..d815a3fd13 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.4 nozzle.json @@ -3,7 +3,7 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "1" + "0" ], "fan_max_speed": [ "20" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json index 01f7deabda..b7cd33d00f 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.6 nozzle.json @@ -3,7 +3,7 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "1" + "0" ], "fan_max_speed": [ "20" diff --git a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json index ae7abb3feb..8d1ffc61d2 100644 --- a/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Qidi/filament/QIDI ABS-GF25 @Qidi Q1 Pro 0.8 nozzle.json @@ -3,7 +3,7 @@ "setting_id": "GFSA04", "instantiation": "true", "activate_chamber_temp_control": [ - "1" + "0" ], "fan_max_speed": [ "20" diff --git a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json index 8d849c8dcf..fe24f7958c 100644 --- a/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Qidi/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -61,8 +61,8 @@ "112x112" ], "layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nLOG_Z\nG92 E0\n", - "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG91\nG0 Z5 F600\nG90\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", - "machine_start_gcode": "PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[chamber_temperature]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[first_layer_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * first_layer_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", + "machine_start_gcode": "PRINT_START BED=[first_layer_bed_temperature] HOTEND=[first_layer_temperature] CHAMBER=[chamber_temperature]\nM83\nM140 S[first_layer_bed_temperature]\nM104 S[first_layer_temperature]\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", "thumbnails_format": "PNG", "default_filament_profile": [ "Qidi Generic PLA @Qidi Q1 Pro 0.4 nozzle" diff --git a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json index 2186dc925f..27ec90533f 100644 --- a/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json +++ b/resources/profiles/Qidi/machine/fdm_qidi_x3_common.json @@ -23,8 +23,8 @@ "210x210/COLPIC", "380x380/PNG" ], - "thumbnails_format": "PNG", - "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", + "thumbnails_format": "ColPic", + "machine_start_gcode": "PRINT_START\nG28\nM141 S0\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]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{min(max_print_height, max_layer_z + 3)} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", "scan_first_layer": "0" } From 467691db5e3ce43c5084f10c305571014e6d1be3 Mon Sep 17 00:00:00 2001 From: cochcoder <103969142+cochcoder@users.noreply.github.com> Date: Sat, 8 Jun 2024 09:36:00 +0000 Subject: [PATCH 4/7] Add support for Prusa XL Input Shaper (only one head will print) & add PC-CF, PA11-CF, & PVB filament types (#5511) * Add Prusa XL & speed profile * Wrong name * Fix cover image sizing * Change infill pattern & density to whats in PrusaSlicer * Fix filament start G-Code & Add additional info in printer notes * Add PETG profile * Link PETG profile * Add ABS & add bed temps * Add Prusament PLA & attempt at removing ramming limits * Allow user to change ramming time & volume * Revert changing identifier * Remove invalid ramming variables * Add Prusament PETG * Try this * Revert "Try this" This reverts commit c6228950fb5f72baa64fa6e63ae8b25ffe4538ec. * Revert ramming changes * Add rPLA, PLA+, PC-CF, PA11-CF, and PVB * Add PVB profile and other minor improvements * Add image formats * Add rPLA profile & remove rPLA & PLA+ from printConfig * Add Prusament PC-CF & small bug fixes * Add Prusament ASA, PA-CF, PC, & pa11cf common file * Minor improvements to common and speed profiles * Add 0.20mm Quality profile * Add .3mm Draft process & link .2mm Quality * Add 0.15mm Quality process * Add 0.10mm Detail process * Add 0.07mm UltraDetail profile * Add 0.5mm nozzle size & related processes * Set default print profile * Fix incorrect bridge flow ratio * Fix incorrect support z distance * Correct skirt values if enabled * Add 0.6 & 0.8 nozzles & respective profiles as well as some fixes * Set default profile for 0.8 * Add 0.25, 0.3, & respective profiles This also adds all the nozzle sizes to the filament profiles * Adapt filename format * Remove unneeded values * Add Input Shaper * Fix raft contact distance * Add Input Shaper profiles to filaments * List default profiles * Add printer variant variable * Change cover sizes & optimize svg * Fix small filament bug * Add comment for symmetry * Add Prusa before XL & XLIS * Fix failing check * Fix failing check part 2 * Some small changes * I've been overthinking this haven't I? * Could it be this? * Revert this change * Try one last thing * Change naming for XLIS & covers * Try removing non-IS profiles * Change IS models * Remove remnants of non-IS profiles * Change naming for better consistency --- resources/profiles/Prusa.json | 245 +++++++++++++++--- .../profiles/Prusa/Pursa XL Input Shaper.svg | 1 + .../Prusa/Pursa XL Input Shaper_bed.stl | Bin 0 -> 25884 bytes .../Prusa/Pursa XL Input Shaper_cover.png | Bin 0 -> 29583 bytes .../Prusa/filament/Prusa Generic ABS @XL.json | 54 ++++ .../filament/Prusa Generic PETG @XL.json | 57 ++++ .../Prusa/filament/Prusa Generic PLA @XL.json | 52 ++++ .../Prusa/filament/Prusament ASA @XL.json | 56 ++++ .../Prusa/filament/Prusament PA-CF @XL.json | 56 ++++ .../filament/Prusament PC Blend @XL.json | 56 ++++ .../Prusa/filament/Prusament PC-CF @XL.json | 56 ++++ .../Prusa/filament/Prusament PETG @XL.json | 57 ++++ .../Prusa/filament/Prusament PLA @XL.json | 52 ++++ .../Prusa/filament/Prusament PVB @XL.json | 57 ++++ .../Prusa/filament/Prusament rPLA @XL.json | 55 ++++ .../Prusa/filament/fdm_filament_pa11cf.json | 79 ++++++ .../Prusa/filament/fdm_filament_pccf.json | 82 ++++++ .../Prusa/filament/fdm_filament_pvb.json | 94 +++++++ .../Prusa/machine/Prusa XLIS 0.25 nozzle.json | 118 +++++++++ .../Prusa/machine/Prusa XLIS 0.3 nozzle.json | 118 +++++++++ .../Prusa/machine/Prusa XLIS 0.4 nozzle.json | 118 +++++++++ .../Prusa/machine/Prusa XLIS 0.5 nozzle.json | 118 +++++++++ .../Prusa/machine/Prusa XLIS 0.6 nozzle.json | 118 +++++++++ .../Prusa/machine/Prusa XLIS 0.8 nozzle.json | 118 +++++++++ .../profiles/Prusa/machine/Prusa XLIS.json | 12 + .../process/0.05mm Detail @XLIS 0.25.json | 67 +++++ .../process/0.07mm Detail @XLIS 0.25.json | 67 +++++ .../process/0.10mm FastDetail @XLIS 0.4.json | 67 +++++ .../process/0.10mm Structural @XLIS 0.5.json | 68 +++++ .../process/0.12mm Speed @XLIS 0.25.json | 67 +++++ .../process/0.12mm Structural @XLIS 0.25.json | 67 +++++ .../process/0.12mm Structural @XLIS 0.3.json | 67 +++++ .../process/0.15mm Speed @XLIS 0.25.json | 67 +++++ .../Prusa/process/0.15mm Speed @XLIS 0.4.json | 67 +++++ .../process/0.15mm Structural @XLIS 0.25.json | 67 +++++ .../process/0.15mm Structural @XLIS 0.4.json | 67 +++++ .../process/0.15mm Structural @XLIS 0.5.json | 68 +++++ .../process/0.15mm Structural @XLIS 0.6.json | 69 +++++ .../Prusa/process/0.16mm Speed @XLIS 0.3.json | 67 +++++ .../process/0.16mm Structural @XLIS 0.3.json | 67 +++++ .../Prusa/process/0.20mm Speed @XLIS 0.3.json | 67 +++++ .../Prusa/process/0.20mm Speed @XLIS 0.4.json | 67 +++++ .../Prusa/process/0.20mm Speed @XLIS 0.5.json | 68 +++++ .../Prusa/process/0.20mm Speed @XLIS 0.6.json | 69 +++++ .../process/0.20mm Structural @XLIS 0.4.json | 67 +++++ .../process/0.20mm Structural @XLIS 0.5.json | 68 +++++ .../process/0.20mm Structural @XLIS 0.6.json | 69 +++++ .../Prusa/process/0.25mm Speed @XLIS 0.5.json | 68 +++++ .../Prusa/process/0.25mm Speed @XLIS 0.6.json | 69 +++++ .../process/0.25mm Structural @XLIS 0.4.json | 67 +++++ .../process/0.25mm Structural @XLIS 0.5.json | 68 +++++ .../process/0.25mm Structural @XLIS 0.6.json | 69 +++++ .../process/0.30mm Detail @XLIS 0.8.json | 71 +++++ .../Prusa/process/0.32mm Speed @XLIS 0.6.json | 69 +++++ .../process/0.32mm Structural @XLIS 0.6.json | 69 +++++ .../process/0.40mm Quality @XLIS 0.8.json | 71 +++++ .../Prusa/process/0.55mm Draft @XLIS 0.8.json | 71 +++++ .../Prusa/process/fdm_process_common.json | 3 +- .../Prusa/process/process_common_xl.json | 96 +++++++ src/libslic3r/PrintConfig.cpp | 3 + src/slic3r/GUI/CreatePresetsDialog.cpp | 6 +- 61 files changed, 4080 insertions(+), 33 deletions(-) create mode 100644 resources/profiles/Prusa/Pursa XL Input Shaper.svg create mode 100644 resources/profiles/Prusa/Pursa XL Input Shaper_bed.stl create mode 100644 resources/profiles/Prusa/Pursa XL Input Shaper_cover.png create mode 100644 resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament ASA @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PA-CF @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PC Blend @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PC-CF @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PETG @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PLA @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament PVB @XL.json create mode 100644 resources/profiles/Prusa/filament/Prusament rPLA @XL.json create mode 100644 resources/profiles/Prusa/filament/fdm_filament_pa11cf.json create mode 100644 resources/profiles/Prusa/filament/fdm_filament_pccf.json create mode 100644 resources/profiles/Prusa/filament/fdm_filament_pvb.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.25 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json create mode 100644 resources/profiles/Prusa/machine/Prusa XLIS.json create mode 100644 resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json create mode 100644 resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json create mode 100644 resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json create mode 100644 resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json create mode 100644 resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json create mode 100644 resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json create mode 100644 resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json create mode 100644 resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json create mode 100644 resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json create mode 100644 resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json create mode 100644 resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json create mode 100644 resources/profiles/Prusa/process/process_common_xl.json diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index bb0ca7890e..4cda8b1ef4 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -19,6 +19,10 @@ { "name": "MINI", "sub_path": "machine/Prusa MINI.json" + }, + { + "name": "Pursa XL Input Shaper", + "sub_path": "machine/Prusa XLIS.json" } ], "process_list": [ @@ -46,6 +50,10 @@ "name": "process_common_mk3", "sub_path": "process/process_common_mk3.json" }, + { + "name": "process_common_xl", + "sub_path": "process/process_common_xl.json" + }, { "name": "0.20mm Standard @MINI 0.25", "sub_path": "process/0.20mm Standard @MINI 0.25.json" @@ -151,137 +159,236 @@ "sub_path": "process/0.12mm Standard @MK4.json" }, { - "name": "0.16mm Standard @MK4", "sub_path": "process/0.16mm Standard @MK4.json" }, { - "name": "0.20mm Standard @MK4", "sub_path": "process/0.20mm Standard @MK4.json" }, { - "name": "0.05mm Detail @MINIIS", "sub_path": "process/0.05mm Detail @MINIIS.json" }, { - "name": "0.07mm Detail @MINIIS", "sub_path": "process/0.07mm Detail @MINIIS.json" }, { - "name": "0.10mm Speed @MINIIS", "sub_path": "process/0.10mm Speed @MINIIS.json" }, { - "name": "0.12mm Speed @MINIIS", "sub_path": "process/0.12mm Speed @MINIIS.json" }, { - "name": "0.12mm Standard @MINIIS", "sub_path": "process/0.12mm Standard @MINIIS.json" }, { - "name": "0.15mm Standard @MINIIS", "sub_path": "process/0.15mm Standard @MINIIS.json" }, { - "name": "0.15mm Standard @MINIIS 0.6", "sub_path": "process/0.15mm Standard @MINIIS 0.6.json" }, { - "name": "0.15mm Standard @MINIIS 0.25", "sub_path": "process/0.15mm Standard @MINIIS 0.25.json" }, - { - "name": "0.15mm Speed @MINIIS", "sub_path": "process/0.15mm Speed @MINIIS.json" }, { - "name": "0.15mm Speed @MINIIS 0.25", "sub_path": "process/0.15mm Speed @MINIIS 0.25.json" }, { - "name": "0.20mm Standard @MINIIS", "sub_path": "process/0.20mm Standard @MINIIS.json" }, { - "name": "0.20mm Standard @MINIIS 0.6", "sub_path": "process/0.20mm Standard @MINIIS 0.6.json" }, { - "name": "0.20mm Speed @MINIIS", "sub_path": "process/0.20mm Speed @MINIIS.json" }, { - "name": "0.20mm Speed @MINIIS 0.6", "sub_path": "process/0.20mm Speed @MINIIS 0.6.json" }, - - { - "name": "0.25mm Standard @MINIIS", "sub_path": "process/0.25mm Standard @MINIIS.json" }, { - "name": "0.25mm Speed @MINIIS", "sub_path": "process/0.25mm Speed @MINIIS.json" }, { - "name": "0.30mm Detail @MINIIS", "sub_path": "process/0.30mm Detail @MINIIS.json" }, { - "name": "0.35mm Standard @MINIIS", "sub_path": "process/0.35mm Standard @MINIIS.json" }, { - "name": "0.40mm Standard @MINIIS", "sub_path": "process/0.40mm Standard @MINIIS.json" }, { - "name": "0.24mm Standard @MK4", "sub_path": "process/0.24mm Standard @MK4.json" }, { - "name": "0.28mm Standard @MK4", "sub_path": "process/0.28mm Standard @MK4.json" }, { - "name": "0.32mm Standard @MK4", "sub_path": "process/0.32mm Standard @MK4.json" }, { - "name": "0.40mm Standard @MK4", "sub_path": "process/0.40mm Standard @MK4.json" }, { - "name": "0.56mm Standard @MK4", "sub_path": "process/0.56mm Standard @MK4.json" + }, + { + "name": "0.15mm Structural @XLIS 0.25", + "sub_path": "process/0.15mm Structural @XLIS 0.25.json" + }, + { + "name": "0.15mm Speed @XLIS 0.25", + "sub_path": "process/0.15mm Speed @XLIS 0.25.json" + }, + { + "name": "0.12mm Structural @XLIS 0.25", + "sub_path": "process/0.12mm Structural @XLIS 0.25.json" + }, + { + "name": "0.12mm Speed @XLIS 0.25", + "sub_path": "process/0.12mm Speed @XLIS 0.25.json" + }, + { + "name": "0.07mm Detail @XLIS 0.25", + "sub_path": "process/0.07mm Detail @XLIS 0.25.json" + }, + { + "name": "0.05mm Detail @XLIS 0.25", + "sub_path": "process/0.05mm Detail @XLIS 0.25.json" + }, + { + "name": "0.20mm Speed @XLIS 0.3", + "sub_path": "process/0.20mm Speed @XLIS 0.3.json" + }, + { + "name": "0.16mm Structural @XLIS 0.3", + "sub_path": "process/0.16mm Structural @XLIS 0.3.json" + }, + { + "name": "0.16mm Speed @XLIS 0.3", + "sub_path": "process/0.16mm Speed @XLIS 0.3.json" + }, + { + "name": "0.12mm Structural @XLIS 0.3", + "sub_path": "process/0.12mm Structural @XLIS 0.3.json" + }, + { + "name": "0.25mm Structural @XLIS 0.4", + "sub_path": "process/0.25mm Structural @XLIS 0.4.json" + }, + { + "name": "0.20mm Structural @XLIS 0.4", + "sub_path": "process/0.20mm Structural @XLIS 0.4.json" + }, + { + "name": "0.20mm Speed @XLIS 0.4", + "sub_path": "process/0.20mm Speed @XLIS 0.4.json" + }, + { + "name": "0.15mm Structural @XLIS 0.4", + "sub_path": "process/0.15mm Structural @XLIS 0.4.json" + }, + { + "name": "0.15mm Speed @XLIS 0.4", + "sub_path": "process/0.15mm Speed @XLIS 0.4.json" + }, + { + "name": "0.10mm FastDetail @XLIS 0.4", + "sub_path": "process/0.10mm FastDetail @XLIS 0.4.json" + }, + { + "name": "0.25mm Structural @XLIS 0.5", + "sub_path": "process/0.25mm Structural @XLIS 0.5.json" + }, + { + "name": "0.25mm Speed @XLIS 0.5", + "sub_path": "process/0.25mm Speed @XLIS 0.5.json" + }, + { + "name": "0.20mm Structural @XLIS 0.5", + "sub_path": "process/0.20mm Structural @XLIS 0.5.json" + }, + { + "name": "0.20mm Speed @XLIS 0.5", + "sub_path": "process/0.20mm Speed @XLIS 0.5.json" + }, + { + "name": "0.15mm Structural @XLIS 0.5", + "sub_path": "process/0.15mm Structural @XLIS 0.5.json" + }, + { + "name": "0.10mm Structural @XLIS 0.5", + "sub_path": "process/0.10mm Structural @XLIS 0.5.json" + }, + { + "name": "0.32mm Structural @XLIS 0.6", + "sub_path": "process/0.32mm Structural @XLIS 0.6.json" + }, + { + "name": "0.32mm Speed @XLIS 0.6", + "sub_path": "process/0.32mm Speed @XLIS 0.6.json" + }, + { + "name": "0.25mm Structural @XLIS 0.6", + "sub_path": "process/0.25mm Structural @XLIS 0.6.json" + }, + { + "name": "0.25mm Speed @XLIS 0.6", + "sub_path": "process/0.25mm Speed @XLIS 0.6.json" + }, + { + "name": "0.20mm Structural @XLIS 0.6", + "sub_path": "process/0.20mm Structural @XLIS 0.6.json" + }, + { + "name": "0.20mm Speed @XLIS 0.6", + "sub_path": "process/0.20mm Speed @XLIS 0.6.json" + }, + { + "name": "0.15mm Structural @XLIS 0.6", + "sub_path": "process/0.15mm Structural @XLIS 0.6.json" + }, + { + "name": "0.55mm Draft @XLIS 0.8", + "sub_path": "process/0.55mm Draft @XLIS 0.8.json" + }, + { + "name": "0.40mm Quality @XLIS 0.8", + "sub_path": "process/0.40mm Quality @XLIS 0.8.json" + }, + { + "name": "0.30mm Detail @XLIS 0.8", + "sub_path": "process/0.30mm Detail @XLIS 0.8.json" } ], "filament_list": [ @@ -309,6 +416,10 @@ "name": "fdm_filament_pc", "sub_path": "filament/fdm_filament_pc.json" }, + { + "name": "fdm_filament_pccf", + "sub_path": "filament/fdm_filament_pccf.json" + }, { "name": "fdm_filament_asa", "sub_path": "filament/fdm_filament_asa.json" @@ -317,10 +428,18 @@ "name": "fdm_filament_pva", "sub_path": "filament/fdm_filament_pva.json" }, + { + "name": "fdm_filament_pvb", + "sub_path": "filament/fdm_filament_pvb.json" + }, { "name": "fdm_filament_pa", "sub_path": "filament/fdm_filament_pa.json" }, + { + "name": "fdm_filament_pa11cf", + "sub_path": "filament/fdm_filament_pa11cf.json" + }, { "name": "Prusa Generic PLA", "sub_path": "filament/Prusa Generic PLA.json" @@ -345,6 +464,18 @@ "name": "Prusa Generic PLA @MINIIS", "sub_path": "filament/Prusa Generic PLA @MINIIS.json" }, + { + "name": "Prusa Generic PLA @XL", + "sub_path": "filament/Prusa Generic PLA @XL.json" + }, + { + "name": "Prusament PLA @XL", + "sub_path": "filament/Prusament PLA @XL.json" + }, + { + "name": "Prusament rPLA @XL", + "sub_path": "filament/Prusament rPLA @XL.json" + }, { "name": "Prusa Generic PLA-CF", "sub_path": "filament/Prusa Generic PLA-CF.json" @@ -389,6 +520,14 @@ "name": "Prusa Generic PETG @MINIIS 0.8", "sub_path": "filament/Prusa Generic PETG @MINIIS 0.8.json" }, + { + "name": "Prusa Generic PETG @XL", + "sub_path": "filament/Prusa Generic PETG @XL.json" + }, + { + "name": "Prusament PETG @XL", + "sub_path": "filament/Prusament PETG @XL.json" + }, { "name": "Prusa Generic ABS", "sub_path": "filament/Prusa Generic ABS.json" @@ -413,6 +552,10 @@ "name": "Prusa Generic ABS @MINIIS 0.8", "sub_path": "filament/Prusa Generic ABS @MINIIS 0.8.json" }, + { + "name": "Prusa Generic ABS @XL", + "sub_path": "filament/Prusa Generic ABS @XL.json" + }, { "name": "Prusa Generic TPU", "sub_path": "filament/Prusa Generic TPU.json" @@ -449,6 +592,10 @@ "name": "Prusa Generic ASA @MINIIS 0.8", "sub_path": "filament/Prusa Generic ASA @MINIIS 0.8.json" }, + { + "name": "Prusament ASA @XL", + "sub_path": "filament/Prusament ASA @XL.json" + }, { "name": "Prusa Generic PC", "sub_path": "filament/Prusa Generic PC.json" @@ -469,6 +616,14 @@ "name": "Prusa Generic PC @MINIIS 0.8", "sub_path": "filament/Prusa Generic PC @MINIIS 0.8.json" }, + { + "name": "Prusament PC Blend @XL", + "sub_path": "filament/Prusament PC Blend @XL.json" + }, + { + "name": "Prusament PC-CF @XL", + "sub_path": "filament/Prusament PC-CF @XL.json" + }, { "name": "Prusa Generic PVA", "sub_path": "filament/Prusa Generic PVA.json" @@ -489,6 +644,10 @@ "name": "Prusa Generic PVA @MINIIS 0.8", "sub_path": "filament/Prusa Generic PVA @MINIIS 0.8.json" }, + { + "name": "Prusament PVB @XL", + "sub_path": "filament/Prusament PVB @XL.json" + }, { "name": "Prusa Generic PA", "sub_path": "filament/Prusa Generic PA.json" @@ -528,6 +687,10 @@ { "name": "Prusa Generic PA-CF @MINIIS 0.8", "sub_path": "filament/Prusa Generic PA-CF @MINIIS 0.8.json" + }, + { + "name": "Prusament PA-CF @XL", + "sub_path": "filament/Prusament PA-CF @XL.json" } ], "machine_list": [ @@ -598,6 +761,30 @@ { "name": "Prusa MINI 0.8 nozzle", "sub_path": "machine/Prusa MINI 0.8 nozzle.json" + }, + { + "name": "Prusa XLIS 0.25 nozzle", + "sub_path": "machine/Prusa XLIS 0.25 nozzle.json" + }, + { + "name": "Prusa XLIS 0.3 nozzle", + "sub_path": "machine/Prusa XLIS 0.3 nozzle.json" + }, + { + "name": "Prusa XLIS 0.4 nozzle", + "sub_path": "machine/Prusa XLIS 0.4 nozzle.json" + }, + { + "name": "Prusa XLIS 0.5 nozzle", + "sub_path": "machine/Prusa XLIS 0.5 nozzle.json" + }, + { + "name": "Prusa XLIS 0.6 nozzle", + "sub_path": "machine/Prusa XLIS 0.6 nozzle.json" + }, + { + "name": "Prusa XLIS 0.8 nozzle", + "sub_path": "machine/Prusa XLIS 0.8 nozzle.json" } ] } diff --git a/resources/profiles/Prusa/Pursa XL Input Shaper.svg b/resources/profiles/Prusa/Pursa XL Input Shaper.svg new file mode 100644 index 0000000000..ca0b2c6c79 --- /dev/null +++ b/resources/profiles/Prusa/Pursa XL Input Shaper.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/Prusa/Pursa XL Input Shaper_bed.stl b/resources/profiles/Prusa/Pursa XL Input Shaper_bed.stl new file mode 100644 index 0000000000000000000000000000000000000000..2ddf41831757d36e32bfb6f1ef08f27600caa457 GIT binary patch literal 25884 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 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json new file mode 100644 index 0000000000..b3ef7672e2 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Prusa XLIS 0.3 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin2", + "printer_model": "Pursa XL Input Shaper", + "default_filament_profile": "Prusa Generic PLA @XL", + "default_print_profile": "0.20mm Speed @XLIS 0.3", + "extruder_clearance_radius": "67", + "extruder_clearance_height_to_rod": "21", + "extruder_clearance_height_to_lid": "21", + "printer_variant": "0.3", + "nozzle_diameter": [ + "0.3" + ], + "max_layer_height": "0.22", + "min_layer_height": "0.05", + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "360x0", + "360x360", + "0x360" + ], + "machine_max_acceleration_e": [ + "2500", + "2500" + ], + "machine_max_acceleration_extruding": [ + "4000", + "4000" + ], + "machine_max_acceleration_retracting": [ + "1200", + "1200" + ], + "machine_max_acceleration_x": [ + "7000", + "7000" + ], + "machine_max_acceleration_y": [ + "7000", + "7000" + ], + "machine_max_acceleration_z": [ + "200", + "200" + ], + "machine_max_acceleration_travel": [ + "3000", + "3000" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "400", + "400" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "retraction_length": "0.7", + "retraction_speed": "35", + "detraction_speed": "25", + "retraction_minimum_travel": "1.5", + "retract_when_changing_layer": "1", + "wipe": "1", + "retract_before_wipe": "80%", + "retract_lift_below": "1.5", + "z_hop_types": "slope", + "host_type": "prusalink", + "printable_height": "360", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_pause_gcode": "M601", + "machine_start_gcode": "M17 ; enable steppers\nM862.3 P \"XL\" ; printer model check\nM115 U6.0.1+14848\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json new file mode 100644 index 0000000000..9fc8e9ac87 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Prusa XLIS 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin2", + "printer_model": "Pursa XL Input Shaper", + "default_filament_profile": "Prusa Generic PLA @XL", + "default_print_profile": "0.20mm Speed @XLIS 0.4", + "extruder_clearance_radius": "67", + "extruder_clearance_height_to_rod": "21", + "extruder_clearance_height_to_lid": "21", + "printer_variant": "0.4", + "nozzle_diameter": [ + "0.4" + ], + "max_layer_height": "0.3", + "min_layer_height": "0.07", + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "360x0", + "360x360", + "0x360" + ], + "machine_max_acceleration_e": [ + "2500", + "2500" + ], + "machine_max_acceleration_extruding": [ + "4000", + "4000" + ], + "machine_max_acceleration_retracting": [ + "1200", + "1200" + ], + "machine_max_acceleration_x": [ + "7000", + "7000" + ], + "machine_max_acceleration_y": [ + "7000", + "7000" + ], + "machine_max_acceleration_z": [ + "200", + "200" + ], + "machine_max_acceleration_travel": [ + "5000", + "5000" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "400", + "400" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "retraction_length": "0.8", + "retraction_speed": "35", + "detraction_speed": "25", + "retraction_minimum_travel": "1.5", + "retract_when_changing_layer": "1", + "wipe": "1", + "retract_before_wipe": "80%", + "retract_lift_below": "1.5", + "z_hop_types": "slope", + "host_type": "prusalink", + "printable_height": "360", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_pause_gcode": "M601", + "machine_start_gcode": "M17 ; enable steppers\nM862.3 P \"XL\" ; printer model check\nM115 U6.0.1+14848\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json b/resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json new file mode 100644 index 0000000000..1b5ac3683b --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Prusa XLIS 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin2", + "printer_model": "Pursa XL Input Shaper", + "default_filament_profile": "Prusa Generic PLA @XL", + "default_print_profile": "0.25mm Speed @XLIS 0.5", + "extruder_clearance_radius": "67", + "extruder_clearance_height_to_rod": "21", + "extruder_clearance_height_to_lid": "21", + "printer_variant": "0.5", + "nozzle_diameter": [ + "0.5" + ], + "max_layer_height": "0.32", + "min_layer_height": "0.07", + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "360x0", + "360x360", + "0x360" + ], + "machine_max_acceleration_e": [ + "2500", + "2500" + ], + "machine_max_acceleration_extruding": [ + "4000", + "4000" + ], + "machine_max_acceleration_retracting": [ + "1200", + "1200" + ], + "machine_max_acceleration_x": [ + "7000", + "7000" + ], + "machine_max_acceleration_y": [ + "7000", + "7000" + ], + "machine_max_acceleration_z": [ + "200", + "200" + ], + "machine_max_acceleration_travel": [ + "5000", + "5000" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "400", + "400" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "retraction_length": "0.7", + "retraction_speed": "35", + "detraction_speed": "25", + "retraction_minimum_travel": "1.5", + "retract_when_changing_layer": "1", + "wipe": "1", + "retract_before_wipe": "80%", + "retract_lift_below": "1.5", + "z_hop_types": "slope", + "host_type": "prusalink", + "printable_height": "360", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_pause_gcode": "M601", + "machine_start_gcode": "M17 ; enable steppers\nM862.3 P \"XL\" ; printer model check\nM115 U6.0.1+14848\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json new file mode 100644 index 0000000000..7dd5c731ba --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Prusa XLIS 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin2", + "printer_model": "Pursa XL Input Shaper", + "default_filament_profile": "Prusa Generic PLA @XL", + "default_print_profile": "0.32mm Speed @XLIS 0.6", + "extruder_clearance_radius": "67", + "extruder_clearance_height_to_rod": "21", + "extruder_clearance_height_to_lid": "21", + "printer_variant": "0.6", + "nozzle_diameter": [ + "0.6" + ], + "max_layer_height": "0.4", + "min_layer_height": "0.15", + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "360x0", + "360x360", + "0x360" + ], + "machine_max_acceleration_e": [ + "2500", + "2500" + ], + "machine_max_acceleration_extruding": [ + "4000", + "4000" + ], + "machine_max_acceleration_retracting": [ + "1200", + "1200" + ], + "machine_max_acceleration_x": [ + "7000", + "7000" + ], + "machine_max_acceleration_y": [ + "7000", + "7000" + ], + "machine_max_acceleration_z": [ + "200", + "200" + ], + "machine_max_acceleration_travel": [ + "5000", + "5000" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "400", + "400" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "retraction_length": "0.7", + "retraction_speed": "35", + "detraction_speed": "25", + "retraction_minimum_travel": "1.5", + "retract_when_changing_layer": "1", + "wipe": "1", + "retract_before_wipe": "0%", + "retract_lift_below": "1.5", + "z_hop_types": "slope", + "host_type": "prusalink", + "printable_height": "360", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_pause_gcode": "M601", + "machine_start_gcode": "M17 ; enable steppers\nM862.3 P \"XL\" ; printer model check\nM115 U6.0.1+14848\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json new file mode 100644 index 0000000000..3f3326a082 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json @@ -0,0 +1,118 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Prusa XLIS 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "gcode_flavor": "marlin2", + "printer_model": "Pursa XL Input Shaper", + "default_filament_profile": "Prusa Generic PLA @XL", + "default_print_profile": "0.40mm Quality @XLIS 0.8", + "extruder_clearance_radius": "67", + "extruder_clearance_height_to_rod": "21", + "extruder_clearance_height_to_lid": "21", + "printer_variant": "0.8", + "nozzle_diameter": [ + "0.8" + ], + "max_layer_height": "0.6", + "min_layer_height": "0.2", + "bed_exclude_area": [ + "0x0" + ], + "printable_area": [ + "0x0", + "360x0", + "360x360", + "0x360" + ], + "machine_max_acceleration_e": [ + "2500", + "2500" + ], + "machine_max_acceleration_extruding": [ + "4000", + "4000" + ], + "machine_max_acceleration_retracting": [ + "1200", + "1200" + ], + "machine_max_acceleration_x": [ + "7000", + "7000" + ], + "machine_max_acceleration_y": [ + "7000", + "7000" + ], + "machine_max_acceleration_z": [ + "200", + "200" + ], + "machine_max_acceleration_travel": [ + "5000", + "5000" + ], + "machine_max_speed_e": [ + "100", + "100" + ], + "machine_max_speed_x": [ + "400", + "400" + ], + "machine_max_speed_y": [ + "400", + "400" + ], + "machine_max_speed_z": [ + "12", + "12" + ], + "machine_max_jerk_e": [ + "10", + "10" + ], + "machine_max_jerk_x": [ + "8", + "8" + ], + "machine_max_jerk_y": [ + "8", + "8" + ], + "machine_max_jerk_z": [ + "2", + "2" + ], + "retraction_length": "0.6", + "retraction_speed": "25", + "detraction_speed": "15", + "retraction_minimum_travel": "1.5", + "retract_when_changing_layer": "1", + "wipe": "1", + "retract_before_wipe": "50%", + "retract_lift_below": "1.5", + "z_hop_types": "slope", + "host_type": "prusalink", + "printable_height": "360", + "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", + "machine_pause_gcode": "M601", + "machine_start_gcode": "M17 ; enable steppers\nM862.3 P \"XL\" ; printer model check\nM115 U6.0.1+14848\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; set extruder temp for bed leveling\nM109 T0 R{((filament_notes[0]=~/.*HT_MBL10.*/) ? (first_layer_temperature[0] - 10) : (filament_type[0] == \"PC\" or filament_type[0] == \"PA\") ? (first_layer_temperature[0] - 25) : (filament_type[0] == \"FLEX\") ? 210 : (filament_type[0]=~/.*PET.*/) ? 175 : 170)} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == \"FLEX\" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]", + "change_filament_gcode": "M600\nG1 E0.3 F1500 ; prime after color change", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER", + "scan_first_layer": "0", + "nozzle_type": "hardened_steel", + "auxiliary_fan": "0", + "thumbnails": [ + "16x16/QOI", + "313x173/QOI", + "440x240/QOI", + "480x240/QOI", + "640x480/PNG" + ] +} diff --git a/resources/profiles/Prusa/machine/Prusa XLIS.json b/resources/profiles/Prusa/machine/Prusa XLIS.json new file mode 100644 index 0000000000..1d0ae08f51 --- /dev/null +++ b/resources/profiles/Prusa/machine/Prusa XLIS.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "Pursa XL Input Shaper", + "model_id": "Pursa XLIS", + "nozzle_diameter": "0.25;0.3;0.4;0.5;0.6;0.8", + "machine_tech": "FFF", + "family": "Prusa", + "bed_model": "Pursa XL Input Shaper_bed.stl", + "bed_texture": "Pursa XL Input Shaper.svg", + "hotend_model": "", + "default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL" +} diff --git a/resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json b/resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json new file mode 100644 index 0000000000..3f91bd5da4 --- /dev/null +++ b/resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.05mm Detail @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.05", + "wall_loops": "3", + "top_shell_layers": "13", + "bottom_shell_layers": "10", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.1", + "support_top_z_distance": "0.1", + "support_bottom_z_distance": "0.1", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "65", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "100", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "25", + "gap_infill_speed": "40", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "1500", + "outer_wall_acceleration": "800", + "inner_wall_acceleration": "1200", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2000", + "sparse_infill_acceleration": "2500", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.25", + "outer_wall_line_width": "0.25", + "sparse_infill_line_width": "0.25", + "internal_solid_infill_line_width": "0.25", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json b/resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json new file mode 100644 index 0000000000..7e41472a58 --- /dev/null +++ b/resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.07mm Detail @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.07", + "wall_loops": "3", + "top_shell_layers": "11", + "bottom_shell_layers": "9", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.1", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "65", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "140", + "top_surface_speed": "70", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "40", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "1500", + "outer_wall_acceleration": "800", + "inner_wall_acceleration": "1200", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2000", + "sparse_infill_acceleration": "2500", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.25", + "outer_wall_line_width": "0.25", + "sparse_infill_line_width": "0.25", + "internal_solid_infill_line_width": "0.25", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json b/resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json new file mode 100644 index 0000000000..b2cdb1247d --- /dev/null +++ b/resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm FastDetail @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.1", + "wall_loops": "3", + "top_shell_layers": "8", + "bottom_shell_layers": "7", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "140", + "small_perimeter_speed": "140", + "outer_wall_speed": "140", + "sparse_infill_speed": "140", + "internal_solid_infill_speed": "200", + "top_surface_speed": "100", + "support_speed": "120", + "support_interface_speed": "50", + "bridge_speed": "40", + "gap_infill_speed": "120", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "2000", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.4", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json new file mode 100644 index 0000000000..0a53b8f4c7 --- /dev/null +++ b/resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm Structural @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.1", + "wall_loops": "2", + "top_shell_layers": "8", + "bottom_shell_layers": "7", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "70", + "support_speed": "75", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "40", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.5", + "outer_wall_line_width": "0.5", + "sparse_infill_line_width": "0.5", + "internal_solid_infill_line_width": "0.5", + "top_surface_line_width": "0.45", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json b/resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json new file mode 100644 index 0000000000..046ccc32fb --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Speed @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.12", + "wall_loops": "3", + "top_shell_layers": "9", + "bottom_shell_layers": "6", + "top_shell_thickness": "0.6", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.08", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "120", + "small_perimeter_speed": "120", + "outer_wall_speed": "120", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "140", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.27", + "outer_wall_line_width": "0.27", + "sparse_infill_line_width": "0.27", + "internal_solid_infill_line_width": "0.27", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json b/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json new file mode 100644 index 0000000000..695dd0ba85 --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Structural @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.12", + "wall_loops": "3", + "top_shell_layers": "9", + "bottom_shell_layers": "7", + "top_shell_thickness": "0.6", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.08", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "140", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1000", + "inner_wall_acceleration": "1500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "2500", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.27", + "outer_wall_line_width": "0.27", + "sparse_infill_line_width": "0.27", + "internal_solid_infill_line_width": "0.27", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json b/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json new file mode 100644 index 0000000000..031cc6b542 --- /dev/null +++ b/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Structural @XLIS 0.3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.12", + "wall_loops": "3", + "top_shell_layers": "7", + "bottom_shell_layers": "6", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.12", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "100%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "200", + "top_surface_speed": "40", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "1500", + "outer_wall_acceleration": "1200", + "inner_wall_acceleration": "1500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.34", + "initial_layer_line_width": "0.4", + "inner_wall_line_width": "0.34", + "outer_wall_line_width": "0.34", + "sparse_infill_line_width": "0.34", + "internal_solid_infill_line_width": "0.34", + "top_surface_line_width": "0.3", + "support_line_width": "0.3", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.3 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json new file mode 100644 index 0000000000..096d0b519e --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Speed @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "3", + "top_shell_layers": "6", + "bottom_shell_layers": "7", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.08", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "120", + "small_perimeter_speed": "120", + "outer_wall_speed": "120", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "140", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.27", + "outer_wall_line_width": "0.27", + "sparse_infill_line_width": "0.27", + "internal_solid_infill_line_width": "0.27", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json b/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json new file mode 100644 index 0000000000..5bbc4c9de2 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Speed @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "2", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "170", + "small_perimeter_speed": "170", + "outer_wall_speed": "170", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "100", + "support_speed": "120", + "support_interface_speed": "50", + "bridge_speed": "45", + "gap_infill_speed": "120", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.42", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json new file mode 100644 index 0000000000..b8fb3b8056 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Structural @XLIS 0.25", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "3", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "95%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.08", + "support_top_z_distance": "0.09", + "support_bottom_z_distance": "0.09", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "150%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "40", + "outer_wall_speed": "40", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "140", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1000", + "inner_wall_acceleration": "1500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "4000", + "line_width": "0.27", + "initial_layer_line_width": "0.32", + "inner_wall_line_width": "0.27", + "outer_wall_line_width": "0.27", + "sparse_infill_line_width": "0.27", + "internal_solid_infill_line_width": "0.27", + "top_surface_line_width": "0.27", + "support_line_width": "0.25", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.25 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json new file mode 100644 index 0000000000..7765edab68 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Structural @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "2", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.17", + "support_bottom_z_distance": "0.17", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "110", + "internal_solid_infill_speed": "140", + "top_surface_speed": "75", + "support_speed": "120", + "support_interface_speed": "50", + "bridge_speed": "45", + "gap_infill_speed": "65", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.42", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json new file mode 100644 index 0000000000..31dc846f89 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Structural @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "2", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "180", + "top_surface_speed": "70", + "support_speed": "75", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.55", + "outer_wall_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "top_surface_line_width": "0.5", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json new file mode 100644 index 0000000000..eea2afc624 --- /dev/null +++ b/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Structural @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.15", + "wall_loops": "2", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "105", + "internal_solid_infill_speed": "160", + "top_surface_speed": "70", + "support_speed": "110", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "75", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.6", + "outer_wall_line_width": "0.6", + "sparse_infill_line_width": "0.6", + "internal_solid_infill_line_width": "0.6", + "top_surface_line_width": "0.5", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json b/resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json new file mode 100644 index 0000000000..d877ec4c04 --- /dev/null +++ b/resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Speed @XLIS 0.3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.16", + "wall_loops": "3", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.12", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "100%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "140", + "small_perimeter_speed": "120", + "outer_wall_speed": "120", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "support_speed": "100", + "support_interface_speed": "45%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.34", + "initial_layer_line_width": "0.4", + "inner_wall_line_width": "0.34", + "outer_wall_line_width": "0.34", + "sparse_infill_line_width": "0.34", + "internal_solid_infill_line_width": "0.34", + "top_surface_line_width": "0.3", + "support_line_width": "0.3", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.3 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json b/resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json new file mode 100644 index 0000000000..5d14e31d91 --- /dev/null +++ b/resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Structural @XLIS 0.3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.16", + "wall_loops": "3", + "top_shell_layers": "6", + "bottom_shell_layers": "5", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.12", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "100%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.34", + "initial_layer_line_width": "0.4", + "inner_wall_line_width": "0.34", + "outer_wall_line_width": "0.34", + "sparse_infill_line_width": "0.34", + "internal_solid_infill_line_width": "0.34", + "top_surface_line_width": "0.3", + "support_line_width": "0.3", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.3 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json new file mode 100644 index 0000000000..ce32faf2c2 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Speed @XLIS 0.3", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "3", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "1", + "brim_object_gap": "0", + "support_threshold_angle": "40", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.12", + "support_top_z_distance": "0.12", + "support_bottom_z_distance": "0.12", + "support_base_pattern_spacing": "1", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "100%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "140", + "small_perimeter_speed": "120", + "outer_wall_speed": "120", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "200", + "top_surface_speed": "50", + "support_speed": "100", + "support_interface_speed": "45%", + "bridge_speed": "30", + "gap_infill_speed": "50", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.34", + "initial_layer_line_width": "0.4", + "inner_wall_line_width": "0.34", + "outer_wall_line_width": "0.34", + "sparse_infill_line_width": "0.34", + "internal_solid_infill_line_width": "0.34", + "top_surface_line_width": "0.3", + "support_line_width": "0.3", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0", + "compatible_printers": [ + "Prusa XLIS 0.3 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json new file mode 100644 index 0000000000..3433844d31 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Speed @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "170", + "small_perimeter_speed": "170", + "outer_wall_speed": "170", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "200", + "top_surface_speed": "100", + "support_speed": "110", + "support_interface_speed": "50%", + "bridge_speed": "50", + "gap_infill_speed": "120", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "4000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.42", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json new file mode 100644 index 0000000000..722cbe2eb4 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Speed @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "140", + "small_perimeter_speed": "140", + "outer_wall_speed": "140", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "135", + "top_surface_speed": "70", + "support_speed": "120", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.55", + "outer_wall_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "top_surface_line_width": "0.5", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json new file mode 100644 index 0000000000..7be3e19729 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Speed @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "120", + "small_perimeter_speed": "120", + "outer_wall_speed": "120", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "110", + "top_surface_speed": "70", + "support_speed": "110", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "75", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "50", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.62", + "outer_wall_line_width": "0.62", + "sparse_infill_line_width": "0.62", + "internal_solid_infill_line_width": "0.62", + "top_surface_line_width": "0.5", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json new file mode 100644 index 0000000000..2e395bcdb6 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Structural @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "140", + "top_surface_speed": "75", + "support_speed": "120", + "support_interface_speed": "50", + "bridge_speed": "50", + "gap_infill_speed": "65", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.42", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json new file mode 100644 index 0000000000..16bcfe597a --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Structural @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "120", + "top_surface_speed": "70", + "support_speed": "75", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.55", + "outer_wall_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "top_surface_line_width": "0.5", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json new file mode 100644 index 0000000000..9fb59ef780 --- /dev/null +++ b/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Structural @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.22", + "support_bottom_z_distance": "0.22", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "110", + "top_surface_speed": "70", + "support_speed": "110", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "75", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.6", + "outer_wall_line_width": "0.6", + "sparse_infill_line_width": "0.6", + "internal_solid_infill_line_width": "0.6", + "top_surface_line_width": "0.5", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json b/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json new file mode 100644 index 0000000000..888572af3b --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Speed @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.25", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "140", + "small_perimeter_speed": "140", + "outer_wall_speed": "140", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "110", + "top_surface_speed": "70", + "support_speed": "120", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.55", + "outer_wall_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "top_surface_line_width": "0.5", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json new file mode 100644 index 0000000000..043252449e --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Speed @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.25", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "80", + "outer_wall_speed": "80", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "90", + "top_surface_speed": "60", + "support_speed": "80", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "50", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.68", + "outer_wall_line_width": "0.68", + "sparse_infill_line_width": "0.68", + "internal_solid_infill_line_width": "0.68", + "top_surface_line_width": "0.55", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json new file mode 100644 index 0000000000..ea6a05029a --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json @@ -0,0 +1,67 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Structural @XLIS 0.4", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.25", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.15", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "120", + "internal_solid_infill_speed": "140", + "top_surface_speed": "75", + "support_speed": "120", + "support_interface_speed": "50", + "bridge_speed": "50", + "gap_infill_speed": "65", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "inner_wall_line_width": "0.45", + "outer_wall_line_width": "0.45", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "top_surface_line_width": "0.42", + "support_line_width": "0.36", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.4 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json new file mode 100644 index 0000000000..ee2883faa6 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json @@ -0,0 +1,68 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Structural @XLIS 0.5", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.25", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.7", + "bottom_shell_thickness": "0.5", + "sparse_infill_density": "15%", + "infill_anchor": "2", + "infill_anchor_max": "15", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.22", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "200", + "internal_solid_infill_speed": "110", + "top_surface_speed": "70", + "support_speed": "75", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "25", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "80%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "2500", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.55", + "initial_layer_line_width": "0.55", + "inner_wall_line_width": "0.55", + "outer_wall_line_width": "0.55", + "sparse_infill_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "top_surface_line_width": "0.5", + "support_line_width": "0.4", + "infill_wall_overlap": "15%", + "resolution": "0.008", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.5 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json new file mode 100644 index 0000000000..017a21dc18 --- /dev/null +++ b/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Structural @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.25", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "80", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "95", + "top_surface_speed": "70", + "support_speed": "80", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.68", + "outer_wall_line_width": "0.68", + "sparse_infill_line_width": "0.68", + "internal_solid_infill_line_width": "0.68", + "top_surface_line_width": "0.55", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json b/resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json new file mode 100644 index 0000000000..83fe78840d --- /dev/null +++ b/resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json @@ -0,0 +1,71 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Detail @XLIS 0.8", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.3", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "1.2", + "bottom_shell_thickness": "0.8", + "thick_bridges": "1", + "seam_position": "nearest", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "rectilinear", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.2", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.35", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "50", + "top_surface_speed": "35", + "support_speed": "65", + "support_interface_speed": "85%", + "bridge_speed": "22", + "gap_infill_speed": "40", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.9", + "initial_layer_line_width": "1", + "inner_wall_line_width": "0.9", + "outer_wall_line_width": "0.9", + "sparse_infill_line_width": "0.9", + "internal_solid_infill_line_width": "0.9", + "top_surface_line_width": "0.7", + "support_line_width": "0.65", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json new file mode 100644 index 0000000000..207b38b504 --- /dev/null +++ b/resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Speed @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.32", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "70", + "outer_wall_speed": "70", + "sparse_infill_speed": "100", + "internal_solid_infill_speed": "70", + "top_surface_speed": "60", + "support_speed": "70", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "65", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "50", + "default_acceleration": "2500", + "outer_wall_acceleration": "2500", + "inner_wall_acceleration": "3000", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.68", + "outer_wall_line_width": "0.68", + "sparse_infill_line_width": "0.68", + "internal_solid_infill_line_width": "0.68", + "top_surface_line_width": "0.55", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json new file mode 100644 index 0000000000..f9c92bcae8 --- /dev/null +++ b/resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json @@ -0,0 +1,69 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Structural @XLIS 0.6", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.32", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.9", + "bottom_shell_thickness": "0.6", + "sparse_infill_density": "20%", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.25", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.25", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "70", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "70", + "internal_solid_infill_speed": "70", + "top_surface_speed": "70", + "support_speed": "80", + "support_interface_speed": "75%", + "bridge_speed": "40", + "gap_infill_speed": "70", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "90%", + "default_acceleration": "2500", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2500", + "top_surface_acceleration": "1500", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1500", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.68", + "initial_layer_line_width": "0.68", + "inner_wall_line_width": "0.68", + "outer_wall_line_width": "0.68", + "sparse_infill_line_width": "0.68", + "internal_solid_infill_line_width": "0.68", + "top_surface_line_width": "0.55", + "support_line_width": "0.55", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json b/resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json new file mode 100644 index 0000000000..e5908f1d4a --- /dev/null +++ b/resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json @@ -0,0 +1,71 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Quality @XLIS 0.8", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.4", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "1.2", + "bottom_shell_thickness": "0.8", + "thick_bridges": "1", + "seam_position": "nearest", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "rectilinear", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.2", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.35", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "50", + "small_perimeter_speed": "45", + "outer_wall_speed": "45", + "sparse_infill_speed": "90", + "internal_solid_infill_speed": "45", + "top_surface_speed": "35", + "support_speed": "50", + "support_interface_speed": "85%", + "bridge_speed": "22", + "gap_infill_speed": "35", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.9", + "initial_layer_line_width": "1", + "inner_wall_line_width": "0.9", + "outer_wall_line_width": "0.9", + "sparse_infill_line_width": "0.9", + "internal_solid_infill_line_width": "0.9", + "top_surface_line_width": "0.75", + "support_line_width": "0.65", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json b/resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json new file mode 100644 index 0000000000..63e7aef354 --- /dev/null +++ b/resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json @@ -0,0 +1,71 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.55mm Draft @XLIS 0.8", + "from": "system", + "instantiation": "true", + "inherits": "process_common_xl", + "inital_layer_height": "0.2", + "layer_height": "0.55", + "wall_loops": "2", + "top_shell_layers": "4", + "bottom_shell_layers": "3", + "top_shell_thickness": "1.2", + "bottom_shell_thickness": "0.8", + "thick_bridges": "1", + "seam_position": "nearest", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "rectilinear", + "infill_anchor": "2.5", + "infill_anchor_max": "20", + "brim_object_gap": "0.1", + "support_threshold_angle": "40", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3.5", + "raft_contact_distance": "0.2", + "support_top_z_distance": "0.25", + "support_bottom_z_distance": "0.25", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_spacing": "0.35", + "support_object_xy_distance": "80%", + "tree_support_bramch_diameter_angle": "5", + "tree_support_tip_diameter": "0.8", + "inner_wall_speed": "40", + "small_perimeter_speed": "35", + "outer_wall_speed": "35", + "sparse_infill_speed": "55", + "internal_solid_infill_speed": "35", + "top_surface_speed": "30", + "support_speed": "35", + "support_interface_speed": "85%", + "bridge_speed": "22", + "gap_infill_speed": "30", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "20", + "overhang_3_4_speed": "25", + "overhang_4_4_speed": "80%", + "default_acceleration": "2000", + "outer_wall_acceleration": "1500", + "inner_wall_acceleration": "2000", + "top_surface_acceleration": "1000", + "internal_solid_infill_acceleration": "3000", + "sparse_infill_acceleration": "4000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "500", + "travel_acceleration": "5000", + "line_width": "0.9", + "initial_layer_line_width": "1", + "inner_wall_line_width": "1", + "outer_wall_line_width": "1", + "sparse_infill_line_width": "0.9", + "internal_solid_infill_line_width": "0.9", + "top_surface_line_width": "0.75", + "support_line_width": "0.65", + "infill_wall_overlap": "15%", + "resolution": "0.0125", + "elefant_foot_compensation": "0.2", + "compatible_printers": [ + "Prusa XLIS 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Prusa/process/fdm_process_common.json b/resources/profiles/Prusa/process/fdm_process_common.json index 1727668cde..9c2ee56fc2 100644 --- a/resources/profiles/Prusa/process/fdm_process_common.json +++ b/resources/profiles/Prusa/process/fdm_process_common.json @@ -57,7 +57,8 @@ "raft_layers": "0", "seam_position": "aligned", "skirt_distance": "2", - "skirt_height": "1", + "skirt_height": "3", + "min_skirt_length": "4", "skirt_loops": "0", "minimum_sparse_infill_area": "15", "spiral_mode": "0", diff --git a/resources/profiles/Prusa/process/process_common_xl.json b/resources/profiles/Prusa/process/process_common_xl.json new file mode 100644 index 0000000000..43570c21b8 --- /dev/null +++ b/resources/profiles/Prusa/process/process_common_xl.json @@ -0,0 +1,96 @@ +{ + "type": "process", + "name": "process_common_xl", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_common", + "infill_combination": "1", + "infill_anchor": "2", + "wall_loops": "2", + "top_shell_layers": "5", + "bottom_shell_layers": "4", + "top_shell_thickness": "0.7", + "detect_overhang_wall": "1", + "wall_generator": "arachne", + "gap_fill_target": "everywhere", + "bottom_shell_thickness": "0.5", + "infill_anchor_max": "12", + "sparse_infill_pattern": "grid", + "sparse_infill_density": "15%", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "skirt_height": "3", + "brim_type": "outer_only", + "brim_width": "0", + "support_threshold_angle": "45", + "raft_first_layer_density": "80%", + "raft_first_layer_expansion": "3", + "raft_contact_distance": "0.2", + "support_type": "tree(auto)", + "support_style": "organic", + "support_base_pattern_spacing": "2", + "support_interface_top_layers": "5", + "support_interface_bottom_layers": "0", + "support_interface_pattern": "rectilinear", + "support_interface_spacing": "0.2", + "support_object_xy_distance": "80%", + "tree_support_branch_angle_organic": "40", + "tree_support_angle_slow": "30", + "tree_support_branch_diameter_organic": "2", + "tree_support_bramch_diameter_angle": "3", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_tip_diameter": "0.6", + "tree_support_top_rate": "30%", + "tree_support_branch_distance_organic": "1", + "initial_layer_speed": "25", + "initial_layer_infill_speed": "25", + "outer_wall_speed": "70", + "inner_wall_speed": "90", + "small_perimeter_speed": "40", + "sparse_infill_speed": "200", + "top_surface_speed": "40", + "internal_solid_infill_speed": "140", + "support_speed": "60", + "support_interface_speed": "70%", + "bridge_speed": "25", + "gap_infill_speed": "45", + "ironing_speed": "15", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "enable_overhang_speed": "1", + "overhang_1_4_speed": "15", + "overhang_2_4_speed": "15", + "overhang_3_4_speed": "20", + "overhang_4_4_speed": "25", + "travel_speed": "400", + "default_acceleration": "1250", + "outer_wall_acceleration": "1000", + "inner_wall_acceleration": "1200", + "top_surface_acceleration": "800", + "internal_solid_infill_acceleration": "2000", + "sparse_infill_acceleration": "3000", + "bridge_acceleration": "1000", + "initial_layer_acceleration": "600", + "travel_acceleration": "0", + "line_width": "0.45", + "initial_layer_line_width": "0.5", + "outer_wall_line_width": "0.45", + "inner_wall_line_width": "0.45", + "top_surface_line_width": "0.42", + "sparse_infill_line_width": "0.45", + "internal_solid_infill_line_width": "0.45", + "support_line_width": "0.37", + "infill_wall_overlap": "10%", + "slice_closing_radius": "0.049", + "resolution": "0.0125", + "enable_arc_fitting": "1", + "elefant_foot_compensation": "0.2", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wall_distribution_count": "1", + "min_bead_width": "85%", + "min_feature_size": "25%", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{print_time}.gcode", + "gcode_label_objects": "1" +} \ No newline at end of file diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index f31b1269f3..df166a49be 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1956,13 +1956,16 @@ def = this->add("filament_loading_speed", coFloats); def->enum_values.push_back("PETG"); def->enum_values.push_back("TPU"); def->enum_values.push_back("PC"); + def->enum_values.push_back("PC-CF"); def->enum_values.push_back("PA"); def->enum_values.push_back("PA-CF"); def->enum_values.push_back("PA6-CF"); + def->enum_values.push_back("PA11-CF"); def->enum_values.push_back("PLA-CF"); def->enum_values.push_back("PET-CF"); def->enum_values.push_back("PETG-CF"); def->enum_values.push_back("PVA"); + def->enum_values.push_back("PVB"); def->enum_values.push_back("HIPS"); def->enum_values.push_back("PLA-AERO"); def->enum_values.push_back("PPS"); diff --git a/src/slic3r/GUI/CreatePresetsDialog.cpp b/src/slic3r/GUI/CreatePresetsDialog.cpp index adfb9c229f..c277b47205 100644 --- a/src/slic3r/GUI/CreatePresetsDialog.cpp +++ b/src/slic3r/GUI/CreatePresetsDialog.cpp @@ -59,9 +59,9 @@ static const std::vector filament_vendors = "Voxelab", "VOXELPLA", "YOOPAI", "Yousu", "Ziro", "Zyltech"}; -static const std::vector filament_types = {"PLA", "PLA+", "PLA Tough", "PETG", "ABS", "ASA", "FLEX", "HIPS", "PA", "PACF", - "NYLON", "PVA", "PC", "PCABS", "PCTG", "PCCF", "PHA", "PP", "PEI", "PET", "PETG", - "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc", +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", + "PETGCF", "PTBA", "PTBA90A", "PEEK", "TPU93A", "TPU75D", "TPU", "TPU92A", "TPU98A", "Misc", "TPE", "GLAZE", "Nylon", "CPE", "METAL", "ABST", "Carbon Fiber"}; static const std::vector printer_vendors = From f9ecc9d423cc4f3341931af8e5562bf629203581 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 8 Jun 2024 17:33:03 +0800 Subject: [PATCH 5/7] Fix some small issues for Prusa XL profiles: 1. fixed some wrong parameter names 2. fixed bed texture 3. Fix typo "pursa" 4. Use Prusa XL in all cases --- resources/profiles/Prusa.json | 156 +++++++++--------- resources/profiles/Prusa/Prusa XL.svg | 17 ++ ... Input Shaper_bed.stl => Prusa XL_bed.stl} | Bin ...ut Shaper_cover.png => Prusa XL_cover.png} | Bin .../profiles/Prusa/Pursa XL Input Shaper.svg | 1 - .../Prusa/filament/Prusa Generic ABS @XL.json | 12 +- .../filament/Prusa Generic PETG @XL.json | 12 +- .../Prusa/filament/Prusa Generic PLA @XL.json | 12 +- .../Prusa/filament/Prusament ASA @XL.json | 12 +- .../Prusa/filament/Prusament PA-CF @XL.json | 12 +- .../filament/Prusament PC Blend @XL.json | 12 +- .../Prusa/filament/Prusament PC-CF @XL.json | 12 +- .../Prusa/filament/Prusament PETG @XL.json | 12 +- .../Prusa/filament/Prusament PLA @XL.json | 12 +- .../Prusa/filament/Prusament PVB @XL.json | 12 +- .../Prusa/filament/Prusament rPLA @XL.json | 12 +- ... nozzle.json => Prusa XL 0.25 nozzle.json} | 8 +- ...3 nozzle.json => Prusa XL 0.3 nozzle.json} | 8 +- ...4 nozzle.json => Prusa XL 0.4 nozzle.json} | 8 +- ...5 nozzle.json => Prusa XL 0.5 nozzle.json} | 8 +- ...6 nozzle.json => Prusa XL 0.6 nozzle.json} | 8 +- ...8 nozzle.json => Prusa XL 0.8 nozzle.json} | 8 +- .../{Prusa XLIS.json => Prusa XL.json} | 8 +- ...json => 0.05mm Detail @Prusa XL 0.25.json} | 4 +- ...json => 0.07mm Detail @Prusa XL 0.25.json} | 4 +- ...n => 0.10mm FastDetail @Prusa XL 0.4.json} | 4 +- ...n => 0.10mm Structural @Prusa XL 0.5.json} | 4 +- ....json => 0.12mm Speed @Prusa XL 0.25.json} | 4 +- ... => 0.12mm Structural @Prusa XL 0.25.json} | 4 +- ...n => 0.12mm Structural @Prusa XL 0.3.json} | 4 +- ....json => 0.15mm Speed @Prusa XL 0.25.json} | 4 +- ...4.json => 0.15mm Speed @Prusa XL 0.4.json} | 4 +- ... => 0.15mm Structural @Prusa XL 0.25.json} | 4 +- ...n => 0.15mm Structural @Prusa XL 0.4.json} | 4 +- ...n => 0.15mm Structural @Prusa XL 0.5.json} | 4 +- ...n => 0.15mm Structural @Prusa XL 0.6.json} | 4 +- ...3.json => 0.16mm Speed @Prusa XL 0.3.json} | 4 +- ...n => 0.16mm Structural @Prusa XL 0.3.json} | 4 +- ...3.json => 0.20mm Speed @Prusa XL 0.3.json} | 4 +- ...4.json => 0.20mm Speed @Prusa XL 0.4.json} | 4 +- ...5.json => 0.20mm Speed @Prusa XL 0.5.json} | 4 +- ...6.json => 0.20mm Speed @Prusa XL 0.6.json} | 4 +- ...n => 0.20mm Structural @Prusa XL 0.4.json} | 4 +- ...n => 0.20mm Structural @Prusa XL 0.5.json} | 4 +- ...n => 0.20mm Structural @Prusa XL 0.6.json} | 4 +- ...5.json => 0.25mm Speed @Prusa XL 0.5.json} | 4 +- ...6.json => 0.25mm Speed @Prusa XL 0.6.json} | 4 +- ...n => 0.25mm Structural @Prusa XL 0.4.json} | 4 +- ...n => 0.25mm Structural @Prusa XL 0.5.json} | 4 +- ...n => 0.25mm Structural @Prusa XL 0.6.json} | 4 +- ....json => 0.30mm Detail @Prusa XL 0.8.json} | 6 +- ...6.json => 0.32mm Speed @Prusa XL 0.6.json} | 4 +- ...n => 0.32mm Structural @Prusa XL 0.6.json} | 4 +- ...json => 0.40mm Quality @Prusa XL 0.8.json} | 6 +- ...8.json => 0.55mm Draft @Prusa XL 0.8.json} | 6 +- .../Prusa/process/fdm_process_common.json | 2 +- .../Prusa/process/process_common_mk3.json | 4 +- .../Prusa/process/process_common_xl.json | 4 +- 58 files changed, 261 insertions(+), 245 deletions(-) create mode 100644 resources/profiles/Prusa/Prusa XL.svg rename resources/profiles/Prusa/{Pursa XL Input Shaper_bed.stl => Prusa XL_bed.stl} (100%) rename resources/profiles/Prusa/{Pursa XL Input Shaper_cover.png => Prusa XL_cover.png} (100%) delete mode 100644 resources/profiles/Prusa/Pursa XL Input Shaper.svg rename resources/profiles/Prusa/machine/{Prusa XLIS 0.25 nozzle.json => Prusa XL 0.25 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS 0.3 nozzle.json => Prusa XL 0.3 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS 0.4 nozzle.json => Prusa XL 0.4 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS 0.5 nozzle.json => Prusa XL 0.5 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS 0.6 nozzle.json => Prusa XL 0.6 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS 0.8 nozzle.json => Prusa XL 0.8 nozzle.json} (97%) rename resources/profiles/Prusa/machine/{Prusa XLIS.json => Prusa XL.json} (71%) rename resources/profiles/Prusa/process/{0.05mm Detail @XLIS 0.25.json => 0.05mm Detail @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.07mm Detail @XLIS 0.25.json => 0.07mm Detail @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.10mm FastDetail @XLIS 0.4.json => 0.10mm FastDetail @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.10mm Structural @XLIS 0.5.json => 0.10mm Structural @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.12mm Speed @XLIS 0.25.json => 0.12mm Speed @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.12mm Structural @XLIS 0.25.json => 0.12mm Structural @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.12mm Structural @XLIS 0.3.json => 0.12mm Structural @Prusa XL 0.3.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Speed @XLIS 0.25.json => 0.15mm Speed @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Speed @XLIS 0.4.json => 0.15mm Speed @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Structural @XLIS 0.25.json => 0.15mm Structural @Prusa XL 0.25.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Structural @XLIS 0.4.json => 0.15mm Structural @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Structural @XLIS 0.5.json => 0.15mm Structural @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.15mm Structural @XLIS 0.6.json => 0.15mm Structural @Prusa XL 0.6.json} (96%) rename resources/profiles/Prusa/process/{0.16mm Speed @XLIS 0.3.json => 0.16mm Speed @Prusa XL 0.3.json} (96%) rename resources/profiles/Prusa/process/{0.16mm Structural @XLIS 0.3.json => 0.16mm Structural @Prusa XL 0.3.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Speed @XLIS 0.3.json => 0.20mm Speed @Prusa XL 0.3.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Speed @XLIS 0.4.json => 0.20mm Speed @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Speed @XLIS 0.5.json => 0.20mm Speed @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Speed @XLIS 0.6.json => 0.20mm Speed @Prusa XL 0.6.json} (97%) rename resources/profiles/Prusa/process/{0.20mm Structural @XLIS 0.4.json => 0.20mm Structural @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Structural @XLIS 0.5.json => 0.20mm Structural @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.20mm Structural @XLIS 0.6.json => 0.20mm Structural @Prusa XL 0.6.json} (96%) rename resources/profiles/Prusa/process/{0.25mm Speed @XLIS 0.5.json => 0.25mm Speed @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.25mm Speed @XLIS 0.6.json => 0.25mm Speed @Prusa XL 0.6.json} (97%) rename resources/profiles/Prusa/process/{0.25mm Structural @XLIS 0.4.json => 0.25mm Structural @Prusa XL 0.4.json} (96%) rename resources/profiles/Prusa/process/{0.25mm Structural @XLIS 0.5.json => 0.25mm Structural @Prusa XL 0.5.json} (96%) rename resources/profiles/Prusa/process/{0.25mm Structural @XLIS 0.6.json => 0.25mm Structural @Prusa XL 0.6.json} (96%) rename resources/profiles/Prusa/process/{0.30mm Detail @XLIS 0.8.json => 0.30mm Detail @Prusa XL 0.8.json} (95%) rename resources/profiles/Prusa/process/{0.32mm Speed @XLIS 0.6.json => 0.32mm Speed @Prusa XL 0.6.json} (97%) rename resources/profiles/Prusa/process/{0.32mm Structural @XLIS 0.6.json => 0.32mm Structural @Prusa XL 0.6.json} (96%) rename resources/profiles/Prusa/process/{0.40mm Quality @XLIS 0.8.json => 0.40mm Quality @Prusa XL 0.8.json} (95%) rename resources/profiles/Prusa/process/{0.55mm Draft @XLIS 0.8.json => 0.55mm Draft @Prusa XL 0.8.json} (95%) diff --git a/resources/profiles/Prusa.json b/resources/profiles/Prusa.json index 4cda8b1ef4..3b6ee65c0f 100644 --- a/resources/profiles/Prusa.json +++ b/resources/profiles/Prusa.json @@ -21,8 +21,8 @@ "sub_path": "machine/Prusa MINI.json" }, { - "name": "Pursa XL Input Shaper", - "sub_path": "machine/Prusa XLIS.json" + "name": "Prusa XL", + "sub_path": "machine/Prusa XL.json" } ], "process_list": [ @@ -263,132 +263,132 @@ "sub_path": "process/0.56mm Standard @MK4.json" }, { - "name": "0.15mm Structural @XLIS 0.25", - "sub_path": "process/0.15mm Structural @XLIS 0.25.json" + "name": "0.15mm Structural @Prusa XL 0.25", + "sub_path": "process/0.15mm Structural @Prusa XL 0.25.json" }, { - "name": "0.15mm Speed @XLIS 0.25", - "sub_path": "process/0.15mm Speed @XLIS 0.25.json" + "name": "0.15mm Speed @Prusa XL 0.25", + "sub_path": "process/0.15mm Speed @Prusa XL 0.25.json" }, { - "name": "0.12mm Structural @XLIS 0.25", - "sub_path": "process/0.12mm Structural @XLIS 0.25.json" + "name": "0.12mm Structural @Prusa XL 0.25", + "sub_path": "process/0.12mm Structural @Prusa XL 0.25.json" }, { - "name": "0.12mm Speed @XLIS 0.25", - "sub_path": "process/0.12mm Speed @XLIS 0.25.json" + "name": "0.12mm Speed @Prusa XL 0.25", + "sub_path": "process/0.12mm Speed @Prusa XL 0.25.json" }, { - "name": "0.07mm Detail @XLIS 0.25", - "sub_path": "process/0.07mm Detail @XLIS 0.25.json" + "name": "0.07mm Detail @Prusa XL 0.25", + "sub_path": "process/0.07mm Detail @Prusa XL 0.25.json" }, { - "name": "0.05mm Detail @XLIS 0.25", - "sub_path": "process/0.05mm Detail @XLIS 0.25.json" + "name": "0.05mm Detail @Prusa XL 0.25", + "sub_path": "process/0.05mm Detail @Prusa XL 0.25.json" }, { - "name": "0.20mm Speed @XLIS 0.3", - "sub_path": "process/0.20mm Speed @XLIS 0.3.json" + "name": "0.20mm Speed @Prusa XL 0.3", + "sub_path": "process/0.20mm Speed @Prusa XL 0.3.json" }, { - "name": "0.16mm Structural @XLIS 0.3", - "sub_path": "process/0.16mm Structural @XLIS 0.3.json" + "name": "0.16mm Structural @Prusa XL 0.3", + "sub_path": "process/0.16mm Structural @Prusa XL 0.3.json" }, { - "name": "0.16mm Speed @XLIS 0.3", - "sub_path": "process/0.16mm Speed @XLIS 0.3.json" + "name": "0.16mm Speed @Prusa XL 0.3", + "sub_path": "process/0.16mm Speed @Prusa XL 0.3.json" }, { - "name": "0.12mm Structural @XLIS 0.3", - "sub_path": "process/0.12mm Structural @XLIS 0.3.json" + "name": "0.12mm Structural @Prusa XL 0.3", + "sub_path": "process/0.12mm Structural @Prusa XL 0.3.json" }, { - "name": "0.25mm Structural @XLIS 0.4", - "sub_path": "process/0.25mm Structural @XLIS 0.4.json" + "name": "0.25mm Structural @Prusa XL 0.4", + "sub_path": "process/0.25mm Structural @Prusa XL 0.4.json" }, { - "name": "0.20mm Structural @XLIS 0.4", - "sub_path": "process/0.20mm Structural @XLIS 0.4.json" + "name": "0.20mm Structural @Prusa XL 0.4", + "sub_path": "process/0.20mm Structural @Prusa XL 0.4.json" }, { - "name": "0.20mm Speed @XLIS 0.4", - "sub_path": "process/0.20mm Speed @XLIS 0.4.json" + "name": "0.20mm Speed @Prusa XL 0.4", + "sub_path": "process/0.20mm Speed @Prusa XL 0.4.json" }, { - "name": "0.15mm Structural @XLIS 0.4", - "sub_path": "process/0.15mm Structural @XLIS 0.4.json" + "name": "0.15mm Structural @Prusa XL 0.4", + "sub_path": "process/0.15mm Structural @Prusa XL 0.4.json" }, { - "name": "0.15mm Speed @XLIS 0.4", - "sub_path": "process/0.15mm Speed @XLIS 0.4.json" + "name": "0.15mm Speed @Prusa XL 0.4", + "sub_path": "process/0.15mm Speed @Prusa XL 0.4.json" }, { - "name": "0.10mm FastDetail @XLIS 0.4", - "sub_path": "process/0.10mm FastDetail @XLIS 0.4.json" + "name": "0.10mm FastDetail @Prusa XL 0.4", + "sub_path": "process/0.10mm FastDetail @Prusa XL 0.4.json" }, { - "name": "0.25mm Structural @XLIS 0.5", - "sub_path": "process/0.25mm Structural @XLIS 0.5.json" + "name": "0.25mm Structural @Prusa XL 0.5", + "sub_path": "process/0.25mm Structural @Prusa XL 0.5.json" }, { - "name": "0.25mm Speed @XLIS 0.5", - "sub_path": "process/0.25mm Speed @XLIS 0.5.json" + "name": "0.25mm Speed @Prusa XL 0.5", + "sub_path": "process/0.25mm Speed @Prusa XL 0.5.json" }, { - "name": "0.20mm Structural @XLIS 0.5", - "sub_path": "process/0.20mm Structural @XLIS 0.5.json" + "name": "0.20mm Structural @Prusa XL 0.5", + "sub_path": "process/0.20mm Structural @Prusa XL 0.5.json" }, { - "name": "0.20mm Speed @XLIS 0.5", - "sub_path": "process/0.20mm Speed @XLIS 0.5.json" + "name": "0.20mm Speed @Prusa XL 0.5", + "sub_path": "process/0.20mm Speed @Prusa XL 0.5.json" }, { - "name": "0.15mm Structural @XLIS 0.5", - "sub_path": "process/0.15mm Structural @XLIS 0.5.json" + "name": "0.15mm Structural @Prusa XL 0.5", + "sub_path": "process/0.15mm Structural @Prusa XL 0.5.json" }, { - "name": "0.10mm Structural @XLIS 0.5", - "sub_path": "process/0.10mm Structural @XLIS 0.5.json" + "name": "0.10mm Structural @Prusa XL 0.5", + "sub_path": "process/0.10mm Structural @Prusa XL 0.5.json" }, { - "name": "0.32mm Structural @XLIS 0.6", - "sub_path": "process/0.32mm Structural @XLIS 0.6.json" + "name": "0.32mm Structural @Prusa XL 0.6", + "sub_path": "process/0.32mm Structural @Prusa XL 0.6.json" }, { - "name": "0.32mm Speed @XLIS 0.6", - "sub_path": "process/0.32mm Speed @XLIS 0.6.json" + "name": "0.32mm Speed @Prusa XL 0.6", + "sub_path": "process/0.32mm Speed @Prusa XL 0.6.json" }, { - "name": "0.25mm Structural @XLIS 0.6", - "sub_path": "process/0.25mm Structural @XLIS 0.6.json" + "name": "0.25mm Structural @Prusa XL 0.6", + "sub_path": "process/0.25mm Structural @Prusa XL 0.6.json" }, { - "name": "0.25mm Speed @XLIS 0.6", - "sub_path": "process/0.25mm Speed @XLIS 0.6.json" + "name": "0.25mm Speed @Prusa XL 0.6", + "sub_path": "process/0.25mm Speed @Prusa XL 0.6.json" }, { - "name": "0.20mm Structural @XLIS 0.6", - "sub_path": "process/0.20mm Structural @XLIS 0.6.json" + "name": "0.20mm Structural @Prusa XL 0.6", + "sub_path": "process/0.20mm Structural @Prusa XL 0.6.json" }, { - "name": "0.20mm Speed @XLIS 0.6", - "sub_path": "process/0.20mm Speed @XLIS 0.6.json" + "name": "0.20mm Speed @Prusa XL 0.6", + "sub_path": "process/0.20mm Speed @Prusa XL 0.6.json" }, { - "name": "0.15mm Structural @XLIS 0.6", - "sub_path": "process/0.15mm Structural @XLIS 0.6.json" + "name": "0.15mm Structural @Prusa XL 0.6", + "sub_path": "process/0.15mm Structural @Prusa XL 0.6.json" }, { - "name": "0.55mm Draft @XLIS 0.8", - "sub_path": "process/0.55mm Draft @XLIS 0.8.json" + "name": "0.55mm Draft @Prusa XL 0.8", + "sub_path": "process/0.55mm Draft @Prusa XL 0.8.json" }, { - "name": "0.40mm Quality @XLIS 0.8", - "sub_path": "process/0.40mm Quality @XLIS 0.8.json" + "name": "0.40mm Quality @Prusa XL 0.8", + "sub_path": "process/0.40mm Quality @Prusa XL 0.8.json" }, { - "name": "0.30mm Detail @XLIS 0.8", - "sub_path": "process/0.30mm Detail @XLIS 0.8.json" + "name": "0.30mm Detail @Prusa XL 0.8", + "sub_path": "process/0.30mm Detail @Prusa XL 0.8.json" } ], "filament_list": [ @@ -763,28 +763,28 @@ "sub_path": "machine/Prusa MINI 0.8 nozzle.json" }, { - "name": "Prusa XLIS 0.25 nozzle", - "sub_path": "machine/Prusa XLIS 0.25 nozzle.json" + "name": "Prusa XL 0.25 nozzle", + "sub_path": "machine/Prusa XL 0.25 nozzle.json" }, { - "name": "Prusa XLIS 0.3 nozzle", - "sub_path": "machine/Prusa XLIS 0.3 nozzle.json" + "name": "Prusa XL 0.3 nozzle", + "sub_path": "machine/Prusa XL 0.3 nozzle.json" }, { - "name": "Prusa XLIS 0.4 nozzle", - "sub_path": "machine/Prusa XLIS 0.4 nozzle.json" + "name": "Prusa XL 0.4 nozzle", + "sub_path": "machine/Prusa XL 0.4 nozzle.json" }, { - "name": "Prusa XLIS 0.5 nozzle", - "sub_path": "machine/Prusa XLIS 0.5 nozzle.json" + "name": "Prusa XL 0.5 nozzle", + "sub_path": "machine/Prusa XL 0.5 nozzle.json" }, { - "name": "Prusa XLIS 0.6 nozzle", - "sub_path": "machine/Prusa XLIS 0.6 nozzle.json" + "name": "Prusa XL 0.6 nozzle", + "sub_path": "machine/Prusa XL 0.6 nozzle.json" }, { - "name": "Prusa XLIS 0.8 nozzle", - "sub_path": "machine/Prusa XLIS 0.8 nozzle.json" + "name": "Prusa XL 0.8 nozzle", + "sub_path": "machine/Prusa XL 0.8 nozzle.json" } ] } diff --git a/resources/profiles/Prusa/Prusa XL.svg b/resources/profiles/Prusa/Prusa XL.svg new file mode 100644 index 0000000000..4ebe0c97ed --- /dev/null +++ b/resources/profiles/Prusa/Prusa XL.svg @@ -0,0 +1,17 @@ + + + + + diff --git a/resources/profiles/Prusa/Pursa XL Input Shaper_bed.stl b/resources/profiles/Prusa/Prusa XL_bed.stl similarity index 100% rename from resources/profiles/Prusa/Pursa XL Input Shaper_bed.stl rename to resources/profiles/Prusa/Prusa XL_bed.stl diff --git a/resources/profiles/Prusa/Pursa XL Input Shaper_cover.png b/resources/profiles/Prusa/Prusa XL_cover.png similarity index 100% rename from resources/profiles/Prusa/Pursa XL Input Shaper_cover.png rename to resources/profiles/Prusa/Prusa XL_cover.png diff --git a/resources/profiles/Prusa/Pursa XL Input Shaper.svg b/resources/profiles/Prusa/Pursa XL Input Shaper.svg deleted file mode 100644 index ca0b2c6c79..0000000000 --- a/resources/profiles/Prusa/Pursa XL Input Shaper.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json index 8e5bdbdcb7..544d644b27 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic ABS @XL.json @@ -44,11 +44,11 @@ "filament_retract_lift_below": "1.5", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.04{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json index 1b026b20f9..c2c535cd91 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PETG @XL.json @@ -47,11 +47,11 @@ "filament_retract_before_wipe": "20%", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.053{elsif nozzle_diameter[0]==0.5}0.042{elsif nozzle_diameter[0]==0.6}0.032{elsif nozzle_diameter[0]==0.8}0.018{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json index 8f8604d467..06acddef20 100644 --- a/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusa Generic PLA @XL.json @@ -42,11 +42,11 @@ "filament_retract_lift_below": "0.6", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament ASA @XL.json b/resources/profiles/Prusa/filament/Prusament ASA @XL.json index cb056319bf..36e1f6c601 100644 --- a/resources/profiles/Prusa/filament/Prusament ASA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament ASA @XL.json @@ -46,11 +46,11 @@ "filament_retract_lift_below": "1.5", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.04{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json b/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json index f17a18a694..28d4862819 100644 --- a/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PA-CF @XL.json @@ -46,11 +46,11 @@ "filament_retract_lift_below": "1.5", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.016{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json b/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json index dbe4ebc963..a2bfaada98 100644 --- a/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PC Blend @XL.json @@ -46,11 +46,11 @@ "filament_retract_lift_below": "1.5", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.016{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json b/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json index e8d1d3e723..79c707f999 100644 --- a/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PC-CF @XL.json @@ -46,11 +46,11 @@ "filament_retract_lift_below": "1.5", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.016{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.09{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S45 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PETG @XL.json b/resources/profiles/Prusa/filament/Prusament PETG @XL.json index 4eaa849d03..c4505feda5 100644 --- a/resources/profiles/Prusa/filament/Prusament PETG @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PETG @XL.json @@ -47,11 +47,11 @@ "filament_retract_before_wipe": "20%", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.07{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.053{elsif nozzle_diameter[0]==0.5}0.042{elsif nozzle_diameter[0]==0.6}0.032{elsif nozzle_diameter[0]==0.8}0.018{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PLA @XL.json b/resources/profiles/Prusa/filament/Prusament PLA @XL.json index 3ee68ba1b5..949dfb23b3 100644 --- a/resources/profiles/Prusa/filament/Prusament PLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PLA @XL.json @@ -42,11 +42,11 @@ "filament_retract_lift_below": "0.6", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament PVB @XL.json b/resources/profiles/Prusa/filament/Prusament PVB @XL.json index 8e17c0ba19..c7e1e5fe0e 100644 --- a/resources/profiles/Prusa/filament/Prusament PVB @XL.json +++ b/resources/profiles/Prusa/filament/Prusament PVB @XL.json @@ -47,11 +47,11 @@ "filament_retract_lift_below": "0.6", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json index 795878de73..6fa3b54c17 100644 --- a/resources/profiles/Prusa/filament/Prusament rPLA @XL.json +++ b/resources/profiles/Prusa/filament/Prusament rPLA @XL.json @@ -45,11 +45,11 @@ "filament_retract_lift_below": "0.6", "filament_start_gcode": "; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.05{elsif nozzle_diameter[0]==0.25}0.14{elsif nozzle_diameter[0]==0.3}0.07{elsif nozzle_diameter[0]==0.35}0.06{elsif nozzle_diameter[0]==0.6}0.03{elsif nozzle_diameter[0]==0.5}0.035{elsif nozzle_diameter[0]==0.8}0.015{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_XLIS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.036{elsif nozzle_diameter[0]==0.5}0.025{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.014{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.08{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle", - "Pursa XLIS 0.3 nozzle", - "Prusa XLIS 0.4 nozzle", - "Prusa XLIS 0.5 nozzle", - "Prusa XLIS 0.6 nozzle", - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.25 nozzle", + "Prusa XL 0.3 nozzle", + "Prusa XL 0.4 nozzle", + "Prusa XL 0.5 nozzle", + "Prusa XL 0.6 nozzle", + "Prusa XL 0.8 nozzle" ] } diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.25 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.25 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json index f8ee60e938..a8a7cd75da 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.25 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.25 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.25 nozzle", + "name": "Prusa XL 0.25 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.15mm Speed @XLIS 0.25", + "default_print_profile": "0.15mm Speed @Prusa XL 0.25", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "80%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json index b3ef7672e2..e83f1871a1 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.3 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.3 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.3 nozzle", + "name": "Prusa XL 0.3 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.20mm Speed @XLIS 0.3", + "default_print_profile": "0.20mm Speed @Prusa XL 0.3", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "80%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json index 9fc8e9ac87..cbb286aa5b 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.4 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.4 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.4 nozzle", + "name": "Prusa XL 0.4 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.20mm Speed @XLIS 0.4", + "default_print_profile": "0.20mm Speed @Prusa XL 0.4", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "80%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json index 1b5ac3683b..937e88f016 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.5 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.5 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.5 nozzle", + "name": "Prusa XL 0.5 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.25mm Speed @XLIS 0.5", + "default_print_profile": "0.25mm Speed @Prusa XL 0.5", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "80%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json index 7dd5c731ba..e0d47b46c6 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.6 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.6 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.6 nozzle", + "name": "Prusa XL 0.6 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.32mm Speed @XLIS 0.6", + "default_print_profile": "0.32mm Speed @Prusa XL 0.6", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "0%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json b/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json similarity index 97% rename from resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json rename to resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json index 3f3326a082..85c1631bcb 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS 0.8 nozzle.json +++ b/resources/profiles/Prusa/machine/Prusa XL 0.8 nozzle.json @@ -1,14 +1,14 @@ { "type": "machine", "setting_id": "GM003", - "name": "Prusa XLIS 0.8 nozzle", + "name": "Prusa XL 0.8 nozzle", "from": "system", "instantiation": "true", "inherits": "fdm_machine_common", "gcode_flavor": "marlin2", - "printer_model": "Pursa XL Input Shaper", + "printer_model": "Prusa XL", "default_filament_profile": "Prusa Generic PLA @XL", - "default_print_profile": "0.40mm Quality @XLIS 0.8", + "default_print_profile": "0.40mm Quality @Prusa XL 0.8", "extruder_clearance_radius": "67", "extruder_clearance_height_to_rod": "21", "extruder_clearance_height_to_lid": "21", @@ -95,7 +95,7 @@ "wipe": "1", "retract_before_wipe": "50%", "retract_lift_below": "1.5", - "z_hop_types": "slope", + "z_hop_types": "Auto Lift", "host_type": "prusalink", "printable_height": "360", "machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720{endif} ; Move bed down\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X6 Y350 F6000 ; park\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+100, max_print_height)} F300{endif} ; Move bed down\nM900 K0 ; reset LA\nM142 S36 ; reset heatbreak target temp\nM221 S100 ; reset flow percentage\nM84 ; disable motors\n; max_layer_z = [max_layer_z]", diff --git a/resources/profiles/Prusa/machine/Prusa XLIS.json b/resources/profiles/Prusa/machine/Prusa XL.json similarity index 71% rename from resources/profiles/Prusa/machine/Prusa XLIS.json rename to resources/profiles/Prusa/machine/Prusa XL.json index 1d0ae08f51..eb8487609c 100644 --- a/resources/profiles/Prusa/machine/Prusa XLIS.json +++ b/resources/profiles/Prusa/machine/Prusa XL.json @@ -1,12 +1,12 @@ { "type": "machine_model", - "name": "Pursa XL Input Shaper", - "model_id": "Pursa XLIS", + "name": "Prusa XL", + "model_id": "Prusa XL", "nozzle_diameter": "0.25;0.3;0.4;0.5;0.6;0.8", "machine_tech": "FFF", "family": "Prusa", - "bed_model": "Pursa XL Input Shaper_bed.stl", - "bed_texture": "Pursa XL Input Shaper.svg", + "bed_model": "Prusa XL_bed.stl", + "bed_texture": "Prusa XL.svg", "hotend_model": "", "default_materials": "Prusa Generic PLA @XL;Prusament PLA @XL;Prusament rPLA @XL;Prusa Generic PETG @XL;Prusament PETG @XL;Prusa Generic ABS @XL;Prusament ASA @XL;Prusament PC Blend @XL;Prusament PC-CF @XL;Prusament PVB @XL;Prusament PA-CF @XL" } diff --git a/resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json b/resources/profiles/Prusa/process/0.05mm Detail @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.05mm Detail @Prusa XL 0.25.json index 3f91bd5da4..408eecaf69 100644 --- a/resources/profiles/Prusa/process/0.05mm Detail @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.05mm Detail @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.05mm Detail @XLIS 0.25", + "name": "0.05mm Detail @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json b/resources/profiles/Prusa/process/0.07mm Detail @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.07mm Detail @Prusa XL 0.25.json index 7e41472a58..e0c16d6552 100644 --- a/resources/profiles/Prusa/process/0.07mm Detail @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.07mm Detail @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.07mm Detail @XLIS 0.25", + "name": "0.07mm Detail @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json b/resources/profiles/Prusa/process/0.10mm FastDetail @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.10mm FastDetail @Prusa XL 0.4.json index b2cdb1247d..69947f0fc9 100644 --- a/resources/profiles/Prusa/process/0.10mm FastDetail @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.10mm FastDetail @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.10mm FastDetail @XLIS 0.4", + "name": "0.10mm FastDetail @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.10mm Structural @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.10mm Structural @Prusa XL 0.5.json index 0a53b8f4c7..ff2f1c73ed 100644 --- a/resources/profiles/Prusa/process/0.10mm Structural @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.10mm Structural @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.10mm Structural @XLIS 0.5", + "name": "0.10mm Structural @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json b/resources/profiles/Prusa/process/0.12mm Speed @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.12mm Speed @Prusa XL 0.25.json index 046ccc32fb..59b981f9de 100644 --- a/resources/profiles/Prusa/process/0.12mm Speed @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.12mm Speed @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.12mm Speed @XLIS 0.25", + "name": "0.12mm Speed @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json b/resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.25.json index 695dd0ba85..d6dd18a043 100644 --- a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.12mm Structural @XLIS 0.25", + "name": "0.12mm Structural @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json b/resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.3.json similarity index 96% rename from resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json rename to resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.3.json index 031cc6b542..ccb7d0fb73 100644 --- a/resources/profiles/Prusa/process/0.12mm Structural @XLIS 0.3.json +++ b/resources/profiles/Prusa/process/0.12mm Structural @Prusa XL 0.3.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.12mm Structural @XLIS 0.3", + "name": "0.12mm Structural @Prusa XL 0.3", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.3 nozzle" + "Prusa XL 0.3 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.25.json index 096d0b519e..c267c2fa28 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Speed @XLIS 0.25", + "name": "0.15mm Speed @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json b/resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.4.json index 5bbc4c9de2..d73fd44ca1 100644 --- a/resources/profiles/Prusa/process/0.15mm Speed @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.15mm Speed @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Speed @XLIS 0.4", + "name": "0.15mm Speed @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.25.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json rename to resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.25.json index b8fb3b8056..8395f8f596 100644 --- a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.25.json +++ b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.25.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Structural @XLIS 0.25", + "name": "0.15mm Structural @Prusa XL 0.25", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.25 nozzle" + "Prusa XL 0.25 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.4.json index 7765edab68..e4194b3a53 100644 --- a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Structural @XLIS 0.4", + "name": "0.15mm Structural @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.5.json index 31dc846f89..e32188d18f 100644 --- a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Structural @XLIS 0.5", + "name": "0.15mm Structural @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.6.json similarity index 96% rename from resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.6.json index eea2afc624..912270b547 100644 --- a/resources/profiles/Prusa/process/0.15mm Structural @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.15mm Structural @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Structural @XLIS 0.6", + "name": "0.15mm Structural @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json b/resources/profiles/Prusa/process/0.16mm Speed @Prusa XL 0.3.json similarity index 96% rename from resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json rename to resources/profiles/Prusa/process/0.16mm Speed @Prusa XL 0.3.json index d877ec4c04..235fa3deeb 100644 --- a/resources/profiles/Prusa/process/0.16mm Speed @XLIS 0.3.json +++ b/resources/profiles/Prusa/process/0.16mm Speed @Prusa XL 0.3.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.16mm Speed @XLIS 0.3", + "name": "0.16mm Speed @Prusa XL 0.3", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.3 nozzle" + "Prusa XL 0.3 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json b/resources/profiles/Prusa/process/0.16mm Structural @Prusa XL 0.3.json similarity index 96% rename from resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json rename to resources/profiles/Prusa/process/0.16mm Structural @Prusa XL 0.3.json index 5d14e31d91..b27221145e 100644 --- a/resources/profiles/Prusa/process/0.16mm Structural @XLIS 0.3.json +++ b/resources/profiles/Prusa/process/0.16mm Structural @Prusa XL 0.3.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.16mm Structural @XLIS 0.3", + "name": "0.16mm Structural @Prusa XL 0.3", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.3 nozzle" + "Prusa XL 0.3 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.3.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json rename to resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.3.json index ce32faf2c2..c8f4d1c288 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.3.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.3.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Speed @XLIS 0.3", + "name": "0.20mm Speed @Prusa XL 0.3", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0", "compatible_printers": [ - "Prusa XLIS 0.3 nozzle" + "Prusa XL 0.3 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.4.json index 3433844d31..214c125a8d 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Speed @XLIS 0.4", + "name": "0.20mm Speed @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.5.json index 722cbe2eb4..469f93b422 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Speed @XLIS 0.5", + "name": "0.20mm Speed @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.6.json similarity index 97% rename from resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.6.json index 7be3e19729..4a9ff4d9e8 100644 --- a/resources/profiles/Prusa/process/0.20mm Speed @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Speed @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Speed @XLIS 0.6", + "name": "0.20mm Speed @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.4.json index 2e395bcdb6..6b94db2fde 100644 --- a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Structural @XLIS 0.4", + "name": "0.20mm Structural @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.5.json index 16bcfe597a..d12f979788 100644 --- a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Structural @XLIS 0.5", + "name": "0.20mm Structural @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.6.json similarity index 96% rename from resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.6.json index 9fb59ef780..bd9ad1e9dc 100644 --- a/resources/profiles/Prusa/process/0.20mm Structural @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.20mm Structural @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Structural @XLIS 0.6", + "name": "0.20mm Structural @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json b/resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.5.json index 888572af3b..6bdd86ca3f 100644 --- a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.25mm Speed @XLIS 0.5", + "name": "0.25mm Speed @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.6.json similarity index 97% rename from resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.6.json index 043252449e..22654cab4e 100644 --- a/resources/profiles/Prusa/process/0.25mm Speed @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.25mm Speed @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.25mm Speed @XLIS 0.6", + "name": "0.25mm Speed @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.4.json similarity index 96% rename from resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json rename to resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.4.json index ea6a05029a..2e068b2d37 100644 --- a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.4.json +++ b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.4.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.25mm Structural @XLIS 0.4", + "name": "0.25mm Structural @Prusa XL 0.4", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -62,6 +62,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.4 nozzle" + "Prusa XL 0.4 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.5.json similarity index 96% rename from resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json rename to resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.5.json index ee2883faa6..8d52826fa8 100644 --- a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.5.json +++ b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.5.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.25mm Structural @XLIS 0.5", + "name": "0.25mm Structural @Prusa XL 0.5", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -63,6 +63,6 @@ "resolution": "0.008", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.5 nozzle" + "Prusa XL 0.5 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.6.json similarity index 96% rename from resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.6.json index 017a21dc18..9091395c5d 100644 --- a/resources/profiles/Prusa/process/0.25mm Structural @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.25mm Structural @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.25mm Structural @XLIS 0.6", + "name": "0.25mm Structural @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json b/resources/profiles/Prusa/process/0.30mm Detail @Prusa XL 0.8.json similarity index 95% rename from resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json rename to resources/profiles/Prusa/process/0.30mm Detail @Prusa XL 0.8.json index 83fe78840d..6307ceb9c2 100644 --- a/resources/profiles/Prusa/process/0.30mm Detail @XLIS 0.8.json +++ b/resources/profiles/Prusa/process/0.30mm Detail @Prusa XL 0.8.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.30mm Detail @XLIS 0.8", + "name": "0.30mm Detail @Prusa XL 0.8", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -15,7 +15,7 @@ "thick_bridges": "1", "seam_position": "nearest", "sparse_infill_density": "15%", - "sparse_infill_pattern": "rectilinear", + "sparse_infill_pattern": "crosshatch", "infill_anchor": "2.5", "infill_anchor_max": "20", "brim_object_gap": "0.1", @@ -66,6 +66,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json b/resources/profiles/Prusa/process/0.32mm Speed @Prusa XL 0.6.json similarity index 97% rename from resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.32mm Speed @Prusa XL 0.6.json index 207b38b504..d7ba66b9ed 100644 --- a/resources/profiles/Prusa/process/0.32mm Speed @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm Speed @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.32mm Speed @XLIS 0.6", + "name": "0.32mm Speed @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json b/resources/profiles/Prusa/process/0.32mm Structural @Prusa XL 0.6.json similarity index 96% rename from resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json rename to resources/profiles/Prusa/process/0.32mm Structural @Prusa XL 0.6.json index f9c92bcae8..38e6891060 100644 --- a/resources/profiles/Prusa/process/0.32mm Structural @XLIS 0.6.json +++ b/resources/profiles/Prusa/process/0.32mm Structural @Prusa XL 0.6.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.32mm Structural @XLIS 0.6", + "name": "0.32mm Structural @Prusa XL 0.6", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -64,6 +64,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.6 nozzle" + "Prusa XL 0.6 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json b/resources/profiles/Prusa/process/0.40mm Quality @Prusa XL 0.8.json similarity index 95% rename from resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json rename to resources/profiles/Prusa/process/0.40mm Quality @Prusa XL 0.8.json index e5908f1d4a..9788a261da 100644 --- a/resources/profiles/Prusa/process/0.40mm Quality @XLIS 0.8.json +++ b/resources/profiles/Prusa/process/0.40mm Quality @Prusa XL 0.8.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.40mm Quality @XLIS 0.8", + "name": "0.40mm Quality @Prusa XL 0.8", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -15,7 +15,7 @@ "thick_bridges": "1", "seam_position": "nearest", "sparse_infill_density": "15%", - "sparse_infill_pattern": "rectilinear", + "sparse_infill_pattern": "crosshatch", "infill_anchor": "2.5", "infill_anchor_max": "20", "brim_object_gap": "0.1", @@ -66,6 +66,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json b/resources/profiles/Prusa/process/0.55mm Draft @Prusa XL 0.8.json similarity index 95% rename from resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json rename to resources/profiles/Prusa/process/0.55mm Draft @Prusa XL 0.8.json index 63e7aef354..5abb705a88 100644 --- a/resources/profiles/Prusa/process/0.55mm Draft @XLIS 0.8.json +++ b/resources/profiles/Prusa/process/0.55mm Draft @Prusa XL 0.8.json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.55mm Draft @XLIS 0.8", + "name": "0.55mm Draft @Prusa XL 0.8", "from": "system", "instantiation": "true", "inherits": "process_common_xl", @@ -15,7 +15,7 @@ "thick_bridges": "1", "seam_position": "nearest", "sparse_infill_density": "15%", - "sparse_infill_pattern": "rectilinear", + "sparse_infill_pattern": "crosshatch", "infill_anchor": "2.5", "infill_anchor_max": "20", "brim_object_gap": "0.1", @@ -66,6 +66,6 @@ "resolution": "0.0125", "elefant_foot_compensation": "0.2", "compatible_printers": [ - "Prusa XLIS 0.8 nozzle" + "Prusa XL 0.8 nozzle" ] } \ No newline at end of file diff --git a/resources/profiles/Prusa/process/fdm_process_common.json b/resources/profiles/Prusa/process/fdm_process_common.json index 9c2ee56fc2..70f8582d43 100644 --- a/resources/profiles/Prusa/process/fdm_process_common.json +++ b/resources/profiles/Prusa/process/fdm_process_common.json @@ -76,7 +76,7 @@ "support_interface_bottom_layers": "2", "support_interface_spacing": "0.5", "support_interface_speed": "80", - "support_base_pattern": "rectilinear", + "support_base_pattern": "default", "support_base_pattern_spacing": "2.5", "support_speed": "150", "support_threshold_angle": "30", diff --git a/resources/profiles/Prusa/process/process_common_mk3.json b/resources/profiles/Prusa/process/process_common_mk3.json index df6f34df22..7a4b8c5d7e 100644 --- a/resources/profiles/Prusa/process/process_common_mk3.json +++ b/resources/profiles/Prusa/process/process_common_mk3.json @@ -70,10 +70,10 @@ "staggered_inner_seams": "0", "standby_temperature_delta": "-5", "support_angle": "0", - "support_base_pattern": "rectilinear", + "support_base_pattern": "default", "support_interface_bottom_layers": "0", "support_interface_loop_pattern": "0", - "support_interface_pattern": "rectilinear", + "support_interface_pattern": "auto", "support_interface_spacing": "0.2", "support_interface_top_layers": "2", "support_on_build_plate_only": "0", diff --git a/resources/profiles/Prusa/process/process_common_xl.json b/resources/profiles/Prusa/process/process_common_xl.json index 43570c21b8..f3f2a7e791 100644 --- a/resources/profiles/Prusa/process/process_common_xl.json +++ b/resources/profiles/Prusa/process/process_common_xl.json @@ -15,7 +15,7 @@ "gap_fill_target": "everywhere", "bottom_shell_thickness": "0.5", "infill_anchor_max": "12", - "sparse_infill_pattern": "grid", + "sparse_infill_pattern": "crosshatch", "sparse_infill_density": "15%", "fuzzy_skin_point_distance": "0.8", "fuzzy_skin_thickness": "0.3", @@ -31,7 +31,7 @@ "support_base_pattern_spacing": "2", "support_interface_top_layers": "5", "support_interface_bottom_layers": "0", - "support_interface_pattern": "rectilinear", + "support_interface_pattern": "auto", "support_interface_spacing": "0.2", "support_object_xy_distance": "80%", "tree_support_branch_angle_organic": "40", From ef73bafeb0006f8d8862b8502207c87591670672 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sat, 8 Jun 2024 21:37:09 +0800 Subject: [PATCH 6/7] Feature/add 0.2 0.6 0.8 nozzle for my klipper machine (#5637) * Add 0.2mm 0.6mm 0.8 mm nozzle for MyKlipper profile * small change --- resources/profiles/Custom.json | 30 ++++- .../Custom/filament/My Generic ABS.json | 11 +- .../Custom/filament/My Generic ASA.json | 11 +- .../Custom/filament/My Generic PA-CF.json | 11 +- .../Custom/filament/My Generic PA.json | 11 +- .../Custom/filament/My Generic PC.json | 13 ++- .../Custom/filament/My Generic PETG.json | 11 +- .../Custom/filament/My Generic PLA-CF.json | 13 ++- .../Custom/filament/My Generic PLA.json | 11 +- .../Custom/filament/My Generic PVA.json | 11 +- .../Custom/filament/My Generic TPU.json | 11 +- .../Custom/machine/MyKlipper 0.2 nozzle.json | 26 +++++ .../Custom/machine/MyKlipper 0.4 nozzle.json | 37 +++--- .../Custom/machine/MyKlipper 0.6 nozzle.json | 26 +++++ .../Custom/machine/MyKlipper 0.8 nozzle.json | 26 +++++ .../profiles/Custom/machine/MyKlipper.json | 2 +- .../Custom/machine/MyMarlin 0.4 nozzle.json | 84 +++++++------- .../process/0.08mm Extra Fine @MyKlipper.json | 12 +- .../process/0.12mm Fine @MyKlipper.json | 12 +- .../process/0.15mm Optimal @MyKlipper.json | 13 ++- .../process/0.16mm Optimal @MyKlipper.json | 20 ++++ .../process/0.20mm Standard @MyKlipper.json | 7 +- .../process/0.24mm Draft @MyKlipper.json | 13 ++- .../0.28mm Extra Draft @MyKlipper.json | 11 +- .../0.32mm Extra Draft @MyKlipper.json | 17 +++ .../0.40mm Extra Draft @MyKlipper.json | 16 +++ .../0.56mm Extra Draft @MyKlipper.json | 15 +++ .../Custom/process/fdm_process_common.json | 108 ++++++++++++------ .../process/fdm_process_klipper_common.json | 88 +------------- 29 files changed, 435 insertions(+), 242 deletions(-) create mode 100644 resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json create mode 100644 resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json create mode 100644 resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json create mode 100644 resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json create mode 100644 resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json create mode 100644 resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json create mode 100644 resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json diff --git a/resources/profiles/Custom.json b/resources/profiles/Custom.json index ebd4f0c118..8a0f2a5c86 100644 --- a/resources/profiles/Custom.json +++ b/resources/profiles/Custom.json @@ -1,6 +1,6 @@ { "name": "Custom Printer", - "version": "02.01.00.00", + "version": "02.01.00.01", "force_update": "0", "description": "My configurations", "machine_model_list": [ @@ -46,6 +46,10 @@ "name": "0.15mm Optimal @MyKlipper", "sub_path": "process/0.15mm Optimal @MyKlipper.json" }, + { + "name": "0.16mm Optimal @MyKlipper", + "sub_path": "process/0.16mm Optimal @MyKlipper.json" + }, { "name": "0.20mm Standard @MyKlipper", "sub_path": "process/0.20mm Standard @MyKlipper.json" @@ -58,6 +62,18 @@ "name": "0.28mm Extra Draft @MyKlipper", "sub_path": "process/0.28mm Extra Draft @MyKlipper.json" }, + { + "name": "0.32mm Extra Draft @MyKlipper", + "sub_path": "process/0.32mm Extra Draft @MyKlipper.json" + }, + { + "name": "0.40mm Extra Draft @MyKlipper", + "sub_path": "process/0.40mm Extra Draft @MyKlipper.json" + }, + { + "name": "0.56mm Extra Draft @MyKlipper", + "sub_path": "process/0.56mm Extra Draft @MyKlipper.json" + }, { "name": "0.08mm Extra Fine @MyRRF", "sub_path": "process/0.08mm Extra Fine @MyRRF.json" @@ -202,6 +218,18 @@ "name": "MyKlipper 0.4 nozzle", "sub_path": "machine/MyKlipper 0.4 nozzle.json" }, + { + "name": "MyKlipper 0.2 nozzle", + "sub_path": "machine/MyKlipper 0.2 nozzle.json" + }, + { + "name": "MyKlipper 0.6 nozzle", + "sub_path": "machine/MyKlipper 0.6 nozzle.json" + }, + { + "name": "MyKlipper 0.8 nozzle", + "sub_path": "machine/MyKlipper 0.8 nozzle.json" + }, { "name": "MyMarlin 0.4 nozzle", "sub_path": "machine/MyMarlin 0.4 nozzle.json" diff --git a/resources/profiles/Custom/filament/My Generic ABS.json b/resources/profiles/Custom/filament/My Generic ABS.json index b7b879dc05..14fe0490e5 100644 --- a/resources/profiles/Custom/filament/My Generic ABS.json +++ b/resources/profiles/Custom/filament/My Generic ABS.json @@ -13,8 +13,11 @@ "12" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic ASA.json b/resources/profiles/Custom/filament/My Generic ASA.json index cbed120fc3..ca6539c115 100644 --- a/resources/profiles/Custom/filament/My Generic ASA.json +++ b/resources/profiles/Custom/filament/My Generic ASA.json @@ -13,8 +13,11 @@ "12" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PA-CF.json b/resources/profiles/Custom/filament/My Generic PA-CF.json index d850d084ec..60efac620c 100644 --- a/resources/profiles/Custom/filament/My Generic PA-CF.json +++ b/resources/profiles/Custom/filament/My Generic PA-CF.json @@ -19,8 +19,11 @@ "8" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PA.json b/resources/profiles/Custom/filament/My Generic PA.json index 8124b0d546..2e284b6d37 100644 --- a/resources/profiles/Custom/filament/My Generic PA.json +++ b/resources/profiles/Custom/filament/My Generic PA.json @@ -16,8 +16,11 @@ "12" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PC.json b/resources/profiles/Custom/filament/My Generic PC.json index 019b5e5ab6..4738b42e18 100644 --- a/resources/profiles/Custom/filament/My Generic PC.json +++ b/resources/profiles/Custom/filament/My Generic PC.json @@ -12,9 +12,12 @@ "filament_flow_ratio": [ "0.94" ], -"compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PETG.json b/resources/profiles/Custom/filament/My Generic PETG.json index cfbd41b29e..f640aea59e 100644 --- a/resources/profiles/Custom/filament/My Generic PETG.json +++ b/resources/profiles/Custom/filament/My Generic PETG.json @@ -43,8 +43,11 @@ "; filament start gcode\n" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PLA-CF.json b/resources/profiles/Custom/filament/My Generic PLA-CF.json index fc45a9903e..b0ed43b93c 100644 --- a/resources/profiles/Custom/filament/My Generic PLA-CF.json +++ b/resources/profiles/Custom/filament/My Generic PLA-CF.json @@ -18,9 +18,12 @@ "slow_down_layer_time": [ "7" ], -"compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PLA.json b/resources/profiles/Custom/filament/My Generic PLA.json index b3dab02002..54dc3dc779 100644 --- a/resources/profiles/Custom/filament/My Generic PLA.json +++ b/resources/profiles/Custom/filament/My Generic PLA.json @@ -16,8 +16,11 @@ "8" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic PVA.json b/resources/profiles/Custom/filament/My Generic PVA.json index 7631b30844..ba874665cb 100644 --- a/resources/profiles/Custom/filament/My Generic PVA.json +++ b/resources/profiles/Custom/filament/My Generic PVA.json @@ -19,8 +19,11 @@ "10" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/filament/My Generic TPU.json b/resources/profiles/Custom/filament/My Generic TPU.json index cfa4bd617d..359d3da7a7 100644 --- a/resources/profiles/Custom/filament/My Generic TPU.json +++ b/resources/profiles/Custom/filament/My Generic TPU.json @@ -10,8 +10,11 @@ "3.2" ], "compatible_printers": [ - "MyKlipper 0.4 nozzle", - "MyMarlin 0.4 nozzle", - "MyRRF 0.4 nozzle" + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle", + "MyMarlin 0.4 nozzle", + "MyRRF 0.4 nozzle" ] -} +} \ No newline at end of file diff --git a/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json new file mode 100644 index 0000000000..1ec29c6465 --- /dev/null +++ b/resources/profiles/Custom/machine/MyKlipper 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "MyKlipper 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Generic Klipper Printer", + "nozzle_diameter": [ + "0.2" + ], + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.04" + ], + "printer_variant": "0.2", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} \ No newline at end of file diff --git a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json index 0bf7f728c7..c2de0ec76e 100644 --- a/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyKlipper 0.4 nozzle.json @@ -1,19 +1,20 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "MyKlipper 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_klipper_common", - "printer_model": "Generic Klipper Printer", - "nozzle_diameter": [ - "0.4" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" -} + "type": "machine", + "setting_id": "GM001", + "name": "MyKlipper 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Generic Klipper Printer", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} \ No newline at end of file diff --git a/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json new file mode 100644 index 0000000000..9240467b89 --- /dev/null +++ b/resources/profiles/Custom/machine/MyKlipper 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "MyKlipper 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Generic Klipper Printer", + "nozzle_diameter": [ + "0.6" + ], + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.12" + ], + "printer_variant": "0.6", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} \ No newline at end of file diff --git a/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json b/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json new file mode 100644 index 0000000000..be658b0bf9 --- /dev/null +++ b/resources/profiles/Custom/machine/MyKlipper 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "MyKlipper 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Generic Klipper Printer", + "nozzle_diameter": [ + "0.8" + ], + "max_layer_height": [ + "0.6" + ], + "min_layer_height": [ + "0.2" + ], + "printer_variant": "0.8", + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" +} \ No newline at end of file diff --git a/resources/profiles/Custom/machine/MyKlipper.json b/resources/profiles/Custom/machine/MyKlipper.json index 9375a376a0..8c4b9f56e9 100644 --- a/resources/profiles/Custom/machine/MyKlipper.json +++ b/resources/profiles/Custom/machine/MyKlipper.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Generic Klipper Printer", "model_id": "my_klipper_01", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.4;0.2;0.6;0.8", "machine_tech": "FFF", "family": "MyPrinter", "bed_model": "", diff --git a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json index 422bc8854e..25581836f2 100644 --- a/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json +++ b/resources/profiles/Custom/machine/MyMarlin 0.4 nozzle.json @@ -1,44 +1,44 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "MyMarlin 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_common", - "printer_model": "Generic Marlin Printer", - "gcode_flavor": "marlin", - "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors", - "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F1000 ; move print head up\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0", - "max_layer_height": [ - "0.32" - ], - "retraction_length": [ - "0.9" - ], - "retraction_minimum_travel": [ - "1" - ], - "retraction_speed": [ - "45" - ], - "deretraction_speed": [ - "35" - ], - "version": "1.5.1.2", - "wipe": [ - "0" - ], - "z_hop": [ - "0.4" - ], - "nozzle_diameter": [ - "0.4" - ], - "printable_area": [ - "0x0", - "250x0", - "250x250", - "0x250" - ], - "printable_height": "250" + "type": "machine", + "setting_id": "GM001", + "name": "MyMarlin 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_common", + "printer_model": "Generic Marlin Printer", + "gcode_flavor": "marlin", + "machine_end_gcode": "G1 E-1.0 F2100 ; retract\nG92 E0.0\nG1{if max_layer_z < max_print_height} Z{z_offset+min(max_layer_z+30, max_print_height)}{endif} E-34.0 F720 ; move print head up & retract filament\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nG1 X0 Y105 F3000 ; park print head\nM84 ; disable motors", + "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM204 S[machine_max_acceleration_extruding] T[machine_max_acceleration_retracting]\nM104 S[first_layer_temperature] ; set extruder temp\nM140 S[first_layer_bed_temperature] ; set bed temp\nG28 ; home all\nG1 Y1.0 Z0.3 F1000 ; move print head up\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM109 S[first_layer_temperature] ; wait for extruder temp\nG92 E0.0\n; initial load\nG1 X205.0 E19 F1000\nG1 Y1.6\nG1 X5.0 E19 F1000\nG92 E0.0\n; intro line\nG1 Y2.0 Z0.2 F1000\nG1 X65.0 E9.0 F1000\nG1 X105.0 E12.5 F1000\nG92 E0.0", + "max_layer_height": [ + "0.32" + ], + "retraction_length": [ + "0.9" + ], + "retraction_minimum_travel": [ + "1" + ], + "retraction_speed": [ + "45" + ], + "deretraction_speed": [ + "35" + ], + "version": "1.5.1.2", + "wipe": [ + "0" + ], + "z_hop": [ + "0.4" + ], + "nozzle_diameter": [ + "0.4" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250" } \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json b/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json index 88b1f4bba1..b9f1557263 100644 --- a/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json +++ b/resources/profiles/Custom/process/0.08mm Extra Fine @MyKlipper.json @@ -7,5 +7,13 @@ "inherits": "fdm_process_klipper_common", "layer_height": "0.08", "bottom_shell_layers": "7", - "top_shell_layers": "9" -} + "top_shell_layers": "9", + "support_top_z_distance": "0.08", + "support_bottom_z_distance": "0.08", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json b/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json index 6d58049123..575bd40d4f 100644 --- a/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json +++ b/resources/profiles/Custom/process/0.12mm Fine @MyKlipper.json @@ -7,5 +7,13 @@ "inherits": "fdm_process_klipper_common", "layer_height": "0.12", "bottom_shell_layers": "5", - "top_shell_layers": "6" -} + "top_shell_layers": "6", + "support_top_z_distance": "0.08", + "support_bottom_z_distance": "0.08", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json b/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json index c74ce50b12..518ed7cba2 100644 --- a/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json +++ b/resources/profiles/Custom/process/0.15mm Optimal @MyKlipper.json @@ -7,5 +7,14 @@ "inherits": "fdm_process_klipper_common", "bottom_shell_layers": "4", "top_shell_layers": "5", - "layer_height": "0.15" -} + "layer_height": "0.15", + "support_top_z_distance": "0.15", + "support_bottom_z_distance": "0.15", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json b/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json new file mode 100644 index 0000000000..45df9dad70 --- /dev/null +++ b/resources/profiles/Custom/process/0.16mm Optimal @MyKlipper.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @MyKlipper", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_klipper_common", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "support_top_z_distance": "0.16", + "support_bottom_z_distance": "0.16", + "layer_height": "0.16", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.2 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json b/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json index 271b64a1f2..d38acd8fa0 100644 --- a/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json +++ b/resources/profiles/Custom/process/0.20mm Standard @MyKlipper.json @@ -6,6 +6,9 @@ "inherits": "fdm_process_klipper_common", "instantiation": "true", "layer_height": "0.2", - "bottom_shell_layers": "3", - "top_shell_layers": "4" + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] } diff --git a/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json b/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json index 510221a0f5..30a520ba46 100644 --- a/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.24mm Draft @MyKlipper.json @@ -5,8 +5,13 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_klipper_common", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", "layer_height": "0.24", - "top_surface_line_width": "0.45", - "bottom_shell_layers": "3", - "top_shell_layers": "4" -} + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json index 7a1b4faff1..a2ff46c4d1 100644 --- a/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json +++ b/resources/profiles/Custom/process/0.28mm Extra Draft @MyKlipper.json @@ -6,7 +6,10 @@ "instantiation": "true", "inherits": "fdm_process_klipper_common", "layer_height": "0.28", - "top_surface_line_width": "0.45", - "bottom_shell_layers": "3", - "top_shell_layers": "4" -} + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json new file mode 100644 index 0000000000..a3da4a7fbd --- /dev/null +++ b/resources/profiles/Custom/process/0.32mm Extra Draft @MyKlipper.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Standard @MyKlipper", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_klipper_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.32", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.4 nozzle", + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json new file mode 100644 index 0000000000..e5f2093074 --- /dev/null +++ b/resources/profiles/Custom/process/0.40mm Extra Draft @MyKlipper.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Standard @MyKlipper", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_klipper_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.40", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.6 nozzle", + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json b/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json new file mode 100644 index 0000000000..d8e6e21cf1 --- /dev/null +++ b/resources/profiles/Custom/process/0.56mm Extra Draft @MyKlipper.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.56mm Standard @MyKlipper", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_klipper_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.56", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "MyKlipper 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Custom/process/fdm_process_common.json b/resources/profiles/Custom/process/fdm_process_common.json index 1da14b4d91..cfb78ab95a 100644 --- a/resources/profiles/Custom/process/fdm_process_common.json +++ b/resources/profiles/Custom/process/fdm_process_common.json @@ -5,66 +5,104 @@ "instantiation": "false", "adaptive_layer_height": "0", "reduce_crossing_wall": "0", - "bridge_flow": "0.95", - "bridge_speed": "25", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_thickness": "0", + "bridge_speed": "50", "brim_width": "5", + "brim_object_gap": "0.1", "compatible_printers": [], + "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "10000", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "1000", + "travel_acceleration": "1000", + "inner_wall_acceleration": "1000", + "outer_wall_acceleration": "700", "bridge_no_support": "0", - "elefant_foot_compensation": "0.1", - "outer_wall_line_width": "0.4", - "outer_wall_speed": "120", - "line_width": "0.45", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "wall_infill_order": "inner wall/outer wall/infill", "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "crosshatch", - "initial_layer_line_width": "0.42", "initial_layer_print_height": "0.2", - "initial_layer_speed": "20", - "gap_infill_speed": "30", "infill_combination": "0", - "sparse_infill_line_width": "0.45", "infill_wall_overlap": "25%", - "sparse_infill_speed": "50", "interface_shells": "0", - "detect_overhang_wall": "0", - "reduce_infill_retraction": "0", - "filename_format": "{input_filename_base}.gcode", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", + "detect_overhang_wall": "1", + "slowdown_for_curled_perimeters": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "line_width": "110%", + "inner_wall_line_width": "110%", + "outer_wall_line_width": "100%", + "top_surface_line_width": "93.75%", + "sparse_infill_line_width": "110%", + "initial_layer_line_width": "120%", + "internal_solid_infill_line_width": "120%", + "support_line_width": "96%", "wall_loops": "3", - "inner_wall_line_width": "0.45", - "inner_wall_speed": "40", "print_settings_id": "", "raft_layers": "0", - "seam_position": "nearest", + "seam_position": "aligned", "skirt_distance": "2", - "skirt_height": "2", - "minimum_sparse_infill_area": "0", - "internal_solid_infill_line_width": "0.45", - "internal_solid_infill_speed": "40", + "skirt_height": "3", + "min_skirt_length": "4", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", "spiral_mode": "0", "standby_temperature_delta": "-5", "enable_support": "0", - "support_filament": "0", - "support_line_width": "0.42", - "support_interface_filament": "0", + "resolution": "0.012", + "support_type": "normal(auto)", "support_on_build_plate_only": "0", - "support_top_z_distance": "0.15", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", "support_interface_loop_pattern": "0", + "support_interface_filament": "0", "support_interface_top_layers": "2", - "support_interface_spacing": "0", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", "support_interface_speed": "80", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2", - "support_speed": "40", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", "support_threshold_angle": "30", - "support_object_xy_distance": "0.5", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "30", + "tree_support_wall_count": "0", + "tree_support_with_infill": "0", "detect_thin_wall": "0", - "top_surface_line_width": "0.4", - "top_surface_speed": "30", - "travel_speed": "400", + "top_surface_pattern": "monotonicline", + "top_shell_thickness": "0.8", "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", "prime_tower_width": "60", "xy_hole_compensation": "0", - "xy_contour_compensation": "0" + "xy_contour_compensation": "0", + "layer_height": "0.2", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "bridge_flow": "1", + "initial_layer_speed": "45", + "initial_layer_infill_speed": "45", + "outer_wall_speed": "45", + "inner_wall_speed": "80", + "sparse_infill_speed": "150", + "internal_solid_infill_speed": "150", + "top_surface_speed": "50", + "gap_infill_speed": "30", + "travel_speed": "200" } diff --git a/resources/profiles/Custom/process/fdm_process_klipper_common.json b/resources/profiles/Custom/process/fdm_process_klipper_common.json index 5634decdd6..cf4a288f17 100644 --- a/resources/profiles/Custom/process/fdm_process_klipper_common.json +++ b/resources/profiles/Custom/process/fdm_process_klipper_common.json @@ -4,89 +4,12 @@ "from": "system", "instantiation": "false", "inherits": "fdm_process_common", - "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": "0.95", - "bridge_speed": "50", - "brim_width": "5", - "brim_object_gap": "0.1", - "compatible_printers_condition": "", - "print_sequence": "by layer", "default_acceleration": "5000", "top_surface_acceleration": "3000", "travel_acceleration": "7000", "inner_wall_acceleration": "5000", "outer_wall_acceleration": "3000", - "bridge_no_support": "0", - "draft_shield": "disabled", - "elefant_foot_compensation": "0", - "outer_wall_line_width": "0.4", - "wall_infill_order": "inner wall/outer wall/infill", - "line_width": "0.4", - "infill_direction": "45", - "sparse_infill_density": "15%", - "sparse_infill_pattern": "crosshatch", "initial_layer_acceleration": "500", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.2", - "infill_combination": "0", - "sparse_infill_line_width": "0.45", - "infill_wall_overlap": "25%", - "interface_shells": "0", - "ironing_flow": "10%", - "ironing_spacing": "0.15", - "ironing_speed": "30", - "ironing_type": "no ironing", - "layer_height": "0.2", - "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_4_4_speed": "10", - "inner_wall_line_width": "0.45", - "wall_loops": "3", - "print_settings_id": "", - "raft_layers": "0", - "seam_position": "aligned", - "skirt_distance": "2", - "skirt_height": "1", - "skirt_loops": "0", - "minimum_sparse_infill_area": "15", - "internal_solid_infill_line_width": "0.4", - "spiral_mode": "0", - "standby_temperature_delta": "-5", - "enable_support": "0", - "resolution": "0.012", - "support_type": "normal(auto)", - "support_style": "default", - "support_on_build_plate_only": "0", - "support_top_z_distance": "0.2", - "support_filament": "0", - "support_line_width": "0.4", - "support_interface_loop_pattern": "0", - "support_interface_filament": "0", - "support_interface_top_layers": "2", - "support_interface_bottom_layers": "2", - "support_interface_spacing": "0.5", - "support_interface_speed": "80", - "support_base_pattern": "rectilinear", - "support_base_pattern_spacing": "2.5", - "support_speed": "150", - "support_threshold_angle": "30", - "support_object_xy_distance": "0.35", - "tree_support_branch_angle": "45", - "tree_support_wall_count": "0", - "detect_thin_wall": "0", - "top_surface_pattern": "monotonicline", - "top_surface_line_width": "0.4", - "top_shell_layers": "3", - "top_shell_thickness": "0.8", "initial_layer_speed": "50", "initial_layer_infill_speed": "105", "outer_wall_speed": "120", @@ -96,14 +19,5 @@ "gap_infill_speed": "100", "sparse_infill_speed": "200", "travel_speed": "350", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", - "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0", - "enable_arc_fitting": "0", - "compatible_printers": [ - "MyKlipper 0.4 nozzle" - ], "exclude_object": "1" -} +} \ No newline at end of file From aa692b815ea01e84d93c88a8467c6ebdfa5615c9 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 9 Jun 2024 00:17:22 +0800 Subject: [PATCH 7/7] Add Profiles for The Positron profiles (#5640) * add the positron profiles * update printable_height to 165 --- resources/profiles/Positron3D.json | 162 ++++++++++++++++++ .../Positron3D/The Positron_cover.png | Bin 0 -> 25762 bytes .../Positron3D/ThePositron_bed_model.stl | Bin 0 -> 25084 bytes .../Positron3D/ThePositron_bed_texture.svg | 86 ++++++++++ .../filament/Positron Generic ABS.json | 21 +++ .../filament/Positron Generic ASA.json | 21 +++ .../filament/Positron Generic PA-CF.json | 27 +++ .../filament/Positron Generic PA.json | 24 +++ .../filament/Positron Generic PC.json | 21 +++ .../filament/Positron Generic PETG.json | 51 ++++++ .../filament/Positron Generic PLA-CF.json | 27 +++ .../filament/Positron Generic PLA.json | 24 +++ .../filament/Positron Generic PVA.json | 27 +++ .../filament/Positron Generic TPU.json | 18 ++ .../Positron3D/filament/fdm_filament_abs.json | 88 ++++++++++ .../Positron3D/filament/fdm_filament_asa.json | 88 ++++++++++ .../filament/fdm_filament_common.json | 144 ++++++++++++++++ .../Positron3D/filament/fdm_filament_pa.json | 85 +++++++++ .../Positron3D/filament/fdm_filament_pc.json | 88 ++++++++++ .../Positron3D/filament/fdm_filament_pet.json | 82 +++++++++ .../Positron3D/filament/fdm_filament_pla.json | 94 ++++++++++ .../Positron3D/filament/fdm_filament_pva.json | 100 +++++++++++ .../Positron3D/filament/fdm_filament_tpu.json | 88 ++++++++++ .../machine/The Positron 0.2 nozzle.json | 26 +++ .../machine/The Positron 0.4 nozzle.json | 20 +++ .../machine/The Positron 0.6 nozzle.json | 26 +++ .../machine/The Positron 0.8 nozzle.json | 26 +++ .../Positron3D/machine/The Positron.json | 12 ++ .../machine/fdm_common_the_positron.json | 60 +++++++ .../machine/fdm_machine_common.json | 119 +++++++++++++ .../0.08mm Extra Fine @The Positron.json | 19 ++ .../process/0.12mm Fine @The Positron.json | 19 ++ .../process/0.16mm Optimal @The Positron.json | 20 +++ .../0.20mm Standard @The Positron.json | 14 ++ .../process/0.24mm Draft @The Positron.json | 17 ++ .../0.28mm Extra Draft @The Positron.json | 15 ++ .../0.32mm Extra Draft @The Positron.json | 17 ++ .../0.40mm Extra Draft @The Positron.json | 16 ++ .../0.56mm Extra Draft @The Positron.json | 15 ++ .../process/fdm_process_common.json | 108 ++++++++++++ .../fdm_process_the_positron_common.json | 30 ++++ 41 files changed, 1945 insertions(+) create mode 100644 resources/profiles/Positron3D.json create mode 100644 resources/profiles/Positron3D/The Positron_cover.png create mode 100644 resources/profiles/Positron3D/ThePositron_bed_model.stl create mode 100644 resources/profiles/Positron3D/ThePositron_bed_texture.svg create mode 100644 resources/profiles/Positron3D/filament/Positron Generic ABS.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic ASA.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PA-CF.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PA.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PC.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PETG.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PLA-CF.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PLA.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic PVA.json create mode 100644 resources/profiles/Positron3D/filament/Positron Generic TPU.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_abs.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_asa.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_common.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_pa.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_pc.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_pet.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_pla.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_pva.json create mode 100644 resources/profiles/Positron3D/filament/fdm_filament_tpu.json create mode 100644 resources/profiles/Positron3D/machine/The Positron 0.2 nozzle.json create mode 100644 resources/profiles/Positron3D/machine/The Positron 0.4 nozzle.json create mode 100644 resources/profiles/Positron3D/machine/The Positron 0.6 nozzle.json create mode 100644 resources/profiles/Positron3D/machine/The Positron 0.8 nozzle.json create mode 100644 resources/profiles/Positron3D/machine/The Positron.json create mode 100644 resources/profiles/Positron3D/machine/fdm_common_the_positron.json create mode 100644 resources/profiles/Positron3D/machine/fdm_machine_common.json create mode 100644 resources/profiles/Positron3D/process/0.08mm Extra Fine @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.12mm Fine @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.16mm Optimal @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.20mm Standard @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.24mm Draft @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.28mm Extra Draft @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.32mm Extra Draft @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.40mm Extra Draft @The Positron.json create mode 100644 resources/profiles/Positron3D/process/0.56mm Extra Draft @The Positron.json create mode 100644 resources/profiles/Positron3D/process/fdm_process_common.json create mode 100644 resources/profiles/Positron3D/process/fdm_process_the_positron_common.json diff --git a/resources/profiles/Positron3D.json b/resources/profiles/Positron3D.json new file mode 100644 index 0000000000..76d4451394 --- /dev/null +++ b/resources/profiles/Positron3D.json @@ -0,0 +1,162 @@ +{ + "name": "Positron 3D", + "version": "02.01.00.01", + "force_update": "0", + "description": "Positron 3D Printer Profile", + "machine_model_list": [ + { + "name": "The Positron", + "sub_path": "machine/The Positron.json" + } + ], + "process_list": [ + { + "name": "fdm_process_common", + "sub_path": "process/fdm_process_common.json" + }, + { + "name": "fdm_process_the_positron_common", + "sub_path": "process/fdm_process_the_positron_common.json" + }, + { + "name": "0.08mm Extra Fine @The Positron", + "sub_path": "process/0.08mm Extra Fine @The Positron.json" + }, + { + "name": "0.12mm Fine @The Positron", + "sub_path": "process/0.12mm Fine @The Positron.json" + }, + { + "name": "0.16mm Optimal @The Positron", + "sub_path": "process/0.16mm Optimal @The Positron.json" + }, + { + "name": "0.20mm Standard @The Positron", + "sub_path": "process/0.20mm Standard @The Positron.json" + }, + { + "name": "0.24mm Draft @The Positron", + "sub_path": "process/0.24mm Draft @The Positron.json" + }, + { + "name": "0.28mm Extra Draft @The Positron", + "sub_path": "process/0.28mm Extra Draft @The Positron.json" + }, + { + "name": "0.32mm Extra Draft @The Positron", + "sub_path": "process/0.32mm Extra Draft @The Positron.json" + }, + { + "name": "0.40mm Extra Draft @The Positron", + "sub_path": "process/0.40mm Extra Draft @The Positron.json" + }, + { + "name": "0.56mm Extra Draft @The Positron", + "sub_path": "process/0.56mm Extra Draft @The Positron.json" + } + ], + "filament_list": [ + { + "name": "fdm_filament_common", + "sub_path": "filament/fdm_filament_common.json" + }, + { + "name": "fdm_filament_pla", + "sub_path": "filament/fdm_filament_pla.json" + }, + { + "name": "fdm_filament_tpu", + "sub_path": "filament/fdm_filament_tpu.json" + }, + { + "name": "fdm_filament_pet", + "sub_path": "filament/fdm_filament_pet.json" + }, + { + "name": "fdm_filament_abs", + "sub_path": "filament/fdm_filament_abs.json" + }, + { + "name": "fdm_filament_pc", + "sub_path": "filament/fdm_filament_pc.json" + }, + { + "name": "fdm_filament_asa", + "sub_path": "filament/fdm_filament_asa.json" + }, + { + "name": "fdm_filament_pva", + "sub_path": "filament/fdm_filament_pva.json" + }, + { + "name": "fdm_filament_pa", + "sub_path": "filament/fdm_filament_pa.json" + }, + { + "name": "Positron Generic PLA", + "sub_path": "filament/Positron Generic PLA.json" + }, + { + "name": "Positron Generic PLA-CF", + "sub_path": "filament/Positron Generic PLA-CF.json" + }, + { + "name": "Positron Generic PETG", + "sub_path": "filament/Positron Generic PETG.json" + }, + { + "name": "Positron Generic ABS", + "sub_path": "filament/Positron Generic ABS.json" + }, + { + "name": "Positron Generic TPU", + "sub_path": "filament/Positron Generic TPU.json" + }, + { + "name": "Positron Generic ASA", + "sub_path": "filament/Positron Generic ASA.json" + }, + { + "name": "Positron Generic PC", + "sub_path": "filament/Positron Generic PC.json" + }, + { + "name": "Positron Generic PVA", + "sub_path": "filament/Positron Generic PVA.json" + }, + { + "name": "Positron Generic PA", + "sub_path": "filament/Positron Generic PA.json" + }, + { + "name": "Positron Generic PA-CF", + "sub_path": "filament/Positron Generic PA-CF.json" + } + ], + "machine_list": [ + { + "name": "fdm_machine_common", + "sub_path": "machine/fdm_machine_common.json" + }, + { + "name": "fdm_common_the_positron", + "sub_path": "machine/fdm_common_the_positron.json" + }, + { + "name": "The Positron 0.4 nozzle", + "sub_path": "machine/The Positron 0.4 nozzle.json" + }, + { + "name": "The Positron 0.2 nozzle", + "sub_path": "machine/The Positron 0.2 nozzle.json" + }, + { + "name": "The Positron 0.6 nozzle", + "sub_path": "machine/The Positron 0.6 nozzle.json" + }, + { + "name": "The Positron 0.8 nozzle", + "sub_path": "machine/The Positron 0.8 nozzle.json" + } + ] +} diff --git a/resources/profiles/Positron3D/The Positron_cover.png b/resources/profiles/Positron3D/The Positron_cover.png new file mode 100644 index 0000000000000000000000000000000000000000..3adaa531c45ef9306e9fafc4eb5e8da7ac53b230 GIT binary patch literal 25762 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 literal 0 HcmV?d00001 diff --git a/resources/profiles/Positron3D/ThePositron_bed_model.stl b/resources/profiles/Positron3D/ThePositron_bed_model.stl new file mode 100644 index 0000000000000000000000000000000000000000..2d203772715ae6ccd1e5d4d92d80d779c5eca7f8 GIT binary patch literal 25084 zcmbW83$RtydB>M1_&^jPib_zcDA7h^DhL;H&mNEQg+!BTqIpbwj5abcGSMqR8ezv* zQXLhd5;0S?)2h`p($MIDa?XZxfeTzSHp-~2Vkye0YMDIzoN??E1^IUAFdD2%};3_K@A1|M}1DP!1+osUy_Krw=+a+w%O_0_9-B z(y-e4*zV0Qe8GG$!Ac#WK8C+AHXCx#ncfEzmWI{j`}Sx)xw#d}!2~OHg!(xA?f%A^ z>o4~{n6NagHb1&&bIv2?g9%pZ2=(#)!$TWqJbkVA!Gxt@_1$OoYM%Bp^T7lwb%gqm zxNS@P!bi@8rD65n2g9ixOt4Z%s1GT5JJeOqgr#A1@6Zv{9!#)ON2m{J!6LMI&V;35 z_1{}ZP+T#=N*$p-Bod1dyEzk)Q9w_BJ{zW2}{Fj)~J1{pEJQq z9icwZ-e^U%ITMzK)o-Wln~ql{!Ac#G_-LS?Ght~fhmDnfgo6)H;JK#M5$Yq9yh0ca zE7ZcLUeoc|IVM=CBh*J|!3^bK!qTupYc4x~RTxW{V5N>wA0ZOG4<;-PD@0|_QuDzC zD|LkW2tCUCV8YU{Lht(Fo92TFR_X}#5k>~@g9%H+3Zuj?x0??pSg9k_M;PI}4<;-P zD~xur989oMN2m`eImUMHg9%H+3Zr&x4<=ZtBh-hqAm%9Vg9%H+3bRj)D<)W}Bh-gP zBIa7}g9%H+3bSbJA55@PN2m|!QCKthKFEZnVTILz^=97(OM;a;LVfW1>YnfI*Rf|= z8diU}W4})Q`ihl0BJt5iKWDYLybmTU4Xe@HM|SGhSFF?#>LavZ zfpRcmX;_V#KC)B4zG9`0P#+-@y$>cV4XgDR?%SzfU$Ih0sE^R2ybmTU4XZ=GvQMXe zeZ@*0p+0!E#Dt|`b=R>YI`!)-R_X}#5k@$aBWJ?Wuo|(~-c$}ISg9k_M;NKS4<;-P ztBe0{FKQ1aSg9k_N0@QE4<;-PtAqC2i{gq2R_X}#5oS*Bg9%H+>cDUBN&SNfR_X}# z5mo@`gE~x1S@rf`r!2y6PAY6=LYsj$E$LE#Y!EK`0(Q{6PC7e*jSma zukc(`>In4_O749yVQE;Q7UKND1S@rf`UowUVZ36((y&5n#(9tlR_X}#5hBt1V8YU{ zLR7~2oC#Ly2=x(ql=s1erD28M71t$9uu?~;4_+-XVQE-ll&D`{u~J8<4_+-XVQE-l zw2S3nf|WW#eMrg6^%WDAh80Hb*d9!a&K*evD@>d>es$;gU6gk2`ti54pL>5ocD49mf~^J* zSku|_=8pI6+?R#;tq?aMSEMAwqBWh?clvz}o!j@kP3_aBj?Av@A_mFo)kD{I?rX0K zJ`M`RTp?It;`NPdJO6N1C-^w&)zQV_FK%p%+jv4ku+`qj4Rj7YZDn)Yz;!L>esTKV z#cO9g-}uQPJsB%Z3|T)QwZ1C&Skrf0@zRY88rh4VO$fH?yLeq^RDThOznFJS(es;O zjYB`0mJn<;xClPlq2yQePApbE*Xo^xx*{bd)_DT$kMY^%@9j1zdtZJyN+!)*)vSw{ zIzpp?2~As+APOZKdl89~X0DazYJMlp9Pnx6-)Fm`eKJC_nMmOwLsv_|`n{^rfzQ5#PvMoaA?S93RP z2+u`&&|7sr-{0Ime?w=BuiY^ZF6;g9?9UbFO6{_uv=S)O5sNhK+*ax1FG*iNLTZ-@ zwn9z+>JJ-2u8!_o)p+OPk;QnaT_)HHv2e#Z>wRvWLrh6*6&6>fFoE{Jdk^z*okZdt zU)$8~3z299TcH=soxU#k_?{5=3vpeDc2k%@9M9dbE|g=f^r+b~zFUtng00XuSMNU% zd~6cp8$uvbSYZPFaoG6-!ABTNS{O^1U@LBa=Rim_dV-ad81NBOj){n^LL)Io3C72| zi1A}$7opL>gr+S@c9$spms{U#$!|YWTf7b~S|>gXkqNfK>=Rq?F^R%=`c}0u<1oQim{Bcyoa>P&oGSC} z52cn_VFGhvjKtAmeWp-0JKM9^3M+%{hiKn)?f@Z95yDmgrX+-{24atT_v+i)V-KHD zT=h*|Wf*}KfLV3+U4xw!N9`l?;3r#`v>y2S#6o`jJZSCAR%r_<tRkTpL?3 z&dA(0e!Ly12k_xAR_{hnZg ztt@u69EcD^3Ub9t9iip0C}aW(M>szTb{e-#z^(y&5JW1Xlzm|&%jP#+;mGL)PNOT!8ggLR_%V1ku8LVbj2_db}g zG^`N$SSP9vCRnK>)W`a5{q3G`#=?Z9VP$W6>VpYZ>In65_CrJ47s}lX)D;t!)^gx| zcXcQS6BwgRsUy^fJUYkoG|Z7`F_T+ zw=K5fH%mFecxOb9{47VV*autjToUutO|TVqjpBZLWb%v^Ca?z-ch8w%g$eBF)catC z38ZaCjUG^rZo;gvqZ7|2B9mvV@N=<06HiQ-V1)_nw#0KBCRkwt?PP0-XpeHFM6|L~ zAiVFS1S|YpJDaK!tT4elNL3%U>%@fZGgW=C!i4R9RS8y@usyjd!3q<$Q&=TfVZ!z= zOCs0u=NT(Z*oksUgbGUuwzBhKB`$qoTn~P<55}nG^)>r*?%NaYSvKcWQ_FsC@xuhK zwbK@4h1b!kkH$}rX@4~S(Bk{sPWEGo`Cx+ATB#3ymaZ~&t7hfJq1`eV(zx1fCR6s- zw$G@xFs~!b3K3eF)jYupKNtNx$yIQaXRI)Rnzng97>8V?M6^Ori^R#Vj9V^0ek|cu zOLvW8+sG}gu~U1_IQE`pC^^>;6Y1VknJ*z&;oTvAQnc^(!36Ksqy!Y(`Q?3BuD6t6 zg$dp-b?%wpT+;L5Ev+e*D{E)A;=N4gCjV~4a{P1?Y*pKWlD#~$+p*}+I2pB`YBzJs zejW;wXRI(`XSX{i*vd{~6C&@<74G8LXu$r;+Vuo0OyDHe=#r2`p0UCN?iVE^1F*cC zU@M%&RtWEd6((>`Dj7>kA55?nPGT#B_rVGi+&A%f|H)AfCfJHs&cQyEoE0Y0eqJ)- zgV!Y>?2HyqvUIdZu2^Bh?vy1_B4|pmm7Q8w309b}J7qg3*vd}ds{|`d*qySS6KrL- z2&x1tOz<7Hw04EzEjR8{{F?!CInmA4uTTDmL1_U za4s<*rwuoD5w_2OoY)Dr`oOuw%Q(>xf)yrg2SLkWC+^(@TUkF>A9gMw zry0`bI@3d`61JBiXA*ul7{Ajf(Kidw-2VPNjR@UcMtdMvwp(M*npiyc znTf?EcXvA1$SIjx;Vo5nfl(uy?$z&|+wb{S>j^2t_)u4-piD-fOmPpnUut*!2NR0J zx(K$icMYX*(gT&9SEsB_YE8zLortotT2JTf>Rmw@hv&Y*w%Mj zd*(MM7EG`e@8UXlpPXcz`aerr_|5IiR)~_==JPjgUAkCe>a3xYk~X(hrq)7iO&t>v zg&K)bVM5b(ZeVA3=pVL%#B*_~YdNuXqSh5o`9dG@Hw18U*iG0up4Qd#(qnNeMb0@B zf~{;_sy=WJ;A|mo5P}sZ>^xF^{6Iz?xd+gedjJW+R6$tEvy& z19(bqrN}*igkUSIOIsIh=;&+^?g12X51?R$2|FJSbtN+a&IsjvFd^8=POX(V>ZxIk zxpFJzt^b{t5NyTm?_9WzQpk-IX>&bGMV(X$ixP<^zqgCHN~1*I=(^iqZww$Fm58xq z?+HfejEWNz+(tn(Y9#90mRcdLW9|H3cbd2xh41w~1ELWlH7h8S5hxSxOlV!|~j{1-&^n^ts?y6|X zBY}vCCk+yX8KTi5(FnGhB zj)U7MugR?xxsj3(Y{l*GTo_Amr^v^Zt*=r-Z;@#2hM2F~RX#N2rh6X(!Z{ea>Qp@8de-*&N0DC9icw(d{ELR zITMzK6-T9WOt4Z%s1MW=N)I1QSQ=Iwm2%612v+I{^?~+AE5Zj8mWEXtS4^-{N2m`x zTmJd@wW!wT>X?YMeQ&WVOc$ZC8wrasB`zBr*CRj6<&-RW|44gOd|Sfv?UQ${kmLH= z-okZEG<(TeLa>#cY$>t-!S^hiwcAwe!-W#+$iQ!5{O%JybQ5gFZ!%rP0eXiP-qUxH zSf(z5-X^q0HHTcLlwgGk+oh=16%%Y_yCPMB6((%AW#7xuqA}| z!30~OZ(?^aA-oS(n6RC~gz!F?U@P01ObG9T6(;NyFd@7TCfJJiALP;HCr{o|nZVeE z)6B$&aJgT@nZksfH13>WD?4c{i5w2#gID_LiX1bXy-kR9_-L+7VIp0(&$_xb<^H9Y z_!);sXSU+CwsYsdK4Lk3tmNi{t%C5^TjgFJ&JLy*3hT#bru!#e1y0i}%NkiA>mCqoj6yUGcNn z%I+Ffi6mFDE{(gYaR)jr2j_(Mba}sY#{^sP?x%BKKl0GxLAl2=ZrjPpzG%A3xwBl^ z9)R5`Luom;JI)mocE7AzSNtrtvioIKg6rLGZ^4S&Da{otOxPW-st+dE%5HKcM2=`@ z#cpr?@wsBcZgM3)q(JF>&Q^AlDwAGoiLTi7TE6PAV* z_L<^&6cen}5$Z#3!#C{jCYZ3amIE`j?QAolqrNJ2g!(|tq73*9E?V8W_X1tlBK^n) z-8Z)H*IaPQO4wBiDBT2TB@UkVM(fe(^NQJjd)o@^s$hi-g?rJ`pZ9lu@=yA`bJw-6 zZLK))?Dp}K=4Pxgk>+a2#;>%`TR7L3g_Sx&`}vlqK6xyZB_CY$gwIv?h-2Sd$>j`P zc8P|&bv>-4K4STNU1j(m9}u=eHX8oyd-Ddg1=YM;2aFZj^NP$EVN+Ud?Q{h`g7V1=W^zSs6R=ErZeZasIN_hAZrSXy(% zxsy*sg)m$h&>NV**My5u@bPYj2o#*y00EYdd7Es$xUH`ealH-F{?3a^Bm+XXQhrPqurN509oT` z>}q?&9Cp`L06f8M9*MLZX0JXX!B*T((H;aVOmO*jOt2Nwu{|P#lE++G>}oB<8Y%5_ z$(8il7=7jgHOeto5|YTfdQ^-tZkv+uKKNN|W$jdH!E!8tV&$mKl{_CG{MA;R)i8=$ zzq9dCdo4_1Z-n&&CTt8Y2?fLlD@Y8#2DbQ7Gb z*v~QQL;169r!sIF?c$5>I|6(30zO%?Em_r7hlI=ZTyNtzC^{BVs=fD@*vvIod4^f}_&8 zajk{zEbA-Q|5v-k3KQS|e1B(Jhy~|P+I4B`7cZYwe0AxO87mxD{3PdIn*QdpH-A6B z`0-woSEK~TSXckB(o2*?#bQiL9#?0mA^Tv}7oXeh50MDktnph3Q<&hEEr}ciD@<7X z*ZGKT-c4BhCqBw?7j16iF48W6u1=jX6E(st>ucSrj>8TK0Md?re;C@ycTI>!0+p z!bIu=EoU`mR^|h3Zs|BO1R@7zgx09e&PG_oI2Ts0-VX> + + + + + + + + diff --git a/resources/profiles/Positron3D/filament/Positron Generic ABS.json b/resources/profiles/Positron3D/filament/Positron Generic ABS.json new file mode 100644 index 0000000000..2ec763c05a --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic ABS.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFB99", + "setting_id": "GFSA04", + "name": "Positron Generic ABS", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_abs", + "filament_flow_ratio": [ + "0.926" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic ASA.json b/resources/profiles/Positron3D/filament/Positron Generic ASA.json new file mode 100644 index 0000000000..e14571afcf --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic ASA.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFB98", + "setting_id": "GFSA04", + "name": "Positron Generic ASA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_asa", + "filament_flow_ratio": [ + "0.93" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PA-CF.json b/resources/profiles/Positron3D/filament/Positron Generic PA-CF.json new file mode 100644 index 0000000000..11d0865e67 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PA-CF.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFN98", + "setting_id": "GFSA04", + "name": "Positron Generic PA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "filament_type": [ + "PA-CF" + ], + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PA.json b/resources/profiles/Positron3D/filament/Positron Generic PA.json new file mode 100644 index 0000000000..ebc35a463b --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PA.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFN99", + "setting_id": "GFSA04", + "name": "Positron Generic PA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pa", + "nozzle_temperature_initial_layer": [ + "280" + ], + "nozzle_temperature": [ + "280" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PC.json b/resources/profiles/Positron3D/filament/Positron Generic PC.json new file mode 100644 index 0000000000..0b7ec94316 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PC.json @@ -0,0 +1,21 @@ +{ + "type": "filament", + "filament_id": "GFC99", + "setting_id": "GFSA04", + "name": "Positron Generic PC", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pc", + "filament_max_volumetric_speed": [ + "12" + ], + "filament_flow_ratio": [ + "0.94" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PETG.json b/resources/profiles/Positron3D/filament/Positron Generic PETG.json new file mode 100644 index 0000000000..cddfe7cd90 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PETG.json @@ -0,0 +1,51 @@ +{ + "type": "filament", + "filament_id": "GFG99", + "setting_id": "GFSA04", + "name": "Positron Generic PETG", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pet", + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_cooling_layer_time": [ + "30" + ], + "overhang_fan_speed": [ + "90" + ], + "overhang_fan_threshold": [ + "25%" + ], + "fan_max_speed": [ + "90" + ], + "fan_min_speed": [ + "40" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "10" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PLA-CF.json b/resources/profiles/Positron3D/filament/Positron Generic PLA-CF.json new file mode 100644 index 0000000000..24f9e37305 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PLA-CF.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSA04", + "name": "Positron Generic PLA-CF", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.95" + ], + "filament_type": [ + "PLA-CF" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PLA.json b/resources/profiles/Positron3D/filament/Positron Generic PLA.json new file mode 100644 index 0000000000..b03c04976a --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PLA.json @@ -0,0 +1,24 @@ +{ + "type": "filament", + "filament_id": "GFL99", + "setting_id": "GFSA04", + "name": "Positron Generic PLA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pla", + "filament_flow_ratio": [ + "0.98" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "8" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic PVA.json b/resources/profiles/Positron3D/filament/Positron Generic PVA.json new file mode 100644 index 0000000000..c0b9ae4647 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic PVA.json @@ -0,0 +1,27 @@ +{ + "type": "filament", + "filament_id": "GFS99", + "setting_id": "GFSA04", + "name": "Positron Generic PVA", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_pva", + "filament_flow_ratio": [ + "0.95" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "slow_down_layer_time": [ + "7" + ], + "slow_down_min_speed": [ + "10" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/Positron Generic TPU.json b/resources/profiles/Positron3D/filament/Positron Generic TPU.json new file mode 100644 index 0000000000..d186eb9348 --- /dev/null +++ b/resources/profiles/Positron3D/filament/Positron Generic TPU.json @@ -0,0 +1,18 @@ +{ + "type": "filament", + "filament_id": "GFU99", + "setting_id": "GFSA04", + "name": "Positron Generic TPU", + "from": "system", + "instantiation": "true", + "inherits": "fdm_filament_tpu", + "filament_max_volumetric_speed": [ + "3.2" + ], + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/filament/fdm_filament_abs.json b/resources/profiles/Positron3D/filament/fdm_filament_abs.json new file mode 100644 index 0000000000..b9d4eeda31 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_abs.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_abs", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "textured_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "textured_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ABS" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_asa.json b/resources/profiles/Positron3D/filament/fdm_filament_asa.json new file mode 100644 index 0000000000..262c561bda --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_asa.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_asa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "105" + ], + "eng_plate_temp" : [ + "105" + ], + "hot_plate_temp" : [ + "105" + ], + "textured_plate_temp" : [ + "105" + ], + "cool_plate_temp_initial_layer" : [ + "105" + ], + "eng_plate_temp_initial_layer" : [ + "105" + ], + "hot_plate_temp_initial_layer" : [ + "105" + ], + "textured_plate_temp_initial_layer" : [ + "105" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "35" + ], + "filament_max_volumetric_speed": [ + "28.6" + ], + "filament_type": [ + "ASA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "260" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "80" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "80" + ], + "nozzle_temperature": [ + "260" + ], + "temperature_vitrification": [ + "110" + ], + "nozzle_temperature_range_low": [ + "240" + ], + "nozzle_temperature_range_high": [ + "270" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "3" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_common.json b/resources/profiles/Positron3D/filament/fdm_filament_common.json new file mode 100644 index 0000000000..9f77975119 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_common.json @@ -0,0 +1,144 @@ +{ + "type": "filament", + "name": "fdm_filament_common", + "from": "system", + "instantiation": "false", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "60" + ], + "hot_plate_temp" : [ + "60" + ], + "textured_plate_temp" : [ + "60" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "60" + ], + "hot_plate_temp_initial_layer" : [ + "60" + ], + "textured_plate_temp_initial_layer" : [ + "60" + ], + "overhang_fan_threshold": [ + "95%" + ], + "overhang_fan_speed": [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "filament_end_gcode": [ + "; filament end gcode \n" + ], + "filament_flow_ratio": [ + "1" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_cooling_layer_time": [ + "60" + ], + "filament_cost": [ + "0" + ], + "filament_density": [ + "0" + ], + "filament_deretraction_speed": [ + "nil" + ], + "filament_diameter": [ + "1.75" + ], + "filament_max_volumetric_speed": [ + "0" + ], + "filament_minimal_purge_on_wipe_tower": [ + "15" + ], + "filament_retraction_minimum_travel": [ + "nil" + ], + "filament_retract_before_wipe": [ + "nil" + ], + "filament_retract_when_changing_layer": [ + "nil" + ], + "filament_retraction_length": [ + "nil" + ], + "filament_z_hop": [ + "nil" + ], + "filament_z_hop_types": [ + "nil" + ], + "filament_retract_restart_extra": [ + "nil" + ], + "filament_retraction_speed": [ + "nil" + ], + "filament_settings_id": [ + "" + ], + "filament_soluble": [ + "0" + ], + "filament_type": [ + "PLA" + ], + "filament_vendor": [ + "Generic" + ], + "filament_wipe": [ + "nil" + ], + "filament_wipe_distance": [ + "nil" + ], + "bed_type": [ + "Cool Plate" + ], + "nozzle_temperature_initial_layer": [ + "200" + ], + "full_fan_speed_layer": [ + "0" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "35" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "8" + ], + "filament_start_gcode": [ + "; Filament gcode\n" + ], + "nozzle_temperature": [ + "200" + ], + "temperature_vitrification": [ + "100" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_pa.json b/resources/profiles/Positron3D/filament/fdm_filament_pa.json new file mode 100644 index 0000000000..58f53cd451 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_pa.json @@ -0,0 +1,85 @@ +{ + "type": "filament", + "name": "fdm_filament_pa", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "100" + ], + "hot_plate_temp" : [ + "100" + ], + "textured_plate_temp" : [ + "100" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "100" + ], + "hot_plate_temp_initial_layer" : [ + "100" + ], + "textured_plate_temp_initial_layer" : [ + "100" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "4" + ], + "filament_max_volumetric_speed": [ + "8" + ], + "filament_type": [ + "PA" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "290" + ], + "reduce_fan_stop_start_freq": [ + "0" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "0" + ], + "overhang_fan_speed": [ + "30" + ], + "nozzle_temperature": [ + "290" + ], + "temperature_vitrification": [ + "108" + ], + "nozzle_temperature_range_low": [ + "270" + ], + "nozzle_temperature_range_high": [ + "300" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_pc.json b/resources/profiles/Positron3D/filament/fdm_filament_pc.json new file mode 100644 index 0000000000..cec8b89a38 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_pc.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_pc", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "0" + ], + "eng_plate_temp" : [ + "110" + ], + "hot_plate_temp" : [ + "110" + ], + "textured_plate_temp" : [ + "110" + ], + "cool_plate_temp_initial_layer" : [ + "0" + ], + "eng_plate_temp_initial_layer" : [ + "110" + ], + "hot_plate_temp_initial_layer" : [ + "110" + ], + "textured_plate_temp_initial_layer" : [ + "110" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "30" + ], + "filament_max_volumetric_speed": [ + "23.2" + ], + "filament_type": [ + "PC" + ], + "filament_density": [ + "1.04" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "270" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "60" + ], + "fan_min_speed": [ + "10" + ], + "overhang_fan_threshold": [ + "25%" + ], + "overhang_fan_speed": [ + "60" + ], + "nozzle_temperature": [ + "280" + ], + "temperature_vitrification": [ + "140" + ], + "nozzle_temperature_range_low": [ + "260" + ], + "nozzle_temperature_range_high": [ + "280" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "2" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_pet.json b/resources/profiles/Positron3D/filament/fdm_filament_pet.json new file mode 100644 index 0000000000..bb2323e9c1 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_pet.json @@ -0,0 +1,82 @@ +{ + "type": "filament", + "name": "fdm_filament_pet", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "80" + ], + "textured_plate_temp" : [ + "80" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "80" + ], + "textured_plate_temp_initial_layer" : [ + "80" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "close_fan_the_first_x_layers": [ + "3" + ], + "fan_cooling_layer_time": [ + "20" + ], + "filament_max_volumetric_speed": [ + "25" + ], + "filament_type": [ + "PETG" + ], + "filament_density": [ + "1.27" + ], + "filament_cost": [ + "30" + ], + "nozzle_temperature_initial_layer": [ + "255" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "20" + ], + "overhang_fan_speed": [ + "100" + ], + "nozzle_temperature": [ + "255" + ], + "temperature_vitrification": [ + "80" + ], + "nozzle_temperature_range_low": [ + "220" + ], + "nozzle_temperature_range_high": [ + "260" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_pla.json b/resources/profiles/Positron3D/filament/fdm_filament_pla.json new file mode 100644 index 0000000000..82c6772f35 --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_pla.json @@ -0,0 +1,94 @@ +{ + "type": "filament", + "name": "fdm_filament_pla", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "12" + ], + "filament_type": [ + "PLA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "cool_plate_temp" : [ + "60" + ], + "eng_plate_temp" : [ + "60" + ], + "hot_plate_temp" : [ + "60" + ], + "textured_plate_temp" : [ + "60" + ], + "cool_plate_temp_initial_layer" : [ + "60" + ], + "eng_plate_temp_initial_layer" : [ + "60" + ], + "hot_plate_temp_initial_layer" : [ + "60" + ], + "textured_plate_temp_initial_layer" : [ + "60" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "230" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_pva.json b/resources/profiles/Positron3D/filament/fdm_filament_pva.json new file mode 100644 index 0000000000..ebf25aa3ae --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_pva.json @@ -0,0 +1,100 @@ +{ + "type": "filament", + "name": "fdm_filament_pva", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "35" + ], + "eng_plate_temp" : [ + "0" + ], + "hot_plate_temp" : [ + "45" + ], + "textured_plate_temp" : [ + "45" + ], + "cool_plate_temp_initial_layer" : [ + "35" + ], + "eng_plate_temp_initial_layer" : [ + "0" + ], + "hot_plate_temp_initial_layer" : [ + "45" + ], + "textured_plate_temp_initial_layer" : [ + "45" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_soluble": [ + "1" + ], + "filament_is_support": [ + "1" + ], + "filament_type": [ + "PVA" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "nozzle_temperature_initial_layer": [ + "220" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "overhang_fan_threshold": [ + "50%" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "220" + ], + "temperature_vitrification": [ + "50" + ], + "nozzle_temperature_range_low": [ + "190" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "slow_down_min_speed": [ + "10" + ], + "slow_down_layer_time": [ + "4" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Positron3D/filament/fdm_filament_tpu.json b/resources/profiles/Positron3D/filament/fdm_filament_tpu.json new file mode 100644 index 0000000000..d00b7dbcab --- /dev/null +++ b/resources/profiles/Positron3D/filament/fdm_filament_tpu.json @@ -0,0 +1,88 @@ +{ + "type": "filament", + "name": "fdm_filament_tpu", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "cool_plate_temp" : [ + "30" + ], + "eng_plate_temp" : [ + "30" + ], + "hot_plate_temp" : [ + "35" + ], + "textured_plate_temp" : [ + "35" + ], + "cool_plate_temp_initial_layer" : [ + "30" + ], + "eng_plate_temp_initial_layer" : [ + "30" + ], + "hot_plate_temp_initial_layer" : [ + "35" + ], + "textured_plate_temp_initial_layer" : [ + "35" + ], + "fan_cooling_layer_time": [ + "100" + ], + "filament_max_volumetric_speed": [ + "15" + ], + "filament_type": [ + "TPU" + ], + "filament_density": [ + "1.24" + ], + "filament_cost": [ + "20" + ], + "filament_retraction_length": [ + "0.4" + ], + "nozzle_temperature_initial_layer": [ + "240" + ], + "reduce_fan_stop_start_freq": [ + "1" + ], + "slow_down_for_layer_cooling": [ + "1" + ], + "fan_max_speed": [ + "100" + ], + "fan_min_speed": [ + "100" + ], + "overhang_fan_speed": [ + "100" + ], + "additional_cooling_fan_speed": [ + "70" + ], + "close_fan_the_first_x_layers": [ + "1" + ], + "nozzle_temperature": [ + "240" + ], + "temperature_vitrification": [ + "60" + ], + "nozzle_temperature_range_low": [ + "200" + ], + "nozzle_temperature_range_high": [ + "250" + ], + "filament_start_gcode": [ + "; filament start gcode\n" + ] +} diff --git a/resources/profiles/Positron3D/machine/The Positron 0.2 nozzle.json b/resources/profiles/Positron3D/machine/The Positron 0.2 nozzle.json new file mode 100644 index 0000000000..dee218f350 --- /dev/null +++ b/resources/profiles/Positron3D/machine/The Positron 0.2 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM002", + "name": "The Positron 0.2 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_common_the_positron", + "printer_model": "The Positron", + "nozzle_diameter": [ + "0.2" + ], + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.04" + ], + "printer_variant": "0.2", + "printable_area": [ + "0x0", + "180x0", + "180x180", + "0x180" + ], + "printable_height": "165" +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/machine/The Positron 0.4 nozzle.json b/resources/profiles/Positron3D/machine/The Positron 0.4 nozzle.json new file mode 100644 index 0000000000..33098367b5 --- /dev/null +++ b/resources/profiles/Positron3D/machine/The Positron 0.4 nozzle.json @@ -0,0 +1,20 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "The Positron 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_common_the_positron", + "printer_model": "The Positron", + "nozzle_diameter": [ + "0.4" + ], + "printer_variant": "0.4", + "printable_area": [ + "0x0", + "180x0", + "180x180", + "0x180" + ], + "printable_height": "165" +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/machine/The Positron 0.6 nozzle.json b/resources/profiles/Positron3D/machine/The Positron 0.6 nozzle.json new file mode 100644 index 0000000000..000acf73da --- /dev/null +++ b/resources/profiles/Positron3D/machine/The Positron 0.6 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "The Positron 0.6 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_common_the_positron", + "printer_model": "The Positron", + "nozzle_diameter": [ + "0.6" + ], + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.12" + ], + "printer_variant": "0.6", + "printable_area": [ + "0x0", + "180x0", + "180x180", + "0x180" + ], + "printable_height": "165" +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/machine/The Positron 0.8 nozzle.json b/resources/profiles/Positron3D/machine/The Positron 0.8 nozzle.json new file mode 100644 index 0000000000..97d6cbd975 --- /dev/null +++ b/resources/profiles/Positron3D/machine/The Positron 0.8 nozzle.json @@ -0,0 +1,26 @@ +{ + "type": "machine", + "setting_id": "GM004", + "name": "The Positron 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_common_the_positron", + "printer_model": "The Positron", + "nozzle_diameter": [ + "0.8" + ], + "max_layer_height": [ + "0.6" + ], + "min_layer_height": [ + "0.2" + ], + "printer_variant": "0.8", + "printable_area": [ + "0x0", + "180x0", + "180x180", + "0x180" + ], + "printable_height": "165" +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/machine/The Positron.json b/resources/profiles/Positron3D/machine/The Positron.json new file mode 100644 index 0000000000..9902c9b948 --- /dev/null +++ b/resources/profiles/Positron3D/machine/The Positron.json @@ -0,0 +1,12 @@ +{ + "type": "machine_model", + "name": "The Positron", + "model_id": "thepositron_1", + "nozzle_diameter": "0.4;0.2;0.6;0.8", + "machine_tech": "FFF", + "family": "ThePositron", + "bed_model": "ThePositron_bed_model.stl", + "bed_texture": "ThePositron_bed_texture.svg", + "hotend_model": "", + "default_materials": "Positron Generic ABS;Positron Generic PLA;Positron Generic PLA-CF;Positron Generic PETG;Positron Generic TPU;Positron Generic ASA;Positron Generic PC;Positron Generic PVA;Positron Generic PA;Positron Generic PA-CF" +} diff --git a/resources/profiles/Positron3D/machine/fdm_common_the_positron.json b/resources/profiles/Positron3D/machine/fdm_common_the_positron.json new file mode 100644 index 0000000000..23effbd1e0 --- /dev/null +++ b/resources/profiles/Positron3D/machine/fdm_common_the_positron.json @@ -0,0 +1,60 @@ +{ + "type": "machine", + "name": "fdm_common_the_positron", + "from": "system", + "instantiation": "false", + "inherits": "fdm_machine_common", + "gcode_flavor": "klipper", + "machine_max_acceleration_e": ["5000", "5000"], + "machine_max_acceleration_extruding": ["8000", "8000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["8000", "8000"], + "machine_max_acceleration_x": ["8000", "8000"], + "machine_max_acceleration_y": ["8000", "8000"], + "machine_max_acceleration_z": ["500", "500"], + "machine_max_speed_e": ["25", "25"], + "machine_max_speed_x": ["420", "420"], + "machine_max_speed_y": ["420", "420"], + "machine_max_speed_z": ["12", "12"], + "machine_max_jerk_e": ["2.5", "2.5"], + "machine_max_jerk_x": ["12", "12"], + "machine_max_jerk_y": ["12", "12"], + "machine_max_jerk_z": ["0.2", "0.4"], + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "max_layer_height": ["0.32"], + "min_layer_height": ["0.08"], + "printable_height": "165", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "printer_settings_id": "", + "printer_technology": "FFF", + "printer_variant": "0.4", + "retraction_minimum_travel": ["1"], + "retract_before_wipe": ["70%"], + "retract_when_changing_layer": ["1"], + "retraction_length": ["2.9"], + "retract_length_toolchange": ["2"], + "z_hop": ["0.4"], + "retract_restart_extra": ["0"], + "retract_restart_extra_toolchange": ["0"], + "retraction_speed": ["50"], + "deretraction_speed": ["40"], + "z_hop_types": "Normal Lift", + "silent_mode": "0", + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": ["1"], + "default_filament_profile": ["Positron Generic ABS"], + "default_print_profile": "0.20mm Standard @The Positron", + "bed_exclude_area": ["0x0"], + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM109 S[nozzle_temperature_initial_layer]\nPRINT_START EXTRUDER=[nozzle_temperature_initial_layer] BED=[bed_temperature_initial_layer_single]\n", + "machine_end_gcode": "PRINT_END", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "PAUSE", + "scan_first_layer": "0", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Positron3D/machine/fdm_machine_common.json b/resources/profiles/Positron3D/machine/fdm_machine_common.json new file mode 100644 index 0000000000..bfb6b23e1a --- /dev/null +++ b/resources/profiles/Positron3D/machine/fdm_machine_common.json @@ -0,0 +1,119 @@ +{ + "type": "machine", + "name": "fdm_machine_common", + "from": "system", + "instantiation": "false", + "printer_technology": "FFF", + "deretraction_speed": [ + "40" + ], + "extruder_colour": [ + "#FCE94F" + ], + "extruder_offset": [ + "0x0" + ], + "gcode_flavor": "marlin", + "silent_mode": "0", + "machine_max_acceleration_e": [ + "5000" + ], + "machine_max_acceleration_extruding": [ + "10000" + ], + "machine_max_acceleration_retracting": [ + "1000" + ], + "machine_max_acceleration_x": [ + "10000" + ], + "machine_max_acceleration_y": [ + "10000" + ], + "machine_max_acceleration_z": [ + "500" + ], + "machine_max_speed_e": [ + "60" + ], + "machine_max_speed_x": [ + "500" + ], + "machine_max_speed_y": [ + "500" + ], + "machine_max_speed_z": [ + "10" + ], + "machine_max_jerk_e": [ + "5" + ], + "machine_max_jerk_x": [ + "8" + ], + "machine_max_jerk_y": [ + "8" + ], + "machine_max_jerk_z": [ + "0.4" + ], + "machine_min_extruding_rate": [ + "0" + ], + "machine_min_travel_rate": [ + "0" + ], + "max_layer_height": [ + "0.32" + ], + "min_layer_height": [ + "0.08" + ], + "printable_height": "165", + "extruder_clearance_radius": "65", + "extruder_clearance_height_to_rod": "36", + "extruder_clearance_height_to_lid": "140", + "nozzle_diameter": [ + "0.4" + ], + "printer_settings_id": "", + "printer_variant": "0.4", + "retraction_minimum_travel": [ + "2" + ], + "retract_before_wipe": [ + "70%" + ], + "retract_when_changing_layer": [ + "1" + ], + "retraction_length": [ + "5" + ], + "retract_length_toolchange": [ + "1" + ], + "z_hop": [ + "0" + ], + "retract_restart_extra": [ + "0" + ], + "retract_restart_extra_toolchange": [ + "0" + ], + "retraction_speed": [ + "60" + ], + "single_extruder_multi_material": "1", + "change_filament_gcode": "", + "wipe": [ + "1" + ], + "default_print_profile": "", + "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", + "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end", + "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", + "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", + "machine_pause_gcode": "M601" +} diff --git a/resources/profiles/Positron3D/process/0.08mm Extra Fine @The Positron.json b/resources/profiles/Positron3D/process/0.08mm Extra Fine @The Positron.json new file mode 100644 index 0000000000..e6880b84a5 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.08mm Extra Fine @The Positron.json @@ -0,0 +1,19 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "layer_height": "0.08", + "bottom_shell_layers": "7", + "top_shell_layers": "9", + "support_top_z_distance": "0.08", + "support_bottom_z_distance": "0.08", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.12mm Fine @The Positron.json b/resources/profiles/Positron3D/process/0.12mm Fine @The Positron.json new file mode 100644 index 0000000000..4985081211 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.12mm Fine @The Positron.json @@ -0,0 +1,19 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "layer_height": "0.12", + "bottom_shell_layers": "5", + "top_shell_layers": "6", + "support_top_z_distance": "0.08", + "support_bottom_z_distance": "0.08", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.16mm Optimal @The Positron.json b/resources/profiles/Positron3D/process/0.16mm Optimal @The Positron.json new file mode 100644 index 0000000000..b1373b2656 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.16mm Optimal @The Positron.json @@ -0,0 +1,20 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "support_top_z_distance": "0.16", + "support_bottom_z_distance": "0.16", + "layer_height": "0.16", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.2 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.20mm Standard @The Positron.json b/resources/profiles/Positron3D/process/0.20mm Standard @The Positron.json new file mode 100644 index 0000000000..14612c6f98 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.20mm Standard @The Positron.json @@ -0,0 +1,14 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @The Positron", + "from": "system", + "inherits": "fdm_process_the_positron_common", + "instantiation": "true", + "layer_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} diff --git a/resources/profiles/Positron3D/process/0.24mm Draft @The Positron.json b/resources/profiles/Positron3D/process/0.24mm Draft @The Positron.json new file mode 100644 index 0000000000..917b608ded --- /dev/null +++ b/resources/profiles/Positron3D/process/0.24mm Draft @The Positron.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "layer_height": "0.24", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.28mm Extra Draft @The Positron.json b/resources/profiles/Positron3D/process/0.28mm Extra Draft @The Positron.json new file mode 100644 index 0000000000..6b68db3305 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.28mm Extra Draft @The Positron.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "layer_height": "0.28", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.32mm Extra Draft @The Positron.json b/resources/profiles/Positron3D/process/0.32mm Extra Draft @The Positron.json new file mode 100644 index 0000000000..e8a316ef72 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.32mm Extra Draft @The Positron.json @@ -0,0 +1,17 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.32mm Standard @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.32", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.4 nozzle", + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.40mm Extra Draft @The Positron.json b/resources/profiles/Positron3D/process/0.40mm Extra Draft @The Positron.json new file mode 100644 index 0000000000..07aac7b020 --- /dev/null +++ b/resources/profiles/Positron3D/process/0.40mm Extra Draft @The Positron.json @@ -0,0 +1,16 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.40mm Standard @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.40", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.6 nozzle", + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/0.56mm Extra Draft @The Positron.json b/resources/profiles/Positron3D/process/0.56mm Extra Draft @The Positron.json new file mode 100644 index 0000000000..8c659c650a --- /dev/null +++ b/resources/profiles/Positron3D/process/0.56mm Extra Draft @The Positron.json @@ -0,0 +1,15 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.56mm Standard @The Positron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_the_positron_common", + "support_top_z_distance": "0.24", + "support_bottom_z_distance": "0.24", + "layer_height": "0.56", + "initial_layer_print_height": "0.2", + "compatible_printers": [ + "The Positron 0.8 nozzle" + ] +} \ No newline at end of file diff --git a/resources/profiles/Positron3D/process/fdm_process_common.json b/resources/profiles/Positron3D/process/fdm_process_common.json new file mode 100644 index 0000000000..cfb78ab95a --- /dev/null +++ b/resources/profiles/Positron3D/process/fdm_process_common.json @@ -0,0 +1,108 @@ +{ + "type": "process", + "name": "fdm_process_common", + "from": "system", + "instantiation": "false", + "adaptive_layer_height": "0", + "reduce_crossing_wall": "0", + "max_travel_detour_distance": "0", + "bottom_surface_pattern": "monotonic", + "bottom_shell_thickness": "0", + "bridge_speed": "50", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers": [], + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "1000", + "initial_layer_acceleration": "500", + "top_surface_acceleration": "1000", + "travel_acceleration": "1000", + "inner_wall_acceleration": "1000", + "outer_wall_acceleration": "700", + "bridge_no_support": "0", + "draft_shield": "disabled", + "elefant_foot_compensation": "0", + "enable_arc_fitting": "0", + "wall_infill_order": "inner wall/outer wall/infill", + "infill_direction": "45", + "sparse_infill_density": "15%", + "sparse_infill_pattern": "crosshatch", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "infill_wall_overlap": "25%", + "interface_shells": "0", + "ironing_flow": "10%", + "ironing_spacing": "0.15", + "ironing_speed": "30", + "ironing_type": "no ironing", + "reduce_infill_retraction": "1", + "filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode", + "detect_overhang_wall": "1", + "slowdown_for_curled_perimeters": "1", + "overhang_1_4_speed": "0", + "overhang_2_4_speed": "50", + "overhang_3_4_speed": "30", + "overhang_4_4_speed": "10", + "line_width": "110%", + "inner_wall_line_width": "110%", + "outer_wall_line_width": "100%", + "top_surface_line_width": "93.75%", + "sparse_infill_line_width": "110%", + "initial_layer_line_width": "120%", + "internal_solid_infill_line_width": "120%", + "support_line_width": "96%", + "wall_loops": "3", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "3", + "min_skirt_length": "4", + "skirt_loops": "0", + "minimum_sparse_infill_area": "15", + "spiral_mode": "0", + "standby_temperature_delta": "-5", + "enable_support": "0", + "resolution": "0.012", + "support_type": "normal(auto)", + "support_on_build_plate_only": "0", + "support_top_z_distance": "0.2", + "support_bottom_z_distance": "0.2", + "support_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_filament": "0", + "support_interface_top_layers": "2", + "support_interface_bottom_layers": "2", + "support_interface_spacing": "0.5", + "support_interface_speed": "80", + "support_base_pattern": "default", + "support_base_pattern_spacing": "2.5", + "support_speed": "150", + "support_threshold_angle": "30", + "support_object_xy_distance": "0.35", + "tree_support_branch_angle": "30", + "tree_support_wall_count": "0", + "tree_support_with_infill": "0", + "detect_thin_wall": "0", + "top_surface_pattern": "monotonicline", + "top_shell_thickness": "0.8", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "layer_height": "0.2", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "bridge_flow": "1", + "initial_layer_speed": "45", + "initial_layer_infill_speed": "45", + "outer_wall_speed": "45", + "inner_wall_speed": "80", + "sparse_infill_speed": "150", + "internal_solid_infill_speed": "150", + "top_surface_speed": "50", + "gap_infill_speed": "30", + "travel_speed": "200" +} diff --git a/resources/profiles/Positron3D/process/fdm_process_the_positron_common.json b/resources/profiles/Positron3D/process/fdm_process_the_positron_common.json new file mode 100644 index 0000000000..76e677a7e9 --- /dev/null +++ b/resources/profiles/Positron3D/process/fdm_process_the_positron_common.json @@ -0,0 +1,30 @@ +{ + "type": "process", + "name": "fdm_process_the_positron_common", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_common", + "default_acceleration": "5000", + "top_surface_acceleration": "3000", + "travel_acceleration": "7000", + "inner_wall_acceleration": "3000", + "outer_wall_acceleration": "1500", + "initial_layer_acceleration": "500", + "initial_layer_speed": "50", + "initial_layer_infill_speed": "105", + "outer_wall_speed": "60", + "inner_wall_speed": "100", + "internal_solid_infill_speed": "180", + "top_surface_speed": "90", + "gap_infill_speed": "90", + "sparse_infill_speed": "180", + "travel_speed": "420", + "travel_jerk": "12", + "outer_wall_jerk": "7", + "inner_wall_jerk": "7", + "default_jerk": "9", + "infill_jerk": "12", + "top_surface_jerk": "7", + "initial_layer_jerk": "7", + "exclude_object": "1" +} \ No newline at end of file