0.1.6

* replace 0 with 1 bytes during reporting print status to trigger state change in OctoPrint sooner.

octoprint_bambu_printer/printer/bambu_virtual_printer.py

@@ -72,6 +72,7 @@ class BambuVirtualPrinter:
 
         self._running = True
         self._print_status_reporter = None
+        self._print_temp_reporter = None
         self._printer_thread = threading.Thread(
             target=self._printer_worker,
             name="octoprint.plugins.bambu_printer.printer_state",
@@ -367,8 +368,10 @@ class BambuVirtualPrinter:
             interval = int(matchS.group(1))
             if interval > 0:
                 self.start_continuous_status_report(interval)
+                return False
             else:
                 self.stop_continuous_status_report()
+                return False
 
         self.report_print_job_status()
         return True
@@ -403,10 +406,39 @@ class BambuVirtualPrinter:
         self._processTemperatureQuery()
         return True
 
+    @gcode_executor.register("M155")
+    def _auto_report_temperatures(self, data: str) -> bool:
+        matchS = re.search(r"S([0-9]+)", data)
+        if matchS:
+            interval = int(matchS.group(1))
+            if interval > 0:
+                self.start_continuous_temp_report(interval)
+            else:
+                self.stop_continuous_temp_report()
+
+        self.report_print_job_status()
+        return True
+
+    def start_continuous_temp_report(self, interval: int):
+        if self._print_temp_reporter is not None:
+            self._print_temp_reporter.cancel()
+
+        self._print_temp_reporter = RepeatedTimer(
+            interval, self._processTemperatureQuery
+        )
+        self._print_temp_reporter.start()
+
+    def stop_continuous_temp_report(self):
+        if self._print_temp_reporter is not None:
+            self._print_temp_reporter.cancel()
+            self._print_temp_reporter = None
+
     # noinspection PyUnusedLocal
     @gcode_executor.register_no_data("M115")
     def _report_firmware_info(self) -> bool:
         self.sendIO("Bambu Printer Integration")
+        self.sendIO("Cap:AUTOREPORT_SD_STATUS:1")
+        self.sendIO("Cap:AUTOREPORT_TEMP:1")
         self.sendIO("Cap:EXTENDED_M20:1")
         self.sendIO("Cap:LFN_WRITE:1")
         return True
@@ -442,19 +474,51 @@ class BambuVirtualPrinter:
             gcode_command = commands.SEND_GCODE_TEMPLATE
             percent = int(data.replace("M220 S", ""))
 
-            if percent is None or percent < 1 or percent > 166:
-                return True
+            def speed_fraction(speed_percent):
+                return math.floor(10000 / speed_percent) / 100
 
-            speed_fraction = 100 / percent
-            acceleration = math.exp((speed_fraction - 1.0191) / -0.814)
-            feed_rate = (
-                2.1645 * (acceleration**3)
-                - 5.3247 * (acceleration**2)
-                + 4.342 * acceleration
-                - 0.181
-            )
-            speed_level = 1.539 * (acceleration**2) - 0.7032 * acceleration + 4.0834
-            speed_command = f"M204.2 K${acceleration:.2f} \nM220 K${feed_rate:.2f} \nM73.2 R${speed_fraction:.2f} \nM1002 set_gcode_claim_speed_level ${speed_level:.0f}\n"
+            def acceleration_magnitude(speed_percent):
+                return math.exp((speed_fraction(speed_percent) - 1.0191) / -0.8139)
+
+            def feed_rate(speed_percent):
+                return 6.426e-5 * speed_percent ** 2 - 2.484e-3 * speed_percent + 0.654
+
+            def linear_interpolate(x, x_points, y_points):
+                if x <= x_points[0]: return y_points[0]
+                if x >= x_points[-1]: return y_points[-1]
+                for i in range(len(x_points) - 1):
+                    if x_points[i] <= x < x_points[i + 1]:
+                        t = (x - x_points[i]) / (x_points[i + 1] - x_points[i])
+                        return y_points[i] * (1 - t) + y_points[i + 1] * t
+
+            def scale_to_data_points(func, data_points):
+                data_points.sort(key=lambda x: x[0])
+                speeds, values = zip(*data_points)
+                scaling_factors = [v / func(s) for s, v in zip(speeds, values)]
+                return lambda x: func(x) * linear_interpolate(x, speeds, scaling_factors)
+
+            def speed_adjust(speed_percentage):
+                if not 30 <= speed_percentage <= 180:
+                    speed_percentage = 100
+
+                bambu_params = {
+                    "speed": [50, 100, 124, 166],
+                    "acceleration": [0.3, 1.0, 1.4, 1.6],
+                    "feed_rate": [0.7, 1.0, 1.4, 2.0]
+                }
+
+                acc_mag_scaled = scale_to_data_points(acceleration_magnitude,
+                                                      list(zip(bambu_params["speed"], bambu_params["acceleration"])))
+                feed_rate_scaled = scale_to_data_points(feed_rate,
+                                                        list(zip(bambu_params["speed"], bambu_params["feed_rate"])))
+
+                speed_frac = speed_fraction(speed_percentage)
+                acc_mag = acc_mag_scaled(speed_percentage)
+                feed = feed_rate_scaled(speed_percentage)
+                # speed_level = 1.539 * (acc_mag**2) - 0.7032 * acc_mag + 4.0834
+                return f"M204.2 K{acc_mag:.2f}\nM220 K{feed:.2f}\nM73.2 R{speed_frac:.2f}\n" # M1002 set_gcode_claim_speed_level ${speed_level:.0f}\n
+
+            speed_command = speed_adjust(percent)
 
             gcode_command["print"]["param"] = speed_command
             if self.bambu_client.publish(gcode_command):
@@ -516,8 +580,9 @@ class BambuVirtualPrinter:
 
     def report_print_job_status(self):
         if self.current_print_job is not None:
+            file_position = 1 if self.current_print_job.file_position == 0 else self.current_print_job.file_position
             self.sendIO(
-                f"SD printing byte {self.current_print_job.file_position}"
+                f"SD printing byte {file_position}"
                 f"/{self.current_print_job.file_info.size}"
             )
         else:

octoprint_bambu_printer/printer/file_system/cached_file_view.py

@@ -85,7 +85,7 @@ class CachedFileView:
         return file_data
 
     def _get_file_by_stem_cached(self, file_stem: str, allowed_suffixes: list[str]):
-        for file_path_str in self._file_data_cache.keys():
+        for file_path_str in list(self._file_data_cache.keys()) + list(self._file_alias_cache.keys()):
             file_path = Path(file_path_str)
             if file_stem == file_path.with_suffix("").stem and all(
                 suffix in allowed_suffixes for suffix in file_path.suffixes

octoprint_bambu_printer/printer/file_system/ftps_client.py

@@ -117,7 +117,7 @@ class IoTFTPSConnection:
                         # But since we operate in prot p mode
                         # we can close the connection always.
                         # This is cursed but it works.
-                        if "vsFTPd" in self.welcome:
+                        if "vsFTPd" in self.ftps_session.welcome:
                             conn.unwrap()
                         else:
                             conn.shutdown(socket.SHUT_RDWR)

octoprint_bambu_printer/printer/states/idle_state.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
-from pathlib import Path
 
 from octoprint_bambu_printer.printer.file_system.file_info import FileInfo
-from octoprint_bambu_printer.printer.print_job import PrintJob
 from octoprint_bambu_printer.printer.states.a_printer_state import APrinterState
 
 
@@ -26,7 +24,7 @@ class IdleState(APrinterState):
         # URL to print. Root path, protocol can vary. E.g., if sd card, "ftp:///myfile.3mf", "ftp:///cache/myotherfile.3mf"
         filesystem_root = (
             "file:///mnt/sdcard/"
-            if self._printer._settings.get_boolean(["device_type"]) in ["X1", "X1C"]
+            if self._printer._settings.get(["device_type"]) in ["X1", "X1C"]
             else "file:///"
         )
 

octoprint_bambu_printer/printer/states/printing_state.py

@@ -22,6 +22,7 @@ class PrintingState(APrinterState):
 
     def __init__(self, printer: BambuVirtualPrinter) -> None:
         super().__init__(printer)
+        self._current_print_job = None
         self._is_printing = False
         self._sd_printing_thread = None
 
@@ -36,6 +37,7 @@ class PrintingState(APrinterState):
             self._is_printing = False
             self._sd_printing_thread.join()
             self._sd_printing_thread = None
+        self._printer.current_print_job = None
 
     def _start_worker_thread(self):
         if self._sd_printing_thread is None:

requirements.txt

@@ -7,3 +7,10 @@
 ###
 
 .
+
+pytest~=7.4.4
+pybambu~=1.0.1
+OctoPrint~=1.10.2
+setuptools~=70.0.0
+pyserial~=3.5
+Flask~=2.2.5

setup.py

@@ -14,7 +14,7 @@ plugin_package = "octoprint_bambu_printer"
 plugin_name = "OctoPrint-BambuPrinter"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "0.1.1"
+plugin_version = "0.1.6"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module