From a22a382e1dc75c1ce8ce047657732c47bbb3d0d7 Mon Sep 17 00:00:00 2001
From: SoftFever <103989404+SoftFever@users.noreply.github.com>
Date: Wed, 9 Nov 2022 21:48:29 +0800
Subject: [PATCH] explicitly specify linear PA mode for Bambu printers

---
 src/libslic3r/GCode.cpp       |  2 ++
 src/libslic3r/GCodeWriter.cpp | 16 ++++++++++------
 src/libslic3r/GCodeWriter.hpp |  9 ++++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index c90244339e..26cfc5f108 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -1306,6 +1306,8 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
 #if ENABLE_GCODE_VIEWER_DATA_CHECKING
     m_last_mm3_per_mm = 0.;
 #endif // ENABLE_GCODE_VIEWER_DATA_CHECKING
+    
+    m_writer.set_is_bbl_machine(is_bbl_printers);
 
     // How many times will be change_layer() called?
     // change_layer() in turn increments the progress bar status.
diff --git a/src/libslic3r/GCodeWriter.cpp b/src/libslic3r/GCodeWriter.cpp
index 68bfb562a3..5876f9fdd0 100644
--- a/src/libslic3r/GCodeWriter.cpp
+++ b/src/libslic3r/GCodeWriter.cpp
@@ -214,12 +214,16 @@ std::string GCodeWriter::set_pressure_advance(double pa) const
     std::ostringstream gcode;
     if (pa < 0)
         return gcode.str();
-
-    if (FLAVOR_IS(gcfKlipper))
-        gcode << "SET_PRESSURE_ADVANCE ADVANCE=" << std::setprecision(4) << pa << "; Override pressure advance value\n";
-    else
-        gcode << "M900 K" <<std::setprecision(4)<< pa << "; Override pressure advance value\n";
-
+    if(m_is_bbl_printers){
+        //SoftFever: set L1000 to use linear model
+        gcode << "M900 K" <<std::setprecision(4)<< pa << " L1000 M10 ; Override pressure advance value\n";
+    }
+    else{
+        if (FLAVOR_IS(gcfKlipper))
+            gcode << "SET_PRESSURE_ADVANCE ADVANCE=" << std::setprecision(4) << pa << "; Override pressure advance value\n";
+        else
+            gcode << "M900 K" <<std::setprecision(4)<< pa << "; Override pressure advance value\n";
+    }
     return gcode.str();
 }
 
diff --git a/src/libslic3r/GCodeWriter.hpp b/src/libslic3r/GCodeWriter.hpp
index f9d36ccde1..2e2d1bc1f3 100644
--- a/src/libslic3r/GCodeWriter.hpp
+++ b/src/libslic3r/GCodeWriter.hpp
@@ -91,6 +91,10 @@ public:
     bool is_current_position_clear() const { return m_is_current_pos_clear; };
     //BBS:
     static const bool full_gcode_comment;
+    
+    //SoftFever
+    void set_is_bbl_machine(bool bval) {m_is_bbl_printers = bval;}
+    const bool is_bbl_printers() const {return m_is_bbl_printers;}
 
 private:
 	// Extruders are sorted by their ID, so that binary search is possible.
@@ -129,7 +133,10 @@ private:
 
     //Radian threshold of slope for lazy lift and spiral lift;
     static const double slope_threshold;
-
+    
+    //SoftFever
+    bool            m_is_bbl_printers = false;
+    
     std::string _travel_to_z(double z, const std::string &comment);
     std::string _spiral_travel_to_z(double z, const Vec2d &ij_offset, const std::string &comment);
     std::string _retract(double length, double restart_extra, const std::string &comment);