3D-Druck/OctoPrint-BambuPrinter
1
0
Fork 0
Code Pull Requests Actions 1 Packages Releases 1 Activity

0.1.8rc2

Browse Source 
fix references to commands after migrating to internal pybambu module
This commit is contained in:
jneilliii
2024-10-28 13:17:53 -04:00
parent 14af93b1d0
commit eaa0ed94c0
8 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
octoprint_bambu_printer/printer/bambu_virtual_printer.py
View File

@ -43,7 +43,7 @@ class BambuPrinterTelemetry:
lastTempAt: float = time.monotonic()
firmwareName: str = "Bambu"
extruderCount: int = 1
ams_current_tray: int = -1
ams_current_tray: int = 255
# noinspection PyBroadException
@ -210,7 +210,8 @@ class BambuVirtualPrinter:
self._telemetry.bedTemp = temperatures.bed_temp
self._telemetry.bedTargetTemp = temperatures.target_bed_temp
self._telemetry.chamberTemp = temperatures.chamber_temp
self._telemetry.ams_current_tray = device_data.push_all_data["ams"]["tray_now"] or -1
if device_data.push_all_data:
self._telemetry.ams_current_tray = device_data.push_all_data["ams"]["tray_now"] or 255
if self._telemetry.ams_current_tray != self._settings.get_int(["ams_current_tray"]):
self._settings.set_int(["ams_current_tray"], self._telemetry.ams_current_tray)
@ -356,7 +357,7 @@ class BambuVirtualPrinter:
return True
if file_info is None:
self._log.error(f"Cannot select not existing file: {file_path}")
self._log.error(f"Cannot select non-existent file: {file_path}")
return False
self._selected_project_file = file_info

3
octoprint_bambu_printer/printer/print_job.py
View File

@ -10,6 +10,9 @@ from octoprint_bambu_printer.printer.file_system.remote_sd_card_file_list import
class PrintJob:
file_info: FileInfo
progress: int
remaining_time: int
current_layer: int
total_layers: int
@property
def file_position(self):

4
octoprint_bambu_printer/printer/states/paused_state.py
View File

@ -37,14 +37,14 @@ class PausedState(APrinterState):
def start_new_print(self):
if self._printer.bambu_client.connected:
if self._printer.bambu_client.publish(pybambu.commands.RESUME):
if self._printer.bambu_client.publish(octoprint_bambu_printer.printer.pybambu.commands.RESUME):
self._log.info("print resumed")
else:
self._log.info("print resume failed")
def cancel_print(self):
if self._printer.bambu_client.connected:
if self._printer.bambu_client.publish(pybambu.commands.STOP):
if self._printer.bambu_client.publish(octoprint_bambu_printer.printer.pybambu.commands.STOP):
self._log.info("print cancelled")
self._printer.finalize_print_job()
else:

6
octoprint_bambu_printer/printer/states/printing_state.py
View File

@ -75,19 +75,19 @@ class PrintingState(APrinterState):
return
progress = print_job_info.print_percentage
self._printer.current_print_job = PrintJob(project_file_info, progress)
self._printer.current_print_job = PrintJob(project_file_info, progress, print_job_info.remaining_time, print_job_info.current_layer, print_job_info.total_layers)
self._printer.select_project_file(project_file_info.path.as_posix())
def pause_print(self):
if self._printer.bambu_client.connected:
if self._printer.bambu_client.publish(pybambu.commands.PAUSE):
if self._printer.bambu_client.publish(octoprint_bambu_printer.printer.pybambu.commands.PAUSE):
self._log.info("print paused")
else:
self._log.info("print pause failed")
def cancel_print(self):
if self._printer.bambu_client.connected:
if self._printer.bambu_client.publish(pybambu.commands.STOP):
if self._printer.bambu_client.publish(octoprint_bambu_printer.printer.pybambu.commands.STOP):
self._log.info("print cancelled")
self._printer.finalize_print_job()
else: