Removing lane name from message when calling handle_lane_failure erro…

…r function
ArmoredTurtle · Dec 20, 2024 · 95d4be5 · 95d4be5
1 parent a6dc0d4
commit 95d4be5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/extras/AFC.py b/extras/AFC.py
@@ -625,7 +625,7 @@ def TOOL_LOAD(self, CUR_LANE):
                     tool_attempts += 1
                     CUR_LANE.move(self.short_move_dis, CUR_EXTRUDER.tool_load_speed, self.long_moves_accel)
                     if tool_attempts > 20:
-                        message = ('FAILED TO LOAD {} TO TOOL, CHECK FILAMENT PATH\n||=====||====||==>--||\nTRG   LOAD   HUB   TOOL'.format(CUR_LANE.name.upper()))
+                        message = ('FAILED TO LOAD TO TOOL, CHECK FILAMENT PATH\n||=====||====||==>--||\nTRG   LOAD   HUB   TOOL')
                         self.ERROR.handle_lane_failure(CUR_LANE, message)
                         return False
 
@@ -683,11 +683,11 @@ def TOOL_LOAD(self, CUR_LANE):
         else:
             # Handle errors if the hub is not clear or the lane is not ready for loading.
             if CUR_HUB.state:
-                message = ('HUB NOT CLEAR WHEN TRYING TO LOAD {}\n||-----||----|x|-----||\nTRG   LOAD   HUB   TOOL'.format(CUR_LANE.name.upper()))
+                message = ('HUB NOT CLEAR WHEN TRYING TO LOAD\n||-----||----|x|-----||\nTRG   LOAD   HUB   TOOL')
                 self.ERROR.handle_lane_failure(CUR_LANE, message)
                 return False
             if not CUR_LANE.load_state:
-                message = ('{} NOT READY, LOAD TRIGGER NOT TRIGGERED\n||==>--||----||-----||\nTRG   LOAD   HUB   TOOL'.format(CUR_LANE.name.upper()))
+                message = ('NOT READY, LOAD TRIGGER NOT TRIGGERED\n||==>--||----||-----||\nTRG   LOAD   HUB   TOOL')
                 self.ERROR.handle_lane_failure(CUR_LANE, message)
                 return False
 

diff --git a/extras/AFC_error.py b/extras/AFC_error.py
@@ -136,7 +136,7 @@ def handle_lane_failure(self, CUR_LANE, message, pause=True):
         # Disable the stepper for this lane
         CUR_LANE.do_enable(False)
         CUR_LANE.status = 'Error'
-        msg = (CUR_LANE.name.upper() + message)
+        msg = "{} {}".format(CUR_LANE.name.upper(), message)
         self.AFC_error(msg, pause)
         self.AFC.afc_led(self.AFC.led_fault, CUR_LANE.led_index)