juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-06-20 02:43:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Elegoo CC2 layer stats G-code and missing Giga preset renamed_from (#14136)

Browse Source 
* Sync Elegoo profiles from ElegooSlicer

Update vendor Elegoo.json, filament/machine/process trees, and OrcaFilamentLibrary
Elegoo entries. Align machine default material names with existing filament preset names.

* feat: expose filament_name for G-code export filename format

Derive from filament_settings_id for the first active extruder and strip the suffix after @, matching ElegooSlicer so filename_format can use {filament_name}.

* chore: reorder Elegoo entries in OrcaFilamentLibrary

Group Elegoo @base profiles and bump library version to 02.03.02.62.

* sync OrcaFilamentLibrary.json with Elegoo filament profiles

* fix: clean up Elegoo process renamed_from for profile validation

Add single renamed_from only where preset names changed from legacy Orca
names; remove duplicate Rapid @System library entries that conflicted with
ECC2 vendor presets.

* fix(profiles): add missing Elegoo renamed_from for profile validation

CI custom-preset tests still inherit legacy Orca preset names that no
longer exist after the Elegoo bundle update. Add renamed_from on process,
Neptune 4 machines, OrcaFilamentLibrary filaments, and Giga profiles so
inherits resolve again, without changing print parameters.

* fix(profiles,elegoo): resolve renamed presets and CC2 SET_PRINT_STATS_INFO G-code

Resolve legacy preset names through renamed_from when validating presets and loading external projects. Add missing renamed_from aliases for Elegoo Giga process and OrcaFilamentLibrary filaments. Combine TOTAL_LAYER and CURRENT_LAYER in one SET_PRINT_STATS_INFO command on Centauri Carbon 2 (ECC2), Centauri (EC), and Centauri Carbon (ECC) 0.4 nozzle profiles.

* chore(profiles): bump Elegoo and OrcaFilamentLibrary profile versions

Refresh installed profile bundles after renamed_from aliases, CC2 SET_PRINT_STATS_INFO G-code, and Preset.cpp renamed preset resolution fixes.
This commit is contained in:
wujie
2026-06-10 21:38:39 +08:00
committed by GitHub
parent a70b903a19
commit 3be36bdea4
46 changed files with 58 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/profiles/Elegoo.json
View File

@@ -1,6 +1,6 @@
{
"name": "Elegoo",
"version": "02.04.00.02",
"version": "02.04.00.04",
"force_update": "0",
"description": "Elegoo configurations",
"machine_model_list": [

4
resources/profiles/Elegoo/machine/EC/Elegoo Centauri 0.4 nozzle.json
View File

@@ -62,7 +62,7 @@
"change_filament_gcode": "",
"machine_pause_gcode": "M600",
"support_multi_filament": "0",
"layer_change_gcode": "SET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}",
"machine_start_gcode": ";;===== date: 20251011 =====================\n;printer_model:[printer_model]\n;initial_filament:{filament_type[initial_extruder]}\n;curr_bed_type:{curr_bed_type}\n;bed_level_temp:[bed_temperature_initial_layer_single]\nM400 ; wait for buffer to clear\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nM729 ;Clean Nozzle\nM190 S[bed_temperature_initial_layer_single]\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_no_support_extruder]==\"PLA\"}\n {if (bed_temperature[initial_no_support_extruder] >50)||(bed_temperature_initial_layer[initial_no_support_extruder] >50)}\n M106 P3 S255\n {elsif (bed_temperature[initial_no_support_extruder] >45)||(bed_temperature_initial_layer[initial_no_support_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\n\n;enable_pressure_advance:{enable_pressure_advance[initial_extruder]}\n;This value is called if pressure advance is enabled\n{if enable_pressure_advance[initial_extruder] == \"true\"}\nSET_PRESSURE_ADVANCE ADVANCE=[pressure_advance] ;\nM400\n{endif}\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\n\n\nG1 X{print_bed_max[0]*0.5} Y-1.2 F20000\nG1 Z0.3 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 F{min(6000, max(900, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X-1.2 E10.156 ;Draw the first line\nG1 Y98.8 E7.934\nG1 X-0.5 Y100 E0.1\nG1 Y-0.3 E7.934\nG1 X{print_bed_max[0]*0.5-50} E6.284\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-10} E2\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+10} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+50} E2\n;End PA test.\n\n\nG3 I-1 J0 Z0.6 F1200.0 ;Move to side a little\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"layer_change_gcode": "SET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER={layer_num+1}",
"machine_start_gcode": ";;===== date: 20251011 =====================\n;printer_model:[printer_model]\n;initial_filament:{filament_type[initial_extruder]}\n;curr_bed_type:{curr_bed_type}\n;bed_level_temp:[bed_temperature_initial_layer_single]\nM400 ; wait for buffer to clear\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nG90\nG28 ;home\nM729 ;Clean Nozzle\nM190 S[bed_temperature_initial_layer_single]\n\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_no_support_extruder]==\"PLA\"}\n {if (bed_temperature[initial_no_support_extruder] >50)||(bed_temperature_initial_layer[initial_no_support_extruder] >50)}\n M106 P3 S255\n {elsif (bed_temperature[initial_no_support_extruder] >45)||(bed_temperature_initial_layer[initial_no_support_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\n\n;enable_pressure_advance:{enable_pressure_advance[initial_extruder]}\n;This value is called if pressure advance is enabled\n{if enable_pressure_advance[initial_extruder] == \"true\"}\nSET_PRESSURE_ADVANCE ADVANCE=[pressure_advance] ;\nM400\n{endif}\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\n\n\nG1 X{print_bed_max[0]*0.5} Y-1.2 F20000\nG1 Z0.3 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 F{min(6000, max(900, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X-1.2 E10.156 ;Draw the first line\nG1 Y98.8 E7.934\nG1 X-0.5 Y100 E0.1\nG1 Y-0.3 E7.934\nG1 X{print_bed_max[0]*0.5-50} E6.284\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-10} E2\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+10} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+50} E2\n;End PA test.\n\n\nG3 I-1 J0 Z0.6 F1200.0 ;Move to side a little\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER=0\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"machine_end_gcode": ";===== date: 20250603 =====================\nM400 ; wait for buffer to clear\nM140 S0 ;Turn-off bed\nM106 S255 ;Cooling nozzle\nM83\nG92 E0 ; zero the extruder\nG1 E-0.8 F1800\nG2 I1 J0 Z{max_layer_z+0.5} F3000 ; lower z a little\nG90\n{if max_layer_z > 100}G1 Z{min(max_layer_z+50, printable_height+0.5)} F20000{else}G1 Z100 F20000 {endif}; Move print head up \nM204 S5000\nM400\nM83\nG1 X202 F20000\nM400\nG1 Y250 F20000\nG1 Y264.5 F1200\nM400\nG92 E0\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off remote part cooling fan\nM106 P3 S0 ; turn off chamber cooling fan\nM84 ;Disable all steppers"
}

4
resources/profiles/Elegoo/machine/ECC/Elegoo Centauri Carbon 0.4 nozzle.json
View File

@@ -66,7 +66,7 @@
"change_filament_gcode": "\n;==========CC_CHANGE_FILAMENT_GCODE_CCB==========\n;===== date: 2025-12-04-001 =====================\nM106 S0\nM106 P2 S0\nG1 Z{min(max_layer_z+3, printable_height+0.5)} F1200\nM6211 T[next_extruder] L[flush_length] M{old_filament_e_feedrate} N{new_filament_e_feedrate} Q[old_filament_temp] R[nozzle_temperature_range_high] S[new_filament_temp]\nT[next_extruder]\n;==========CC_CHANGE_FILAMENT_GCODE_CCE==========",
"machine_pause_gcode": "M600",
"support_multi_filament": "1",
"layer_change_gcode": "SET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}",
"machine_start_gcode": ";===== CC_START_GCODE ================\n;===== date: 2026-04-28-001 =====================\n;printer_model:[printer_model]\n;initial_filament:{filament_type[initial_extruder]}\n;curr_bed_type:{curr_bed_type}\n;bed_level_temp:[bed_temperature_initial_layer_single]\nM400 ; wait for buffer to clear\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nG90\nM83\nG28 ;home\nM729 ;Clean Nozzle\nM190 S[bed_temperature_initial_layer_single]\n\nM109 S[nozzle_temperature_initial_layer]\nM6211 A1 L200 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_no_support_extruder]==\"PLA\"}\n {if (bed_temperature[initial_no_support_extruder] >50)||(bed_temperature_initial_layer[initial_no_support_extruder] >50)}\n M106 P3 S255\n {elsif (bed_temperature[initial_no_support_extruder] >45)||(bed_temperature_initial_layer[initial_no_support_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\n\n;enable_pressure_advance:{enable_pressure_advance[initial_extruder]}\n;This value is called if pressure advance is enabled\n{if enable_pressure_advance[initial_extruder] == \"true\"}\nSET_PRESSURE_ADVANCE ADVANCE=[pressure_advance] ;\nM400\n{endif}\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\n\n\nG1 X{print_bed_max[0]*0.5} Y-1.2 F20000\nG1 Z0.3 F900\n\n\nG90\nM83\nG92 E0 ;Reset Extruder\nG1 F{min(6000, max(900, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X0 E10.156 ;Draw the first line\nG1 Y98.8 E7.934\nG1 X0.9 Y100 E0.1\nG1 Y-0.3 E7.934\nG1 X{print_bed_max[0]*0.5-50} E6.284\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-10} E2\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+10} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+50} E2\n;End PA test.\n\n\nG3 I-1 J0 Z0.6 F1200.0 ;Move to side a little\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"layer_change_gcode": "SET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER={layer_num+1}",
"machine_start_gcode": ";===== CC_START_GCODE ================\n;===== date: 2026-04-28-001 =====================\n;printer_model:[printer_model]\n;initial_filament:{filament_type[initial_extruder]}\n;curr_bed_type:{curr_bed_type}\n;bed_level_temp:[bed_temperature_initial_layer_single]\nM400 ; wait for buffer to clear\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nG90\nM83\nG28 ;home\nM729 ;Clean Nozzle\nM190 S[bed_temperature_initial_layer_single]\n\nM109 S[nozzle_temperature_initial_layer]\nM6211 A1 L200 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\n\n;=============turn on fans to prevent PLA jamming=================\n{if filament_type[initial_no_support_extruder]==\"PLA\"}\n {if (bed_temperature[initial_no_support_extruder] >50)||(bed_temperature_initial_layer[initial_no_support_extruder] >50)}\n M106 P3 S255\n {elsif (bed_temperature[initial_no_support_extruder] >45)||(bed_temperature_initial_layer[initial_no_support_extruder] >45)}\n M106 P3 S180\n {endif};Prevent PLA from jamming\n{endif}\n\n;enable_pressure_advance:{enable_pressure_advance[initial_extruder]}\n;This value is called if pressure advance is enabled\n{if enable_pressure_advance[initial_extruder] == \"true\"}\nSET_PRESSURE_ADVANCE ADVANCE=[pressure_advance] ;\nM400\n{endif}\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\n\n\nG1 X{print_bed_max[0]*0.5} Y-1.2 F20000\nG1 Z0.3 F900\n\n\nG90\nM83\nG92 E0 ;Reset Extruder\nG1 F{min(6000, max(900, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X0 E10.156 ;Draw the first line\nG1 Y98.8 E7.934\nG1 X0.9 Y100 E0.1\nG1 Y-0.3 E7.934\nG1 X{print_bed_max[0]*0.5-50} E6.284\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5-10} E2\nG1 F{0.2*min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+10} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+30} E2\nG1 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]/0.5/0.3*60))} \nG1 X{print_bed_max[0]*0.5+50} E2\n;End PA test.\n\n\nG3 I-1 J0 Z0.6 F1200.0 ;Move to side a little\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER=0\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"machine_end_gcode": ";===== CC_END_GCODE ================\n;===== date: 2025-12-04-001 =====================\nM400 ; wait for buffer to clear\nM140 S0 ;Turn-off bed\nM106 S255 ;Cooling nozzle\nM83\nG92 E0 ; zero the extruder\nG1 E-0.8 F1800\nG2 I1 J0 Z{max_layer_z+0.5} F3000 ; lower z a little\nG90\n{if max_layer_z > 100}G1 Z{min(max_layer_z+50, printable_height+0.5)} F20000{else}G1 Z100 F20000 {endif}; Move print head up \nM204 S5000\nM749\nM204 S5000\nM400\nM83\nG1 X202 F20000\nM400\nG1 Y250 F20000\nG1 Y264.5 F1200\nM400\nG92 E0\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off remote part cooling fan\nM106 P3 S0 ; turn off chamber cooling fan\nM84 ;Disable all steppers"
}

4
resources/profiles/Elegoo/machine/ECC2/Elegoo Centauri Carbon 2 0.4 nozzle.json
View File

@@ -86,9 +86,9 @@
"9"
],
"change_filament_gcode": "\n;==========CC2_CHANGE_FILAMENT_GCODE==========\n;===== date: 2026-01-16-001 =====================\nM106 S0\nM106 P2 S0\nG1 Z{min(max_layer_z+3, printable_height+0.5)} F1200\nM6211 T[next_extruder] L[flush_length] M{old_filament_e_feedrate} N{new_filament_e_feedrate} Q[old_filament_temp] R[nozzle_temperature_range_high] S[new_filament_temp]\nT[next_extruder]\n",
"layer_change_gcode": "M73 L{layer_num+1}\n;LAYER:{layer_num+1}\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}",
"layer_change_gcode": "M73 L{layer_num+1}\n;LAYER:{layer_num+1}\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER={layer_num+1}",
"machine_end_gcode": ";===== CC2_END_GCODE ================\n;===== date: 2026-01-16-001 =====================\n\n\nM140 S0 ;Turn-off bed\nM83\nG92 E0 ; zero the extruder\nG1 E-1.5 F1800\nG2 I0 J1 Z{max_layer_z+0.5} F3000 ; lower z a little\nM106 S0\nM106 P2 S0\nG90\n{if max_layer_z > 75}G1 Z{min(max_layer_z+5, printable_height+0.5)} F20000{else}G1 Z80 F20000 {endif}; Move print head up \nG180 S9\nM104 S0\nM84\n",
"machine_start_gcode": ";===== CC2_START_GCODE ================\n;===== date: 2026-01-16-001 =====================\n\nG90\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nM190 S[bed_temperature_initial_layer_single] A\nM106 S0\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 FROM_SLICER=1\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\nG28\nM109 S[nozzle_temperature_initial_layer]\nM6211 A1 L200 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\n\n{if first_layer_print_min[1] > 0.5}\nG180 S7\nG1 X{print_bed_max[0]*0.5-1} Y-1.2 F20000\nG1 Z0.5 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 E6 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nM106 S200\nG1 X{print_bed_max[0]*0.5-41} E20 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nG1 F6000\nG1 X{print_bed_max[0]*0.5-46} E0.8\n{else}\nG1 E30 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))}\n{endif}\nM106 S0\nG180 S8\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"machine_start_gcode": ";===== CC2_START_GCODE ================\n;===== date: 2026-01-16-001 =====================\n\nG90\nM104 S140\nM140 S[bed_temperature_initial_layer_single]\nM190 S[bed_temperature_initial_layer_single] A\nM106 S0\nBED_MESH_CALIBRATE mesh_min={adaptive_bed_mesh_min[0]},{adaptive_bed_mesh_min[1]} mesh_max={adaptive_bed_mesh_max[0]},{adaptive_bed_mesh_max[1]} ALGORITHM=[bed_mesh_algo] PROBE_COUNT={bed_mesh_probe_count[0]},{bed_mesh_probe_count[1]} ADAPTIVE=0 ADAPTIVE_MARGIN=0 FROM_SLICER=1\nM204 S{min(20000,max(1000,outer_wall_acceleration))} ;Call exterior wall print acceleration\nG28\nM109 S[nozzle_temperature_initial_layer]\nM6211 A1 L200 T[initial_no_support_extruder] Q[nozzle_temperature_initial_layer] R[nozzle_temperature_initial_layer] S[nozzle_temperature_initial_layer]\nT[initial_no_support_extruder]\n\n{if first_layer_print_min[1] > 0.5}\nG180 S7\nG1 X{print_bed_max[0]*0.5-1} Y-1.2 F20000\nG1 Z0.5 F900\nM109 S[nozzle_temperature_initial_layer]\nM83\nG92 E0 ;Reset Extruder\nG1 E6 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nM106 S200\nG1 X{print_bed_max[0]*0.5-41} E20 F{min(12000, max(1200, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))} \nG1 F6000\nG1 X{print_bed_max[0]*0.5-46} E0.8\n{else}\nG1 E30 F{min(1200, max(120, filament_max_volumetric_speed[initial_no_support_extruder]*60/2/2.5043))}\n{endif}\nM106 S0\nG180 S8\nG1 F20000\nG92 E0 ;Reset Extruder\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count] CURRENT_LAYER=0\n;LAYER_COUNT:[total_layer_count]\n;LAYER:0",
"retract_restart_extra_toolchange": [
"0.5"
]

