diff --git a/resources/profiles/PrusaResearch.idx b/resources/profiles/PrusaResearch.idx index 8dc5600be2..2a1d974987 100644 --- a/resources/profiles/PrusaResearch.idx +++ b/resources/profiles/PrusaResearch.idx @@ -1,4 +1,7 @@ min_slic3r_version = 2.6.2-alpha0 +1.11.1-alpha2 Updated print speeds in "SOLUBLE" profiles. Updated filament settings (Prusa XL). +1.11.1-alpha1 Reduced nozzle temperature in selected filament profiles (Prusa XL 0.6mm nozzle). +1.11.1-alpha0 Added additional printer checks for Prusa XL Input Shaper (Alpha). 1.11.0-alpha9 Added printer profiles for Prusa XL Input Shaper (Alpha). Updated Prusa MINI Input Shaper profiles. Added profiles for "Filament PM" filaments. 1.11.0-alpha8 Default file extension changed to bgcode also for other nozzle diameters (MK4IS/MK3.9). 1.11.0-alpha7 Updated end g-code for XL Multi-Tool. Slightly decreased PETG bed temperature (XL). @@ -10,6 +13,9 @@ min_slic3r_version = 2.6.2-alpha0 1.11.0-alpha1 Updated ramming parameters. Updated start-gcode for XL Multi-Tool. Updated output filename format. 1.11.0-alpha0 Binary g-code, arc fitting, QOI/PNG thumbnails, 90degree XL tower, XL specific filament variants. min_slic3r_version = 2.6.1-rc2 +1.10.4 Reduced nozzle temperature in selected filament profiles (Prusa XL 0.6mm nozzle). +1.10.3 Added additional printer checks for Prusa XL Input Shaper (Alpha). +1.10.2 Added printer profiles for Prusa XL Input Shaper (Alpha). Updated Prusa MINI Input Shaper profiles. Added profiles for "Filament PM" filaments. 1.10.1 Increased MBL temperature for PET filaments (MK4, XL). PETG V0 is now UL certified for MK4. Updated end g-code for XL Multi-Tool. Slightly decreased bed temperature for some PET filaments (XL). 1.10.0 Added new profiles for Prusa MINI Input Shaper (Alpha). Enabled XL ramming feature. Prusa XL users may need to re-enable filament profiles in configuration wizard. min_slic3r_version = 2.6.0-beta2 diff --git a/resources/profiles/PrusaResearch.ini b/resources/profiles/PrusaResearch.ini index a88e5f21aa..b6504246e9 100644 --- a/resources/profiles/PrusaResearch.ini +++ b/resources/profiles/PrusaResearch.ini @@ -5,7 +5,7 @@ name = Prusa Research # Configuration version of this file. Config file will only be installed, if the config_version differs. # This means, the server may force the PrusaSlicer configuration to be downgraded. -config_version = 1.11.0-alpha9 +config_version = 1.11.1-alpha2 # Where to get the updates from? config_update_url = https://files.prusa3d.com/wp-content/uploads/repository/PrusaSlicer-settings-master/live/PrusaResearch/ changelog_url = https://files.prusa3d.com/?latest=slicer-profiles&lng=%1% @@ -1957,8 +1957,8 @@ inherits = *0.10mm*; *XL*; *0.25nozzleXL* perimeter_speed = 35 external_perimeter_speed = 25 small_perimeter_speed = 25 -infill_speed = 60 -solid_infill_speed = 60 +infill_speed = 70 +solid_infill_speed = 70 top_solid_infill_speed = 30 support_material_speed = 40 support_material_interface_speed = 85% @@ -1982,8 +1982,8 @@ inherits = *0.12mm*; *XL*; *0.25nozzleXL* perimeter_speed = 30 external_perimeter_speed = 20 small_perimeter_speed = 20 -infill_speed = 60 -solid_infill_speed = 60 +infill_speed = 70 +solid_infill_speed = 70 top_solid_infill_speed = 30 support_material_speed = 50 support_material_interface_speed = 80% @@ -2073,8 +2073,8 @@ raft_contact_distance = 0.08 perimeter_speed = 30 external_perimeter_speed = 20 small_perimeter_speed = 20 -infill_speed = 60 -solid_infill_speed = 60 +infill_speed = 70 +solid_infill_speed = 70 top_solid_infill_speed = 35 support_material_speed = 40 support_material_interface_speed = 85% @@ -2319,7 +2319,7 @@ support_material_extruder = 0 perimeter_speed = 50 external_perimeter_speed = 35 small_perimeter_speed = 30 -solid_infill_speed = 55 +solid_infill_speed = 70 solid_infill_acceleration = 1200 support_material_interface_layers = 3 support_material_extrusion_width = 0.4 @@ -2475,7 +2475,7 @@ support_material_extruder = 0 perimeter_speed = 50 external_perimeter_speed = 35 small_perimeter_speed = 30 -solid_infill_speed = 55 +solid_infill_speed = 70 solid_infill_acceleration = 1200 support_material_interface_layers = 3 compatible_printers_condition = printer_model=~/.*XL.*/ and nozzle_diameter[0]==0.5 and num_extruders>1 and printer_notes!~/.*INPUT_SHAPER.*/ @@ -2647,7 +2647,7 @@ support_material_extruder = 0 perimeter_speed = 50 external_perimeter_speed = 35 small_perimeter_speed = 30 -solid_infill_speed = 55 +solid_infill_speed = 70 solid_infill_acceleration = 1200 support_material_interface_layers = 3 support_material_extrusion_width = 0.5 @@ -2753,7 +2753,7 @@ compatible_printers_condition = printer_model=~/.*XL.*/ and nozzle_diameter[0]== [print:0.40mm DRAFT @XL 0.6] inherits = *0.40mm*; *XL*; *0.6nozzleXL* -perimeter_speed = 60 +perimeter_speed = 65 external_perimeter_speed = 45 small_perimeter_speed = 40 infill_speed = 200 @@ -4472,7 +4472,7 @@ perimeter_speed = 70 external_perimeter_speed = 45 small_perimeter_speed = 45 solid_infill_speed = 165 -infill_speed = 200 +infill_speed = 150 top_solid_infill_speed = 70 bridge_speed = 40 gap_fill_speed = 80 @@ -5009,7 +5009,7 @@ perimeter_speed = 80 external_perimeter_speed = 45 small_perimeter_speed = 45 infill_speed = 140 -gap_fill_speed = 60 +gap_fill_speed = 65 top_solid_infill_speed = 80 support_material_speed = 120 support_material_interface_speed = 50 @@ -5022,7 +5022,7 @@ overhang_speed_3 = 90% [print:0.20mm SOLUBLE INTERFACE @XLIS 0.4] inherits = 0.20mm STRUCTURAL @XLIS 0.4; *soluble_support_XL* support_material_extruder = 0 -solid_infill_speed = 60 +solid_infill_speed = 70 solid_infill_acceleration = 1500 support_material_interface_layers = 3 support_material_extrusion_width = 0.35 @@ -5089,12 +5089,12 @@ bottom_solid_layers = 9 top_solid_layers = 11 support_material_contact_distance = 0.1 raft_contact_distance = 0.1 -perimeter_speed = 60 +perimeter_speed = 65 small_perimeter_speed = 40 external_perimeter_speed = 40 -top_solid_infill_speed = 60 +top_solid_infill_speed = 70 gap_fill_speed = 40 -support_material_speed = 60 +support_material_speed = 70 external_perimeter_acceleration = 800 perimeter_acceleration = 1200 top_solid_infill_acceleration = 1000 @@ -5320,7 +5320,7 @@ raft_contact_distance = 0.25 [print:0.25mm SOLUBLE INTERFACE @XLIS 0.5] inherits = 0.25mm STRUCTURAL @XLIS 0.5; *soluble_support_XL* support_material_extruder = 0 -solid_infill_speed = 60 +solid_infill_speed = 70 solid_infill_acceleration = 1500 support_material_interface_layers = 3 support_material_extrusion_width = 0.45 @@ -5342,7 +5342,7 @@ perimeter_speed = 80 external_perimeter_speed = 45 small_perimeter_speed = 45 solid_infill_speed = 165 -infill_speed = 200 +infill_speed = 150 top_solid_infill_speed = 70 gap_fill_speed = 80 external_perimeter_acceleration = 1500 @@ -5393,6 +5393,7 @@ inherits = 0.15mm STRUCTURAL @XLIS 0.6 layer_height = 0.2 bottom_solid_layers = 4 top_solid_layers = 5 +infill_speed = 200 [print:0.25mm SPEED @XLIS 0.6] inherits = *XLIS_common06* @@ -5419,7 +5420,7 @@ inherits = 0.25mm SPEED @XLIS 0.6 perimeter_speed = 80 external_perimeter_speed = 45 small_perimeter_speed = 45 -top_solid_infill_speed = 60 +top_solid_infill_speed = 70 external_perimeter_acceleration = 1500 perimeter_acceleration = 2500 top_solid_infill_acceleration = 1500 @@ -5432,7 +5433,7 @@ support_material_extruder = 0 perimeter_speed = 70 external_perimeter_speed = 45 small_perimeter_speed = 45 -solid_infill_speed = 55 +solid_infill_speed = 70 solid_infill_acceleration = 1500 support_material_interface_layers = 3 support_material_extrusion_width = 0.5 @@ -5453,8 +5454,8 @@ external_perimeter_speed = 70 small_perimeter_speed = 70 infill_speed = 200 solid_infill_speed = 70 -top_solid_infill_speed = 60 -gap_fill_speed = 60 +top_solid_infill_speed = 65 +gap_fill_speed = 65 support_material_speed = 70 external_perimeter_acceleration = 2500 perimeter_acceleration = 3000 @@ -5487,7 +5488,7 @@ small_perimeter_speed = 45 infill_speed = 100 solid_infill_speed = 50 top_solid_infill_speed = 35 -support_material_speed = 60 +support_material_speed = 65 bridge_speed = 22 gap_fill_speed = 40 external_perimeter_acceleration = 1500 @@ -5530,7 +5531,7 @@ top_solid_layers = 4 perimeter_speed = 40 external_perimeter_speed = 35 small_perimeter_speed = 35 -infill_speed = 60 +infill_speed = 55 solid_infill_speed = 35 top_solid_infill_speed = 30 support_material_speed = 35 @@ -6562,6 +6563,7 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and nozzle_diameter[0]! [filament:ColorFabb HT @PG 0.6] inherits = ColorFabb HT @PG; *PET06PG* +temperature = 260 compatible_printers_condition = printer_notes=~/.*MK4.*/ and nozzle_diameter[0]==0.6 [filament:ColorFabb HT @PG 0.8] @@ -6574,10 +6576,12 @@ compatible_printers_condition = printer_model=~/.*XL.*/ and nozzle_diameter[0]!= [filament:ColorFabb HT @XL 0.6] inherits = ColorFabb HT @PG 0.6; *PET06XLNT* +temperature = 260 compatible_printers_condition = printer_model=~/.*XL.*/ and nozzle_diameter[0]==0.6 [filament:ColorFabb HT @XL 0.8] inherits = ColorFabb HT @PG 0.8; *PET08XLNT* +temperature = 265 compatible_printers_condition = printer_model=~/.*XL.*/ and nozzle_diameter[0]==0.8 [filament:ColorFabb PLA-PHA] @@ -6662,20 +6666,24 @@ inherits = ColorFabb corkFill; *PLAPG*; *04PLUSPG* inherits = ColorFabb corkFill; *PLA06PG* filament_max_volumetric_speed = 14 extrusion_multiplier = 1.05 +temperature = 215 [filament:ColorFabb corkFill @PG 0.8] inherits = ColorFabb corkFill; *PLA08PG* filament_max_volumetric_speed = 17 extrusion_multiplier = 1.05 +temperature = 215 [filament:ColorFabb corkFill @XL] inherits = ColorFabb corkFill @PG; *PLAXL*; *04PLUSXL* [filament:ColorFabb corkFill @XL 0.6] inherits = ColorFabb corkFill @PG 0.6; *PLA06XL* +temperature = 215 [filament:ColorFabb corkFill @XL 0.8] inherits = ColorFabb corkFill @PG 0.8; *PLA08XL* +temperature = 215 [filament:ColorFabb XT] inherits = *PET* @@ -6692,18 +6700,22 @@ inherits = ColorFabb XT; *PETPG* [filament:ColorFabb XT @PG 0.6] inherits = ColorFabb XT; *PET06PG* +temperature = 260 [filament:ColorFabb XT @PG 0.8] inherits = ColorFabb XT; *PET08PG* +temperature = 265 [filament:ColorFabb XT @XL] inherits = ColorFabb XT @PG; *PETXL* [filament:ColorFabb XT @XL 0.6] inherits = ColorFabb XT @PG 0.6; *PET06XL* +temperature = 260 [filament:ColorFabb XT @XL 0.8] inherits = ColorFabb XT @PG 0.8; *PET08XL* +temperature = 265 [filament:ColorFabb XT-CF20] inherits = *PET* @@ -6762,6 +6774,7 @@ inherits = ColorFabb nGen; *PETPG* [filament:ColorFabb nGen @PG 0.6] inherits = ColorFabb nGen @PG; *PET06PG* +temperature = 235 [filament:ColorFabb nGen @PG 0.8] inherits = ColorFabb nGen @PG; *PET08PG* @@ -6771,6 +6784,7 @@ inherits = ColorFabb nGen @PG; *PETPG* [filament:ColorFabb nGen @XL 0.6] inherits = ColorFabb nGen @PG 0.6; *PET06XL* +temperature = 235 [filament:ColorFabb nGen @XL 0.8] inherits = ColorFabb nGen @PG 0.8; *PET08XL* @@ -6808,14 +6822,16 @@ filament_retract_length_toolchange = 2.5 [filament:ColorFabb nGen flex @XL 0.6] inherits = ColorFabb nGen flex; *FLEX06XL* renamed_from = "ColorFabb nGen flex @PG 0.6" -filament_max_volumetric_speed = 7 -filament_multitool_ramming_flow = 7 +filament_max_volumetric_speed = 6 +filament_multitool_ramming_flow = 6 +temperature = 250 [filament:ColorFabb nGen flex @XL 0.8] inherits = ColorFabb nGen flex; *FLEX08XL* renamed_from = "ColorFabb nGen flex @PG 0.8" -filament_max_volumetric_speed = 10 -filament_multitool_ramming_flow = 10 +filament_max_volumetric_speed = 9 +filament_multitool_ramming_flow = 9 +temperature = 255 [filament:ColorFabb nGen flex @MK4] inherits = ColorFabb nGen flex; *FLEXPG* @@ -6824,11 +6840,13 @@ filament_retract_length = 2.5 [filament:ColorFabb nGen flex @MK4 0.6] inherits = ColorFabb nGen flex; *FLEX06PG* -filament_max_volumetric_speed = 9 +filament_max_volumetric_speed = 8 +temperature = 250 [filament:ColorFabb nGen flex @MK4 0.8] inherits = ColorFabb nGen flex; *FLEX08PG* -filament_max_volumetric_speed = 12 +filament_max_volumetric_speed = 11 +temperature = 255 [filament:Kimya PETG Carbon] inherits = *PET* @@ -6852,6 +6870,7 @@ inherits = Kimya PETG Carbon; *PETPG*; *04PLUSPG* [filament:Kimya PETG Carbon @PG 0.6] inherits = Kimya PETG Carbon @PG; *PET06PG* filament_max_volumetric_speed = 9 +temperature = 235 [filament:Kimya PETG Carbon @PG 0.8] inherits = Kimya PETG Carbon @PG; *PET08PG* @@ -6862,6 +6881,7 @@ inherits = Kimya PETG Carbon @PG; *PETXL*; *04PLUSXL* [filament:Kimya PETG Carbon @XL 0.6] inherits = Kimya PETG Carbon @PG 0.6; *PET06XL* +temperature = 235 [filament:Kimya PETG Carbon @XL 0.8] inherits = Kimya PETG Carbon @PG 0.8; *PET08XL* @@ -6887,6 +6907,7 @@ filament_max_volumetric_speed = 6 inherits = Kimya ABS Carbon @XL; *ABS06XL* renamed_from = "Kimya ABS Carbon @PG 0.6" filament_max_volumetric_speed = 10 +temperature = 255 [filament:Kimya ABS Carbon @XL 0.8] inherits = Kimya ABS Carbon @XL; *ABS08XL* @@ -6900,6 +6921,7 @@ filament_max_volumetric_speed = 6 [filament:Kimya ABS Carbon @MK4 0.6] inherits = Kimya ABS Carbon @MK4; *ABS06PG* filament_max_volumetric_speed = 10 +temperature = 255 [filament:Kimya ABS Carbon @MK4 0.8] inherits = Kimya ABS Carbon @MK4; *ABS08PG* @@ -6957,6 +6979,7 @@ filament_max_volumetric_speed = 6.5 [filament:Kimya PEBA-S @PG 0.6] inherits = Kimya PEBA-S @PG; *PET06PG* filament_max_volumetric_speed = 8 +temperature = 245 [filament:Kimya PEBA-S @PG 0.8] inherits = Kimya PEBA-S @PG; *PET08PG* @@ -6967,6 +6990,7 @@ inherits = Kimya PEBA-S @PG; *PETXL* [filament:Kimya PEBA-S @XL 0.6] inherits = Kimya PEBA-S @PG 0.6; *PET06XL* +temperature = 245 [filament:Kimya PEBA-S @XL 0.8] inherits = Kimya PEBA-S @PG 0.8; *PET08XL* @@ -7138,12 +7162,11 @@ max_fan_speed = 10 [filament:Prusament ASA @XL 0.6] inherits = Prusament ASA @XL; *ABS06XL* renamed_from = "Prusament ASA @PG 0.6" +temperature = 255 [filament:Prusament ASA @XL 0.8] inherits = Prusament ASA @XL; *ABS08XL* renamed_from = "Prusament ASA @PG 0.8" -first_layer_temperature = 265 -temperature = 265 [filament:Prusament ASA @MK4] inherits = Prusament ASA; *ABSPG* @@ -7152,11 +7175,10 @@ max_fan_speed = 10 [filament:Prusament ASA @MK4 0.6] inherits = Prusament ASA @MK4; *ABS06PG* +temperature = 255 [filament:Prusament ASA @MK4 0.8] inherits = Prusament ASA @MK4; *ABS08PG* -first_layer_temperature = 265 -temperature = 265 [filament:Prusament PC Blend] inherits = *ABS* @@ -7195,6 +7217,7 @@ max_fan_speed = 10 inherits = Prusament PC Blend @XL; *PC06XL* renamed_from = "Prusament PC Blend @PG 0.6" filament_max_volumetric_speed = 13 +temperature = 270 [filament:Prusament PC Blend @XL 0.8] inherits = Prusament PC Blend @XL; *PC08XL* @@ -7210,6 +7233,7 @@ max_fan_speed = 10 [filament:Prusament PC Blend @MK4 0.6] inherits = Prusament PC Blend @MK4; *PC06PG* filament_max_volumetric_speed = 13 +temperature = 270 [filament:Prusament PC Blend @MK4 0.8] inherits = Prusament PC Blend @MK4; *PC08PG* @@ -7246,6 +7270,7 @@ max_fan_speed = 10 inherits = Prusament PC Blend Carbon Fiber @XL; *PC06XL* renamed_from = "Prusament PC Blend Carbon Fiber @PG 0.6" filament_max_volumetric_speed = 13 +temperature = 280 [filament:Prusament PC Blend Carbon Fiber @XL 0.8] inherits = Prusament PC Blend Carbon Fiber @XL; *PC08XL* @@ -7260,6 +7285,7 @@ max_fan_speed = 10 [filament:Prusament PC Blend Carbon Fiber @MK4 0.6] inherits = Prusament PC Blend Carbon Fiber @MK4; *PC06PG* filament_max_volumetric_speed = 13 +temperature = 280 [filament:Prusament PC Blend Carbon Fiber @MK4 0.8] inherits = Prusament PC Blend Carbon Fiber @MK4; *PC08PG* @@ -7295,6 +7321,7 @@ filament_max_volumetric_speed = 6.5 [filament:Prusament PA11 Carbon Fiber @XL 0.6] inherits = Prusament PA11 Carbon Fiber @XL; *PC06XL* filament_max_volumetric_speed = 8 +temperature = 280 [filament:Prusament PA11 Carbon Fiber @XL 0.8] inherits = Prusament PA11 Carbon Fiber @XL; *PC08XL* @@ -7333,7 +7360,7 @@ min_fan_speed = 30 max_fan_speed = 50 disable_fan_first_layers = 3 full_fan_speed_layer = 5 -temperature = 275 +temperature = 270 start_filament_gcode = "M900 K{if printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.6}0.12{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/ and nozzle_diameter[0]==0.8}0.06{elsif printer_notes=~/.*PRINTER_MODEL_MINI.*/}0.2{elsif nozzle_diameter[0]==0.8}0.02{elsif nozzle_diameter[0]==0.6}0.04{else}0.08{endif} ; Filament gcode LA 1.5\n{if printer_notes=~/.*PRINTER_MODEL_MINI.*/};{elsif printer_notes=~/.*PRINTER_HAS_BOWDEN.*/}M900 K200{elsif nozzle_diameter[0]==0.6}M900 K24{elsif nozzle_diameter[0]==0.8};{else}M900 K45{endif} ; Filament gcode LA 1.0\n\n{if printer_notes=~/.*PRINTER_MODEL_MINIIS.*/}\nM572 S{if nozzle_diameter[0]==0.6}0.22{elsif nozzle_diameter[0]==0.8}0.15{elsif nozzle_diameter[0]==0.4}0.4{elsif nozzle_diameter[0]==0.25}1.02{else}0{endif}\n{endif}" [filament:Fillamentum CPE @PG] @@ -7341,6 +7368,7 @@ inherits = Fillamentum CPE; *PETPG* [filament:Fillamentum CPE @PG 0.6] inherits = Fillamentum CPE; *PET06PG* +temperature = 265 [filament:Fillamentum CPE @PG 0.8] inherits = Fillamentum CPE; *PET08PG* @@ -7352,6 +7380,7 @@ first_layer_bed_temperature = 85 [filament:Fillamentum CPE @XL 0.6] inherits = Fillamentum CPE @PG 0.6; *PET06XL* first_layer_bed_temperature = 85 +temperature = 265 [filament:Fillamentum CPE @XL 0.8] inherits = Fillamentum CPE @PG 0.8; *PET08XL* @@ -7415,6 +7444,7 @@ filament_max_volumetric_speed = 11 inherits = Smartfil Wood; *PLA06PG* filament_max_volumetric_speed = 13 extrusion_multiplier = 1.05 +temperature = 215 [filament:Smartfil Wood @PG 0.8] inherits = Smartfil Wood; *PLA08PG* @@ -7426,6 +7456,7 @@ inherits = Smartfil Wood @PG; *PLAXL* [filament:Smartfil Wood @XL 0.6] inherits = Smartfil Wood @PG 0.6; *PLA06XL* +temperature = 215 [filament:Smartfil Wood @XL 0.8] inherits = Smartfil Wood @PG 0.8; *PLA08XL* @@ -7449,8 +7480,8 @@ renamed_from = "Generic ABS @PG 0.6" [filament:Generic ABS @XL 0.8] inherits = Generic ABS @XL; *ABS08XL* renamed_from = "Generic ABS @PG 0.8" -first_layer_temperature = 265 -temperature = 265 +first_layer_temperature = 260 +temperature = 260 [filament:Generic ABS @MK4] inherits = Generic ABS; *ABSPG* @@ -7460,8 +7491,8 @@ inherits = Generic ABS @MK4; *ABS06PG* [filament:Generic ABS @MK4 0.8] inherits = Generic ABS @MK4; *ABS08PG* -first_layer_temperature = 265 -temperature = 265 +first_layer_temperature = 260 +temperature = 260 [filament:Esun ABS] inherits = *ABSC* @@ -7596,12 +7627,13 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*M [filament:Generic PETG @PG 0.6] inherits = Generic PETG; *PET06PG* filament_max_volumetric_speed = 17 +temperature = 235 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Generic PETG @PG 0.8] inherits = Generic PETG; *PET08PG* first_layer_temperature = 240 -temperature = 250 +temperature = 245 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.8 [filament:Generic PETG @XL] @@ -7609,6 +7641,7 @@ inherits = Generic PETG @PG; *PETXL* [filament:Generic PETG @XL 0.6] inherits = Generic PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Generic PETG @XL 0.8] inherits = Generic PETG @PG 0.8; *PET08XL* @@ -7630,7 +7663,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Generic PETG @PGIS 0.6] inherits = Generic PETG @PG 0.6 first_layer_temperature = 240 -temperature = 240 +temperature = 235 filament_retract_length = 0.8 filament_wipe = 1 filament_retract_before_wipe = 20 @@ -7640,7 +7673,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Generic PETG @PGIS 0.8] inherits = Generic PETG @PG 0.8 first_layer_temperature = 240 -temperature = 250 +temperature = 245 filament_retract_length = 0.8 filament_wipe = 1 filament_retract_before_wipe = 20 @@ -7732,6 +7765,7 @@ inherits = Extrudr XPETG CF; *PETPG* [filament:Extrudr XPETG CF @PG 0.6] inherits = Extrudr XPETG CF; *PET06PG* +temperature = 230 [filament:Extrudr XPETG CF @PG 0.8] inherits = Extrudr XPETG CF; *PET08PG* @@ -7741,6 +7775,7 @@ inherits = Extrudr XPETG CF @PG; *PETXLNT* [filament:Extrudr XPETG CF @XL 0.6] inherits = Extrudr XPETG CF @PG 0.6; *PET06XLNT* +temperature = 230 [filament:Extrudr XPETG CF @XL 0.8] inherits = Extrudr XPETG CF @PG 0.8; *PET08XLNT* @@ -7762,6 +7797,7 @@ inherits = Extrudr XPETG Matt; *PETPG* [filament:Extrudr XPETG Matt @PG 0.6] inherits = Extrudr XPETG Matt; *PET06PG* +temperature = 225 [filament:Extrudr XPETG Matt @PG 0.8] inherits = Extrudr XPETG Matt; *PET08PG* @@ -7771,6 +7807,7 @@ inherits = Extrudr XPETG Matt @PG; *PETXLNT* [filament:Extrudr XPETG Matt @XL 0.6] inherits = Extrudr XPETG Matt @PG 0.6; *PET06XLNT* +temperature = 225 [filament:Extrudr XPETG Matt @XL 0.8] inherits = Extrudr XPETG Matt @PG 0.8; *PET08XLNT* @@ -7929,6 +7966,7 @@ inherits = Extrudr GreenTEC Pro Carbon; *PLAPG* [filament:Extrudr GreenTEC Pro Carbon @PG 0.6] inherits = Extrudr GreenTEC Pro Carbon; *PLA06PG* +temperature = 220 [filament:Extrudr GreenTEC Pro Carbon @PG 0.8] inherits = Extrudr GreenTEC Pro Carbon; *PLA08PG* @@ -7938,6 +7976,7 @@ inherits = Extrudr GreenTEC Pro Carbon @PG; *PLAXL* [filament:Extrudr GreenTEC Pro Carbon @XL 0.6] inherits = Extrudr GreenTEC Pro Carbon @PG 0.6; *PLA06XL* +temperature = 220 [filament:Extrudr GreenTEC Pro Carbon @XL 0.8] inherits = Extrudr GreenTEC Pro Carbon @PG 0.8; *PLA08XL* @@ -8172,6 +8211,7 @@ inherits = addnorth Adamant S1 @XL; *FLEX06XL* renamed_from = "addnorth Adamant S1 @PG 0.6" filament_max_volumetric_speed = 4.5 filament_multitool_ramming_flow = 4.5 +temperature = 245 [filament:addnorth Adamant S1 @XL 0.8] inherits = addnorth Adamant S1 @XL; *FLEX08XL* @@ -8189,6 +8229,7 @@ filament_retract_lift = 0.2 [filament:addnorth Adamant S1 @MK4 0.6] inherits = addnorth Adamant S1 @MK4; *FLEX06PG* filament_max_volumetric_speed = 5.5 +temperature = 245 [filament:addnorth Adamant S1 @MK4 0.8] inherits = addnorth Adamant S1 @MK4; *FLEX08PG* @@ -8232,6 +8273,7 @@ filament_max_volumetric_speed = 4 inherits = addnorth Adura X @XL; *PET06XLNT* renamed_from = "addnorth Adura X @PG 0.6" filament_max_volumetric_speed = 6 +temperature = 260 [filament:addnorth Adura X @XL 0.8] inherits = addnorth Adura X @XL; *PET08XLNT* @@ -8245,6 +8287,7 @@ filament_max_volumetric_speed = 4 [filament:addnorth Adura X @MK4 0.6] inherits = addnorth Adura X @MK4; *PET06PG* filament_max_volumetric_speed = 6 +temperature = 265 [filament:addnorth Adura X @MK4 0.8] inherits = addnorth Adura X @MK4; *PET08PG* @@ -8293,6 +8336,7 @@ inherits = addnorth E-PLA; *PLAPG* [filament:addnorth E-PLA @PG 0.6] inherits = addnorth E-PLA; *PLA06PG* +temperature = 210 [filament:addnorth E-PLA @PG 0.8] inherits = addnorth E-PLA; *PLA08PG* @@ -8302,6 +8346,7 @@ inherits = addnorth E-PLA @PG; *PLAXL* [filament:addnorth E-PLA @XL 0.6] inherits = addnorth E-PLA @PG 0.6; *PLA06XL* +temperature = 210 [filament:addnorth E-PLA @XL 0.8] inherits = addnorth E-PLA @PG 0.8; *PLA08XL* @@ -8337,6 +8382,7 @@ filament_max_volumetric_speed = 2 [filament:addnorth ESD-PETG @PG 0.6] inherits = addnorth ESD-PETG @PG; *PET06PG* filament_max_volumetric_speed = 3.5 +temperature = 260 [filament:addnorth ESD-PETG @PG 0.8] inherits = addnorth ESD-PETG @PG; *PET08PG* @@ -8347,6 +8393,7 @@ inherits = addnorth ESD-PETG @PG; *PETXL* [filament:addnorth ESD-PETG @XL 0.6] inherits = addnorth ESD-PETG @PG 0.6; *PET06XL* +temperature = 255 [filament:addnorth ESD-PETG @XL 0.8] inherits = addnorth ESD-PETG @PG 0.8; *PET08XL* @@ -8452,6 +8499,7 @@ inherits = addnorth PETG; *PETPG* [filament:addnorth PETG @PG 0.6] inherits = addnorth PETG @PG; *PET06PG* +temperature = 240 [filament:addnorth PETG @PG 0.8] inherits = addnorth PETG @PG; *PET08PG* @@ -8461,6 +8509,7 @@ inherits = addnorth PETG @PG; *PETXL* [filament:addnorth PETG @XL 0.6] inherits = addnorth PETG @PG 0.6; *PET06XL* +temperature = 240 [filament:addnorth PETG @XL 0.8] inherits = addnorth PETG @PG 0.8; *PET08XL* @@ -8513,6 +8562,7 @@ filament_max_volumetric_speed = 5 [filament:addnorth Rigid X @PG 0.6] inherits = addnorth Rigid X @PG; *PET06PG* filament_max_volumetric_speed = 7 +temperature = 255 [filament:addnorth Rigid X @PG 0.8] inherits = addnorth Rigid X @PG; *PET08PG* @@ -8523,6 +8573,7 @@ inherits = addnorth Rigid X @PG; *PETXL*; *04PLUSXL* [filament:addnorth Rigid X @XL 0.6] inherits = addnorth Rigid X @PG 0.6; *PET06XL* +temperature = 250 [filament:addnorth Rigid X @XL 0.8] inherits = addnorth Rigid X @PG 0.8; *PET08XL* @@ -8566,6 +8617,7 @@ inherits = addnorth Textura; *PLAPG* [filament:addnorth Textura @PG 0.6] inherits = addnorth Textura; *PLA06PG* +temperature = 210 [filament:addnorth Textura @PG 0.8] inherits = addnorth Textura; *PLA08PG* @@ -8575,6 +8627,7 @@ inherits = addnorth Textura @PG; *PLAXL* [filament:addnorth Textura @XL 0.6] inherits = addnorth Textura @PG 0.6; *PLA06XL* +temperature = 210 [filament:addnorth Textura @XL 0.8] inherits = addnorth Textura @PG 0.8; *PLA08XL* @@ -8674,6 +8727,7 @@ inherits = Filamentworld PETG @PG; *PETXLNT* [filament:Filamentworld PETG @XL 0.6] inherits = Filamentworld PETG @PG 0.6; *PET06XLNT* +temperature = 230 [filament:Filamentworld PETG @XL 0.8] inherits = Filamentworld PETG @PG 0.8; *PET08XLNT* @@ -8733,6 +8787,7 @@ inherits = Filament PM PETG; *PETPG* [filament:Filament PM PETG @PG 0.6] inherits = Filament PM PETG; *PET06PG* +temperature = 235 [filament:Filament PM PETG @PG 0.8] inherits = Filament PM PETG; *PET08PG* @@ -8742,6 +8797,7 @@ inherits = Filament PM PETG @PG; *PETXL* [filament:Filament PM PETG @XL 0.6] inherits = Filament PM PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Filament PM PETG @XL 0.8] inherits = Filament PM PETG @PG 0.8; *PET08XL* @@ -8774,6 +8830,8 @@ compatible_printers_condition = printer_notes=~/.*XL.*/ and nozzle_diameter[0]!= [filament:Generic PLA @XL 0.6] inherits = Generic PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Generic PLA @XL 0.8] inherits = Generic PLA @PG 0.8; *PLA08XL* @@ -8789,7 +8847,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Generic PLA @PGIS 0.6] inherits = Generic PLA @PG 0.6 first_layer_temperature = 230 -temperature = 215 +temperature = 210 compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Generic PLA @PGIS 0.8] @@ -8857,7 +8915,7 @@ compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0] inherits = Generic PLA Silk @XLIS filament_max_volumetric_speed = 12 slowdown_below_layer_time = 20 -temperature = 225 +temperature = 220 compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0]==0.8 [filament:3D-Fuel Standard PLA] @@ -8936,6 +8994,7 @@ filament_max_volumetric_speed = 12 [filament:3D-Fuel Pro PLA @PG 0.6] inherits = 3D-Fuel Pro PLA @PG; *PLA06PG* filament_max_volumetric_speed = 14 +temperature = 210 [filament:3D-Fuel Pro PLA @PG 0.8] inherits = 3D-Fuel Pro PLA @PG; *PLA08PG* @@ -8948,6 +9007,7 @@ inherits = 3D-Fuel Pro PLA @PG; *PLAXL* [filament:3D-Fuel Pro PLA @XL 0.6] inherits = 3D-Fuel Pro PLA @PG 0.6; *PLA06XL* +temperature = 210 [filament:3D-Fuel Pro PLA @XL 0.8] inherits = 3D-Fuel Pro PLA @PG 0.8; *PLA08XL* @@ -9091,18 +9151,20 @@ filament_max_volumetric_speed = 8 [filament:Jessie PETG @PG 0.6] inherits = Jessie PETG @PG; *PET06PG* filament_max_volumetric_speed = 16 +temperature = 235 [filament:Jessie PETG @PG 0.8] inherits = Jessie PETG @PG; *PET08PG* filament_max_volumetric_speed = 20 first_layer_temperature = 245 -temperature = 255 +temperature = 245 [filament:Jessie PETG @XL] inherits = Jessie PETG @PG; *PETXL* [filament:Jessie PETG @XL 0.6] inherits = Jessie PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Jessie PETG @XL 0.8] inherits = Jessie PETG @PG 0.8; *PET08XL* @@ -9213,6 +9275,7 @@ inherits = Spectrum PETG Matt; *PETPG* [filament:Spectrum PETG Matt @PG 0.6] inherits = Spectrum PETG Matt @PG; *PET06PG* +temperature = 235 [filament:Spectrum PETG Matt @PG 0.8] inherits = Spectrum PETG Matt @PG; *PET08PG* @@ -9222,6 +9285,7 @@ inherits = Spectrum PETG Matt @PG; *PETXL* [filament:Spectrum PETG Matt @XL 0.6] inherits = Spectrum PETG Matt @PG 0.6; *PET06XL* +temperature = 235 [filament:Spectrum PETG Matt @XL 0.8] inherits = Spectrum PETG Matt @PG 0.8; *PET08XL* @@ -9254,6 +9318,7 @@ inherits = Spectrum PETG HT100; *PETPG* [filament:Spectrum PETG HT100 @PG 0.6] inherits = Spectrum PETG HT100 @PG; *PET06PG* +temperature = 240 [filament:Spectrum PETG HT100 @PG 0.8] inherits = Spectrum PETG HT100 @PG; *PET08PG* @@ -9263,6 +9328,7 @@ inherits = Spectrum PETG HT100 @PG; *PETXLNT* [filament:Spectrum PETG HT100 @XL 0.6] inherits = Spectrum PETG HT100 @PG 0.6; *PET06XLNT* +temperature = 240 [filament:Spectrum PETG HT100 @XL 0.8] inherits = Spectrum PETG HT100 @PG 0.8; *PET08XLNT* @@ -9326,6 +9392,7 @@ inherits = Spectrum ASA 275; *ABSPG* [filament:Spectrum ASA 275 @PG 0.6] inherits = Spectrum ASA 275 @PG; *ABS06PG* +temperature = 235 [filament:Spectrum ASA 275 @PG 0.8] inherits = Spectrum ASA 275 @PG; *ABS08PG* @@ -9335,6 +9402,7 @@ inherits = Spectrum ASA 275; *ABSPG*; *ABSXL* [filament:Spectrum ASA 275 @XL 0.6] inherits = Spectrum ASA 275 @XL; *ABS06XL* +temperature = 235 [filament:Spectrum ASA 275 @XL 0.8] inherits = Spectrum ASA 275 @XL; *ABS08XL* @@ -9362,6 +9430,7 @@ renamed_from = "Spectrum ASA Kevlar @PG" [filament:Spectrum ASA Kevlar @XL 0.6] inherits = Spectrum ASA Kevlar @XL; *ABS06XL* renamed_from = "Spectrum ASA Kevlar @PG 0.6" +temperature = 245 [filament:Spectrum ASA Kevlar @XL 0.8] inherits = Spectrum ASA Kevlar @XL; *ABS08XL* @@ -9372,6 +9441,7 @@ inherits = Spectrum ASA Kevlar; *ABSPG* [filament:Spectrum ASA Kevlar @MK4 0.6] inherits = Spectrum ASA Kevlar @MK4; *ABS06PG* +temperature = 245 [filament:Spectrum ASA Kevlar @MK4 0.8] inherits = Spectrum ASA Kevlar @MK4; *ABS08PG* @@ -9397,6 +9467,7 @@ inherits = Spectrum Tough PLA; *PLAPG* [filament:Spectrum Tough PLA @PG 0.6] inherits = Spectrum Tough PLA @PG; *PLA06PG* +temperature = 230 [filament:Spectrum Tough PLA @PG 0.8] inherits = Spectrum Tough PLA @PG; *PLA08PG* @@ -9406,6 +9477,7 @@ inherits = Spectrum Tough PLA @PG; *PLAXL* [filament:Spectrum Tough PLA @XL 0.6] inherits = Spectrum Tough PLA @PG 0.6; *PLA06XL* +temperature = 230 [filament:Spectrum Tough PLA @XL 0.8] inherits = Spectrum Tough PLA @PG 0.8; *PLA08XL* @@ -9447,6 +9519,7 @@ inherits = Spectrum PCTG; *PETPG* [filament:Spectrum PCTG @PG 0.6] inherits = Spectrum PCTG @PG; *PET06PG* +temperature = 235 [filament:Spectrum PCTG @PG 0.8] inherits = Spectrum PCTG @PG; *PET08PG* @@ -9456,6 +9529,7 @@ inherits = Spectrum PCTG @PG; *PETXL* [filament:Spectrum PCTG @XL 0.6] inherits = Spectrum PCTG @PG 0.6; *PET06XL* +temperature = 235 [filament:Spectrum PCTG @XL 0.8] inherits = Spectrum PCTG @PG 0.8; *PET08XL* @@ -9549,13 +9623,15 @@ filament_retract_length_toolchange = 3.5 [filament:Fillamentum Flexfill 92A @XL 0.6] inherits = Fillamentum Flexfill 92A @XL; *FLEX06XL* -filament_max_volumetric_speed = 4.5 -filament_multitool_ramming_flow = 4.5 +filament_max_volumetric_speed = 4 +filament_multitool_ramming_flow = 4 +temperature = 230 [filament:Fillamentum Flexfill 92A @XL 0.8] inherits = Fillamentum Flexfill 92A @XL; *FLEX08XL* filament_max_volumetric_speed = 8 filament_multitool_ramming_flow = 8 +temperature = 235 [filament:Fillamentum Flexfill 92A @MK4] inherits = Fillamentum Flexfill 92A; *FLEXPG* @@ -9565,11 +9641,13 @@ filament_retract_length = 3.5 [filament:Fillamentum Flexfill 92A @MK4 0.6] inherits = Fillamentum Flexfill 92A @MK4; *FLEX06PG* -filament_max_volumetric_speed = 6.5 +filament_max_volumetric_speed = 5.5 +temperature = 230 [filament:Fillamentum Flexfill 92A @MK4 0.8] inherits = Fillamentum Flexfill 92A @MK4; *FLEX08PG* -filament_max_volumetric_speed = 10 +filament_max_volumetric_speed = 9.5 +temperature = 235 [filament:AmazonBasics TPU] inherits = *FLEX* @@ -9606,8 +9684,9 @@ filament_retract_length_toolchange = 2.5 [filament:AmazonBasics TPU @XL 0.6] inherits = AmazonBasics TPU @XL; *FLEX06XL* -filament_max_volumetric_speed = 5 -filament_multitool_ramming_flow = 5 +filament_max_volumetric_speed = 4.5 +filament_multitool_ramming_flow = 4.5 +temperature = 230 [filament:AmazonBasics TPU @XL 0.8] inherits = AmazonBasics TPU @XL; *FLEX08XL* @@ -9621,7 +9700,8 @@ extrusion_multiplier = 1.1 [filament:AmazonBasics TPU @MK4 0.6] inherits = AmazonBasics TPU @MK4; *FLEX06PG* -filament_max_volumetric_speed = 6.5 +filament_max_volumetric_speed = 6 +temperature = 230 [filament:AmazonBasics TPU @MK4 0.8] inherits = AmazonBasics TPU @MK4; *FLEX08PG* @@ -9721,8 +9801,9 @@ filament_retract_length_toolchange = 3.5 [filament:NinjaTek NinjaFlex TPU @XL 0.6] inherits = NinjaTek NinjaFlex TPU @XL; *FLEX06XL* -filament_max_volumetric_speed = 4.5 -filament_multitool_ramming_flow = 4.5 +filament_max_volumetric_speed = 4 +filament_multitool_ramming_flow = 4 +temperature = 230 [filament:NinjaTek NinjaFlex TPU @XL 0.8] inherits = NinjaTek NinjaFlex TPU @XL; *FLEX08XL* @@ -9737,7 +9818,8 @@ extrusion_multiplier = 1.12 [filament:NinjaTek NinjaFlex TPU @MK4 0.6] inherits = NinjaTek NinjaFlex TPU @MK4; *FLEX06PG* -filament_max_volumetric_speed = 6.5 +filament_max_volumetric_speed = 6 +temperature = 230 [filament:NinjaTek NinjaFlex TPU @MK4 0.8] inherits = NinjaTek NinjaFlex TPU @MK4; *FLEX08PG* @@ -9763,8 +9845,9 @@ filament_retract_length_toolchange = 2.2 [filament:NinjaTek Cheetah TPU @XL 0.6] inherits = NinjaTek Cheetah TPU @XL; *FLEX06XL* -filament_max_volumetric_speed = 7 -filament_multitool_ramming_flow = 7 +filament_max_volumetric_speed = 6.5 +filament_multitool_ramming_flow = 6.5 +temperature = 235 [filament:NinjaTek Cheetah TPU @XL 0.8] inherits = NinjaTek Cheetah TPU @XL; *FLEX08XL* @@ -9779,6 +9862,7 @@ filament_retract_length = 2.2 [filament:NinjaTek Cheetah TPU @MK4 0.6] inherits = NinjaTek Cheetah TPU @MK4; *FLEX06PG* filament_max_volumetric_speed = 8 +temperature = 235 [filament:NinjaTek Cheetah TPU @MK4 0.8] inherits = NinjaTek Cheetah TPU @MK4; *FLEX08PG* @@ -9941,6 +10025,7 @@ filament_retract_length_toolchange = 2.2 inherits = Filatech TPU @XL; *FLEX06XL* filament_max_volumetric_speed = 5 filament_multitool_ramming_flow = 5 +temperature = 230 [filament:Filatech TPU @XL 0.8] inherits = Filatech TPU @XL; *FLEX08XL* @@ -9956,6 +10041,7 @@ filament_retract_length = 2.2 [filament:Filatech TPU @MK4 0.6] inherits = Filatech TPU @MK4; *FLEX06PG* filament_max_volumetric_speed = 7 +temperature = 230 [filament:Filatech TPU @MK4 0.8] inherits = Filatech TPU @MK4; *FLEX08PG* @@ -10042,6 +10128,7 @@ inherits = Filatech FilaPLA; *PLAPG* [filament:Filatech FilaPLA @PG 0.6] inherits = Filatech FilaPLA; *PLA06PG* +temperature = 225 [filament:Filatech FilaPLA @PG 0.8] inherits = Filatech FilaPLA; *PLA08PG* @@ -10051,6 +10138,7 @@ inherits = Filatech FilaPLA @PG; *PLAXL* [filament:Filatech FilaPLA @XL 0.6] inherits = Filatech FilaPLA @PG 0.6; *PLA06XL* +temperature = 220 [filament:Filatech FilaPLA @XL 0.8] inherits = Filatech FilaPLA @PG 0.8; *PLA08XL* @@ -10119,6 +10207,7 @@ inherits = Filatech FilaTough; *ABSPG* [filament:Filatech FilaTough @PG 0.6] inherits = Filatech FilaTough; *ABS06PG* +temperature = 235 [filament:Filatech FilaTough @PG 0.8] inherits = Filatech FilaTough; *ABS08PG* @@ -10128,6 +10217,7 @@ inherits = Filatech FilaTough @PG; *ABSXL* [filament:Filatech FilaTough @XL 0.6] inherits = Filatech FilaTough @PG 0.6; *ABS06XL* +temperature = 235 [filament:Filatech FilaTough @XL 0.8] inherits = Filatech FilaTough @PG 0.8; *ABS08XL* @@ -10215,6 +10305,7 @@ filament_max_volumetric_speed = 8 inherits = Filatech PA @XL; *ABS06XL* renamed_from = "Filatech PA @PG 0.6" filament_max_volumetric_speed = 10 +temperature = 270 [filament:Filatech PA @XL 0.8] inherits = Filatech PA @XL; *ABS08XL* @@ -10228,6 +10319,7 @@ filament_max_volumetric_speed = 8 [filament:Filatech PA @MK4 0.6] inherits = Filatech PA @MK4; *ABS06PG* filament_max_volumetric_speed = 10 +temperature = 270 [filament:Filatech PA @MK4 0.8] inherits = Filatech PA @MK4; *ABS08PG* @@ -10326,7 +10418,7 @@ filament_cost = filament_density = 1.27 first_layer_temperature = 240 first_layer_bed_temperature = 75 -temperature = 245 +temperature = 240 bed_temperature = 80 extrusion_multiplier = 0.95 fan_always_on = 0 @@ -10336,6 +10428,7 @@ inherits = Filatech PETG; *PETPG* [filament:Filatech PETG @PG 0.6] inherits = Filatech PETG; *PET06PG* +temperature = 235 [filament:Filatech PETG @PG 0.8] inherits = Filatech PETG; *PET08PG* @@ -10345,6 +10438,7 @@ inherits = Filatech PETG @PG; *PETXLNT* [filament:Filatech PETG @XL 0.6] inherits = Filatech PETG @PG 0.6; *PET06XLNT* +temperature = 235 [filament:Filatech PETG @XL 0.8] inherits = Filatech PETG @PG 0.8; *PET08XLNT* @@ -10527,6 +10621,7 @@ bed_temperature = 100 [filament:Ultrafuse ABS Fusion+ @XL 0.6] inherits = Ultrafuse ABS Fusion+ @XL; *ABS06XL* renamed_from = "Ultrafuse ABS Fusion+ @PG 0.6" +temperature = 265 [filament:Ultrafuse ABS Fusion+ @XL 0.8] inherits = Ultrafuse ABS Fusion+ @XL; *ABS08XL* @@ -10537,6 +10632,7 @@ inherits = Ultrafuse ABS Fusion+; *ABSPG* [filament:Ultrafuse ABS Fusion+ @MK4 0.6] inherits = Ultrafuse ABS Fusion+ @MK4; *ABS06PG* +temperature = 265 [filament:Ultrafuse ABS Fusion+ @MK4 0.8] inherits = Ultrafuse ABS Fusion+ @MK4; *ABS08PG* @@ -10578,6 +10674,7 @@ extrusion_multiplier = 0.98 inherits = Ultrafuse ASA @XL; *ABS06XL* renamed_from = "Ultrafuse ASA @PG 0.6" filament_max_volumetric_speed = 9 +temperature = 265 [filament:Ultrafuse ASA @XL 0.8] inherits = Ultrafuse ASA @XL; *ABS08XL* @@ -10596,6 +10693,7 @@ extrusion_multiplier = 0.98 [filament:Ultrafuse ASA @MK4 0.6] inherits = Ultrafuse ASA @MK4; *ABS06PG* filament_max_volumetric_speed = 9 +temperature = 265 [filament:Ultrafuse ASA @MK4 0.8] inherits = Ultrafuse ASA @MK4; *ABS08PG* @@ -10624,6 +10722,7 @@ bed_temperature = 100 [filament:Ultrafuse HIPS @XL 0.6] inherits = Ultrafuse HIPS @XL; *ABS06XL* renamed_from = "Ultrafuse HIPS @PG 0.6" +temperature = 240 [filament:Ultrafuse HIPS @XL 0.8] inherits = Ultrafuse HIPS @XL; *ABS08XL* @@ -10634,6 +10733,7 @@ inherits = Ultrafuse HIPS; *ABSPG* [filament:Ultrafuse HIPS @MK4 0.6] inherits = Ultrafuse HIPS @MK4; *ABS06PG* +temperature = 240 [filament:Ultrafuse HIPS @MK4 0.8] inherits = Ultrafuse HIPS @MK4; *ABS08PG* @@ -10687,6 +10787,7 @@ inherits = Ultrafuse PA @PG; *ABSXL* [filament:Ultrafuse PA @XL 0.6] inherits = Ultrafuse PA @PG 0.6; *ABS06XL* +temperature = 235 [filament:Ultrafuse PA @XL 0.8] inherits = Ultrafuse PA @PG 0.8; *ABS08XL* @@ -10729,6 +10830,7 @@ compatible_printers_condition = nozzle_diameter[0]==0.8 and printer_notes=~/.*PG [filament:Ultrafuse PA6 GF30 @XL 0.6] inherits = Ultrafuse PA6 GF30 @PG 0.6; *ABS06XL* +temperature = 265 [filament:Ultrafuse PA6 GF30 @XL 0.8] inherits = Ultrafuse PA6 GF30 @PG 0.8; *ABS08XL* @@ -10780,6 +10882,7 @@ filament_max_volumetric_speed = 8 inherits = Ultrafuse PC-ABS-FR @XL; *ABS06XL* renamed_from = "Ultrafuse PC-ABS-FR @PG 0.6" filament_max_volumetric_speed = 10 +temperature = 270 [filament:Ultrafuse PC-ABS-FR @XL 0.8] inherits = Ultrafuse PC-ABS-FR @XL; *ABS08XL* @@ -10793,6 +10896,7 @@ filament_max_volumetric_speed = 8 [filament:Ultrafuse PC-ABS-FR @MK4 0.6] inherits = Ultrafuse PC-ABS-FR @MK4; *ABS06PG* filament_max_volumetric_speed = 10 +temperature = 270 [filament:Ultrafuse PC-ABS-FR @MK4 0.8] inherits = Ultrafuse PC-ABS-FR @MK4; *ABS08PG* @@ -10826,15 +10930,15 @@ compatible_printers_condition = nozzle_diameter[0]>=0.6 and printer_notes!~/.*MI [filament:Ultrafuse PET-CF15 @PG 0.6] inherits = Ultrafuse PET-CF15; *PET06PG* filament_max_volumetric_speed = 10 +temperature = 265 [filament:Ultrafuse PET-CF15 @PG 0.8] inherits = Ultrafuse PET-CF15; *PET08PG* filament_max_volumetric_speed = 13 -first_layer_temperature = 270 -temperature = 275 [filament:Ultrafuse PET-CF15 @XL 0.6] inherits = Ultrafuse PET-CF15 @PG 0.6; *PET06XL* +temperature = 265 [filament:Ultrafuse PET-CF15 @XL 0.8] inherits = Ultrafuse PET-CF15 @PG 0.8; *PET08XL* @@ -10934,12 +11038,14 @@ compatible_printers_condition = nozzle_diameter[0]>=0.6 and printer_notes!~/.*MI [filament:Ultrafuse PP-GF30 @PG 0.6] inherits = Ultrafuse PP; *ABS06PG* +temperature = 245 [filament:Ultrafuse PP-GF30 @PG 0.8] inherits = Ultrafuse PP; *ABS08PG* [filament:Ultrafuse PP-GF30 @XL 0.6] inherits = Ultrafuse PP-GF30 @PG 0.6; *ABS06XL* +temperature = 245 [filament:Ultrafuse PP-GF30 @XL 0.8] inherits = Ultrafuse PP-GF30 @PG 0.8; *ABS08XL* @@ -11125,18 +11231,18 @@ filament_max_volumetric_speed = 8 [filament:Ultrafuse rPET @PG 0.6] inherits = Ultrafuse rPET; *PET06PG* filament_max_volumetric_speed = 16 +temperature = 230 [filament:Ultrafuse rPET @PG 0.8] inherits = Ultrafuse rPET; *PET08PG* filament_max_volumetric_speed = 18 -first_layer_temperature = 235 -temperature = 245 [filament:Ultrafuse rPET @XL] inherits = Ultrafuse rPET @PG; *PETXLNT* [filament:Ultrafuse rPET @XL 0.6] inherits = Ultrafuse rPET @PG 0.6; *PET06XLNT* +temperature = 230 [filament:Ultrafuse rPET @XL 0.8] inherits = Ultrafuse rPET @PG 0.8; *PET08XLNT* @@ -11204,6 +11310,7 @@ filament_max_volumetric_speed = 8 inherits = Polymaker PC-Max @XL; *ABS06XL* renamed_from = "Polymaker PC-Max @PG 0.6" filament_max_volumetric_speed = 12 +temperature = 265 [filament:Polymaker PC-Max @XL 0.8] inherits = Polymaker PC-Max @XL; *ABS08XL* @@ -11285,8 +11392,8 @@ renamed_from = "Prusa ABS @PG 0.6" [filament:Prusa ABS @XL 0.8] inherits = Prusa ABS @XL; *ABS08XL* renamed_from = "Prusa ABS @PG 0.8" -first_layer_temperature = 265 -temperature = 265 +first_layer_temperature = 260 +temperature = 260 [filament:Prusa ABS @MK4] inherits = Prusa ABS; *ABSPG* @@ -11296,8 +11403,8 @@ inherits = Prusa ABS @MK4; *ABS06PG* [filament:Prusa ABS @MK4 0.8] inherits = Prusa ABS @MK4; *ABS08PG* -first_layer_temperature = 265 -temperature = 265 +first_layer_temperature = 260 +temperature = 260 [filament:*ABS MMU2*] inherits = Prusa ABS @@ -11608,6 +11715,7 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*M [filament:Prusa PETG @PG 0.6] inherits = Prusa PETG; *PET06PG* compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 +temperature = 235 [filament:Prusa PETG @PG 0.8] inherits = Prusa PETG; *PET08PG* @@ -11619,6 +11727,7 @@ inherits = Prusa PETG @PG; *PETXL* [filament:Prusa PETG @XL 0.6] inherits = Prusa PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Prusa PETG @XL 0.8] inherits = Prusa PETG @PG 0.8; *PET08XL* @@ -11640,7 +11749,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Prusa PETG @PGIS 0.6] inherits = Generic PETG @PG 0.6 first_layer_temperature = 240 -temperature = 240 +temperature = 235 filament_retract_length = 0.8 filament_wipe = 1 filament_retract_before_wipe = 20 @@ -11650,7 +11759,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Prusa PETG @PGIS 0.8] inherits = Generic PETG @PG 0.8 first_layer_temperature = 240 -temperature = 250 +temperature = 245 filament_retract_length = 0.8 filament_wipe = 1 filament_retract_before_wipe = 20 @@ -11670,6 +11779,7 @@ inherits = Verbatim PETG; *PETPG* [filament:Verbatim PETG @PG 0.6] inherits = Verbatim PETG; *PET06PG* +temperature = 235 [filament:Verbatim PETG @PG 0.8] inherits = Verbatim PETG; *PET08PG* @@ -11679,6 +11789,7 @@ inherits = Verbatim PETG @PG; *PETXL* [filament:Verbatim PETG @XL 0.6] inherits = Verbatim PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Verbatim PETG @XL 0.8] inherits = Verbatim PETG @PG 0.8; *PET08XL* @@ -11700,12 +11811,11 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*M [filament:Prusament PETG @PG 0.6] inherits = Prusament PETG; *PET06PG* +temperature = 240 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Prusament PETG @PG 0.8] inherits = Prusament PETG; *PET08PG* -first_layer_temperature = 250 -temperature = 260 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.8 [filament:Prusament PETG @XL] @@ -11713,6 +11823,7 @@ inherits = Prusament PETG @PG; *PETXL* [filament:Prusament PETG @XL 0.6] inherits = Prusament PETG @PG 0.6; *PET06XL* +temperature = 240 [filament:Prusament PETG @XL 0.8] inherits = Prusament PETG @PG 0.8; *PET08XL* @@ -11822,6 +11933,7 @@ inherits = Prusament PETG Carbon Fiber; *PETPG*; *04PLUSPG* [filament:Prusament PETG Carbon Fiber @PG 0.6] inherits = Prusament PETG Carbon Fiber @PG; *PET06PG* +temperature = 260 [filament:Prusament PETG Carbon Fiber @PG 0.8] inherits = Prusament PETG Carbon Fiber @PG; *PET08PG* @@ -11831,6 +11943,7 @@ inherits = Prusament PETG Carbon Fiber @PG; *PETXL*; *04PLUSXL* [filament:Prusament PETG Carbon Fiber @XL 0.6] inherits = Prusament PETG Carbon Fiber @PG 0.6; *PET06XL* +temperature = 260 [filament:Prusament PETG Carbon Fiber @XL 0.8] inherits = Prusament PETG Carbon Fiber @PG 0.8; *PET08XL* @@ -12043,7 +12156,8 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*M [filament:Prusa PLA @PG 0.6] inherits = Prusa PLA; *PLA06PG* -filament_max_volumetric_speed = 15.5 +filament_max_volumetric_speed = 15 +temperature = 205 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Prusa PLA @PG 0.8] @@ -12056,6 +12170,8 @@ compatible_printers_condition = printer_notes=~/.*XL.*/ and nozzle_diameter[0]!= [filament:Prusa PLA @XL 0.6] inherits = Prusa PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Prusa PLA @XL 0.8] inherits = Prusa PLA @PG 0.8; *PLA08XL* @@ -12208,6 +12324,7 @@ inherits = Eolas Prints PETG; *PETPG* [filament:Eolas Prints PETG @PG 0.6] inherits = Eolas Prints PETG; *PET06PG* +temperature = 235 [filament:Eolas Prints PETG @PG 0.8] inherits = Eolas Prints PETG; *PET08PG* @@ -12217,6 +12334,7 @@ inherits = Eolas Prints PETG @PG; *PETXL* [filament:Eolas Prints PETG @XL 0.6] inherits = Eolas Prints PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Eolas Prints PETG @XL 0.8] inherits = Eolas Prints PETG @PG 0.8; *PET08XL* @@ -12235,6 +12353,7 @@ inherits = Eolas Prints PETG - UV Resistant; *PETPG* [filament:Eolas Prints PETG - UV Resistant @PG 0.6] inherits = Eolas Prints PETG - UV Resistant; *PET06PG* +temperature = 230 [filament:Eolas Prints PETG - UV Resistant @PG 0.8] inherits = Eolas Prints PETG - UV Resistant; *PET08PG* @@ -12244,6 +12363,7 @@ inherits = Eolas Prints PETG - UV Resistant @PG; *PETXL* [filament:Eolas Prints PETG - UV Resistant @XL 0.6] inherits = Eolas Prints PETG - UV Resistant @PG 0.6; *PET06XL* +temperature = 230 [filament:Eolas Prints PETG - UV Resistant @XL 0.8] inherits = Eolas Prints PETG - UV Resistant @PG 0.8; *PET08XL* @@ -12274,6 +12394,7 @@ filament_retract_length_toolchange = 2.5 [filament:Eolas Prints TPU 93A @XL 0.6] inherits = Eolas Prints TPU 93A @XL; *FLEX06XL* renamed_from = "Eolas Prints TPU 93A @PG 0.6" +temperature = 230 [filament:Eolas Prints TPU 93A @PG 0.8] inherits = Eolas Prints TPU 93A @XL; *FLEX08XL* @@ -12321,7 +12442,7 @@ inherits = Print With Smile PLA @PG 0.6; *PLA06XL* [filament:Print With Smile PLA @XL 0.8] inherits = Print With Smile PLA @PG 0.8; *PLA08XL* first_layer_temperature = 215 -temperature = 215 +temperature = 210 [filament:Print With Smile PETG] inherits = *PET* @@ -12343,6 +12464,7 @@ filament_max_volumetric_speed = 8 [filament:Print With Smile PETG @PG 0.6] inherits = Print With Smile PETG; *PET06PG* filament_max_volumetric_speed = 16 +temperature = 235 [filament:Print With Smile PETG @PG 0.8] inherits = Print With Smile PETG; *PET08PG* @@ -12353,6 +12475,7 @@ inherits = Print With Smile PETG @PG; *PETXL* [filament:Print With Smile PETG @XL 0.6] inherits = Print With Smile PETG @PG 0.6; *PET06XL* +temperature = 235 [filament:Print With Smile PETG @XL 0.8] inherits = Print With Smile PETG @PG 0.8; *PET08XL* @@ -12462,6 +12585,7 @@ filament_max_volumetric_speed = 5 [filament:Print With Smile PETG CF @PG 0.6] inherits = Print With Smile PETG CF @PG; *PET06PG* filament_max_volumetric_speed = 6.5 +temperature = 255 [filament:Print With Smile PETG CF @PG 0.8] inherits = Print With Smile PETG CF @PG; *PET08PG* @@ -12472,6 +12596,7 @@ inherits = Print With Smile PETG CF @PG; *PETXL* [filament:Print With Smile PETG CF @XL 0.6] inherits = Print With Smile PETG CF @PG 0.6; *PET06XL* +temperature = 255 [filament:Print With Smile PETG CF @XL 0.8] inherits = Print With Smile PETG CF @PG 0.8; *PET08XL* @@ -12540,6 +12665,7 @@ inherits = Fiberlogy Easy PLA; *PLAPG* [filament:Fiberlogy Easy PLA @PG 0.6] inherits = Fiberlogy Easy PLA; *PLA06PG* +temperature = 215 [filament:Fiberlogy Easy PLA @PG 0.8] inherits = Fiberlogy Easy PLA; *PLA08PG* @@ -12549,6 +12675,7 @@ inherits = Fiberlogy Easy PLA @PG; *PLAXL* [filament:Fiberlogy Easy PLA @XL 0.6] inherits = Fiberlogy Easy PLA @PG 0.6; *PLA06XL* +temperature = 210 [filament:Fiberlogy Easy PLA @XL 0.8] inherits = Fiberlogy Easy PLA @PG 0.8; *PLA08XL* @@ -12577,6 +12704,7 @@ inherits = Fiberlogy Easy PET-G; *PETPG* [filament:Fiberlogy Easy PET-G @PG 0.6] inherits = Fiberlogy Easy PET-G; *PET06PG* +temperature = 230 [filament:Fiberlogy Easy PET-G @PG 0.8] inherits = Fiberlogy Easy PET-G; *PET08PG* @@ -12586,6 +12714,7 @@ inherits = Fiberlogy Easy PET-G @PG; *PETXL* [filament:Fiberlogy Easy PET-G @XL 0.6] inherits = Fiberlogy Easy PET-G @PG 0.6; *PET06XL* +temperature = 230 [filament:Fiberlogy Easy PET-G @XL 0.8] inherits = Fiberlogy Easy PET-G @PG 0.8; *PET08XL* @@ -12620,6 +12749,7 @@ bed_temperature = 105 [filament:Fiberlogy ASA @XL 0.6] inherits = Fiberlogy ASA @XL; *ABS06XL* renamed_from = "Fiberlogy ASA @PG 0.6" +temperature = 255 [filament:Fiberlogy ASA @XL 0.8] inherits = Fiberlogy ASA @XL; *ABS08XL* @@ -12705,6 +12835,7 @@ bed_temperature = 105 [filament:Fiberlogy CPE HT @PG 0.6] inherits = Fiberlogy CPE HT @PG; *PET06PG* +temperature = 265 [filament:Fiberlogy CPE HT @PG 0.8] inherits = Fiberlogy CPE HT @PG; *PET08PG* @@ -12714,6 +12845,7 @@ inherits = Fiberlogy CPE HT @PG; *PETXLNT* [filament:Fiberlogy CPE HT @XL 0.6] inherits = Fiberlogy CPE HT @XL; *PET06XLNT* +temperature = 265 [filament:Fiberlogy CPE HT @XL 0.8] inherits = Fiberlogy CPE HT @XL; *PET08XLNT* @@ -12736,6 +12868,7 @@ inherits = Fiberlogy PCTG; *PETPG* [filament:Fiberlogy PCTG @PG 0.6] inherits = Fiberlogy PCTG; *PET06PG* +temperature = 260 [filament:Fiberlogy PCTG @PG 0.8] inherits = Fiberlogy PCTG; *PET08PG* @@ -12745,6 +12878,7 @@ inherits = Fiberlogy PCTG @PG; *PETXL* [filament:Fiberlogy PCTG @XL 0.6] inherits = Fiberlogy PCTG @PG 0.6; *PET06XL* +temperature = 255 [filament:Fiberlogy PCTG @XL 0.8] inherits = Fiberlogy PCTG @PG 0.8; *PET08XL* @@ -13030,6 +13164,7 @@ inherits = Fiberlogy HD PLA; *PLAPG* [filament:Fiberlogy HD PLA @PG 0.6] inherits = Fiberlogy HD PLA; *PLA06PG* +temperature = 225 [filament:Fiberlogy HD PLA @PG 0.8] inherits = Fiberlogy HD PLA; *PLA08PG* @@ -13039,6 +13174,7 @@ inherits = Fiberlogy HD PLA @PG; *PLAXL* [filament:Fiberlogy HD PLA @XL 0.6] inherits = Fiberlogy HD PLA @PG 0.6; *PLA06XL* +temperature = 225 [filament:Fiberlogy HD PLA @XL 0.8] inherits = Fiberlogy HD PLA @PG 0.8; *PLA08XL* @@ -13127,6 +13263,7 @@ filament_max_volumetric_speed = 6 inherits = Fiberlogy Nylon PA12 @XL; *ABS06XL* renamed_from = "Fiberlogy Nylon PA12 @PG 0.6" filament_max_volumetric_speed = 8 +temperature = 260 [filament:Fiberlogy Nylon PA12 @XL 0.8] inherits = Fiberlogy Nylon PA12 @XL; *ABS08XL* @@ -13173,6 +13310,7 @@ filament_max_volumetric_speed = 8 inherits = Fiberlogy Nylon PA12+CF15 @XL; *ABS06XL* renamed_from = "Fiberlogy Nylon PA12+CF15 @PG 0.6" filament_max_volumetric_speed = 10 +temperature = 260 [filament:Fiberlogy Nylon PA12+CF15 @XL 0.8] inherits = Fiberlogy Nylon PA12+CF15 @XL; *ABS08XL* @@ -13266,6 +13404,7 @@ inherits = Fiberlogy PP @PG; *ABSXL* [filament:Fiberlogy PP @XL 0.6] inherits = Fiberlogy PP @PG 0.6; *ABS06XL* +temperature = 240 [filament:Fiberlogy PP @XL 0.8] inherits = Fiberlogy PP @PG 0.8; *ABS08XL* @@ -13284,6 +13423,7 @@ inherits = Filament PM PLA; *PLAPG* [filament:Filament PM PLA @PG 0.6] inherits = Filament PM PLA; *PLA06PG* filament_max_volumetric_speed = 15 +temperature = 205 [filament:Filament PM PLA @PG 0.8] inherits = Filament PM PLA; *PLA08PG* @@ -13295,6 +13435,7 @@ inherits = Filament PM PLA @PG; *PLAXL* [filament:Filament PM PLA @XL 0.6] inherits = Filament PM PLA @PG 0.6; *PLA06XL* +temperature = 205 [filament:Filament PM PLA @XL 0.8] inherits = Filament PM PLA @PG 0.8; *PLA08XL* @@ -13316,6 +13457,7 @@ inherits = Filament PM PLA+; *PLAPG* [filament:Filament PM PLA+ @PG 0.6] inherits = Filament PM PLA+; *PLA06PG* filament_max_volumetric_speed = 15 +temperature = 205 [filament:Filament PM PLA+ @PG 0.8] inherits = Filament PM PLA+; *PLA08PG* @@ -13327,6 +13469,7 @@ inherits = Filament PM PLA+ @PG; *PLAXL* [filament:Filament PM PLA+ @XL 0.6] inherits = Filament PM PLA+ @PG 0.6; *PLA06XL* +temperature = 205 [filament:Filament PM PLA+ @XL 0.8] inherits = Filament PM PLA+ @PG 0.8; *PLA08XL* @@ -13391,6 +13534,7 @@ inherits = Filament PM CFJet @PG; *PETXL*; *04PLUSXL* [filament:Filament PM CFJet @XL 0.6] inherits = Filament PM CFJet @PG 0.6; *PET06XL* +temperature = 250 [filament:Filament PM CFJet @XL 0.8] inherits = Filament PM CFJet @PG 0.8; *PET08XL* @@ -13509,6 +13653,7 @@ inherits = Filament PM FRJet; *PETPG* [filament:Filament PM FRJet @PG 0.6] inherits = Filament PM FRJet @PG; *PET06PG* +temperature = 235 [filament:Filament PM FRJet @PG 0.8] inherits = Filament PM FRJet @PG; *PET08PG* @@ -13518,6 +13663,7 @@ inherits = Filament PM FRJet @PG; *PETXL* [filament:Filament PM FRJet @XL 0.6] inherits = Filament PM FRJet @PG 0.6; *PET06XL* +temperature = 235 [filament:Filament PM FRJet @XL 0.8] inherits = Filament PM FRJet @PG 0.8; *PET08XL* @@ -13548,6 +13694,7 @@ inherits = Filament PM PC-ABS; *PCPG*; *04PLUSPG* [filament:Filament PM PC-ABS @PG 0.6] inherits = Filament PM PC-ABS @PG; *PC06PG* +temperature = 270 [filament:Filament PM PC-ABS @PG 0.8] inherits = Filament PM PC-ABS @PG; *PC08PG* @@ -13559,6 +13706,7 @@ bed_temperature = 105 [filament:Filament PM PC-ABS @XL 0.6] inherits = Filament PM PC-ABS @XL; *PC06XL* +temperature = 270 [filament:Filament PM PC-ABS @XL 0.8] inherits = Filament PM PC-ABS @XL; *PC08XL* @@ -13654,6 +13802,7 @@ filament_retract_length = 2.5 [filament:Filament PM TPE88 RubberJet @PG 0.6] inherits = Filament PM TPE88 RubberJet @PG; *FLEX06PG* filament_max_volumetric_speed = 4.5 +temperature = 235 [filament:Filament PM TPE88 RubberJet @PG 0.8] inherits = Filament PM TPE88 RubberJet @PG; *FLEX08PG* @@ -13670,6 +13819,7 @@ filament_retract_length_toolchange = 2.5 inherits = Filament PM TPE88 RubberJet @XL; *FLEX06XL* filament_max_volumetric_speed = 4 filament_multitool_ramming_flow = 4 +temperature = 235 [filament:Filament PM TPE88 RubberJet @XL 0.8] inherits = Filament PM TPE88 RubberJet @XL; *FLEX08XL* @@ -13687,6 +13837,8 @@ inherits = AmazonBasics PLA; *PLAPG* [filament:AmazonBasics PLA @PG 0.6] inherits = AmazonBasics PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:AmazonBasics PLA @PG 0.8] inherits = AmazonBasics PLA; *PLA08PG* @@ -13698,6 +13850,8 @@ inherits = AmazonBasics PLA @PG; *PLAXL* [filament:AmazonBasics PLA @XL 0.6] inherits = AmazonBasics PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:AmazonBasics PLA @XL 0.8] inherits = AmazonBasics PLA @PG 0.8; *PLA08XL* @@ -13714,6 +13868,8 @@ inherits = Overture PLA; *PLAPG* [filament:Overture PLA @PG 0.6] inherits = Overture PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 14 [filament:Overture PLA @PG 0.8] inherits = Overture PLA; *PLA08PG* @@ -13725,6 +13881,8 @@ inherits = Overture PLA @PG; *PLAXL* [filament:Overture PLA @XL 0.6] inherits = Overture PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 14 [filament:Overture PLA @XL 0.8] inherits = Overture PLA @PG 0.8; *PLA08XL* @@ -13745,6 +13903,8 @@ temperature = 215 [filament:Hatchbox PLA @PG 0.6] inherits = Hatchbox PLA @PG; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Hatchbox PLA @PG 0.8] inherits = Hatchbox PLA; *PLA08PG* @@ -13756,6 +13916,8 @@ inherits = Hatchbox PLA @PG; *PLAXL* [filament:Hatchbox PLA @XL 0.6] inherits = Hatchbox PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Hatchbox PLA @XL 0.8] inherits = Hatchbox PLA @PG 0.8; *PLA08XL* @@ -13774,6 +13936,8 @@ filament_max_volumetric_speed = 13 [filament:Esun PLA @PG 0.6] inherits = Esun PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Esun PLA @PG 0.8] inherits = Esun PLA; *PLA08PG* @@ -13785,6 +13949,8 @@ inherits = Esun PLA @PG; *PLAXL* [filament:Esun PLA @XL 0.6] inherits = Esun PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Esun PLA @XL 0.8] inherits = Esun PLA @PG 0.8; *PLA08XL* @@ -13800,6 +13966,8 @@ inherits = Das Filament PLA; *PLAPG* [filament:Das Filament PLA @PG 0.6] inherits = Das Filament PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Das Filament PLA @PG 0.8] inherits = Das Filament PLA; *PLA08PG* @@ -13811,6 +13979,8 @@ inherits = Das Filament PLA @PG; *PLAXL* [filament:Das Filament PLA @XL 0.6] inherits = Das Filament PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Das Filament PLA @XL 0.8] inherits = Das Filament PLA @PG 0.8; *PLA08XL* @@ -13827,6 +13997,8 @@ filament_max_volumetric_speed = 13 [filament:EUMAKERS PLA @PG 0.6] inherits = EUMAKERS PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:EUMAKERS PLA @PG 0.8] inherits = EUMAKERS PLA; *PLA08PG* @@ -13838,6 +14010,8 @@ inherits = EUMAKERS PLA @PG; *PLAXL* [filament:EUMAKERS PLA @XL 0.6] inherits = EUMAKERS PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:EUMAKERS PLA @XL 0.8] inherits = EUMAKERS PLA @PG 0.8; *PLA08XL* @@ -13853,6 +14027,8 @@ inherits = Floreon3D PLA; *PLAPG* [filament:Floreon3D PLA @PG 0.6] inherits = Floreon3D PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Floreon3D PLA @PG 0.8] inherits = Floreon3D PLA; *PLA08PG* @@ -13864,6 +14040,8 @@ inherits = Floreon3D PLA @PG; *PLAXL* [filament:Floreon3D PLA @XL 0.6] inherits = Floreon3D PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Floreon3D PLA @XL 0.8] inherits = Floreon3D PLA @PG 0.8; *PLA08XL* @@ -13884,13 +14062,14 @@ compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*M [filament:Prusament PLA @PG 0.6] inherits = Prusament PLA; *PLA06PG* -filament_max_volumetric_speed = 16 +filament_max_volumetric_speed = 15.5 +temperature = 210 compatible_printers_condition = printer_notes=~/.*MK4.*/ and printer_notes!~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Prusament PLA @PG 0.8] inherits = Prusament PLA; *PLA08PG* first_layer_temperature = 230 -temperature = 225 +temperature = 220 [filament:Prusament PLA @XL] inherits = Prusament PLA @PG; *PLAXL* @@ -13898,6 +14077,8 @@ compatible_printers_condition = printer_notes=~/.*XL.*/ and nozzle_diameter[0]!= [filament:Prusament PLA @XL 0.6] inherits = Prusament PLA @PG 0.6; *PLA06XL* +filament_max_volumetric_speed = 15.5 +temperature = 210 [filament:Prusament PLA @XL 0.8] inherits = Prusament PLA @PG 0.8; *PLA08XL* @@ -13913,7 +14094,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Prusament PLA @PGIS 0.6] inherits = Prusament PLA @PG 0.6 first_layer_temperature = 230 -temperature = 220 +temperature = 215 compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 [filament:Prusament PLA @XLIS] @@ -13943,7 +14124,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK [filament:Prusament PLA Blend @PGIS 0.6] inherits = Prusament PLA Blend @PGIS -temperature = 220 +temperature = 215 filament_max_volumetric_speed = 9 slowdown_below_layer_time = 14 compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK4IS.*/ and nozzle_diameter[0]==0.6 @@ -13952,7 +14133,7 @@ compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK inherits = Prusament PLA Blend @PGIS filament_max_volumetric_speed = 12 slowdown_below_layer_time = 20 -temperature = 225 +temperature = 220 compatible_printers_condition = printer_notes=~/.*PG.*/ and printer_notes=~/.*MK4IS.*/ and nozzle_diameter[0]==0.8 [filament:Prusament PLA Blend @XLIS] @@ -13967,7 +14148,7 @@ compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0] [filament:Prusament PLA Blend @XLIS 0.6] inherits = Prusament PLA Blend @XLIS first_layer_temperature = 220 -temperature = 215 +temperature = 210 filament_max_volumetric_speed = 9 slowdown_below_layer_time = 14 compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0]==0.6 @@ -13976,7 +14157,7 @@ compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0] inherits = Prusament PLA Blend @XLIS filament_max_volumetric_speed = 12 slowdown_below_layer_time = 20 -temperature = 225 +temperature = 220 compatible_printers_condition = printer_notes=~/.*XLIS.*/ and nozzle_diameter[0]==0.8 [filament:Prusament PVB] @@ -14134,6 +14315,7 @@ inherits = Fillamentum Flexfill 98A @XL; *FLEX06XL* renamed_from = "Fillamentum Flexfill 98A @PG 0.6" filament_max_volumetric_speed = 3 filament_multitool_ramming_flow = 3 +temperature = 235 [filament:Fillamentum Flexfill 98A @XL 0.8] inherits = Fillamentum Flexfill 98A @XL; *FLEX08XL* @@ -14150,6 +14332,7 @@ extrusion_multiplier = 1.08 [filament:Fillamentum Flexfill 98A @MK4 0.6] inherits = Fillamentum Flexfill 98A @MK4; *FLEX06PG* filament_max_volumetric_speed = 4 +temperature = 235 [filament:Fillamentum Flexfill 98A @MK4 0.8] inherits = Fillamentum Flexfill 98A @MK4; *FLEX08PG* @@ -14210,6 +14393,7 @@ filament_max_volumetric_speed = 7 inherits = Taulman Bridge @XL; *ABS06XL* renamed_from = "Taulman Bridge @PG 0.6" filament_max_volumetric_speed = 9 +temperature = 255 [filament:Taulman Bridge @XL 0.8] inherits = Taulman Bridge @XL; *ABS08XL* @@ -14225,6 +14409,7 @@ filament_max_volumetric_speed = 7 [filament:Taulman Bridge @MK4 0.6] inherits = Taulman Bridge @MK4; *ABS06PG* filament_max_volumetric_speed = 9 +temperature = 255 [filament:Taulman Bridge @MK4 0.8] inherits = Taulman Bridge @MK4; *ABS08PG* @@ -14327,6 +14512,7 @@ inherits = Fiberthree F3 PA Pure Pro @PG; *PA06PG* filament_max_volumetric_speed = 7 bed_temperature = 90 first_layer_bed_temperature = 90 +temperature = 275 [filament:Fiberthree F3 PA Pure Pro @PG 0.8] inherits = Fiberthree F3 PA Pure Pro @PG; *PA08PG* @@ -14339,6 +14525,7 @@ inherits = Fiberthree F3 PA Pure Pro @PG; *PAXL* [filament:Fiberthree F3 PA Pure Pro @XL 0.6] inherits = Fiberthree F3 PA Pure Pro @PG 0.6; *PA06XL* +temperature = 275 [filament:Fiberthree F3 PA Pure Pro @XL 0.8] inherits = Fiberthree F3 PA Pure Pro @PG 0.8; *PA08XL* @@ -14384,6 +14571,7 @@ inherits = Fiberthree F3 PA-CF Pro; *PA06PG* filament_max_volumetric_speed = 7 bed_temperature = 90 first_layer_bed_temperature = 90 +temperature = 275 [filament:Fiberthree F3 PA-CF Pro @PG 0.8] inherits = Fiberthree F3 PA-CF Pro; *PA08PG* @@ -14396,6 +14584,7 @@ inherits = Fiberthree F3 PA-CF Pro @PG; *PAXL* [filament:Fiberthree F3 PA-CF Pro @XL 0.6] inherits = Fiberthree F3 PA-CF Pro @PG 0.6; *PA06XL* +temperature = 275 [filament:Fiberthree F3 PA-CF Pro @XL 0.8] inherits = Fiberthree F3 PA-CF Pro @PG 0.8; *PA08XL* @@ -14464,6 +14653,7 @@ inherits = Fiberthree F3 PA-GF30 Pro @PG; *PA06PG* filament_max_volumetric_speed = 7.5 bed_temperature = 90 first_layer_bed_temperature = 90 +temperature = 275 [filament:Fiberthree F3 PA-GF30 Pro @PG 0.8] inherits = Fiberthree F3 PA-GF30 Pro @PG; *PA08PG* @@ -14476,6 +14666,7 @@ inherits = Fiberthree F3 PA-GF30 Pro @PG; *PAXL* [filament:Fiberthree F3 PA-GF30 Pro @XL 0.6] inherits = Fiberthree F3 PA-GF30 Pro @PG 0.6; *PA06XL* +temperature = 275 [filament:Fiberthree F3 PA-GF30 Pro @XL 0.8] inherits = Fiberthree F3 PA-GF30 Pro @PG 0.8; *PA08XL* @@ -14524,6 +14715,8 @@ inherits = Verbatim PLA; *PLAPG* [filament:Verbatim PLA @PG 0.6] inherits = Verbatim PLA; *PLA06PG* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Verbatim PLA @PG 0.8] inherits = Verbatim PLA; *PLA08PG* @@ -14535,6 +14728,8 @@ inherits = Verbatim PLA @PG; *PLAXL* [filament:Verbatim PLA @XL 0.6] inherits = Verbatim PLA @PG 0.6; *PLA06XL* +temperature = 205 +filament_max_volumetric_speed = 15 [filament:Verbatim PLA @XL 0.8] inherits = Verbatim PLA @PG 0.8; *PLA08XL* @@ -20509,7 +20704,7 @@ machine_max_feedrate_y = 400 retract_length = 2.5 retract_lift = 0.2 wipe = 0 -start_gcode = M862.3 P "MINI" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P"Input shaper" ; FW feature check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow\n +start_gcode = M862.3 P "MINI" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P"Input shaper" ; FW feature check\nM115 U5.1.0-alpha2+13126\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\nG1 Y-2 X179 F2400\nG1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X170 F1000\nG1 Z0.2 F720\nG1 X110 E8 F900\nG1 X40 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow\n end_gcode = G1 E-1 F2100 ; retract\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X178 Y178 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+30, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM572 S0 ; reset PA\nM569 S1 X Y ; reset to stealthchop for X Y\nM84 ; disable motors\n; max_layer_z = [max_layer_z] printer_notes = Don't remove the following keywords! These keywords are used in the "compatible printer" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINIIS\nNO_TEMPLATES\n before_layer_gcode = ;BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))} Y{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))}\n{if ! spiral_vase}M74 W[extruded_weight_total]{endif}\n @@ -20604,7 +20799,7 @@ machine_max_acceleration_y = 7000 machine_max_feedrate_x = 450 machine_max_feedrate_y = 450 printer_notes = Do not remove the keywords below.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER -start_gcode = M17 ; enable steppers\nM862.3 P "XL" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_type[0] == "PC" or filament_type[0] == "PA") ? (first_layer_temperature[0] - 25) : (filament_type[0] == "FLEX" ? 210 : (filament_type[0]=~/.*PET.*/ ? 195 : 170)))} ; set extruder temp for bed leveling\nM109 T0 R{((filament_type[0] == "PC" or filament_type[0] == "PA") ? (first_layer_temperature[0] - 25) : (filament_type[0] == "FLEX" ? 210 : (filament_type[0]=~/.*PET.*/ ? 195 : 170)))} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position\n\nM593 X T2 F38.4\nM593 Y T2 F39.2\n +start_gcode = M17 ; enable steppers\nM862.3 P "XL" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P"Input shaper" ; FW feature check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\nM862.1 P[nozzle_diameter]\n; set & wait for bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nM104 T0 S{((filament_type[0] == "PC" or filament_type[0] == "PA") ? (first_layer_temperature[0] - 25) : (filament_type[0] == "FLEX" ? 210 : (filament_type[0]=~/.*PET.*/ ? 195 : 170)))} ; set extruder temp for bed leveling\nM109 T0 R{((filament_type[0] == "PC" or filament_type[0] == "PA") ? (first_layer_temperature[0] - 25) : (filament_type[0] == "FLEX" ? 210 : (filament_type[0]=~/.*PET.*/ ? 195 : 170)))} ; wait for temp\n; home carriage, pick tool, home all\nG28 XY\nM84 E ; turn off E motor\nG28 Z\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F4800\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z10 F480 ; move away in Z\n{if first_layer_bed_temperature[0] > 60}\nG0 Z70 F480 ; move away (a bit more) in Z\nG0 X30 Y{print_bed_min[1]} F6000 ; move away in X/Y for higher bed temperatures\n{endif}\nM106 S100 ; cool off the nozzle\nM107 ; stop cooling off the nozzle - turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W50 H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nM104 S[first_layer_temperature] ; set extruder temp\nG1 Z10 F720 ; move away in Z\nG0 X30 Y-8 F6000 ; move next to the sheet\n; wait for extruder temp\nM109 T0 S{first_layer_temperature[0]}\n;\n; purge\n;\nG92 E0 ; reset extruder position\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -8 : -5.5)} ; move close to the sheet's edge\nG1 E{(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; deretraction after the initial one before nozzle cleaning\nG0 E10 X40 Z0.2 F500 ; purge\nG0 X70 E9 F800 ; purge\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG92 E0 ; reset extruder position\n\nM593 X T2 F38.4\nM593 Y T2 F39.2\n default_print_profile = 0.20mm SPEED @XLIS 0.4 default_filament_profile = "Prusament PLA @XLIS" @@ -20641,7 +20836,7 @@ machine_max_acceleration_y = 7000 machine_max_feedrate_x = 450 machine_max_feedrate_y = 450 printer_notes = Do not remove the keywords below.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_XLIS\nPG\nINPUT_SHAPER -start_gcode = M17 ; enable steppers\nM862.3 P "XL" ; printer model check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\n{if (is_extruder_used[0])}M862.1 T0 P{nozzle_diameter[0]}{endif}\n{if (is_extruder_used[1])}M862.1 T1 P{nozzle_diameter[1]}{endif}\n{if (is_extruder_used[2])}M862.1 T2 P{nozzle_diameter[2]}{endif}\n{if (is_extruder_used[3])}M862.1 T3 P{nozzle_diameter[3]}{endif}\n{if (is_extruder_used[4])}M862.1 T4 P{nozzle_diameter[4]}{endif}\n\n; turn off unused heaters\n{if ! is_extruder_used[0]} M104 T0 S0 {endif}\n{if ! is_extruder_used[1]} M104 T1 S0 {endif}\n{if ! is_extruder_used[2]} M104 T2 S0 {endif}\n{if ! is_extruder_used[3]} M104 T3 S0 {endif}\n{if ! is_extruder_used[4]} M104 T4 S0 {endif}\n\nM217 Z{max(zhop, 2.0)} ; set toolchange z hop to 2mm, or zhop variable from slicer if higher\n; set bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nG0 Z5 ; add Z clearance\nM109 T{initial_tool} S{((filament_type[initial_tool] == "PC" or filament_type[initial_tool] == "PA") ? (first_layer_temperature[initial_tool] - 25) : (filament_type[initial_tool] == "FLEX" ? 210 : (filament_type[initial_tool]=~/.*PET.*/ ? 195 : 170)))} ; wait for temp\n\n; Home XY\nG28 XY\n; try picking tools used in print\nG1 F{travel_speed * 60}\n{if (is_extruder_used[0]) and (initial_tool != 0)}T0 S1 L0 D0{endif}\n{if (is_extruder_used[1]) and (initial_tool != 1)}T1 S1 L0 D0{endif}\n{if (is_extruder_used[2]) and (initial_tool != 2)}T2 S1 L0 D0{endif}\n{if (is_extruder_used[3]) and (initial_tool != 3)}T3 S1 L0 D0{endif}\n{if (is_extruder_used[4]) and (initial_tool != 4)}T4 S1 L0 D0{endif}\n; select tool that will be used to home & MBL\nT{initial_tool} S1 L0 D0\n; home Z with MBL tool\nM84 E ; turn off E motor\nG28 Z\nG0 Z5 ; add Z clearance\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F{(travel_speed * 60)}\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z5 F480 ; move away in Z\nM107 ; turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W{(((is_extruder_used[4]) or ((is_extruder_used[3]) or (is_extruder_used[2]))) ? "300" : ((is_extruder_used[1]) ? "130" : "50"))} H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nG1 Z10 F720 ; move away in Z\nG1 F{travel_speed * 60}\nP0 S1 L1 D0; park the tool\n; set extruder temp\n{if first_layer_temperature[0] > 0 and (is_extruder_used[0])}M104 T0 S{first_layer_temperature[0]}{endif}\n{if first_layer_temperature[1] > 0 and (is_extruder_used[1])}M104 T1 S{first_layer_temperature[1]}{endif}\n{if first_layer_temperature[2] > 0 and (is_extruder_used[2])}M104 T2 S{first_layer_temperature[2]}{endif}\n{if first_layer_temperature[3] > 0 and (is_extruder_used[3])}M104 T3 S{first_layer_temperature[3]}{endif}\n{if first_layer_temperature[4] > 0 and (is_extruder_used[4])}M104 T4 S{first_layer_temperature[4]}{endif}\n{if (is_extruder_used[0]) and initial_tool != 0}\n;\n; purge first tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T0 S{first_layer_temperature[0]}\nT0 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[0])}10{else}30{endif} X40 Z0.2 F{if is_nil(filament_multitool_ramming[0])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X70 E9 F800 ; continue purging and wipe the nozzle\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[0]} F2400 ; retract\n{e_retracted[0] = 1.5 * retract_length[0]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[0]) ? (first_layer_temperature[0] + standby_temperature_delta) : (idle_temperature[0]))} T0\n{endif}\n{if (is_extruder_used[1]) and initial_tool != 1}\n;\n; purge second tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T1 S{first_layer_temperature[1]}\nT1 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(1 == 0 ? 30 : (1 == 1 ? 150 : (1 == 2 ? 210 : 330)))} Y{(1 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[1])}10{else}30{endif} X140 Z0.2 F{if is_nil(filament_multitool_ramming[1])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X110 E9 F800 ; continue purging and wipe the nozzle\nG0 X{110 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{110 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[1]} F2400 ; retract\n{e_retracted[1] = 1.5 * retract_length[1]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[1]) ? (first_layer_temperature[1] + standby_temperature_delta) : (idle_temperature[1]))} T1\n{endif}\n{if (is_extruder_used[2]) and initial_tool != 2}\n;\n; purge third tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T2 S{first_layer_temperature[2]}\nT2 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(2 == 0 ? 30 : (2 == 1 ? 150 : (2 == 2 ? 210 : 330)))} Y{(2 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[2])}10{else}30{endif} X220 Z0.2 F{if is_nil(filament_multitool_ramming[2])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X250 E9 F800 ; continue purging and wipe the nozzle\nG0 X{250 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{250 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[2]} F2400 ; retract\n{e_retracted[2] = 1.5 * retract_length[2]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[2]) ? (first_layer_temperature[2] + standby_temperature_delta) : (idle_temperature[2]))} T2\n{endif}\n{if (is_extruder_used[3]) and initial_tool != 3}\n;\n; purge fourth tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T3 S{first_layer_temperature[3]}\nT3 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(3 == 0 ? 30 : (3 == 1 ? 150 : (3 == 2 ? 210 : 330)))} Y{(3 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[3])}10{else}30{endif} X320 Z0.2 F{if is_nil(filament_multitool_ramming[3])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X290 E9 F800 ; continue purging and wipe the nozzle\nG0 X{290 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{290 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[3]} F2400 ; retract\n{e_retracted[3] = 1.5 * retract_length[3]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[3]) ? (first_layer_temperature[3] + standby_temperature_delta) : (idle_temperature[3]))} T3\n{endif}\n{if (is_extruder_used[4]) and initial_tool != 4}\n;\n; purge fifth tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T4 S{first_layer_temperature[4]}\nT4 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(4 == 0 ? 30 : (4 == 1 ? 150 : (4 == 2 ? 210 : 330)))} Y{(4 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[4])}10{else}30{endif} X320 Z0.2 F{if is_nil(filament_multitool_ramming[4])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X290 E9 F800 ; continue purging and wipe the nozzle\nG0 X{290 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{290 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[4]} F2400 ; retract\n{e_retracted[4] = 1.5 * retract_length[4]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[4]) ? (first_layer_temperature[4] + standby_temperature_delta) : (idle_temperature[4]))} T4\n{endif}\n;\n; purge initial tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]}\nT{initial_tool} S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330)))} Y{(initial_tool < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[initial_tool])}10{else}30{endif} X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 10)} Z0.2 F{if is_nil(filament_multitool_ramming[initial_tool])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40)} E9 F800 ; continue purging and wipe the nozzle\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3)} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3 * 2)} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[initial_tool]} F2400 ; retract\n{e_retracted[initial_tool] = 1.5 * retract_length[initial_tool]}\nG92 E0 ; reset extruder position\n\nM593 X T2 F35.8\nM593 Y T2 F35.4\n +start_gcode = M17 ; enable steppers\nM862.3 P "XL" ; printer model check\nM862.5 P2 ; g-code level check\nM862.6 P"Input shaper" ; FW feature check\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\n; set print area\nM555 X{first_layer_print_min[0]} Y{first_layer_print_min[1]} W{(first_layer_print_max[0]) - (first_layer_print_min[0])} H{(first_layer_print_max[1]) - (first_layer_print_min[1])}\n; inform about nozzle diameter\n{if (is_extruder_used[0])}M862.1 T0 P{nozzle_diameter[0]}{endif}\n{if (is_extruder_used[1])}M862.1 T1 P{nozzle_diameter[1]}{endif}\n{if (is_extruder_used[2])}M862.1 T2 P{nozzle_diameter[2]}{endif}\n{if (is_extruder_used[3])}M862.1 T3 P{nozzle_diameter[3]}{endif}\n{if (is_extruder_used[4])}M862.1 T4 P{nozzle_diameter[4]}{endif}\n\n; turn off unused heaters\n{if ! is_extruder_used[0]} M104 T0 S0 {endif}\n{if ! is_extruder_used[1]} M104 T1 S0 {endif}\n{if ! is_extruder_used[2]} M104 T2 S0 {endif}\n{if ! is_extruder_used[3]} M104 T3 S0 {endif}\n{if ! is_extruder_used[4]} M104 T4 S0 {endif}\n\nM217 Z{max(zhop, 2.0)} ; set toolchange z hop to 2mm, or zhop variable from slicer if higher\n; set bed and extruder temp for MBL\nM140 S[first_layer_bed_temperature] ; set bed temp\nG0 Z5 ; add Z clearance\nM109 T{initial_tool} S{((filament_type[initial_tool] == "PC" or filament_type[initial_tool] == "PA") ? (first_layer_temperature[initial_tool] - 25) : (filament_type[initial_tool] == "FLEX" ? 210 : (filament_type[initial_tool]=~/.*PET.*/ ? 195 : 170)))} ; wait for temp\n\n; Home XY\nG28 XY\n; try picking tools used in print\nG1 F{travel_speed * 60}\n{if (is_extruder_used[0]) and (initial_tool != 0)}T0 S1 L0 D0{endif}\n{if (is_extruder_used[1]) and (initial_tool != 1)}T1 S1 L0 D0{endif}\n{if (is_extruder_used[2]) and (initial_tool != 2)}T2 S1 L0 D0{endif}\n{if (is_extruder_used[3]) and (initial_tool != 3)}T3 S1 L0 D0{endif}\n{if (is_extruder_used[4]) and (initial_tool != 4)}T4 S1 L0 D0{endif}\n; select tool that will be used to home & MBL\nT{initial_tool} S1 L0 D0\n; home Z with MBL tool\nM84 E ; turn off E motor\nG28 Z\nG0 Z5 ; add Z clearance\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG29 G ; absorb heat\n; move to the nozzle cleanup area\nG1 X{(min(((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32))), first_layer_print_min[0])) + 32} Y{(min((first_layer_print_min[1] - 7), first_layer_print_min[1]))} Z{5} F{(travel_speed * 60)}\nM302 S160 ; lower cold extrusion limit to 160C\nG1 E{-(filament_type[0] == "FLEX" ? 4 : 2)} F2400 ; retraction for nozzle cleanup\n; nozzle cleanup\nM84 E ; turn off E motor\nG29 P9 X{((((first_layer_print_min[0] + first_layer_print_max[0]) / 2) < ((print_bed_min[0] + print_bed_max[0]) / 2)) ? (((first_layer_print_min[1] - 7) < -2) ? 70 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)) : (((first_layer_print_min[1] - 7) < -2) ? 260 : (min(print_bed_max[0], first_layer_print_min[0] + 32) - 32)))} Y{(first_layer_print_min[1] - 7)} W{32} H{7}\nG0 Z5 F480 ; move away in Z\nM107 ; turn off the fan\n; MBL\nM84 E ; turn off E motor\nG29 P1 ; invalidate mbl & probe print area\nG29 P1 X30 Y0 W{(((is_extruder_used[4]) or ((is_extruder_used[3]) or (is_extruder_used[2]))) ? "300" : ((is_extruder_used[1]) ? "130" : "50"))} H20 C ; probe near purge place\nG29 P3.2 ; interpolate mbl probes\nG29 P3.13 ; extrapolate mbl outside probe area\nG29 A ; activate mbl\nG1 Z10 F720 ; move away in Z\nG1 F{travel_speed * 60}\nP0 S1 L1 D0; park the tool\n; set extruder temp\n{if first_layer_temperature[0] > 0 and (is_extruder_used[0])}M104 T0 S{first_layer_temperature[0]}{endif}\n{if first_layer_temperature[1] > 0 and (is_extruder_used[1])}M104 T1 S{first_layer_temperature[1]}{endif}\n{if first_layer_temperature[2] > 0 and (is_extruder_used[2])}M104 T2 S{first_layer_temperature[2]}{endif}\n{if first_layer_temperature[3] > 0 and (is_extruder_used[3])}M104 T3 S{first_layer_temperature[3]}{endif}\n{if first_layer_temperature[4] > 0 and (is_extruder_used[4])}M104 T4 S{first_layer_temperature[4]}{endif}\n{if (is_extruder_used[0]) and initial_tool != 0}\n;\n; purge first tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T0 S{first_layer_temperature[0]}\nT0 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(0 == 0 ? 30 : (0 == 1 ? 150 : (0 == 2 ? 210 : 330)))} Y{(0 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[0])}10{else}30{endif} X40 Z0.2 F{if is_nil(filament_multitool_ramming[0])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X70 E9 F800 ; continue purging and wipe the nozzle\nG0 X{70 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{70 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[0]} F2400 ; retract\n{e_retracted[0] = 1.5 * retract_length[0]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[0]) ? (first_layer_temperature[0] + standby_temperature_delta) : (idle_temperature[0]))} T0\n{endif}\n{if (is_extruder_used[1]) and initial_tool != 1}\n;\n; purge second tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T1 S{first_layer_temperature[1]}\nT1 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(1 == 0 ? 30 : (1 == 1 ? 150 : (1 == 2 ? 210 : 330)))} Y{(1 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[1])}10{else}30{endif} X140 Z0.2 F{if is_nil(filament_multitool_ramming[1])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X110 E9 F800 ; continue purging and wipe the nozzle\nG0 X{110 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{110 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[1]} F2400 ; retract\n{e_retracted[1] = 1.5 * retract_length[1]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[1]) ? (first_layer_temperature[1] + standby_temperature_delta) : (idle_temperature[1]))} T1\n{endif}\n{if (is_extruder_used[2]) and initial_tool != 2}\n;\n; purge third tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T2 S{first_layer_temperature[2]}\nT2 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(2 == 0 ? 30 : (2 == 1 ? 150 : (2 == 2 ? 210 : 330)))} Y{(2 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[2])}10{else}30{endif} X220 Z0.2 F{if is_nil(filament_multitool_ramming[2])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X250 E9 F800 ; continue purging and wipe the nozzle\nG0 X{250 + 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{250 + 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[2]} F2400 ; retract\n{e_retracted[2] = 1.5 * retract_length[2]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[2]) ? (first_layer_temperature[2] + standby_temperature_delta) : (idle_temperature[2]))} T2\n{endif}\n{if (is_extruder_used[3]) and initial_tool != 3}\n;\n; purge fourth tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T3 S{first_layer_temperature[3]}\nT3 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(3 == 0 ? 30 : (3 == 1 ? 150 : (3 == 2 ? 210 : 330)))} Y{(3 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[3])}10{else}30{endif} X320 Z0.2 F{if is_nil(filament_multitool_ramming[3])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X290 E9 F800 ; continue purging and wipe the nozzle\nG0 X{290 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{290 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[3]} F2400 ; retract\n{e_retracted[3] = 1.5 * retract_length[3]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[3]) ? (first_layer_temperature[3] + standby_temperature_delta) : (idle_temperature[3]))} T3\n{endif}\n{if (is_extruder_used[4]) and initial_tool != 4}\n;\n; purge fifth tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T4 S{first_layer_temperature[4]}\nT4 S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(4 == 0 ? 30 : (4 == 1 ? 150 : (4 == 2 ? 210 : 330)))} Y{(4 < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[4])}10{else}30{endif} X320 Z0.2 F{if is_nil(filament_multitool_ramming[4])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X290 E9 F800 ; continue purging and wipe the nozzle\nG0 X{290 - 3} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{290 - 3 * 2} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[4]} F2400 ; retract\n{e_retracted[4] = 1.5 * retract_length[4]} ; update slicer internal retract variable\nG92 E0 ; reset extruder position\n\nM104 S{(is_nil(idle_temperature[4]) ? (first_layer_temperature[4] + standby_temperature_delta) : (idle_temperature[4]))} T4\n{endif}\n;\n; purge initial tool\n;\nG1 F{travel_speed * 60}\nP0 S1 L2 D0; park the tool\nM109 T{initial_tool} S{first_layer_temperature[initial_tool]}\nT{initial_tool} S1 L0 D0; pick the tool\nG92 E0 ; reset extruder position\n\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330)))} Y{(initial_tool < 4 ? -7 : -4.5)} Z10 F{(travel_speed * 60)} ; move close to the sheet's edge\nG0 E{if is_nil(filament_multitool_ramming[initial_tool])}10{else}30{endif} X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 10)} Z0.2 F{if is_nil(filament_multitool_ramming[initial_tool])}500{else}170{endif} ; purge while moving towards the sheet\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40)} E9 F800 ; continue purging and wipe the nozzle\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3)} Z{0.05} F{8000} ; wipe, move close to the bed\nG0 X{(initial_tool == 0 ? 30 : (initial_tool == 1 ? 150 : (initial_tool == 2 ? 210 : 330))) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 40) + ((initial_tool == 0 or initial_tool == 2 ? 1 : -1) * 3 * 2)} Z0.2 F{8000} ; wipe, move quickly away from the bed\nG1 E{- 1.5 * retract_length[initial_tool]} F2400 ; retract\n{e_retracted[initial_tool] = 1.5 * retract_length[initial_tool]}\nG92 E0 ; reset extruder position\n\nM593 X T2 F35.8\nM593 Y T2 F35.4\n default_print_profile = 0.20mm SPEED @XLIS 0.4 default_filament_profile = "Prusament PLA @XLIS" diff --git a/src/libslic3r/Emboss.cpp b/src/libslic3r/Emboss.cpp index 0ff5ffc0ba..aeb865c98c 100644 --- a/src/libslic3r/Emboss.cpp +++ b/src/libslic3r/Emboss.cpp @@ -2,6 +2,7 @@ ///|/ ///|/ PrusaSlicer is released under the terms of the AGPLv3 or higher ///|/ +#include #include "Emboss.hpp" #include #include @@ -562,7 +563,7 @@ Duplicates collect_duplicit_indices(const ExPolygons &expoly) // initialize original index locations std::vector idx(pts.size()); - iota(idx.begin(), idx.end(), 0); + std::iota(idx.begin(), idx.end(), 0); std::sort(idx.begin(), idx.end(), [&pts](uint32_t i1, uint32_t i2) { return pts[i1] < pts[i2]; }); @@ -2218,4 +2219,4 @@ void remove_spikes(ExPolygons &expolygons, const SpikeDesc &spike_desc) remove_bad(expolygons); } -#endif // REMOVE_SPIKES \ No newline at end of file +#endif // REMOVE_SPIKES diff --git a/src/libslic3r/NSVGUtils.cpp b/src/libslic3r/NSVGUtils.cpp index 56b90a33ba..6bfb89b74e 100644 --- a/src/libslic3r/NSVGUtils.cpp +++ b/src/libslic3r/NSVGUtils.cpp @@ -7,6 +7,7 @@ #include // to_chars #include +#include #include "ClipperUtils.hpp" #include "Emboss.hpp" // heal for shape @@ -543,4 +544,4 @@ HealedExPolygons stroke_to_expolygons(const LinesPath &lines_path, const NSVGsha return Emboss::heal_polygons(result, is_non_zero, param.max_heal_iteration); } -} // namespace \ No newline at end of file +} // namespace diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 19b8b3e108..39f614654b 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -88,7 +88,7 @@ static choice_ctrl* create_word_local_combo(wxWindow *parent) temp->SetTextCtrlStyle(wxTE_READONLY); temp->Create(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr); #else - temp = new choice_ctrl(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY/* | wxBORDER_SIMPLE*/); + temp = new choice_ctrl(parent, wxID_ANY, wxString(""), wxDefaultPosition, size, 0, nullptr, wxCB_READONLY | DD_NO_CHECK_ICON); #endif //__WXOSX__ temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index a0637189f1..aa319d016e 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -1,6 +1,10 @@ #include "IconManager.hpp" #include +#include #include +#include +#include +#include #include "nanosvg/nanosvg.h" #include "nanosvg/nanosvgrast.h" #include "libslic3r/Utils.hpp" // ScopeGuard diff --git a/src/slic3r/GUI/Jobs/EmbossJob.cpp b/src/slic3r/GUI/Jobs/EmbossJob.cpp index 3fc4616cb9..3c6902dfbb 100644 --- a/src/slic3r/GUI/Jobs/EmbossJob.cpp +++ b/src/slic3r/GUI/Jobs/EmbossJob.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include // load_obj for default mesh diff --git a/src/slic3r/GUI/Widgets/ComboBox.cpp b/src/slic3r/GUI/Widgets/ComboBox.cpp index f0e885ccb4..5320beefcc 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.cpp +++ b/src/slic3r/GUI/Widgets/ComboBox.cpp @@ -131,7 +131,14 @@ bool ComboBox::SetBackgroundColour(const wxColour& colour) TextInput::SetBackgroundColour(colour); drop.SetBackgroundColour(colour); - drop.SetSelectorBackgroundColor(background_color); + StateColor selector_colors( std::make_pair(clr_background_focused, (int)StateColor::Checked), + Slic3r::GUI::wxGetApp().dark_mode() ? + std::make_pair(clr_background_disabled_dark, (int)StateColor::Disabled) : + std::make_pair(clr_background_disabled_light, (int)StateColor::Disabled), + Slic3r::GUI::wxGetApp().dark_mode() ? + std::make_pair(clr_background_normal_dark, (int)StateColor::Normal) : + std::make_pair(clr_background_normal_light, (int)StateColor::Normal)); + drop.SetSelectorBackgroundColor(selector_colors); return true; } @@ -179,14 +186,9 @@ int ComboBox::Insert(const wxString& item, int ComboBox::Insert(const wxString& item, const wxBitmapBundle& bitmap, unsigned int pos, void* clientData) { - const int n = wxItemContainer::Insert(item, pos); - if (n != wxNOT_FOUND) { - texts.insert(texts.begin() + n, item); - icons.insert(icons.begin() + n, bitmap); - datas.insert(datas.begin() + n, clientData); - types.insert(types.begin() + n, wxClientData_None); - drop.Invalidate(); - } + const int n = wxItemContainer::Insert(item, pos, clientData); + if (n != wxNOT_FOUND) + icons[n] = bitmap; return n; } @@ -206,7 +208,9 @@ void ComboBox::DoDeleteOneItem(unsigned int pos) icons.erase(icons.begin() + pos); datas.erase(datas.begin() + pos); types.erase(types.begin() + pos); + const int selection = drop.GetSelection(); drop.Invalidate(true); + drop.SetSelection(selection); } unsigned int ComboBox::GetCount() const { return texts.size(); } @@ -242,7 +246,9 @@ int ComboBox::DoInsertItems(const wxArrayStringsAdapter &items, types.insert(types.begin() + pos, type); ++pos; } + const int selection = drop.GetSelection(); drop.Invalidate(true); + drop.SetSelection(selection); return int(pos) - 1; } @@ -286,8 +292,6 @@ void ComboBox::keyDown(wxKeyEvent& event) switch (key_code) { #ifndef __WXOSX__ case WXK_RETURN: -#endif - case WXK_SPACE: if (drop_down) { drop.DismissAndNotify(); } else if (drop.HasDismissLongTime()) { @@ -298,6 +302,7 @@ void ComboBox::keyDown(wxKeyEvent& event) GetEventHandler()->ProcessEvent(e); } break; +#endif case WXK_UP: case WXK_DOWN: case WXK_LEFT: diff --git a/src/slic3r/GUI/Widgets/ComboBox.hpp b/src/slic3r/GUI/Widgets/ComboBox.hpp index 7ba9911228..1268acec04 100644 --- a/src/slic3r/GUI/Widgets/ComboBox.hpp +++ b/src/slic3r/GUI/Widgets/ComboBox.hpp @@ -30,7 +30,7 @@ public: DropDown & GetDropDown() { return drop; } - virtual bool SetFont(wxFont const & font) override; + bool SetFont(wxFont const & font) override; bool SetBackgroundColour(const wxColour& colour) override; bool SetForegroundColour(const wxColour& colour) override; @@ -38,7 +38,6 @@ public: void SetBorderColor(StateColor const& color); int Append(const wxString &item, const wxBitmapBundle &bitmap = wxNullBitmap); - int Append(const wxString &item, const wxBitmapBundle &bitmap, void *clientData); int Insert(const wxString& item, const wxBitmapBundle& bitmap, unsigned int pos); @@ -72,7 +71,7 @@ protected: unsigned int pos, void ** clientData, wxClientDataType type) override; - virtual void DoClear() override; + void DoClear() override; void DoDeleteOneItem(unsigned int pos) override; diff --git a/src/slic3r/GUI/Widgets/DropDown.cpp b/src/slic3r/GUI/Widgets/DropDown.cpp index 259ed11e63..4aac437458 100644 --- a/src/slic3r/GUI/Widgets/DropDown.cpp +++ b/src/slic3r/GUI/Widgets/DropDown.cpp @@ -211,6 +211,10 @@ void DropDown::SetTransparentBG(wxDC& dc, wxWindow* win) #endif //__WXMSW__ } +constexpr int slider_width = 12; +constexpr int slider_step = 5; +constexpr int items_padding = 2; + /* * Here we do the actual rendering. I put it in a separate * method so that it can work no matter what type of DC @@ -243,11 +247,17 @@ void DropDown::render(wxDC &dc) // draw hover rectangle wxRect rcContent = {{0, offset.y}, rowSize}; + const int text_size = int(texts.size()); + + const bool has_bar = rowSize.y * text_size > size.y; + if (has_bar) + rcContent.width -= slider_width; + if (hover_item >= 0 && (states & StateColor::Hovered)) { rcContent.y += rowSize.y * hover_item; if (rcContent.GetBottom() > 0 && rcContent.y < size.y) { if (selection == hover_item) - dc.SetBrush(wxBrush(selector_background_color.colorForStates(states | StateColor::Checked))); + dc.SetBrush(wxBrush(selector_background_color.colorForStates(StateColor::Disabled))); dc.SetPen(wxPen(selector_border_color.colorForStates(states))); rcContent.Deflate(4, 1); dc.DrawRectangle(rcContent); @@ -259,7 +269,7 @@ void DropDown::render(wxDC &dc) if (selection >= 0 && (selection != hover_item || (states & StateColor::Hovered) == 0)) { rcContent.y += rowSize.y * selection; if (rcContent.GetBottom() > 0 && rcContent.y < size.y) { - dc.SetBrush(wxBrush(selector_background_color.colorForStates(states | StateColor::Checked))); + dc.SetBrush(wxBrush(selector_background_color.colorForStates(StateColor::Disabled))); dc.SetPen(wxPen(selector_background_color.colorForStates(states))); rcContent.Deflate(4, 1); dc.DrawRectangle(rcContent); @@ -274,15 +284,13 @@ void DropDown::render(wxDC &dc) } // draw position bar - const int text_size = int(texts.size()); - if (rowSize.y * text_size > size.y) { + if (has_bar) { int height = rowSize.y * text_size; - wxRect rect = {size.x - 6, -offset.y * size.y / height, 4, - size.y * size.y / height}; + wxRect rect = {size.x - slider_width - 2, -offset.y * size.y / height + 2, slider_width, + size.y * size.y / height - 3}; dc.SetPen(wxPen(border_color.defaultColor())); - dc.SetBrush(wxBrush(*wxLIGHT_GREY)); + dc.SetBrush(wxBrush(selector_background_color.colorForStates(states | StateColor::Checked))); dc.DrawRoundedRectangle(rect, 2); - rcContent.width -= 6; } // draw check icon @@ -373,7 +381,7 @@ void DropDown::messureSize() } if (iconSize.x > 0) szContent.x += iconSize.x + (text_off ? 0 : 5); if (iconSize.y > szContent.y) szContent.y = iconSize.y; - szContent.y += 10; + szContent.y += items_padding; if (texts.size() > 15) szContent.x += 6; if (GetParent()) { auto x = GetParent()->GetSize().x; @@ -432,6 +440,13 @@ void DropDown::mouseDown(wxMouseEvent& event) return; // force calc hover item again mouseMove(event); + + const wxSize size = GetSize(); + const int height = rowSize.y * int(texts.size()); + const wxRect rect = { size.x - slider_width, -offset.y * size.y / height, slider_width - 2, + size.y * size.y / height }; + slider_grabbed = rect.Contains(event.GetPosition()); + pressedDown = true; CaptureMouse(); dragStart = event.GetPosition(); @@ -442,6 +457,7 @@ void DropDown::mouseReleased(wxMouseEvent& event) if (pressedDown) { dragStart = wxPoint(); pressedDown = false; + slider_grabbed = false; if (HasCapture()) ReleaseMouse(); if (hover_item >= 0) { // not moved @@ -462,7 +478,10 @@ void DropDown::mouseMove(wxMouseEvent &event) wxPoint pt = event.GetPosition(); int text_size = int(texts.size()); if (pressedDown) { - wxPoint pt2 = offset + pt - dragStart; + const int height = rowSize.y * text_size; + const int y_step = slider_grabbed ? -height / GetSize().y : 1; + + wxPoint pt2 = offset + (pt - dragStart)*y_step; dragStart = pt; if (pt2.y > 0) pt2.y = 0; @@ -477,7 +496,7 @@ void DropDown::mouseMove(wxMouseEvent &event) } if (!pressedDown || hover_item >= 0) { int hover = (pt.y - offset.y) / rowSize.y; - if (hover >= text_size) hover = -1; + if (hover >= text_size || slider_grabbed) hover = -1; if (hover == hover_item) return; hover_item = hover; if (hover >= 0) @@ -489,7 +508,7 @@ void DropDown::mouseMove(wxMouseEvent &event) void DropDown::mouseWheelMoved(wxMouseEvent &event) { auto delta = event.GetWheelRotation() > 0 ? rowSize.y : -rowSize.y; - wxPoint pt2 = offset + wxPoint{0, delta}; + wxPoint pt2 = offset + wxPoint{0, slider_step * delta}; int text_size = int(texts.size()); if (pt2.y > 0) pt2.y = 0; diff --git a/src/slic3r/GUI/Widgets/DropDown.hpp b/src/slic3r/GUI/Widgets/DropDown.hpp index 87eccd0238..8a4757f5f7 100644 --- a/src/slic3r/GUI/Widgets/DropDown.hpp +++ b/src/slic3r/GUI/Widgets/DropDown.hpp @@ -41,6 +41,7 @@ class DropDown : public wxPopupTransientWindow ScalableBitmap check_bitmap; bool pressedDown = false; + bool slider_grabbed = false; boost::posix_time::ptime dismissTime; wxPoint offset; // x not used wxPoint dragStart; diff --git a/src/slic3r/GUI/Widgets/StaticBox.cpp b/src/slic3r/GUI/Widgets/StaticBox.cpp index f2dd175f39..9e7b18ba9d 100644 --- a/src/slic3r/GUI/Widgets/StaticBox.cpp +++ b/src/slic3r/GUI/Widgets/StaticBox.cpp @@ -24,10 +24,10 @@ StaticBox::StaticBox() { border_color = StateColor(std::make_pair(clr_border_disabled, (int) StateColor::Disabled), #ifndef __WXMSW__ - std::make_pair(clr_border_nornal, (int) StateColor::Focused), + std::make_pair(clr_border_normal, (int) StateColor::Focused), #endif std::make_pair(clr_border_hovered, (int) StateColor::Hovered), - std::make_pair(clr_border_nornal, (int) StateColor::Normal)); + std::make_pair(clr_border_normal, (int) StateColor::Normal)); #ifndef __WXMSW__ border_color.setTakeFocusedAsHovered(false); #endif diff --git a/src/slic3r/GUI/Widgets/UIColors.hpp b/src/slic3r/GUI/Widgets/UIColors.hpp index fefa6efd71..14ecb6f64f 100644 --- a/src/slic3r/GUI/Widgets/UIColors.hpp +++ b/src/slic3r/GUI/Widgets/UIColors.hpp @@ -1,17 +1,17 @@ #ifndef slic3r_UI_Colors_hpp_ #define slic3r_UI_Colors_hpp_ -static const int clr_border_nornal = 0x646464;//0xDBDBDB; +static const int clr_border_normal = 0x646464;//0xDBDBDB; static const int clr_border_hovered = 0xED6B21;//0x00AE42; static const int clr_border_disabled = 0x646464;//0xDBDBDB; -static const int clr_background_nornal_light = 0xFFFFFF; -static const int clr_background_nornal_dark = 0x2B2B2B;//0x434343; +static const int clr_background_normal_light = 0xFFFFFF; +static const int clr_background_normal_dark = 0x2B2B2B;//0x434343; static const int clr_background_focused = 0xED6B21;//0xEDFAF2; static const int clr_background_disabled_dark = 0x404040;//0xF0F0F0; static const int clr_background_disabled_light = 0xD9D9D9;//0xF0F0F0; -static const int clr_foreground_nornal = 0x262E30; +static const int clr_foreground_normal = 0x262E30; static const int clr_foreground_focused = 0x00AE42; static const int clr_foreground_disabled = 0x909090;