file format customization

README.md

@@ -6,6 +6,11 @@ It also supports Voron and Prusa MK3S printers.
 You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases
 
 ## BambuStudio SoftFever change notes:
+### [V1.2.5 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5-sf):
+1. Add options to adjust jerk for different line types
+2. Add an option to adjust acceleration for travel. Higher acceleration for travel and lower acceleration for the outer wall makes it possible to print faster and nicer.
+3. Add an option to manually override the Pressure Advance / Linear Advance for each filament.
+
 ### [V1.2.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.4-sf):
 1. Allow users to adjust accelerations for inner/outer walls separately.
 2. Allow users to adjust the bottom surface flow-rate
@@ -73,6 +78,10 @@ gcode:
     SET_VELOCITY_LIMIT
   {% endif %}
 
+[gcode_macro M900]
+gcode:
+      SET_PRESSURE_ADVANCE ADVANCE={params.K}
+
 ```
 
 It's also recommended to add followinging dummy macros to make Klipper happy

build_release_macos.sh

@@ -13,5 +13,5 @@ cd $WD
 mkdir -p build
 cd build
 cmake .. -DBBL_RELEASE_TO_PUBLIC=0 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON
-make -j10
+cmake --build . --config Release --target all
 cmake --build . --target install --config Release -j10

resources/profiles/Anycubic/process/fdm_process_common.json

@@ -17,6 +17,9 @@
     "default_acceleration": "1000",
     "initial_layer_acceleration": "500",
     "top_surface_acceleration": "800",
+    "travel_acceleration": "1000",
+    "inner_wall_acceleration": "900",
+    "outer_wall_acceleration": "700",
     "bridge_no_support": "0",
     "draft_shield": "disabled",
     "elefant_foot_compensation": "0",

resources/profiles/Prusa.json

@@ -1,6 +1,6 @@
 {
     "name": "Prusa",
-    "version": "01.02.00.01",
+    "version": "01.02.00.02",
     "force_update": "0",
     "description": "Prusa configurations",
     "machine_model_list": [

resources/profiles/Prusa/process/fdm_process_common.json

@@ -16,7 +16,10 @@
     "print_sequence": "by layer",
     "default_acceleration": "1000",
     "initial_layer_acceleration": "500",
-    "top_surface_acceleration": "800",
+    "top_surface_acceleration": "1000",
+    "travel_acceleration": "1000",
+    "inner_wall_acceleration": "1000",
+    "outer_wall_acceleration": "700",
     "bridge_no_support": "0",
     "draft_shield": "disabled",
     "elefant_foot_compensation": "0",

resources/profiles/Voron.json

@@ -1,6 +1,6 @@
 {
     "name": "Voron",
-    "version": "01.02.00.01",
+    "version": "01.02.00.02",
     "force_update": "0",
     "description": "Voron configurations",
     "machine_model_list": [

resources/profiles/Voron/process/fdm_process_voron_common.json

@@ -16,8 +16,11 @@
     "brim_object_gap": "0.1",
     "compatible_printers_condition": "",
     "print_sequence": "by layer",
-    "default_acceleration": "7000",
+    "default_acceleration": "5000",
     "top_surface_acceleration": "3000",
+    "travel_acceleration": "7000",
+    "inner_wall_acceleration": "5000",
+    "outer_wall_acceleration": "3000",
     "bridge_no_support": "0",
     "draft_shield": "disabled",
     "elefant_foot_compensation": "0",

src/libslic3r/GCode.cpp

@@ -79,7 +79,7 @@ static const float g_min_purge_volume = 100.f;
 static const float g_purge_volume_one_time = 135.f;
 static const int g_max_flush_count = 4;
 
-bool GCode::gcode_label_objects = false;
+bool GCode::gcode_label_objects = true;
 
 // Only add a newline in case the current G-code does not end with a newline.
     static inline void check_add_eol(std::string& gcode)
@@ -1599,7 +1599,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
         file.write("M981 S1 P20000 ;open spaghetti detector\n");
     if(m_config.enable_pressure_advance.value)
     {
-        file.write_format("M900 K%.3f ; Override pressure advance value\nM900 S0\n",m_config.pressure_advance.values.front());
+        file.write_format("M900 K%.3f ; Override pressure advance value\n",m_config.pressure_advance.values.front());
     }
     // Do all objects for each layer.
     if (print.config().print_sequence == PrintSequence::ByObject) {

src/libslic3r/PrintConfig.cpp

@@ -1052,7 +1052,7 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Pressure advnce(Klipper) AKA Linear advance factor(Marlin)");
     def->max = 2;
     def->mode = comAdvanced;
-    def->set_default_value(new ConfigOptionFloats { 0. });
+    def->set_default_value(new ConfigOptionFloats { 0.02 });
 
     def = this->add("line_width", coFloat);
     def->label = L("Default");
@@ -1940,8 +1940,8 @@ void PrintConfigDef::init_fff_params()
     def->label = L("Filename format");
     def->tooltip = L("User can self-define the project file name when export");
     def->full_width = true;
-    def->mode = comDevelop;
-    def->set_default_value(new ConfigOptionString("[input_filename_base].gcode"));
+    def->mode = comAdvanced;
+    def->set_default_value(new ConfigOptionString("{input_filename_base}_{filament_type[0]}_{print_time}.gcode"));
 
     def = this->add("detect_overhang_wall", coBool);
     def->label = L("Detect overhang wall");
@@ -3715,7 +3715,7 @@ void PrintConfigDef::handle_legacy(t_config_option_key &opt_key, std::string &va
     static std::set<std::string> ignore = {
         "acceleration", "scale", "rotate", "duplicate", "duplicate_grid",
         "bed_size",
-        "print_center", "g0", "pressure_advance", "wipe_tower_per_color_wipe"
+        "print_center", "g0", "wipe_tower_per_color_wipe"
 #ifndef HAS_PRESSURE_EQUALIZER
         , "max_volumetric_extrusion_rate_slope_positive", "max_volumetric_extrusion_rate_slope_negative"
 #endif /* HAS_PRESSURE_EQUALIZER */

src/slic3r/GUI/Tab.cpp

@@ -1952,7 +1952,10 @@ void TabPrint::build()
         optgroup->append_single_option_line("reduce_infill_retraction");
         optgroup->append_single_option_line("gcode_add_line_number");
         Option option = optgroup->get_option("filename_format");
-        option.opt.full_width = true;
+        // option.opt.full_width = true;
+        option.opt.is_code = true;
+        option.opt.multiline = true;
+        // option.opt.height = 5;
         optgroup->append_single_option_line(option);
 
 #if 0