Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions bambulabs_api/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,8 @@ def set_filament_printer(
True if the filament is set successfully.
"""
assert len(color) == 6, "Color must be a 6 character hex code"
if isinstance(filament, str) or isinstance(filament, AMSFilamentSettings): # type: ignore # noqa: E501
if isinstance(filament, str):
filament = Filament(filament)
else:
raise ValueError(
"Filament must be a string or AMSFilamentSettings object")
return self.mqtt_client.set_printer_filament(
filament,
color,
Expand Down
4 changes: 2 additions & 2 deletions bambulabs_api/mqtt_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
PrinterFirmwareInfo,
PrinterType)

from .filament_info import Filament, FilamentTray
from .filament_info import AMSFilamentSettings, FilamentTray
from .states_info import GcodeState, PrintStatus


Expand Down Expand Up @@ -878,7 +878,7 @@ def set_nozzle_temperature(

def set_printer_filament(
self,
filament_material: Filament,
filament_material: AMSFilamentSettings,
colour: str,
ams_id: int = 255,
tray_id: int = 254,
Expand Down