From 9813600ef475d43aaca1377a2b8485376fead3f4 Mon Sep 17 00:00:00 2001
From: Desuuuu <contact@desuuuu.com>
Date: Sat, 30 Jan 2021 10:52:50 +0100
Subject: [PATCH] allow the t5uid1 code to work even with [display_status]
 defined

---
 klippy/extras/t5uid1/t5uid1.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/klippy/extras/t5uid1/t5uid1.py b/klippy/extras/t5uid1/t5uid1.py
index e2bac9eb..2e0445b6 100644
--- a/klippy/extras/t5uid1/t5uid1.py
+++ b/klippy/extras/t5uid1/t5uid1.py
@@ -154,6 +154,9 @@ class T5UID1:
         self._t5uid1_ping_cmd = self._t5uid1_write_cmd = None
         self._is_connected = False
 
+        self._original_M73 = None
+        self._original_M117 = None
+
         global_context = {
             'get_variable': self.get_variable,
             'set_variable': self.set_variable,
@@ -234,8 +237,6 @@ class T5UID1:
             'DGUS_PRINT_START', self.cmd_DGUS_PRINT_START)
         self.gcode.register_command(
             'DGUS_PRINT_END', self.cmd_DGUS_PRINT_END)
-        self.gcode.register_command('M73', self.cmd_M73)
-        self.gcode.register_command('M117', self.cmd_M117)
         self.gcode.register_command('M300', self.cmd_M300)
 
         self.printer.register_event_handler("klippy:ready",
@@ -360,6 +361,18 @@ class T5UID1:
         except self.printer.config_error:
             pass
 
+        if self._original_M73 is None:
+            original_M73 = self.gcode.register_command('M73', None)
+            if original_M73 != self.cmd_M73:
+                self._original_M73 = original_M73
+            self.gcode.register_command('M73', self.cmd_M73)
+
+        if self._original_M117 is None:
+            original_M117 = self.gcode.register_command('M117', None)
+            if original_M117 != self.cmd_M117:
+                self._original_M117 = original_M117
+            self.gcode.register_command('M117', self.cmd_M117)
+
         self._status_data.update({
             'limits': self.limits(),
             'has_bltouch': has_bltouch
@@ -861,6 +874,8 @@ class T5UID1:
     def cmd_M73(self, gcmd):
         progress = gcmd.get_int('P', 0)
         self._print_progress = min(100, max(0, progress))
+        if self._original_M73 is not None:
+            self._original_M73(gcmd)
 
     def cmd_M117(self, gcmd):
         msg = gcmd.get_commandline()
@@ -873,6 +888,8 @@ class T5UID1:
             self.set_message(msg[5:])
         else:
             self.set_message("")
+        if self._original_M117 is not None:
+            self._original_M117(gcmd)
 
     def cmd_M300(self, gcmd):
         if self._notification_sound >= 0: