From 7b0b24e64e962a169934e5f14d3bb57d3e70d984 Mon Sep 17 00:00:00 2001 From: "xun.zhang" Date: Mon, 26 Jun 2023 17:23:41 +0800 Subject: [PATCH] ENH: add PLA-AERO,add default key in common json Change-Id: Ia6551f50e0f921a196a3a94659b367ca1ec4424f --- resources/profiles/BBL/filament/Bambu PLA Aero @base.json | 3 +++ resources/profiles/BBL/filament/fdm_filament_common.json | 3 ++- resources/profiles/BBL/machine/fdm_machine_common.json | 4 +++- src/libslic3r/PrintConfig.cpp | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/profiles/BBL/filament/Bambu PLA Aero @base.json b/resources/profiles/BBL/filament/Bambu PLA Aero @base.json index 373b85e7c..b5787ea31 100644 --- a/resources/profiles/BBL/filament/Bambu PLA Aero @base.json +++ b/resources/profiles/BBL/filament/Bambu PLA Aero @base.json @@ -5,6 +5,9 @@ "instantiation": "false", "inherits": "fdm_filament_pla", "filament_id": "GFA11", + "filament_type":[ + "PLA-AERO" + ], "filament_flow_ratio": [ "0.6" ], diff --git a/resources/profiles/BBL/filament/fdm_filament_common.json b/resources/profiles/BBL/filament/fdm_filament_common.json index 89fe50f47..8ea752f4d 100644 --- a/resources/profiles/BBL/filament/fdm_filament_common.json +++ b/resources/profiles/BBL/filament/fdm_filament_common.json @@ -143,5 +143,6 @@ ], "temperature_vitrification": [ "100" - ] + ], + "compatible_printers":[] } \ No newline at end of file diff --git a/resources/profiles/BBL/machine/fdm_machine_common.json b/resources/profiles/BBL/machine/fdm_machine_common.json index 31c0f357d..4fb2bb4a0 100644 --- a/resources/profiles/BBL/machine/fdm_machine_common.json +++ b/resources/profiles/BBL/machine/fdm_machine_common.json @@ -110,7 +110,9 @@ "wipe": [ "1" ], - "default_print_profile": "0.16mm Optimal @Bambu Lab X1 Carbon 0.4 nozzle", + "default_filament_profile":[], + "default_print_profile": "0.16mm Optimal @BBL X1C", + "upward_compatible_machine": [], "machine_start_gcode": "G0 Z20 F9000\nG92 E0; G1 E-10 F1200\nG28\nM970 Q1 A10 B10 C130 K0\nM970 Q1 A10 B131 C250 K1\nM974 Q1 S1 P0\nM970 Q0 A10 B10 C130 H20 K0\nM970 Q0 A10 B131 C250 K1\nM974 Q0 S1 P0\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\nG29 ;Home\nG90;\nG92 E0 ;Reset Extruder \nG1 Z2.0 F3000 ;Move Z Axis up \nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S205;\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder \nG1 X110 Y110 Z2.0 F3000 ;Move Z Axis up", "machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90 \nG0 X110 Y200 F3600 \nprint_end" } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 07ff98b1a..7f1d63ff3 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1300,6 +1300,7 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("PETG-CF"); def->enum_values.push_back("PVA"); def->enum_values.push_back("HIPS"); + def->enum_values.push_back("PLA-AERO"); def->mode = comSimple; def->set_default_value(new ConfigOptionStrings { "PLA" });