1
resources/profiles/Elegoo/process/EOSGIGA/0.16mm Optimal @Elegoo Giga 0.4 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle",
"layer_height": "0.16",
"instantiation": "true",
"renamed_from": "0.16mm Optimal @EOS Giga 0.4 nozzle",
"name": "0.16mm Optimal @Elegoo Giga 0.4 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.18mm Fine @Elegoo Giga 0.6 nozzle.json
View File

@@ -2,6 +2,7 @@
"inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle",
"layer_height": "0.18",
"instantiation": "true",
"renamed_from": "0.18mm Fine @EOS Giga 0.6 nozzle",
"name": "0.18mm Fine @Elegoo Giga 0.6 nozzle",
"compatible_printers": [
"Elegoo OrangeStorm Giga 0.6 nozzle"

1
resources/profiles/Elegoo/process/EOSGIGA/0.20mm Standard @Elegoo Giga 0.4 nozzle.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "PEOSG04020",
"instantiation": "true",
"renamed_from": "0.20mm Standard @EOS Giga 0.4 nozzle",
"default_acceleration": "3000",
"filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
"initial_layer_print_height": "0.25",

1
resources/profiles/Elegoo/process/EOSGIGA/0.20mm Strength @Elegoo Giga 0.4 nozzle.json
View File

@@ -4,5 +4,6 @@
"wall_sequence": "inner-outer-inner wall",
"reduce_crossing_wall": "1",
"instantiation": "true",
"renamed_from": "0.20mm Strength @EOS Giga 0.4 nozzle",
"wall_loops": "6"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.24mm Draft @Elegoo Giga 0.4 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle",
"layer_height": "0.24",
"instantiation": "true",
"renamed_from": "0.24mm Draft @EOS Giga 0.4 nozzle",
"name": "0.24mm Draft @Elegoo Giga 0.4 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.24mm Fine @Elegoo Giga 0.8 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle",
"layer_height": "0.24",
"instantiation": "true",
"renamed_from": "0.24mm Fine @EOS Giga 0.8 nozzle",
"name": "0.24mm Fine @Elegoo Giga 0.8 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.24mm Optimal @Elegoo Giga 0.6 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle",
"layer_height": "0.24",
"instantiation": "true",
"renamed_from": "0.24mm Optimal @EOS Giga 0.6 nozzle",
"name": "0.24mm Optimal @Elegoo Giga 0.6 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.28mm Extra Draft @Elegoo Giga 0.4 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.20mm Standard @Elegoo Giga 0.4 nozzle",
"layer_height": "0.28",
"instantiation": "true",
"renamed_from": "0.28mm Extra Draft @EOS Giga 0.4 nozzle",
"name": "0.28mm Extra Draft @Elegoo Giga 0.4 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.30mm Fine @Elegoo Giga 1.0 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle",
"layer_height": "0.3",
"instantiation": "true",
"renamed_from": "0.30mm Fine @EOS Giga 1.0 nozzle",
"name": "0.30mm Fine @Elegoo Giga 1.0 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.30mm Standard @Elegoo Giga 0.6 nozzle.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "PEOSG06030",
"instantiation": "true",
"renamed_from": "0.30mm Standard @EOS Giga 0.6 nozzle",
"default_acceleration": "3000",
"filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
"initial_layer_acceleration": "1000",

1
resources/profiles/Elegoo/process/EOSGIGA/0.30mm Strength @Elegoo Giga 0.6 nozzle.json
View File

@@ -4,5 +4,6 @@
"wall_sequence": "inner-outer-inner wall",
"reduce_crossing_wall": "1",
"instantiation": "true",
"renamed_from": "0.30mm Strength @EOS Giga 0.6 nozzle",
"wall_loops": "5"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.32mm Optimal @Elegoo Giga 0.8 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle",
"layer_height": "0.32",
"instantiation": "true",
"renamed_from": "0.32mm Optimal @EOS Giga 0.8 nozzle",
"name": "0.32mm Optimal @Elegoo Giga 0.8 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.36mm Draft @Elegoo Giga 0.6 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle",
"layer_height": "0.36",
"instantiation": "true",
"renamed_from": "0.36mm Draft @EOS Giga 0.6 nozzle",
"name": "0.36mm Draft @Elegoo Giga 0.6 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.40mm Optimal @Elegoo Giga 1.0 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle",
"layer_height": "0.4",
"instantiation": "true",
"renamed_from": "0.40mm Optimal @EOS Giga 1.0 nozzle",
"name": "0.40mm Optimal @Elegoo Giga 1.0 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.40mm Standard @Elegoo Giga 0.8 nozzle.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "PEOSG08040",
"instantiation": "true",
"renamed_from": "0.40mm Standard @EOS Giga 0.8 nozzle",
"default_acceleration": "3000",
"filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
"initial_layer_acceleration": "1000",

1
resources/profiles/Elegoo/process/EOSGIGA/0.42mm Extra Draft @Elegoo Giga 0.6 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.30mm Standard @Elegoo Giga 0.6 nozzle",
"layer_height": "0.42",
"instantiation": "true",
"renamed_from": "0.42mm Extra Draft @EOS Giga 0.6 nozzle",
"name": "0.42mm Extra Draft @Elegoo Giga 0.6 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.48mm Draft @Elegoo Giga 0.8 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle",
"layer_height": "0.48",
"instantiation": "true",
"renamed_from": "0.48mm Draft @EOS Giga 0.8 nozzle",
"name": "0.48mm Draft @Elegoo Giga 0.8 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.50mm Standard @Elegoo Giga 1.0 nozzle.json
View File

@@ -4,6 +4,7 @@
"from": "system",
"setting_id": "PEOSG10050",
"instantiation": "true",
"renamed_from": "0.50mm Standard @EOS Giga 1.0 nozzle",
"default_acceleration": "3000",
"filename_format": "EOGiga1_{nozzle_diameter[0]}_{input_filename_base}_{filament_name}_{layer_height}_{print_time}.gcode",
"initial_layer_acceleration": "1000",

1
resources/profiles/Elegoo/process/EOSGIGA/0.56mm Extra Draft @Elegoo Giga 0.8 nozzle.json
View File

@@ -1,5 +1,6 @@
{
"inherits": "0.40mm Standard @Elegoo Giga 0.8 nozzle",
"instantiation": "true",
"renamed_from": "0.56mm Extra Draft @EOS Giga 0.8 nozzle",
"name": "0.56mm Extra Draft @Elegoo Giga 0.8 nozzle"
}

1
resources/profiles/Elegoo/process/EOSGIGA/0.60mm Draft @Elegoo Giga 1.0 nozzle.json
View File

@@ -2,5 +2,6 @@
"inherits": "0.50mm Standard @Elegoo Giga 1.0 nozzle",
"layer_height": "0.6",
"instantiation": "true",
"renamed_from": "0.60mm Draft @EOS Giga 1.0 nozzle",
"name": "0.60mm Draft @Elegoo Giga 1.0 nozzle"
}

