diff --git a/localization/i18n/fr/OrcaSlicer_fr.po b/localization/i18n/fr/OrcaSlicer_fr.po index 12c0e625d3..0cd391b5e2 100644 --- a/localization/i18n/fr/OrcaSlicer_fr.po +++ b/localization/i18n/fr/OrcaSlicer_fr.po @@ -3352,7 +3352,7 @@ msgid "Print plate" msgstr "Imprimer le plateau" msgid "Slice all" -msgstr "Découper toutes les plateaux" +msgstr "Découper tous les plateaux" msgid "Export G-code file" msgstr "Exporter le fichier G-code" diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index 5cb6b67943..ee6a578f89 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: OrcaSlicer V1.8.0 Release Candidate 2\n" +"Project-Id-Version: OrcaSlicer V1.8.0 Official Release\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-08-26 19:45+0800\n" -"PO-Revision-Date: 2023-11-16 20:19+0700\n" +"PO-Revision-Date: 2023-11-20 01:07+0700\n" "Last-Translator: Andylg \n" "Language-Team: \n" "Language: ru_RU\n" @@ -4424,7 +4424,7 @@ msgid "G-code loading" msgstr "Загрузка G-кода" msgid "G-code files can not be loaded with models together!" -msgstr "Одновременная загрузка файла G-кода и модели не возможна!" +msgstr "Одновременная загрузка файла G-кода и модели невозможна!" msgid "Can not add models when in preview mode!" msgstr "В режиме предпросмотра добавление моделей недоступно!" @@ -4670,7 +4670,7 @@ msgid "Maximum recent projects" msgstr "Максимальное количество недавних проектов" msgid "Maximum count of recent projects" -msgstr "Максимальное количество проектов отображаемое в списке недавних проектов." +msgstr "Максимальное количество проектов, отображаемое в списке недавних проектов." msgid "Clear my choice on the unsaved projects." msgstr "Очистить мой выбор от несохранённых проектов." @@ -7286,13 +7286,13 @@ msgid "Enable accel_to_decel" msgstr "Вкл. ограничение ускорения зигзагов" msgid "Klipper's max_accel_to_decel will be adjusted automatically" -msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано автоматически" +msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано автоматически." msgid "accel_to_decel" -msgstr "ограничение ускорение зигзагов" +msgstr "Ограничение ускорение зигзагов" msgid "Klipper's max_accel_to_decel will be adjusted to this % of acceleration" -msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано на данный процент ускорения" +msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано на заданный процент ускорения." msgid "Jerk of outer walls" msgstr "Рывок для внешних периметров." @@ -7917,13 +7917,13 @@ msgid "All Surfaces" msgstr "Все верхние поверхности" msgid "Top Only" -msgstr "Только на верней" +msgstr "Только на верхней" msgid "Bottom Only" msgstr "Только на нижней" msgid "Top and Bottom" -msgstr "На верней и нижней" +msgstr "На верхней и нижней" msgid "Extra length on restart" msgstr "Доп. длина подачи перед возобновлением печати" @@ -7947,10 +7947,10 @@ msgid "Speed for reloading filament into extruder. Zero means same speed with re msgstr "Скорость возврата материала при откате. Если оставить 0, будет использоваться та же скорость что и при извлечении." msgid "Use firmware retraction" -msgstr "Использовать откат из прошивки" +msgstr "Исп. откат из прошивки" msgid "This experimental setting uses G10 and G11 commands to have the firmware handle the retraction. This is only supported in recent Marlin." -msgstr "Эта экспериментальная опция использует команды G10 и G11, чтобы прошивка обрабатывала откаты. Поддерживается только в последних версиях Marlin." +msgstr "Эта экспериментальная опция использует команды G10 и G11, чтобы сама прошивка обрабатывала откаты. Поддерживается только в последних версиях Marlin." msgid "Show auto-calibration marks" msgstr "Отображать на столе линии автокалибровки" @@ -8050,7 +8050,7 @@ msgid "Spiral vase" msgstr "Спиральная ваза" msgid "Spiralize smooths out the z moves of the outer contour. And turns a solid model into a single walled print with solid bottom layers. The final generated model has no seam" -msgstr "Печать спиральных и пустотелых, а также тонкостенных моделей. Модель печатается в одну стенку без верней поверхности, заполнения и поддержки. При этом сопло движется вдоль периметра непрерывно постепенно поднимаясь, так получаются ровные красивые вазы без видимых швов." +msgstr "Печать спиральных и пустотелых, а также тонкостенных моделей. Модель печатается в одну стенку без верхней поверхности, заполнения и поддержки. При этом сопло движется вдоль периметра непрерывно постепенно поднимаясь, так получаются ровные красивые вазы без видимых швов." msgid "" "If smooth or traditional mode is selected, a timelapse video will be generated for each print. After each layer is printed, a snapshot is taken with the chamber camera. All of these snapshots are composed into a timelapse video when printing completes. If smooth mode is selected, the toolhead will move to the excess chute after each layer is printed and then take a snapshot. Since the melt " @@ -8486,13 +8486,13 @@ msgid "Picture sizes to be stored into a .gcode and .sl1 / .sl1s files, in the f msgstr "Размеры изображения, которые будут сохранены в файлах .sl1 / .sl1s в следующем формате: \"XxY, XxY, ...\"" msgid "Use relative E distances" -msgstr "Исп. относительные координаты для экструдера (E)" +msgstr "Исп. относительные координаты для экструдера" msgid "Relative extrusion is recommended when using \"label_objects\" option.Some extruders work better with this option unckecked (absolute extrusion mode). Wipe tower is only compatible with relative mode. It is always enabled on BambuLab printers. Default is checked" msgstr "" "Относительная экструзия рекомендуется при использовании опции «Название моделей».\n" "\n" -"Черновая башня совместима только с относительной экструзии. На принтерах BambuLab она всегда включена (флажок стоит).\n" +"Черновая башня совместима только с относительной экструзией. На принтерах BambuLab она всегда включена (флажок стоит).\n" "Некоторые экструдеры работают лучше при отключении этой опции (абсолютный режим экструзии)." msgid "Classic wall generator produces walls with constant extrusion width and for very thin areas is used gap-fill. Arachne engine produces walls with variable extrusion width" @@ -9305,7 +9305,7 @@ msgid "Upload to Printer Host with the following filename:" msgstr "Загрузить на хост принтера со следующим именем:" msgid "Use forward slashes ( / ) as a directory separator if needed." -msgstr "При необходимости используйте косую черту ( / ) в качестве разделителя каталогов." +msgstr "В качестве разделителя каталогов используйте косую черту ( / ). " msgid "Upload to storage" msgstr "Загрузить в хранилище" @@ -9537,7 +9537,7 @@ msgid "To use a custom CA file, please import your CA file into Certificate Stor msgstr "Чтобы использовать пользовательский файл корневого сертификата, импортируйте его в хранилище сертификатов/Keychain." msgid "Connection to printers connected via the print host failed." -msgstr "Не удалось подключиться к принтерам, подключенным через через хост печати." +msgstr "Не удалось подключиться к принтерам, подключенным через хост печати." #: resources/data/hints.ini: [hint:3D Scene Operations] msgid "" @@ -10185,7 +10185,7 @@ msgstr " Но принтеры с кинематикой I3 не будут пи msgid "Filament unloading" msgstr "Выгрузка прутка" -# ??? Пауза при пропуске шагов +# ??? msgid "Skip step pause" msgstr "Пропуск команды паузы" @@ -10204,7 +10204,6 @@ msgstr "Печать приостановлена из-за низкой ско msgid "Paused due to chamber temperature control error" msgstr "Печать приостановлена из-за ошибки контроля температуры в камере" -# ??? или Снижение температуры msgid "Cooling chamber" msgstr "Охлаждение камеры" @@ -10571,7 +10570,7 @@ msgstr "Ускорение на первом слое. Использовани #, c-format, boost-format msgid "Klipper's max_accel_to_decel will be adjusted to this %% of acceleration" -msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано на данное ускорение: %%\"" +msgstr "Значение Klipper-а max_accel_to_decel (ограничение ускорения зигзагов) будет скорректировано на заданный процент ускорения." #, c-format, boost-format msgid "%%" @@ -10937,3 +10936,9 @@ msgstr "Показывать окно приветствия" msgid "Show the splash screen during startup." msgstr "Показывать окно приветствия при запуске приложения." + +msgid "invalid value" +msgstr "недопустимое значение" + +msgid "MB uploaded" +msgstr "МБ загружено" diff --git a/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png b/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png index ba5213fb23..efe2c318ca 100644 Binary files a/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png and b/resources/profiles/Comgrow/comgrow_t500_buildplate_texture.png differ diff --git a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json b/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json index cda8f8c7f6..40876799a9 100644 --- a/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json +++ b/resources/profiles/Comgrow/filament/Comgrow Generic PETG.json @@ -11,12 +11,13 @@ "fan_cooling_layer_time": ["30"], "overhang_fan_speed": ["90"], "overhang_fan_threshold": ["25%"], - "fan_max_speed": ["90"], - "fan_min_speed": ["40"], + "fan_max_speed": ["25"], + "fan_min_speed": ["10"], "slow_down_min_speed": ["10"], "slow_down_layer_time": ["8"], - "filament_flow_ratio": ["0.95"], - "filament_max_volumetric_speed": ["30"], + "filament_flow_ratio": ["0.98"], + "filament_max_volumetric_speed": ["8"], + "nozzle_temperature_initial_layer": ["260"], "filament_retraction_length": ["0.5"], "filament_start_gcode": ["; filament start gcode\n"], "compatible_printers": [ diff --git a/resources/profiles/Comgrow/machine/fdm_comgrow_common.json b/resources/profiles/Comgrow/machine/fdm_comgrow_common.json index 155e234d8b..f16b2203db 100644 --- a/resources/profiles/Comgrow/machine/fdm_comgrow_common.json +++ b/resources/profiles/Comgrow/machine/fdm_comgrow_common.json @@ -18,16 +18,16 @@ "5000" ], "machine_max_acceleration_travel": [ - "20000", - "20000" + "3000", + "3000" ], "machine_max_acceleration_x": [ - "8000", - "8000" + "3000", + "3000" ], "machine_max_acceleration_y": [ - "8000", - "8000" + "3000", + "3000" ], "machine_max_acceleration_z": [ "500", @@ -38,12 +38,12 @@ "25" ], "machine_max_speed_x": [ - "500", - "200" + "300", + "300" ], "machine_max_speed_y": [ - "500", - "200" + "300", + "300" ], "machine_max_speed_z": [ "12", @@ -79,7 +79,7 @@ "min_layer_height": [ "0.08" ], - "printable_height": "250", + "printable_height": "500", "extruder_clearance_radius": "65", "extruder_clearance_height_to_rod": "36", "extruder_clearance_height_to_lid": "140", @@ -124,6 +124,12 @@ "wipe": [ "1" ], + "thumbnails": [ + "32x32", + "300x300" + ], + "thumbnails_format": "PNG", + "nozzle_type": "hardened_steel", "default_filament_profile": [ "Comgrow Generic PETG" ], @@ -136,6 +142,5 @@ "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n", "scan_first_layer": "0", - "nozzle_type": "undefine", "auxiliary_fan": "0" } diff --git a/resources/profiles/Comgrow/process/0.16mm Opitmal @Comgrow T500 0.6.json b/resources/profiles/Comgrow/process/0.16mm Opitmal @Comgrow T500 0.6.json index e26560c548..75aad4846c 100644 --- a/resources/profiles/Comgrow/process/0.16mm Opitmal @Comgrow T500 0.6.json +++ b/resources/profiles/Comgrow/process/0.16mm Opitmal @Comgrow T500 0.6.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.6", "initial_layer_print_height": "0.2", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.16mm Optimal @Comgrow T500 0.4.json b/resources/profiles/Comgrow/process/0.16mm Optimal @Comgrow T500 0.4.json index 528d2aa9ec..17d1839a79 100644 --- a/resources/profiles/Comgrow/process/0.16mm Optimal @Comgrow T500 0.4.json +++ b/resources/profiles/Comgrow/process/0.16mm Optimal @Comgrow T500 0.4.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "8000", - "outer_wall_acceleration": "8000", - "top_surface_acceleration": "8000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "8000", - "inner_wall_acceleration": "8000", "initial_layer_line_width": "0.4", "initial_layer_print_height": "0.2", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.18mm Optimal @Comgrow T500.json b/resources/profiles/Comgrow/process/0.18mm Optimal @Comgrow T500.json index 2d004fd44f..2b364ee2a8 100644 --- a/resources/profiles/Comgrow/process/0.18mm Optimal @Comgrow T500.json +++ b/resources/profiles/Comgrow/process/0.18mm Optimal @Comgrow T500.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "0", - "outer_wall_acceleration": "0", - "top_surface_acceleration": "0", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", "initial_layer_line_width": "0.42", "initial_layer_print_height": "0.24", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.4.json b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.4.json index d47a54b293..9d94e6c504 100644 --- a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.4.json +++ b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.4.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "8000", - "outer_wall_acceleration": "8000", - "top_surface_acceleration": "8000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "8000", - "inner_wall_acceleration": "8000", "initial_layer_line_width": "0.4", "initial_layer_print_height": "0.24", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.6.json b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.6.json index 6477dea269..d11dfb24a1 100644 --- a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.6.json +++ b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 0.6.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.6", "initial_layer_print_height": "0.24", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json index d62c4c09bd..17de958703 100644 --- a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json +++ b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500 1.0.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "1.0", "initial_layer_print_height": "0.28", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500.json b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500.json index 879f37b316..505373d1e9 100644 --- a/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500.json +++ b/resources/profiles/Comgrow/process/0.20mm Standard @Comgrow T500.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "0", - "outer_wall_acceleration": "0", - "top_surface_acceleration": "0", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "0", - "travel_acceleration": "0", - "inner_wall_acceleration": "0", "initial_layer_line_width": "0.42", "initial_layer_print_height": "0.24", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.4.json b/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.4.json index 658ce30138..7f8c3778b1 100644 --- a/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.4.json +++ b/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.4.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "8000", - "outer_wall_acceleration": "8000", - "top_surface_acceleration": "8000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "8000", - "inner_wall_acceleration": "8000", "initial_layer_line_width": "0.4", "initial_layer_print_height": "0.28", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.6.json b/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.6.json index 5e583b07e5..3b9cbaa7a5 100644 --- a/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.6.json +++ b/resources/profiles/Comgrow/process/0.24mm Draft @Comgrow T500 0.6.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.6", "initial_layer_print_height": "0.28", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.24mm Optimal @Comgrow T500 0.8.json b/resources/profiles/Comgrow/process/0.24mm Optimal @Comgrow T500 0.8.json index 84ce20e50d..a1ca8bf2cb 100644 --- a/resources/profiles/Comgrow/process/0.24mm Optimal @Comgrow T500 0.8.json +++ b/resources/profiles/Comgrow/process/0.24mm Optimal @Comgrow T500 0.8.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.8", "initial_layer_print_height": "0.28", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.4.json b/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.4.json index 54258381a9..9fbe8bb3f8 100644 --- a/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.4.json +++ b/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.4.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "8000", - "outer_wall_acceleration": "8000", - "top_surface_acceleration": "8000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "8000", - "inner_wall_acceleration": "8000", "initial_layer_line_width": "0.4", "initial_layer_print_height": "0.32", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.6.json b/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.6.json index 09464ff582..af0be46947 100644 --- a/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.6.json +++ b/resources/profiles/Comgrow/process/0.28mm SuperDraft @Comgrow T500 0.6.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.6", "initial_layer_print_height": "0.32", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.32mm Standard @Comgrow T500 0.8.json b/resources/profiles/Comgrow/process/0.32mm Standard @Comgrow T500 0.8.json index 4bdaa10b76..7fc0fb213c 100644 --- a/resources/profiles/Comgrow/process/0.32mm Standard @Comgrow T500 0.8.json +++ b/resources/profiles/Comgrow/process/0.32mm Standard @Comgrow T500 0.8.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.8", "initial_layer_print_height": "0.36", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.40mm Draft @Comgrow T500 0.8.json b/resources/profiles/Comgrow/process/0.40mm Draft @Comgrow T500 0.8.json index c34ae3c2a3..a7385a9177 100644 --- a/resources/profiles/Comgrow/process/0.40mm Draft @Comgrow T500 0.8.json +++ b/resources/profiles/Comgrow/process/0.40mm Draft @Comgrow T500 0.8.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.8", "initial_layer_print_height": "0.44", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.48mm Draft @Comgrow T500 0.8.json b/resources/profiles/Comgrow/process/0.48mm Draft @Comgrow T500 0.8.json index f0bd1280ba..8bddb7adca 100644 --- a/resources/profiles/Comgrow/process/0.48mm Draft @Comgrow T500 0.8.json +++ b/resources/profiles/Comgrow/process/0.48mm Draft @Comgrow T500 0.8.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.8", "initial_layer_print_height": "0.52", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/0.56mm SuperDraft @Comgrow T500 0.8.json b/resources/profiles/Comgrow/process/0.56mm SuperDraft @Comgrow T500 0.8.json index 7136ac1838..0b014b0791 100644 --- a/resources/profiles/Comgrow/process/0.56mm SuperDraft @Comgrow T500 0.8.json +++ b/resources/profiles/Comgrow/process/0.56mm SuperDraft @Comgrow T500 0.8.json @@ -18,9 +18,6 @@ "brim_object_gap": "0", "compatible_printers_condition": "", "print_sequence": "by layer", - "default_acceleration": "3000", - "outer_wall_acceleration": "3000", - "top_surface_acceleration": "3000", "bridge_no_support": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0.1", @@ -31,9 +28,6 @@ "infill_direction": "45", "sparse_infill_density": "15%", "sparse_infill_pattern": "grid", - "initial_layer_acceleration": "1000", - "travel_acceleration": "3000", - "inner_wall_acceleration": "3000", "initial_layer_line_width": "0.8", "initial_layer_print_height": "0.60", "infill_combination": "0", diff --git a/resources/profiles/Comgrow/process/fdm_process_comgrow_common.json b/resources/profiles/Comgrow/process/fdm_process_comgrow_common.json index 7e50fbdbe6..d8156dbfdc 100644 --- a/resources/profiles/Comgrow/process/fdm_process_comgrow_common.json +++ b/resources/profiles/Comgrow/process/fdm_process_comgrow_common.json @@ -1,104 +1,229 @@ { - "type": "process", - "name": "fdm_process_comgrow_common", - "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", + "accel_to_decel_enable": "1", + "accel_to_decel_factor": "50%", + "bottom_shell_layers": "2", "bottom_shell_thickness": "0", - "bridge_flow": "0.95", - "bridge_speed": "25", - "brim_width": "5", - "brim_object_gap": "0.1", - "compatible_printers_condition": "", - "print_sequence": "by layer", - "default_acceleration": "500", - "top_surface_acceleration": "500", + "bottom_solid_infill_flow_ratio": "1", + "bottom_surface_pattern": "monotonic", + "bridge_acceleration": "50%", + "bridge_angle": "0", + "bridge_density": "100%", + "bridge_flow": "0.85", "bridge_no_support": "0", + "bridge_speed": "25", + "brim_ears_detection_length": "1", + "brim_ears_max_angle": "125", + "brim_object_gap": "0", + "brim_type": "auto_brim", + "brim_width": "0", + "compatible_printers_condition": "", + "default_acceleration": "3000", + "default_jerk": "0", + "detect_overhang_wall": "1", + "detect_thin_wall": "1", "draft_shield": "disabled", - "elefant_foot_compensation": "0", + "elefant_foot_compensation": "0.1", + "elefant_foot_compensation_layers": "1", "enable_arc_fitting": "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": "grid", - "initial_layer_acceleration": "500", - "travel_acceleration": "700", - "inner_wall_acceleration": "500", - "initial_layer_line_width": "0.5", - "initial_layer_print_height": "0.2", + "enable_overhang_speed": "1", + "enable_prime_tower": "0", + "enable_support": "0", + "enforce_support_layers": "0", + "exclude_object": "0", + "extra_perimeters_on_overhangs": "0", + "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", + "filter_out_gap_fill": "0", + "flush_into_infill": "0", + "flush_into_objects": "0", + "flush_into_support": "1", + "from": "", + "fuzzy_skin": "none", + "fuzzy_skin_point_distance": "0.8", + "fuzzy_skin_thickness": "0.3", + "gap_infill_speed": "70", + "gcode_add_line_number": "0", + "gcode_comments": "0", + "gcode_label_objects": "0", + "hole_to_polyhole": "0", + "hole_to_polyhole_threshold": "0.01", + "hole_to_polyhole_twisted": "1", + "independent_support_layer_height": "1", + "infill_anchor": "400%", + "infill_anchor_max": "20", "infill_combination": "0", - "sparse_infill_line_width": "0.45", + "infill_direction": "45", + "infill_jerk": "9", "infill_wall_overlap": "23%", + "inherits": "fdm_process_common", + "initial_layer_acceleration": "1000", + "initial_layer_infill_speed": "60", + "initial_layer_jerk": "9", + "initial_layer_line_width": "0.4", + "initial_layer_min_bead_width": "85%", + "initial_layer_print_height": "0.24", + "initial_layer_speed": "40", + "initial_layer_travel_speed": "100%", + "inner_wall_acceleration": "3000", + "inner_wall_jerk": "9", + "inner_wall_line_width": "0.4", + "inner_wall_speed": "160", "interface_shells": "0", + "internal_bridge_speed": "150%", + "internal_solid_infill_acceleration": "100%", + "internal_solid_infill_line_width": "0", + "internal_solid_infill_pattern": "monotonic", + "internal_solid_infill_speed": "200", + "ironing_angle": "-1", "ironing_flow": "15%", - "ironing_spacing": "0.1", + "ironing_pattern": "zig-zag", + "ironing_spacing": "0.25", "ironing_speed": "15", "ironing_type": "no ironing", "layer_height": "0.2", - "reduce_infill_retraction": "1", - "filename_format": "{printer_model}_{input_filename_base}_{filament_type[0]}_{layer_height}_{print_time}.gcode", - "detect_overhang_wall": "1", + "line_width": "0.4", + "make_overhang_printable": "0", + "make_overhang_printable_angle": "55", + "make_overhang_printable_hole_size": "0", + "max_bridge_length": "10", + "max_travel_detour_distance": "0", + "max_volumetric_extrusion_rate_slope": "0", + "max_volumetric_extrusion_rate_slope_segment_length": "3", + "min_bead_width": "85%", + "min_feature_size": "25%", + "min_width_top_surface": "300%", + "minimum_sparse_infill_area": "10", + "only_one_wall_first_layer": "0", + "only_one_wall_top": "0", + "ooze_prevention": "0", + "outer_wall_acceleration": "1000", + "outer_wall_jerk": "9", + "outer_wall_speed": "140", "overhang_1_4_speed": "0", "overhang_2_4_speed": "20", "overhang_3_4_speed": "15", "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": "1", - "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": "monotonic", - "top_surface_line_width": "0.4", - "top_shell_layers": "3", - "top_shell_thickness": "0.8", - "initial_layer_speed": "15", - "initial_layer_infill_speed": "20", - "outer_wall_speed": "25", - "inner_wall_speed": "40", - "internal_solid_infill_speed": "40", - "top_surface_speed": "30", - "gap_infill_speed": "30", - "sparse_infill_speed": "50", - "travel_speed": "150", - "enable_prime_tower": "0", - "wipe_tower_no_sparse_layers": "0", + "overhang_reverse": "0", + "overhang_reverse_threshold": "50%", + "overhang_speed_classic": "0", + "post_process": [], + "precise_outer_wall": "0", + "prime_tower_brim_width": "3", "prime_tower_width": "60", - "xy_hole_compensation": "0", - "xy_contour_compensation": "0" + "prime_volume": "45", + "print_flow_ratio": "1", + "print_sequence": "by layer", + "raft_contact_distance": "0.1", + "raft_expansion": "1.5", + "raft_first_layer_density": "90%", + "raft_first_layer_expansion": "2", + "raft_layers": "0", + "reduce_crossing_wall": "0", + "reduce_infill_retraction": "1", + "resolution": "0.012", + "role_based_wipe_speed": "1", + "seam_gap": "5%", + "seam_position": "aligned", + "single_extruder_multi_material_priming": "1", + "skirt_distance": "3", + "skirt_height": "2", + "skirt_loops": "0", + "skirt_speed": "50", + "slice_closing_radius": "0.049", + "slicing_mode": "regular", + "slow_down_layers": "0", + "slowdown_for_curled_perimeters": "0", + "small_perimeter_speed": "50%", + "small_perimeter_threshold": "0", + "solid_infill_filament": "1", + "sparse_infill_acceleration": "100%", + "sparse_infill_density": "10%", + "sparse_infill_filament": "1", + "sparse_infill_line_width": "0.4", + "sparse_infill_pattern": "adaptivecubic", + "sparse_infill_speed": "200", + "spiral_mode": "0", + "staggered_inner_seams": "0", + "standby_temperature_delta": "-5", + "support_angle": "0", + "support_base_pattern": "rectilinear", + "support_base_pattern_spacing": "0.2", + "support_bottom_interface_spacing": "0.5", + "support_bottom_z_distance": "0.2", + "support_critical_regions_only": "0", + "support_expansion": "0", + "support_filament": "0", + "support_interface_bottom_layers": "-1", + "support_interface_filament": "0", + "support_interface_loop_pattern": "0", + "support_interface_pattern": "rectilinear", + "support_interface_spacing": "0.2", + "support_interface_speed": "80", + "support_interface_top_layers": "3", + "support_object_xy_distance": "0.35", + "support_on_build_plate_only": "0", + "support_remove_small_overhang": "1", + "support_speed": "140", + "support_style": "grid", + "support_threshold_angle": "40", + "support_top_z_distance": "0.15", + "support_type": "normal(auto)", + "thick_bridges": "0", + "timelapse_type": "0", + "top_shell_layers": "2", + "top_solid_infill_flow_ratio": "1", + "top_surface_acceleration": "2000", + "top_surface_jerk": "9", + "top_surface_line_width": "0.4", + "top_surface_pattern": "monotonic", + "top_surface_speed": "40", + "travel_acceleration": "3000", + "travel_jerk": "12", + "travel_speed": "200", + "travel_speed_z": "0", + "tree_support_adaptive_layer_height": "1", + "tree_support_angle_slow": "25", + "tree_support_auto_brim": "1", + "tree_support_branch_angle": "40", + "tree_support_branch_angle_organic": "40", + "tree_support_branch_diameter": "5", + "tree_support_branch_diameter_angle": "5", + "tree_support_branch_diameter_double_wall": "3", + "tree_support_branch_diameter_organic": "2", + "tree_support_branch_distance": "5", + "tree_support_branch_distance_organic": "1", + "tree_support_brim_width": "3", + "tree_support_tip_diameter": "0.8", + "tree_support_top_rate": "30%", + "tree_support_wall_count": "0", + "version": "1.7.0.0", + "wall_distribution_count": "1", + "wall_filament": "1", + "wall_generator": "arachne", + "wall_infill_order": "inner wall/outer wall/infill", + "wall_loops": "3", + "wall_transition_angle": "10", + "wall_transition_filter_deviation": "25%", + "wall_transition_length": "100%", + "wipe_on_loops": "0", + "wipe_speed": "80%", + "wipe_tower_bridging": "10", + "wipe_tower_cone_angle": "0", + "wipe_tower_extra_spacing": "100%", + "wipe_tower_extruder": "0", + "wipe_tower_no_sparse_layers": "0", + "wipe_tower_rotation_angle": "0", + "wiping_volumes_extruders": [ + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70", + "70" + ], + "xy_contour_compensation": "0", + "xy_hole_compensation": "0" } diff --git a/resources/profiles/Creality.json b/resources/profiles/Creality.json index 7c9e40ea84..a602307d82 100644 --- a/resources/profiles/Creality.json +++ b/resources/profiles/Creality.json @@ -78,14 +78,66 @@ "name": "fdm_process_creality_common", "sub_path": "process/fdm_process_creality_common.json" }, + { + "name": "fdm_process_creality_common_0_2", + "sub_path": "process/fdm_process_creality_common_0_2.json" + }, + { + "name": "fdm_process_creality_common_0_25", + "sub_path": "process/fdm_process_creality_common_0_25.json" + }, + { + "name": "fdm_process_creality_common_0_3", + "sub_path": "process/fdm_process_creality_common_0_3.json" + }, + { + "name": "fdm_process_creality_common_0_5", + "sub_path": "process/fdm_process_creality_common_0_5.json" + }, + { + "name": "fdm_process_creality_common_0_6", + "sub_path": "process/fdm_process_creality_common_0_6.json" + }, + { + "name": "fdm_process_creality_common_0_8", + "sub_path": "process/fdm_process_creality_common_0_8.json" + }, + { + "name": "fdm_process_creality_common_1_0", + "sub_path": "process/fdm_process_creality_common_1_0.json" + }, { "name": "0.08mm SuperDetail @Creality CR-6 0.2", "sub_path": "process/0.08mm SuperDetail @Creality CR-6 0.2.json" }, + { + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle)", + "sub_path": "process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle).json" + }, + { + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle)", + "sub_path": "process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle).json" + }, + { + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, { "name": "0.10mm HighDetail @Creality CR-6 0.4.json", "sub_path": "process/0.10mm HighDetail @Creality CR-6 0.4.json" }, + { + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle)", + "sub_path": "process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle).json" + }, + { + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle)", + "sub_path": "process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle).json" + }, + { + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, { "name": "0.12mm Fine @Creality CR10Max", "sub_path": "process/0.12mm Fine @Creality CR10Max.json" @@ -103,8 +155,24 @@ "sub_path": "process/0.12mm Fine @Creality Ender3V2.json" }, { - "name": "0.12mm Fine @Creality Ender5Pro (2019)", - "sub_path": "process/0.12mm Fine @Creality Ender5Pro (2019).json" + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle)", + "sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle).json" + }, + { + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle)", + "sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle).json" + }, + { + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, + { + "name": "0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle)", + "sub_path": "process/0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle).json" + }, + { + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle).json" }, { "name": "0.16mm Optimal @Creality CR10V2", @@ -135,8 +203,28 @@ "sub_path": "process/0.16mm Optimal @Creality Ender5Plus.json" }, { - "name": "0.15mm Optimal @Creality Ender5Pro (2019)", - "sub_path": "process/0.15mm Optimal @Creality Ender5Pro (2019).json" + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle)", + "sub_path": "process/0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle).json" + }, + { + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle)", + "sub_path": "process/0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle).json" + }, + { + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, + { + "name": "0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle)", + "sub_path": "process/0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle).json" + }, + { + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle).json" + }, + { + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle)", + "sub_path": "process/0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle).json" }, { "name": "0.16mm Optimal @Creality Ender5S", @@ -173,8 +261,8 @@ { "name": "0.20mm Standard @Creality CR-6 0.6", "sub_path": "process/0.20mm Standard @Creality CR-6 0.6.json" - }, - { + }, + { "name": "0.20mm Standard @Creality Ender3", "sub_path": "process/0.20mm Standard @Creality Ender3.json" }, @@ -199,8 +287,28 @@ "sub_path": "process/0.20mm Standard @Creality Ender5Plus.json" }, { - "name": "0.20mm Standard @Creality Ender5Pro (2019)", - "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019).json" + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle).json" + }, + { + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, + { + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle).json" + }, + { + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle).json" + }, + { + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle).json" + }, + { + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle)", + "sub_path": "process/0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle).json" }, { "name": "0.20mm Standard @Creality Ender5S", @@ -243,8 +351,24 @@ "sub_path": "process/0.24mm Draft @Creality Ender3V2.json" }, { - "name": "0.24mm Draft @Creality Ender5Pro (2019)", - "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019).json" + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle)", + "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle).json" + }, + { + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle)", + "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle).json" + }, + { + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle).json" + }, + { + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle)", + "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle).json" + }, + { + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle)", + "sub_path": "process/0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle).json" }, { "name": "0.28mm SuperDraft @Creality CR-6 0.4", @@ -254,6 +378,22 @@ "name": "0.28mm SuperDraft @Creality CR-6 0.6", "sub_path": "process/0.28mm SuperDraft @Creality CR-6 0.6.json" }, + { + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle).json" + }, + { + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle)", + "sub_path": "process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle).json" + }, + { + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle)", + "sub_path": "process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle).json" + }, + { + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle)", + "sub_path": "process/0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle).json" + }, { "name": "0.32mm Chunky @Creality CR-6 0.6", "sub_path": "process/0.32mm Chunky @Creality CR-6 0.6.json" @@ -266,6 +406,22 @@ "name": "0.36mm SuperChunky @Creality CR-6 0.6", "sub_path": "process/0.36mm SuperChunky @Creality CR-6 0.6.json" }, + { + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle)", + "sub_path": "process/0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle).json" + }, + { + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle)", + "sub_path": "process/0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle).json" + }, + { + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle)", + "sub_path": "process/0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle).json" + }, + { + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle)", + "sub_path": "process/0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle).json" + }, { "name": "0.40mm Draft @Creality CR-6 0.8", "sub_path": "process/0.40mm Draft @Creality CR-6 0.8.json" @@ -475,8 +631,36 @@ "sub_path": "machine/Creality Ender-5 Plus 0.4 nozzle.json" }, { - "name": "Creality Ender-5 Pro (2019) 0.4 nozzle", - "sub_path": "machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json" + "name": "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.2 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.25 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.3 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.4 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.4 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.5 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.6 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (0.8 nozzle).json" + }, + { + "name": "Creality Ender-5 Pro (2019) (1.0 nozzle)", + "sub_path": "machine/Creality Ender-5 Pro (2019) (1.0 nozzle).json" }, { "name": "Creality Ender-5S 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic ABS.json b/resources/profiles/Creality/filament/Creality Generic ABS.json index 482d180125..88526e3f07 100644 --- a/resources/profiles/Creality/filament/Creality Generic ABS.json +++ b/resources/profiles/Creality/filament/Creality Generic ABS.json @@ -25,7 +25,14 @@ "Creality Ender-3 S1 Pro 0.4 nozzle", "Creality Ender-5 0.4 nozzle", "Creality Ender-5 Plus 0.4 nozzle", - "Creality Ender-5 Pro (2019) 0.4 nozzle", + "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "Creality Ender-5 Pro (2019) (0.4 nozzle)", + "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "Creality Ender-5 Pro (2019) (1.0 nozzle)", "Creality Ender-5S 0.4 nozzle", "Creality Ender-5 S1 0.4 nozzle", "Creality Ender-6 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic ASA.json b/resources/profiles/Creality/filament/Creality Generic ASA.json index 97970fc562..cfc0be665d 100644 --- a/resources/profiles/Creality/filament/Creality Generic ASA.json +++ b/resources/profiles/Creality/filament/Creality Generic ASA.json @@ -25,7 +25,14 @@ "Creality Ender-3 S1 Pro 0.4 nozzle", "Creality Ender-5 0.4 nozzle", "Creality Ender-5 Plus 0.4 nozzle", - "Creality Ender-5 Pro (2019) 0.4 nozzle", + "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "Creality Ender-5 Pro (2019) (0.4 nozzle)", + "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "Creality Ender-5 Pro (2019) (1.0 nozzle)", "Creality Ender-5S 0.4 nozzle", "Creality Ender-5 S1 0.4 nozzle", "Creality Ender-6 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PETG.json b/resources/profiles/Creality/filament/Creality Generic PETG.json index 715f4d7607..8ef6079e0b 100644 --- a/resources/profiles/Creality/filament/Creality Generic PETG.json +++ b/resources/profiles/Creality/filament/Creality Generic PETG.json @@ -35,7 +35,14 @@ "Creality Ender-3 S1 Pro 0.4 nozzle", "Creality Ender-5 0.4 nozzle", "Creality Ender-5 Plus 0.4 nozzle", - "Creality Ender-5 Pro (2019) 0.4 nozzle", + "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "Creality Ender-5 Pro (2019) (0.4 nozzle)", + "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "Creality Ender-5 Pro (2019) (1.0 nozzle)", "Creality Ender-5S 0.4 nozzle", "Creality Ender-5 S1 0.4 nozzle", "Creality Ender-6 0.4 nozzle", diff --git a/resources/profiles/Creality/filament/Creality Generic PLA.json b/resources/profiles/Creality/filament/Creality Generic PLA.json index a63a760af2..387f57f011 100644 --- a/resources/profiles/Creality/filament/Creality Generic PLA.json +++ b/resources/profiles/Creality/filament/Creality Generic PLA.json @@ -26,7 +26,14 @@ "Creality Ender-3 S1 Pro 0.4 nozzle", "Creality Ender-5 0.4 nozzle", "Creality Ender-5 Plus 0.4 nozzle", - "Creality Ender-5 Pro (2019) 0.4 nozzle", + "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "Creality Ender-5 Pro (2019) (0.4 nozzle)", + "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "Creality Ender-5 Pro (2019) (1.0 nozzle)", "Creality Ender-5S 0.4 nozzle", "Creality Ender-5 S1 0.4 nozzle", "Creality Ender-6 0.4 nozzle", diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.2 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.2 nozzle).json new file mode 100644 index 0000000000..7252f3a347 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.2 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.2 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.2", + "default_print_profile": "0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle)", + "max_layer_height": [ + "0.16" + ], + "min_layer_height": [ + "0.05" + ], + "nozzle_diameter": [ + "0.2" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..589ae4ef39 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.25 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.25", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle)", + "max_layer_height": [ + "0.2" + ], + "min_layer_height": [ + "0.06" + ], + "nozzle_diameter": [ + "0.25" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..f9f84d37bf --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.3 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.3", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle)", + "max_layer_height": [ + "0.24" + ], + "min_layer_height": [ + "0.08" + ], + "nozzle_diameter": [ + "0.3" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.4 nozzle).json similarity index 87% rename from resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json rename to resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.4 nozzle).json index fe029ae8d3..1babc0db4c 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) 0.4 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.4 nozzle).json @@ -1,7 +1,7 @@ { "type": "machine", "setting_id": "GM001", - "name": "Creality Ender-5 Pro (2019) 0.4 nozzle", + "name": "Creality Ender-5 Pro (2019) (0.4 nozzle)", "from": "system", "instantiation": "true", "inherits": "fdm_creality_common", @@ -9,7 +9,7 @@ "default_filament_profile": [ "Creality Generic PLA" ], - "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019)", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle)", "nozzle_diameter": [ "0.4" ], diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..5bd4b6eac7 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.5 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.5", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle)", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.12" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..be4951fece --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.6 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.6", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle)", + "max_layer_height": [ + "0.48" + ], + "min_layer_height": [ + "0.16" + ], + "nozzle_diameter": [ + "0.6" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.8 nozzle).json new file mode 100644 index 0000000000..c1ad60e649 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (0.8 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "0.8", + "default_print_profile": "0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle)", + "max_layer_height": [ + "0.64" + ], + "min_layer_height": [ + "0.2" + ], + "nozzle_diameter": [ + "0.8" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (1.0 nozzle).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (1.0 nozzle).json new file mode 100644 index 0000000000..d843420ee8 --- /dev/null +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019) (1.0 nozzle).json @@ -0,0 +1,32 @@ +{ + "type": "machine", + "setting_id": "GM001", + "name": "Creality Ender-5 Pro (2019) (1.0 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_creality_common", + "printer_model": "Creality Ender-5 Pro (2019)", + "default_filament_profile": [ + "Creality Generic PLA" + ], + "printer_variant": "1.0", + "default_print_profile": "0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle)", + "max_layer_height": [ + "0.80" + ], + "min_layer_height": [ + "0.25" + ], + "nozzle_diameter": [ + "1.0" + ], + "printable_area": [ + "0x0", + "220x0", + "220x220", + "0x220" + ], + "printable_height": "300", + "nozzle_type": "undefine", + "auxiliary_fan": "0" +} diff --git a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json index b6d9ee1c97..3f71b5fbc4 100644 --- a/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json +++ b/resources/profiles/Creality/machine/Creality Ender-5 Pro (2019).json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Creality Ender-5 Pro (2019)", "model_id": "Creality_Ender_5_Pro_2019", - "nozzle_diameter": "0.4", + "nozzle_diameter": "0.2;0.25;0.3;0.4;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "Creality", "bed_model": "creality_ender5pro_buildplate_model.stl", diff --git a/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle).json b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle).json new file mode 100644 index 0000000000..8b9f027e3b --- /dev/null +++ b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.2 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_2", + "bottom_shell_layers": "9", + "top_shell_layers": "11", + "layer_height": "0.08", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..80f7962f52 --- /dev/null +++ b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_25", + "bottom_shell_layers": "9", + "top_shell_layers": "11", + "layer_height": "0.08", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..48a3fb6f48 --- /dev/null +++ b/resources/profiles/Creality/process/0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.08mm SuperDetail @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "9", + "top_shell_layers": "11", + "layer_height": "0.08", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle).json b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle).json new file mode 100644 index 0000000000..ee580beee3 --- /dev/null +++ b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.2 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_2", + "bottom_shell_layers": "7", + "top_shell_layers": "9", + "layer_height": "0.1", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..09e4383061 --- /dev/null +++ b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_25", + "bottom_shell_layers": "7", + "top_shell_layers": "9", + "layer_height": "0.1", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..3ab61528ae --- /dev/null +++ b/resources/profiles/Creality/process/0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm HighDetail @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "7", + "top_shell_layers": "9", + "layer_height": "0.1", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle).json b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle).json new file mode 100644 index 0000000000..c7e669aff1 --- /dev/null +++ b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.2 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_2", + "bottom_shell_layers": "6", + "top_shell_layers": "7", + "layer_height": "0.12", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..daa30bc87d --- /dev/null +++ b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_25", + "bottom_shell_layers": "6", + "top_shell_layers": "7", + "layer_height": "0.12", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..a9b9f144a0 --- /dev/null +++ b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "6", + "top_shell_layers": "7", + "layer_height": "0.12", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..6cfc7f79ff --- /dev/null +++ b/resources/profiles/Creality/process/0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Detail @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "6", + "top_shell_layers": "7", + "layer_height": "0.12", + "bridge_flow": "0.7" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019).json b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle).json similarity index 96% rename from resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019).json rename to resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle).json index 95e24872c8..a3b3608867 100644 --- a/resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019).json +++ b/resources/profiles/Creality/process/0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle).json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.12mm Fine @Creality Ender5Pro (2019)", + "name": "0.12mm Fine @Creality Ender5Pro (2019) (0.4 nozzle)", "from": "system", "inherits": "fdm_process_creality_common", "instantiation": "true", @@ -103,6 +103,6 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "compatible_printers": [ - "Creality Ender-5 Pro (2019) 0.4 nozzle" + "Creality Ender-5 Pro (2019) (0.4 nozzle)" ] } diff --git a/resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019).json b/resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle).json similarity index 96% rename from resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019).json rename to resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle).json index 9404f9d2f8..e6eace18cc 100644 --- a/resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019).json +++ b/resources/profiles/Creality/process/0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle).json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.15mm Optimal @Creality Ender5Pro (2019)", + "name": "0.15mm Optimal @Creality Ender5Pro (2019) (0.4 nozzle)", "from": "system", "inherits": "fdm_process_creality_common", "instantiation": "true", @@ -103,6 +103,6 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "compatible_printers": [ - "Creality Ender-5 Pro (2019) 0.4 nozzle" + "Creality Ender-5 Pro (2019) (0.4 nozzle)" ] } diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle).json new file mode 100644 index 0000000000..3ae935a983 --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.2 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_2", + "bottom_shell_layers": "5", + "top_shell_layers": "7", + "layer_height": "0.16", + "bridge_flow": "0.85" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..4748d4d118 --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_25", + "bottom_shell_layers": "5", + "top_shell_layers": "7", + "layer_height": "0.16", + "bridge_flow": "0.85" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..f6e198e0f3 --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "5", + "top_shell_layers": "7", + "layer_height": "0.16", + "bridge_flow": "0.85" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..dc5cab3e6e --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "5", + "top_shell_layers": "7", + "layer_height": "0.16", + "bridge_flow": "0.85" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..4ecfa311b6 --- /dev/null +++ b/resources/profiles/Creality/process/0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle).json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @Creality Ender5Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_6", + "bottom_shell_layers": "5", + "top_shell_layers": "7", + "bridge_flow": "0.85", + "layer_height": "0.16" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle).json new file mode 100644 index 0000000000..115ebb0b48 --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.25 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_25", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "layer_height": "0.20" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..da2b648875 --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "layer_height": "0.20" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle).json similarity index 96% rename from resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019).json rename to resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle).json index 04b6b36d34..0f363058f0 100644 --- a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019).json +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle).json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.20mm Standard @Creality Ender5Pro (2019)", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.4 nozzle)", "from": "system", "inherits": "fdm_process_creality_common", "instantiation": "true", @@ -103,6 +103,6 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "compatible_printers": [ - "Creality Ender-5 Pro (2019) 0.4 nozzle" + "Creality Ender-5 Pro (2019) (0.4 nozzle)" ] } diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..dae5dac6f2 --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "layer_height": "0.20" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..0dc39d710a --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_6", + "bottom_shell_layers": "4", + "top_shell_layers": "4", + "layer_height": "0.20" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle).json b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle).json new file mode 100644 index 0000000000..424ce00241 --- /dev/null +++ b/resources/profiles/Creality/process/0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Creality Ender5Pro (2019) (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_8", + "bottom_shell_layers": "4", + "top_shell_layers": "5", + "layer_height": "0.20" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle).json new file mode 100644 index 0000000000..a6598bd7ac --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.3 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_3", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.24" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019).json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle).json similarity index 96% rename from resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019).json rename to resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle).json index d6df736aba..0eaf237d7c 100644 --- a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019).json +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle).json @@ -1,7 +1,7 @@ { "type": "process", "setting_id": "GP004", - "name": "0.24mm Draft @Creality Ender5Pro (2019)", + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.4 nozzle)", "from": "system", "inherits": "fdm_process_creality_common", "instantiation": "true", @@ -103,6 +103,6 @@ "xy_hole_compensation": "0", "xy_contour_compensation": "0", "compatible_printers": [ - "Creality Ender-5 Pro (2019) 0.4 nozzle" + "Creality Ender-5 Pro (2019) (0.4 nozzle)" ] } diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..4b69460109 --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.24" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..5fb0dc077c --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_6", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.24" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle).json b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle).json new file mode 100644 index 0000000000..d72b9bb75f --- /dev/null +++ b/resources/profiles/Creality/process/0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Creality Ender5Pro (2019) (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_8", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.24" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..1bcc1b9375 --- /dev/null +++ b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.28" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..c2ffcd3a17 --- /dev/null +++ b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_6", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.28" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle).json b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle).json new file mode 100644 index 0000000000..be0f9dafa0 --- /dev/null +++ b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_8", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.28" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle).json b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle).json new file mode 100644 index 0000000000..2dfc5ae38b --- /dev/null +++ b/resources/profiles/Creality/process/0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.28mm SuperDraft @Creality Ender5Pro (2019) (1.0 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_1_0", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.28" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle).json b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle).json new file mode 100644 index 0000000000..6f9756b36e --- /dev/null +++ b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.5 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_5", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.36" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle).json b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle).json new file mode 100644 index 0000000000..9e556a7c53 --- /dev/null +++ b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.6 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_6", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.36" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle).json b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle).json new file mode 100644 index 0000000000..f682e1a4a9 --- /dev/null +++ b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (0.8 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_0_8", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.36" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle).json b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle).json new file mode 100644 index 0000000000..1d565411fb --- /dev/null +++ b/resources/profiles/Creality/process/0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle).json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.36mm Chunky @Creality Ender5Pro (2019) (1.0 nozzle)", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_creality_common_1_0", + "bottom_shell_layers": "3", + "top_shell_layers": "4", + "layer_height": "0.36" +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_2.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_2.json new file mode 100644 index 0000000000..d93df94b3e --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_2.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_2", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.2", + "line_width": "0.22", + "initial_layer_line_width": "0.2", + "sparse_infill_line_width": "0.22", + "inner_wall_line_width": "0.22", + "internal_solid_infill_line_width": "0.22", + "support_line_width": "0.18", + "top_surface_line_width": "0.2", + "initial_layer_print_height": "0.12", + "wall_loops": "6", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.2 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_25.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_25.json new file mode 100644 index 0000000000..8040cb846f --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_25.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_25", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.26", + "line_width": "0.28", + "initial_layer_line_width": "0.26", + "sparse_infill_line_width": "0.28", + "inner_wall_line_width": "0.28", + "internal_solid_infill_line_width": "0.28", + "support_line_width": "0.23", + "top_surface_line_width": "0.25", + "initial_layer_print_height": "0.12", + "wall_loops": "5", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.25 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_3.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_3.json new file mode 100644 index 0000000000..4e50dbc4b9 --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_3.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_3", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.31", + "line_width": "0.33", + "initial_layer_line_width": "0.31", + "sparse_infill_line_width": "0.33", + "inner_wall_line_width": "0.33", + "internal_solid_infill_line_width": "0.33", + "support_line_width": "0.27", + "top_surface_line_width": "0.3", + "wall_loops": "4", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.3 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_5.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_5.json new file mode 100644 index 0000000000..3c1a20b6a1 --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_5.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_5", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.52", + "line_width": "0.55", + "initial_layer_line_width": "0.52", + "sparse_infill_line_width": "0.55", + "inner_wall_line_width": "0.55", + "internal_solid_infill_line_width": "0.55", + "support_line_width": "0.45", + "top_surface_line_width": "0.5", + "wall_loops": "3", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.5 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_6.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_6.json new file mode 100644 index 0000000000..579aa1fa7b --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_6.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_6", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.63", + "line_width": "0.66", + "initial_layer_line_width": "0.63", + "sparse_infill_line_width": "0.66", + "inner_wall_line_width": "0.66", + "internal_solid_infill_line_width": "0.66", + "support_line_width": "0.54", + "top_surface_line_width": "0.6", + "wall_loops": "2", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "initial_layer_print_height": "0.2", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.6 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_0_8.json b/resources/profiles/Creality/process/fdm_process_creality_common_0_8.json new file mode 100644 index 0000000000..43959bc9dc --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_0_8.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_0_8", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "0.84", + "line_width": "0.88", + "initial_layer_line_width": "0.84", + "sparse_infill_line_width": "0.88", + "inner_wall_line_width": "0.88", + "internal_solid_infill_line_width": "0.88", + "support_line_width": "0.72", + "top_surface_line_width": "0.8", + "initial_layer_print_height": "0.32", + "wall_loops": "2", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (0.8 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Creality/process/fdm_process_creality_common_1_0.json b/resources/profiles/Creality/process/fdm_process_creality_common_1_0.json new file mode 100644 index 0000000000..72a927710d --- /dev/null +++ b/resources/profiles/Creality/process/fdm_process_creality_common_1_0.json @@ -0,0 +1,107 @@ +{ + "type": "process", + "name": "fdm_process_creality_common_1_0", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_creality_common", + "outer_wall_line_width": "1.05", + "line_width": "1.10", + "initial_layer_line_width": "1.05", + "sparse_infill_line_width": "1.10", + "inner_wall_line_width": "1.10", + "internal_solid_infill_line_width": "1.10", + "support_line_width": "0.9", + "top_surface_line_width": "1.0", + "initial_layer_print_height": "0.32", + "wall_loops": "1", + "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": "25", + "brim_width": "5", + "brim_object_gap": "0.1", + "compatible_printers_condition": "", + "print_sequence": "by layer", + "default_acceleration": "500", + "top_surface_acceleration": "500", + "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": "grid", + "initial_layer_acceleration": "500", + "travel_acceleration": "700", + "inner_wall_acceleration": "500", + "infill_combination": "0", + "infill_wall_overlap": "23%", + "interface_shells": "0", + "ironing_flow": "15%", + "ironing_spacing": "0.1", + "ironing_speed": "15", + "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": "20", + "overhang_3_4_speed": "15", + "overhang_4_4_speed": "10", + "print_settings_id": "", + "raft_layers": "0", + "seam_position": "aligned", + "skirt_distance": "2", + "skirt_height": "1", + "skirt_loops": "1", + "minimum_sparse_infill_area": "15", + "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_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": "monotonic", + "top_shell_layers": "4", + "top_shell_thickness": "0.8", + "initial_layer_speed": "15", + "initial_layer_infill_speed": "20", + "outer_wall_speed": "25", + "inner_wall_speed": "40", + "internal_solid_infill_speed": "40", + "top_surface_speed": "30", + "gap_infill_speed": "30", + "sparse_infill_speed": "50", + "travel_speed": "150", + "enable_prime_tower": "0", + "wipe_tower_no_sparse_layers": "0", + "prime_tower_width": "60", + "xy_hole_compensation": "0", + "xy_contour_compensation": "0", + "compatible_printers": [ + "Creality Ender-5 Pro (2019) (1.0 nozzle)" + ] +} \ No newline at end of file diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json index a256bd2178..68cc8df4eb 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.4 Nozzle.json @@ -46,7 +46,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disable motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json index 2c1c75aa70..ac637d25b6 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M 0.6 Nozzle.json @@ -46,7 +46,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disable motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json index dded44af82..922ee4a85b 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.4 Nozzle.json @@ -46,7 +46,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disable motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json index 60aba649ea..4e2cc3019e 100644 --- a/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json +++ b/resources/profiles/Flashforge/machine/Flashforge Adventurer 5M Pro 0.6 Nozzle.json @@ -46,7 +46,7 @@ "change_filament_gcode": "", "machine_pause_gcode": "M25", "default_filament_profile": [ "Flashforge Generic PLA" ], - "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG1 Z5 F6000\nG1 E-1.5 F600\nG1 E12 F800\nG1 X85 Y110 Z0.25 F1200\nG1 X-110 E15 F2400\nG1 Y0 E4 F2400\nG1 X-109.6 F2400\nG1 Y110 E5 F2400\nG92 E0", + "machine_start_gcode": "M190 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nG90\nM83\nG1 Z5 F6000\nG1 E-1.5 F800\nG1 X110 Y-110 F6000\nG1 E2 F800\nG1 Y-110 X55 Z0.25 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG1 Y-110 X55 Z0.45 F4800\nG1 X-55 E8 F2400\nG1 Y-109.6 F2400\nG1 X55 E5 F2400\nG92 E0", "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F30000\nG28\nM104 S0 ; turn off temperature\nM84 ; disable motors", "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]", "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]", diff --git a/src/libslic3r/LayerRegion.cpp b/src/libslic3r/LayerRegion.cpp index ff0c1736ab..a89dd3cfa7 100644 --- a/src/libslic3r/LayerRegion.cpp +++ b/src/libslic3r/LayerRegion.cpp @@ -446,6 +446,24 @@ void LayerRegion::process_external_surfaces(const Layer *lower_layer, const Poly RegionExpansionParameters::build(expansion_top, expansion_step, max_nr_expansion_steps), sparse, expansion_params_into_sparse_infill, closing_radius); + // turn too small internal regions into solid regions according to the user setting + if (!this->layer()->object()->print()->config().spiral_mode && this->region().config().sparse_infill_density.value > 0) { + // scaling an area requires two calls! + double min_area = scale_(scale_(this->region().config().minimum_sparse_infill_area.value)); + ExPolygons small_regions{}; + sparse.erase(std::remove_if(sparse.begin(), sparse.end(), [min_area, &small_regions](ExPolygon& ex_polygon) { + if (ex_polygon.area() <= min_area) { + small_regions.push_back(ex_polygon); + return true; + } + return false; + }), sparse.end()); + + if (!small_regions.empty()) { + shells = union_ex(shells, small_regions); + } + } + // m_fill_surfaces.remove_types({ stBottomBridge, stBottom, stTop, stInternal, stInternalSolid }); this->fill_surfaces.clear(); reserve_more(this->fill_surfaces.surfaces, shells.size() + sparse.size() + bridges.size() + bottoms.size() + tops.size()); @@ -792,12 +810,10 @@ void LayerRegion::prepare_fill_surfaces() surface.surface_type = stInternal; } - // turn too small internal regions into solid regions according to the user setting - if (! spiral_mode && this->region().config().sparse_infill_density.value > 0) { - // scaling an area requires two calls! - double min_area = scale_(scale_(this->region().config().minimum_sparse_infill_area.value)); + if (!spiral_mode && fabs(this->region().config().sparse_infill_density.value - 100.) < EPSILON) { + // Turn all internal sparse infill into solid infill, if sparse_infill_density is 100% for (Surface &surface : this->fill_surfaces.surfaces) - if (surface.surface_type == stInternal && surface.area() <= min_area) + if (surface.surface_type == stInternal) surface.surface_type = stInternalSolid; } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index e8f9219940..cecda027f8 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1726,7 +1726,7 @@ def = this->add("filament_loading_speed", coFloats); def = this->add("sparse_infill_density", coPercent); def->label = L("Sparse infill density"); def->category = L("Strength"); - def->tooltip = L("Density of internal sparse infill, 100% means solid throughout"); + def->tooltip = L("Density of internal sparse infill, 100% turns all sparse infill into solid infill and internal solid infill pattern will be used"); def->sidetext = L("%"); def->min = 0; def->max = 100; @@ -5711,12 +5711,6 @@ std::map validate(const FullPrintConfig &cfg, bool und error_message.emplace("internal_solid_infill_pattern", L("invalid value ") + cfg.internal_solid_infill_pattern.serialize()); } - // --fill-density - if (fabs(cfg.sparse_infill_density.value - 100.) < EPSILON && - ! print_config_def.get("top_surface_pattern")->has_enum_value(cfg.sparse_infill_pattern.serialize())) { - error_message.emplace("sparse_infill_pattern", cfg.sparse_infill_pattern.serialize() + L(" doesn't work at 100%% density ")); - } - // --skirt-height if (cfg.skirt_height < 0) { error_message.emplace("skirt_height", L("invalid value ") + std::to_string(cfg.skirt_height)); diff --git a/src/libslic3r/PrintObject.cpp b/src/libslic3r/PrintObject.cpp index d3ccbfbb34..092427fd04 100644 --- a/src/libslic3r/PrintObject.cpp +++ b/src/libslic3r/PrintObject.cpp @@ -3315,6 +3315,13 @@ void PrintObject::combine_infill() const bool enable_combine_infill = region.config().infill_combination.value; if (enable_combine_infill == false || region.config().sparse_infill_density == 0.) continue; + + // Support internal solid infill when sparse_infill_density is 100% + const bool use_solid_infill = fabs(region.config().sparse_infill_density.value - 100.) < EPSILON; + const SurfaceType surface_type = use_solid_infill ? stInternalSolid : stInternal; + const InfillPattern infill_pattern = use_solid_infill ? region.config().internal_solid_infill_pattern : + region.config().sparse_infill_pattern; + // Limit the number of combined layers to the maximum height allowed by this regions' nozzle. //FIXME limit the layer height to max_layer_height double nozzle_diameter = std::min( @@ -3361,10 +3368,10 @@ void PrintObject::combine_infill() layerms.emplace_back(m_layers[i]->regions()[region_id]); // We need to perform a multi-layer intersection, so let's split it in pairs. // Initialize the intersection with the candidates of the lowest layer. - ExPolygons intersection = to_expolygons(layerms.front()->fill_surfaces.filter_by_type(stInternal)); + ExPolygons intersection = to_expolygons(layerms.front()->fill_surfaces.filter_by_type(surface_type)); // Start looping from the second layer and intersect the current intersection with it. for (size_t i = 1; i < layerms.size(); ++ i) - intersection = intersection_ex(layerms[i]->fill_surfaces.filter_by_type(stInternal), intersection); + intersection = intersection_ex(layerms[i]->fill_surfaces.filter_by_type(surface_type), intersection); double area_threshold = layerms.front()->infill_area_threshold(); if (! intersection.empty() && area_threshold > 0.) intersection.erase(std::remove_if(intersection.begin(), intersection.end(), @@ -3384,21 +3391,21 @@ void PrintObject::combine_infill() 0.5f * layerms.back()->flow(frPerimeter).scaled_width() + // Because fill areas for rectilinear and honeycomb are grown // later to overlap perimeters, we need to counteract that too. - ((region.config().sparse_infill_pattern == ipRectilinear || - region.config().sparse_infill_pattern == ipMonotonic || - region.config().sparse_infill_pattern == ipGrid || - region.config().sparse_infill_pattern == ipLine || - region.config().sparse_infill_pattern == ipHoneycomb) ? 1.5f : 0.5f) * + ((infill_pattern == ipRectilinear || + infill_pattern == ipMonotonic || + infill_pattern == ipGrid || + infill_pattern == ipLine || + infill_pattern == ipHoneycomb) ? 1.5f : 0.5f) * layerms.back()->flow(frSolidInfill).scaled_width(); for (ExPolygon &expoly : intersection) polygons_append(intersection_with_clearance, offset(expoly, clearance_offset)); for (LayerRegion *layerm : layerms) { - Polygons internal = to_polygons(std::move(layerm->fill_surfaces.filter_by_type(stInternal))); - layerm->fill_surfaces.remove_type(stInternal); - layerm->fill_surfaces.append(diff_ex(internal, intersection_with_clearance), stInternal); + Polygons internal = to_polygons(std::move(layerm->fill_surfaces.filter_by_type(surface_type))); + layerm->fill_surfaces.remove_type(surface_type); + layerm->fill_surfaces.append(diff_ex(internal, intersection_with_clearance), surface_type); if (layerm == layerms.back()) { // Apply surfaces back with adjusted depth to the uppermost layer. - Surface templ(stInternal, ExPolygon()); + Surface templ(surface_type, ExPolygon()); templ.thickness = 0.; for (LayerRegion *layerm2 : layerms) templ.thickness += layerm2->layer()->height; diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp index e31656cda9..8b1f86a3ac 100644 --- a/src/libslic3r/utils.cpp +++ b/src/libslic3r/utils.cpp @@ -852,70 +852,20 @@ CopyFileResult copy_file(const std::string &from, const std::string &to, std::st ::MultiByteToWideChar(CP_UTF8, NULL, dest_str, strlen(dest_str), dst_wstr, dst_wlen); dst_wstr[dst_wlen] = '\0'; - BOOL result; - char* buff = nullptr; - HANDLE handlesrc = nullptr; - HANDLE handledst = nullptr; CopyFileResult ret = SUCCESS; - - handlesrc = CreateFile(src_wstr, - GENERIC_READ, - FILE_SHARE_READ, - NULL, - OPEN_EXISTING, - FILE_ATTRIBUTE_TEMPORARY, - 0); - if(handlesrc==INVALID_HANDLE_VALUE){ - error_message = "Error: open src file"; - ret = FAIL_COPY_FILE; - goto __finished; - } - - handledst=CreateFile(dst_wstr, - GENERIC_WRITE, - FILE_SHARE_READ, - NULL, - CREATE_ALWAYS, - FILE_ATTRIBUTE_TEMPORARY, - 0); - if(handledst==INVALID_HANDLE_VALUE){ - error_message = "Error: create dest file"; - ret = FAIL_COPY_FILE; - goto __finished; - } - - DWORD size=GetFileSize(handlesrc,NULL); - buff = new char[size+1]; - DWORD dwRead=0,dwWrite; - result = ReadFile(handlesrc, buff, size, &dwRead, NULL); + BOOL result = CopyFileW(src_wstr, dst_wstr, FALSE); if (!result) { DWORD errCode = GetLastError(); error_message = "Error: " + errCode; ret = FAIL_COPY_FILE; goto __finished; } - buff[size]=0; - result = WriteFile(handledst,buff,size,&dwWrite,NULL); - if (!result) { - DWORD errCode = GetLastError(); - error_message = "Error: " + errCode; - ret = FAIL_COPY_FILE; - goto __finished; - } - - FlushFileBuffers(handledst); __finished: if (src_wstr) delete[] src_wstr; if (dst_wstr) delete[] dst_wstr; - if (handlesrc) - CloseHandle(handlesrc); - if (handledst) - CloseHandle(handledst); - if (buff) - delete[] buff; return ret; #else diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 64a0ac84ef..069eb4fb36 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -419,43 +419,6 @@ void ConfigManipulation::update_print_fff_config(DynamicPrintConfig* config, con } } - if (config->option("sparse_infill_density")->value == 100) { - std::string sparse_infill_pattern = config->option>("sparse_infill_pattern")->serialize(); - const auto &top_fill_pattern_values = config->def()->get("top_surface_pattern")->enum_values; - bool correct_100p_fill = std::find(top_fill_pattern_values.begin(), top_fill_pattern_values.end(), sparse_infill_pattern) != top_fill_pattern_values.end(); - if (!correct_100p_fill) { - // get sparse_infill_pattern name from enum_labels for using this one at dialog_msg - const ConfigOptionDef *fill_pattern_def = config->def()->get("sparse_infill_pattern"); - assert(fill_pattern_def != nullptr); - auto it_pattern = std::find(fill_pattern_def->enum_values.begin(), fill_pattern_def->enum_values.end(), sparse_infill_pattern); - assert(it_pattern != fill_pattern_def->enum_values.end()); - if (it_pattern != fill_pattern_def->enum_values.end()) { - wxString msg_text = GUI::format_wxstr(_L("%1% infill pattern doesn't support 100%% density."), - _(fill_pattern_def->enum_labels[it_pattern - fill_pattern_def->enum_values.begin()])); - if (is_global_config) - msg_text += "\n" + _L("Switch to rectilinear pattern?\n" - "Yes - switch to rectilinear pattern automaticlly\n" - "No - reset density to default non 100% value automaticlly") + "\n"; - MessageDialog dialog(m_msg_dlg_parent, msg_text, "", - wxICON_WARNING | (is_global_config ? wxYES | wxNO : wxOK) ); - DynamicPrintConfig new_conf = *config; - is_msg_dlg_already_exist = true; - auto answer = dialog.ShowModal(); - if (!is_global_config || answer == wxID_YES) { - new_conf.set_key_value("sparse_infill_pattern", new ConfigOptionEnum(ipRectilinear)); - sparse_infill_density = 100; - } - else - sparse_infill_density = wxGetApp().preset_bundle->prints.get_selected_preset().config.option("sparse_infill_density")->value; - new_conf.set_key_value("sparse_infill_density", new ConfigOptionPercent(sparse_infill_density)); - apply(config, &new_conf); - if (cb_value_change) - cb_value_change("sparse_infill_density", sparse_infill_density); - is_msg_dlg_already_exist = false; - } - } - } - // BBS static const char* keys[] = { "support_filament", "support_interface_filament"}; for (int i = 0; i < sizeof(keys) / sizeof(keys[0]); i++) { diff --git a/src/slic3r/GUI/GCodeViewer.cpp b/src/slic3r/GUI/GCodeViewer.cpp index ff985e3595..0f031ca839 100644 --- a/src/slic3r/GUI/GCodeViewer.cpp +++ b/src/slic3r/GUI/GCodeViewer.cpp @@ -550,7 +550,7 @@ void GCodeViewer::SequentialView::GCodeWindow::render(float top, float bottom, f static const ImVec4 PARAMETERS_COLOR = { 1.0f, 1.0f, 1.0f, 1.0f }; static const ImVec4 COMMENT_COLOR = { 0.7f, 0.7f, 0.7f, 1.0f }; - if (!m_visible || !wxGetApp().show_gcode_window() || m_filename.empty() || m_lines_ends.empty() || curr_line_id == 0) + if (!wxGetApp().show_gcode_window() || m_filename.empty() || m_lines_ends.empty() || curr_line_id == 0) return; // window height @@ -675,8 +675,12 @@ void GCodeViewer::SequentialView::GCodeWindow::stop_mapping_file() } void GCodeViewer::SequentialView::render(const bool has_render_path, float legend_height, int canvas_width, int canvas_height, int right_margin, const EViewType& view_type) { -if (has_render_path) - marker.render(canvas_width, canvas_height, view_type); + if (has_render_path && m_show_marker) { + marker.set_world_position(current_position); + marker.set_world_offset(current_offset); + + marker.render(canvas_width, canvas_height, view_type); + } //float bottom = wxGetApp().plater()->get_current_canvas3D()->get_canvas_size().get_height(); // BBS @@ -973,7 +977,7 @@ void GCodeViewer::load(const GCodeProcessorResult& gcode_result, const Print& pr m_settings_ids = gcode_result.settings_ids; m_filament_diameters = gcode_result.filament_diameters; m_filament_densities = gcode_result.filament_densities; -m_sequential_view.m_show_gcode_window = false; + m_sequential_view.m_show_marker = false; //BBS: always load shell at preview /*if (wxGetApp().is_editor()) @@ -1254,15 +1258,9 @@ void GCodeViewer::render(int canvas_width, int canvas_height, int right_margin) //BBS fixed bottom_margin for space to render horiz slider int bottom_margin = SLIDER_BOTTOM_MARGIN * GCODE_VIEWER_SLIDER_SCALE; - m_sequential_view.m_show_gcode_window = - m_sequential_view.m_show_gcode_window || - (m_sequential_view.current.last != m_sequential_view.endpoints.last && !m_no_render_path); - if (m_sequential_view.m_show_gcode_window) { - m_sequential_view.marker.set_world_position(m_sequential_view.current_position); - m_sequential_view.marker.set_world_offset(m_sequential_view.current_offset); - //BBS fixed buttom margin. m_moves_slider.pos_y - m_sequential_view.render(!m_no_render_path, legend_height, canvas_width, canvas_height - bottom_margin * m_scale, right_margin * m_scale, m_view_type); - } + m_sequential_view.m_show_marker = m_sequential_view.m_show_marker || (m_sequential_view.current.last != m_sequential_view.endpoints.last && !m_no_render_path); + // BBS fixed buttom margin. m_moves_slider.pos_y + m_sequential_view.render(!m_no_render_path, legend_height, canvas_width, canvas_height - bottom_margin * m_scale, right_margin * m_scale, m_view_type); #if ENABLE_GCODE_VIEWER_STATISTICS render_statistics(); #endif // ENABLE_GCODE_VIEWER_STATISTICS diff --git a/src/slic3r/GUI/GCodeViewer.hpp b/src/slic3r/GUI/GCodeViewer.hpp index a91e7b938e..d0bfdc544f 100644 --- a/src/slic3r/GUI/GCodeViewer.hpp +++ b/src/slic3r/GUI/GCodeViewer.hpp @@ -650,7 +650,6 @@ public: std::string comment; }; bool m_is_dark = false; - bool m_visible{ true }; uint64_t m_selected_line_id{ 0 }; size_t m_last_lines_size{ 0 }; std::string m_filename; @@ -674,8 +673,6 @@ public: m_filename.shrink_to_fit(); } - void toggle_visibility() { m_visible = !m_visible; } - //BBS: GUI refactor: add canvas size //void render(float top, float bottom, uint64_t curr_line_id) const; void render(float top, float bottom, float right, uint64_t curr_line_id) const; @@ -701,7 +698,7 @@ public: GCodeWindow gcode_window; std::vector gcode_ids; float m_scale = 1.0; - bool m_show_gcode_window = false; + bool m_show_marker = false; void render(const bool has_render_path, float legend_height, int canvas_width, int canvas_height, int right_margin, const EViewType& view_type); }; @@ -883,8 +880,6 @@ public: void export_toolpaths_to_obj(const char* filename) const; - void toggle_gcode_window_visibility() { m_sequential_view.gcode_window.toggle_visibility(); } - std::vector& get_custom_gcode_per_print_z() { return m_custom_gcode_per_print_z; } size_t get_extruders_count() { return m_extruders_count; } void push_combo_style(); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index bc74bd4441..8bbab3a2bf 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -3196,7 +3196,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt) //case 'B': //case 'b': { zoom_to_bed(); break; } case 'C': - case 'c': { m_gcode_viewer.toggle_gcode_window_visibility(); m_dirty = true; request_extra_frame(); break; } + case 'c': { wxGetApp().toggle_show_gcode_window(); m_dirty = true; request_extra_frame(); break; } //case 'G': //case 'g': { // if ((evt.GetModifiers() & shiftMask) != 0) { diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 8e6c4f64a2..9a29714f28 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -988,6 +988,12 @@ static void generic_exception_handle() //#endif } +void GUI_App::toggle_show_gcode_window() +{ + m_show_gcode_window = !m_show_gcode_window; + app_config->set_bool("show_gcode_window", m_show_gcode_window); +} + std::vector GUI_App::split_str(std::string src, std::string separator) { std::string::size_type pos; @@ -1165,7 +1171,7 @@ void GUI_App::post_init() if (app_config->get("stealth_mode") == "false") hms_query = new HMSQuery(); - m_show_gcode_window = app_config->get("show_gcode_window") == "true"; + m_show_gcode_window = app_config->get_bool("show_gcode_window"); if (m_networking_need_update) { //updating networking int ret = updating_bambu_networking(); diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp index 7acf5e8f26..7a0631c05f 100644 --- a/src/slic3r/GUI/GUI_App.hpp +++ b/src/slic3r/GUI/GUI_App.hpp @@ -324,7 +324,7 @@ private: // SoftFever bool show_gcode_window() const { return m_show_gcode_window; } - void set_show_gcode_window(bool val) { m_show_gcode_window = val; } + void toggle_show_gcode_window(); wxString get_inf_dialog_contect () {return m_info_dialog_content;}; diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 23ae74c7f5..6e5328da9c 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -2508,6 +2508,15 @@ void MainFrame::init_menubar_as_editor() else viewMenu->Check(wxID_CAMERA_ORTHOGONAL + camera_id_base, true); + viewMenu->AppendSeparator(); + append_menu_check_item(viewMenu, wxID_ANY, _L("Show &G-code Window") + "\tC", _L("Show g-code window in Previce scene"), + [this](wxCommandEvent &) { + wxGetApp().toggle_show_gcode_window(); + m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); + }, + this, [this]() { return m_plater->is_preview_shown(); }, + [this]() { return wxGetApp().show_gcode_window(); }, this); + viewMenu->AppendSeparator(); append_menu_check_item(viewMenu, wxID_ANY, _L("Show &Labels") + "\t" + ctrl + "E", _L("Show object labels in 3D scene"), [this](wxCommandEvent&) { m_plater->show_view3D_labels(!m_plater->are_view3D_labels_shown()); m_plater->get_current_canvas3D()->post_event(SimpleEvent(wxEVT_PAINT)); }, this, diff --git a/src/slic3r/GUI/Preferences.cpp b/src/slic3r/GUI/Preferences.cpp index 6704a03550..64bf3c273f 100644 --- a/src/slic3r/GUI/Preferences.cpp +++ b/src/slic3r/GUI/Preferences.cpp @@ -681,11 +681,6 @@ wxBoxSizer *PreferencesDialog::create_item_checkbox(wxString title, wxWindow *pa } } - if (param == "show_gcode_window") { - bool pbool = app_config->get("show_gcode_window") == "true" ? true : false; - wxGetApp().set_show_gcode_window(pbool); - } - #endif // __WXMSW__ if (param == "developer_mode") @@ -987,7 +982,6 @@ wxWindow* PreferencesDialog::create_general_page() auto item_show_splash_screen = create_item_checkbox(_L("Show splash screen"), page, _L("Show the splash screen during startup."), 50, "show_splash_screen"); auto item_hints = create_item_checkbox(_L("Show \"Tip of the day\" notification after start"), page, _L("If enabled, useful hints are displayed at startup."), 50, "show_hints"); - auto item_gcode_window = create_item_checkbox(_L("Show g-code window"), page, _L("If enabled, g-code window will be displayed."), 50, "show_gcode_window"); auto title_presets = create_item_title(_L("Presets"), page, _L("Presets")); auto item_user_sync = create_item_checkbox(_L("Auto sync user presets(Printer/Filament/Process)"), page, _L("User Sync"), 50, "sync_user_preset"); @@ -1048,7 +1042,6 @@ wxWindow* PreferencesDialog::create_general_page() sizer_page->Add(item_use_free_camera_settings, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_show_splash_screen, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_hints, 0, wxTOP, FromDIP(3)); - sizer_page->Add(item_gcode_window, 0, wxTOP, FromDIP(3)); sizer_page->Add(title_presets, 0, wxTOP | wxEXPAND, FromDIP(20)); sizer_page->Add(item_stealth_mode, 0, wxTOP, FromDIP(3)); sizer_page->Add(item_user_sync, 0, wxTOP, FromDIP(3)); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index cd370063cb..075bbd8e05 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1927,13 +1927,13 @@ void TabPrint::build() optgroup->append_single_option_line("bottom_surface_pattern", "fill-patterns#Infill of the top surface and bottom surface"); optgroup->append_single_option_line("bottom_shell_layers"); optgroup->append_single_option_line("bottom_shell_thickness"); - optgroup->append_single_option_line("internal_solid_infill_pattern"); optgroup = page->new_optgroup(L("Infill"), L"param_infill"); optgroup->append_single_option_line("sparse_infill_density"); optgroup->append_single_option_line("sparse_infill_pattern", "fill-patterns#infill types and their properties of sparse"); optgroup->append_single_option_line("infill_anchor"); optgroup->append_single_option_line("infill_anchor_max"); + optgroup->append_single_option_line("internal_solid_infill_pattern"); optgroup->append_single_option_line("filter_out_gap_fill");