Fixes and Change Filament

BlocksScreen.cfg

@@ -7,3 +7,7 @@ timeout: 5000
 
 [usb_manager]
 gcodes_dir: ~/printer_data/gcodes/
+
+[filament_presence]
+object: cutter_sensor
+name: extruder_cutter 

BlocksScreen/lib/moonrakerComm.py

@@ -280,9 +280,10 @@ def on_message(self, *args) -> None:
                         metadata=_entry,
                     )
         elif "method" in response:
-            if (
-                str(response["method"]).lower() == "notify_klippy_disconnected"
-            ):  # Checkout for notify_klippy_disconnect
+            if str(response["method"]).lower() in (
+                "notify_klippy_disconnected",
+                "notify_klippy_shutdown",
+            ):
                 self.evaluate_klippy_status()
 
             message_event = (

BlocksScreen/lib/panels/controlTab.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
-
 import re
 import typing
 from functools import partial
+import logging
 
 from helper_methods import normalize
 from lib.moonrakerComm import MoonWebSocket
@@ -18,6 +18,9 @@
 from PyQt6 import QtCore, QtGui, QtWidgets
 
 
+_logger = logging.getLogger(__name__)
+
+
 class ControlTab(QtWidgets.QStackedWidget):
     """Printer Control Stacked Widget"""
 
@@ -37,6 +40,9 @@ class ControlTab(QtWidgets.QStackedWidget):
     disable_popups: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
         bool, name="disable-popups"
     )
+    lock_ui: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
+        bool, name="lock-ui"
+    )
     request_numpad: typing.ClassVar[QtCore.pyqtSignal] = QtCore.pyqtSignal(
         [str, int, "PyQt_PyObject"],
         [str, int, "PyQt_PyObject", int, int],
@@ -79,6 +85,7 @@ def __init__(
         self.probe_helper_page = ProbeHelper(self)
         self.probe_helper_page.toggle_conn_page.connect(self.toggle_conn_page)
         self.probe_helper_page.disable_popups.connect(self.disable_popups)
+        self.probe_helper_page.lock_ui.connect(self.lock_ui)
         self.addWidget(self.probe_helper_page)
         self.probe_helper_page.call_load_panel.connect(self.call_load_panel)
         self.printcores_page = SwapPrintcorePage(self)
@@ -252,24 +259,6 @@ def __init__(
         self.numpadPage.request_back.connect(self.request_back_button)
         self.addWidget(self.numpadPage)
 
-        self.panel.extruder_temp_display.clicked.connect(
-            lambda: self.request_numpad[str, int, "PyQt_PyObject", int, int].emit(
-                "Extruder Temperature",
-                int(round(float(self.panel.extruder_temp_display.secondary_text))),
-                self.on_numpad_change,
-                0,
-                370,  # TODO: Get this value from printer objects
-            )
-        )
-        self.panel.bed_temp_display.clicked.connect(
-            lambda: self.request_numpad[str, int, "PyQt_PyObject", int, int].emit(
-                "Bed Temperature",
-                int(round(float(self.panel.bed_temp_display.secondary_text))),
-                self.on_numpad_change,
-                0,
-                120,  # TODO: Get this value from printer objects
-            )
-        )
         self.request_numpad[str, int, "PyQt_PyObject", int, int].connect(
             self.on_numpad_request
         )
@@ -304,6 +293,8 @@ def __init__(
         self.printer.fan_update[str, str, float].connect(self.on_fan_object_update)
         self.printer.fan_update[str, str, int].connect(self.on_fan_object_update)
 
+        self.printer.printer_config.connect(self.on_printer_config)
+
     def _handle_z_tilt_object_update(self, value, state):
         if state:
             self.call_load_panel.emit(False, "")
@@ -470,6 +461,44 @@ def _handle_gcode_response(self, messages: list):
                         f"Retries: {retries_done}/{retries_total} | Range: {probed_range:.6f} | Tolerance: {tolerance:.6f}",
                     )
 
+    @QtCore.pyqtSlot(dict, name="printer_config")
+    def on_printer_config(self, config: dict) -> None:
+        """Slot that receives the full printer configuration,
+
+        Additionally, this method configures the signal connections
+        between controllable heaters and numpad calls
+        """
+        try:
+            self.panel.extruder_temp_display.clicked.disconnect()
+            self.panel.bed_temp_display.clicked.disconnect()
+        except Exception:
+            _logger.debug("Signals were not connected")
+        extruder = config.get("extruder", None) or {}
+        bed = config.get("heater_bed", None) or {}
+        e_min_temp = extruder.get("min_temp", 0)
+        e_max_temp = extruder.get("max_temp", 300)
+        b_max_temp = bed.get("max_temp", 100)
+        b_min_temp = bed.get("min_temp", 0)
+        # Configure numpads
+        self.panel.extruder_temp_display.clicked.connect(
+            lambda: self.request_numpad[str, int, "PyQt_PyObject", int, int].emit(
+                "Extruder Temperature",
+                int(round(float(self.panel.extruder_temp_display.secondary_text))),
+                self.on_numpad_change,
+                int(e_min_temp),
+                int(e_max_temp),
+            )
+        )
+        self.panel.bed_temp_display.clicked.connect(
+            lambda: self.request_numpad[str, int, "PyQt_PyObject", int, int].emit(
+                "Bed Temperature",
+                int(round(float(self.panel.bed_temp_display.secondary_text))),
+                self.on_numpad_change,
+                int(b_min_temp),
+                int(b_max_temp),
+            )
+        )
+
     def handle_ztilt(self):
         """Handle Z-Tilt Adjustment"""
         self.call_load_panel.emit(True, "Please wait, performing Z-axis calibration.")