2
resources/profiles/OrcaFilamentLibrary.json
View File

@@ -1,6 +1,6 @@
{
"name": "OrcaFilamentLibrary",
"version": "02.04.00.01",
"version": "02.04.00.02",
"force_update": "0",
"description": "Orca Filament Library",
"filament_list": [

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ABS @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEABSS00",
"instantiation": "true",
"renamed_from": "Elegoo ABS",
"fan_max_speed": [
"40"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo ASA-CF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEASACFS00",
"instantiation": "true",
"renamed_from": "Elegoo ASA-CF",
"pressure_advance": [
"0.04"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PAHT-CF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPAHTCFS00",
"instantiation": "true",
"renamed_from": "Elegoo PAHT-CF",
"close_fan_the_first_x_layers": [
"3"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPCS00",
"instantiation": "true",
"renamed_from": "Elegoo PC",
"pressure_advance": [
"0.052"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PC-FR @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPCFRS00",
"instantiation": "true",
"renamed_from": "Elegoo PC-FR",
"pressure_advance": [
"0.05"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PET-CF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPETCFS00",
"instantiation": "true",
"renamed_from": "Elegoo PET-CF",
"pressure_advance": [
"0.05"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPETGS00",
"instantiation": "true",
"renamed_from": "Elegoo PETG",
"pressure_advance": [
"0.05"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG HF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OERPETGHFS00",
"instantiation": "true",
"renamed_from": "Elegoo PETG HF",
"pressure_advance": [
"0.052"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG Translucent @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPETGTRANSS00",
"instantiation": "true",
"renamed_from": "Elegoo PETG Translucent",
"pressure_advance": [
"0.052"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-CF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPETGCFS00",
"instantiation": "true",
"renamed_from": "Elegoo PETG-CF",
"pressure_advance": [
"0.052"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PETG-GF @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPETGFS00",
"instantiation": "true",
"renamed_from": "Elegoo PETG-GF",
"pressure_advance": [
"0.052"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Basic @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLABASICS00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Basic",
"nozzle_temperature": [
"220"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Galaxy @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLAGALAXYS00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Galaxy",
"fan_min_speed": [
"80"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Glow @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLAGLOWS00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Glow",
"pressure_advance": [
"0.04"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Marble @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLAMARBLES00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Marble",
"fan_min_speed": [
"80"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Sparkle @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLASPARKLES00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Sparkle",
"fan_min_speed": [
"80"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Translucent2 @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLATRA2S00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Translucent2",
"pressure_advance": [
"0.04"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo PLA Wood @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OEPLAWOODS00",
"instantiation": "true",
"renamed_from": "Elegoo PLA Wood",
"fan_min_speed": [
"80"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo Rapid TPU 95A @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OERTPU95AS00",
"instantiation": "true",
"renamed_from": "Elegoo Rapid TPU 95A",
"pressure_advance": [
"0.1"
],

1
resources/profiles/OrcaFilamentLibrary/filament/Elegoo/Elegoo TPU 95A @System.json
View File

@@ -5,6 +5,7 @@
"from": "system",
"setting_id": "OETPU95AS00",
"instantiation": "true",
"renamed_from": "Elegoo TPU 95A",
"filament_max_volumetric_speed": [
"3.2"
],

12
src/libslic3r/Preset.cpp
View File

@@ -2362,6 +2362,10 @@ bool PresetCollection::validate_preset(const std::string &preset_name, std::stri
const std::string canonical_inherit_name = this->canonical_preset_name(inherit_name);
it = this->find_preset_internal(canonical_inherit_name);
found = it != m_presets.end() && it->name == canonical_inherit_name && is_trusted(*it);
if (!found) {
it = this->find_preset_renamed(canonical_inherit_name);
found = it != m_presets.end() && is_trusted(*it);
}
if (found)
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": preset_name %1%, inherit_name %2%, found inherit in list")%preset_name %inherit_name;
else
@@ -2453,7 +2457,9 @@ std::pair<Preset*, bool> PresetCollection::load_external_preset(
if (!inherits.empty() && (different_settings_list.size() > 0)) {
auto iter = this->find_preset_internal(inherits);
if (iter != m_presets.end() && iter->name == inherits) {
if (iter == m_presets.end() || iter->name != inherits)
iter = this->find_preset_renamed(inherits);
if (iter != m_presets.end()) {
//std::vector<std::string> dirty_options = cfg.diff(iter->config);
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << boost::format(": change preset %1% inherit %2% 's value to %3% 's values")%original_name %inherits %path;
cfg.update_non_diff_values_to_base_config(iter->config, keys, different_settings_list, extruder_id_name, extruder_variant_name, *key_set1, *key_set2);
@@ -2505,7 +2511,9 @@ std::pair<Preset*, bool> PresetCollection::load_external_preset(
// and override its settings with the loaded ones.
assert(it == m_presets.end());
it = this->find_preset_internal(inherits);
found = it != m_presets.end() && it->name == inherits;
if (it == m_presets.end() || it->name != inherits)
it = this->find_preset_renamed(inherits);
found = it != m_presets.end();
if (found && profile_print_params_same(it->config, cfg)) {
// The system preset exists and it matches the values stored inside config.
if (select == LoadAndSelect::Always)