Release v1.0.32

DEV to main merge for release v1.0.32

Author: jimmyjon711

CHANGELOG.md

@@ -5,6 +5,63 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2025-11-01]
+### Changed
+- Removed code for Belay.
+- Cleanup terminology around compressing/expanding of the buffer to make it easier to understand for users.
+
+## [2025-10-29]
+### Fixes
+- Fixed klipper crashing when commanding distance of zero for LANE_MOVE macro.
+
+## [2025-10-25]
+### Fixes
+- Resolved a bug where runout logic could potentially be triggered during a toolchange.
+- Resolved a bug where AFC_STATUS would crash klipper when using buffer as toolhead sensor and last lane was loaded into toolhead.
+
+## [2025-10-18]
+### Fixes
+- On startup, or when assigning a spool to a lane, AFC will now check the weight of the spool to check if it is either zero, null,
+  or a negative value. If any of these conditions are met, AFC will not assign the spool. This check can be disabled by 
+  setting `disable_weight_check: True` in the `[AFC]` section of the `AFC.cfg` file.
+
+## [2025-10-16]
+### Fixes
+- Fixed issue with debounce logic on latest version of Kalico.
+
+## [2025-10-12]
+### Fixes
+- Capitalized AFC_CALIBRATION help text
+- Removing returning TD-1 color as color in api endpoint, TD-1 color is still returned in td1_color variable per lane
+- Current toolchange will return zero if current toolchange is below zero(starts at -1 when first starting a print)
+- Added additional logic when parsing TD-1 scan_time to work with updated format in moonraker
+
+## [2025-10-10]
+### Added
+- Created a new folder for community-contributed mods and configurations at ``/community_mods/``
+- Added Blurolls AFC-X mcu board with a path of ``/community_mods/mcu/AFC-X.cfg``. [Customer image of board](https://ae-pic-a1.aliexpress-media.com/kf/A030fad34724c426ba8564ca98bb570dfQ.jpg_.webp) Colors do **NOT** match the product description on online retailers.
+
+## [2025-09-30]
+### Added
+- Allow `tool_stn_unload` to be `0` for toolheads with cutter above extruder.
+
+## [2025-09-26]
+### Added
+- Support to move filament to TD-1 device that is inline with PTFE tube to gather TD and color
+
+## [2025-09-27]
+### Fixes
+- Logging the same information multiple times to AFC.log file
+
+## [2025-09-07]
+### Added
+- Support to push lane information to moonrakers `machine/lane_data` endpoint so that third-parties can pull this information easily(eg. orcaslicer)
+
+### Fixes
+- The `AFC_LANE_RESET` macro will properly check for input instead of crashing Klipper.
+### Added
+- Added ability to auto level when `auto_level_macro` is defined with a valid leveling macro.
+
 ## [2025-09-05]
 ### Added
 - Check to verify that pin_tool_start/end is not set to `Unknown`, throws error if pins are set to `Unknown`.

community_mods/mcu/AFC-X.cfg

@@ -0,0 +1,23 @@
+[board_pins Turtle_1]
+mcu: Turtle_1
+aliases:
+    M1_STEP=PD4    	, M1_DIR=PD3    , M1_EN=PD5   	, M1_UART=PC12   , # M1_DIAG=PD2   ,
+    M2_STEP=PD0   	, M2_DIR=PC11   , M2_EN=PD1   	, M2_UART=PC10   , # M2_DIAG=PC10  ,
+    M3_STEP=PC8    	, M3_DIR=PA10    , M3_EN=PC9   	, M3_UART=PA9   , # M3_DIAG=PE4   ,
+    M4_STEP=PD13   	, M4_DIR=PD12   , M4_EN=PD14   	, M4_UART=PC6   , # M4_DIAG=PC8   ,
+
+    # suggested switch pin configurations
+    HUB=PE7 		, 
+    TRG1=PA1  		, TRG2=PA2  	, TRG3=PA3 		, TRG4=PA4		,
+    EXT1=PA5 		, EXT2=PA6  	, EXT3=PA7		, EXT4=PC4		,
+    #TN_ADV=PE12     , TN_TRL=PE13   ,
+    # alternate names for endstop ports
+    SW1=PA1 		, SW2=PA2 	, SW3=PA3  	, SW4=PA4 	, SW5=PA5	, SW6=PA6	,
+    SW7=PA7 		, SW8=PC4	, SW9=PC5	, SW10=PB0	, SW11=PB1	, SW12=PE7	,
+    
+    MOT1_RWD=PE15	, MOT1_FWD=PB10	, MOT1_EN=PD11	,
+    MOT2_RWD=PE13	, MOT2_FWD=PE14	, MOT2_EN=PD10	,
+    MOT3_RWD=PE11	, MOT3_FWD=PE12	, MOT3_EN=PD9	,
+    MOT4_RWD=PE8	, MOT4_FWD=PE10	, MOT4_EN=PD8	,
+    
+    RGB1=PB15		, RGB2=PB14	    , RGB3=PB13	    , RGB4=PB12		,

extras/AFC.py

@@ -27,7 +27,7 @@
 try: from extras.AFC_stats import AFCStats
 except: raise error(ERROR_STR.format(import_lib="AFC_stats", trace=traceback.format_exc()))
 
-AFC_VERSION="1.0.31"
+AFC_VERSION="1.0.32"
 
 # Class for holding different states so its clear what all valid states are
 class State:
@@ -65,15 +65,19 @@ def __init__(self, config):
         # Registering webhooks endpoint for <ip_address>/printer/afc/status
         self.webhooks.register_endpoint("afc/status", self._webhooks_status)
 
-        self.current        = None
-        self.current_loading= None
-        self.next_lane_load = None
-        self.error_state    = False
-        self.current_state  = State.INIT
-        self.position_saved = False
-        self.spoolman       = None
-        self.prep_done      = False         # Variable used to hold of save_vars function from saving too early and overriding save before prep can be ran
-        self.in_print_timer = None
+        self.current            = None
+        self.current_loading    = None
+        self.next_lane_load     = None
+        self.error_state        = False
+        self.current_state      = State.INIT
+        self.position_saved     = False
+        self.spoolman           = None
+        self.moonraker          = None
+        self.td1_defined        = False
+        self._td1_present       = False
+        self.lane_data_enabled  = False
+        self.prep_done          = False         # Variable used to hold of save_vars function from saving too early and overriding save before prep can be ran
+        self.in_print_timer     = None
 
         # Objects for everything configured for AFC
         self.units      = {}
@@ -123,6 +127,7 @@ def __init__(self, config):
         self.common_density_values  = list(self.common_density_values)
         self.test_extrude_amt       = config.get('test_extrude_amt', 10)
 
+        self.disable_weight_check   = config.getboolean("disable_weight_check", False) # Set to True to disable weight check when loading filament into lane/toolhead
         #LED SETTINGS
         self.ind_lights = None
         # led_name is not used, either use or needs to be removed, removing this would break everyone's config as well
@@ -161,7 +166,8 @@ def __init__(self, config):
 
         # MOVE SETTINGS
         self.quiet_mode             = False                                         # Flag indicating if quiet move is enabled or not
-        self.auto_home              = config.getboolean("auto_home", False)          # Flag indicating if homing needs to be done if printer is not already homed
+        self.auto_home              = config.getboolean("auto_home", False)         # Flag indicating if homing needs to be done if printer is not already homed
+        self.auto_level_macro       = config.get("auto_level_macro", None)          # Set name for macro to run for auto bed leveling before tool change if auto_home is True and printer is not already homed
         self.show_quiet_mode        = config.getboolean("show_quiet_mode", True)    # Flag indicating if quiet move is enabled or not
         self.quiet_moves_speed      = config.getfloat("quiet_moves_speed", 50)      # Max speed in mm/s to move filament during quietmode
         self.long_moves_speed       = config.getfloat("long_moves_speed", 100)      # Speed in mm/s to move filament when doing long moves
@@ -175,6 +181,7 @@ def __init__(self, config):
 
         self.tool_max_unload_attempts= config.getint('tool_max_unload_attempts', 4) # Max number of attempts to unload filament from toolhead when using buffer as ramming sensor
         self.tool_max_load_checks   = config.getint('tool_max_load_checks', 4)      # Max number of attempts to check to make sure filament is loaded into toolhead extruder when using buffer as ramming sensor
+        self.max_move_tries         = config.getint("max_move_tries", 20)
 
         self.rev_long_moves_speed_factor 	= config.getfloat("rev_long_moves_speed_factor", 1.)     # scalar speed factor when reversing filamentalist
 
@@ -200,7 +207,9 @@ def __init__(self, config):
         self.enable_tool_runout     = config.getboolean("enable_tool_runout",   True)
         self.debounce_delay         = config.getfloat("debounce_delay",         0.)
 
+        self.td1_when_loaded        = config.getboolean("capture_td1_when_loaded", False)
         self.debug                  = config.getboolean('debug', False)             # Setting to True turns on more debugging to show on console
+        self.log_frame_data         = config.getboolean('log_frame_data', True)
         self.testing                = config.getboolean('testing', False)           # Set to true for testing only so that failure states can be tested without stats being reset
         # Get debug and cast to boolean
         self.logger.set_debug( self.debug )
@@ -292,12 +301,18 @@ def handle_moonraker_connect(self):
             self.moonraker = AFC_moonraker( self.moonraker_host, self.moonraker_port, self.logger )
             if not self.moonraker.wait_for_moonraker( toolhead=self.toolhead, timeout=self.moonraker_connect_to ):
                 return False
+
+            # Remove current lane_data from database before pushing data back up so that
+            # stale lane data is not in database
+            self.moonraker.delete_lane_data()
             self.spoolman = self.moonraker.get_spoolman_server()
+            self.td1_defined, self._td1_present, self.lane_data_enabled = self.moonraker.check_for_td1()
             self.afc_stats = AFCStats(self.moonraker, self.logger, self.tool_cut_threshold)
+
+            self.printer.send_event("afc:moonraker_connect")
         except Exception as e:
-            self.logger.debug("Moonraker/Spoolman/afc_stats error: {}\n{}".format(e, traceback.format_exc()))
+            self.logger.debug("Moonraker/Spoolman/afc_stats/td1 error\nError: {}\n{}".format(e, traceback.format_exc()))
             self.spoolman = None                      # set to none if not found
-        return True
 
     def handle_connect(self):
         """
@@ -339,6 +354,16 @@ def print_version(self, console_only=False):
 
         self.logger.info(string, console_only)
 
+    @property
+    def td1_present(self):
+        present = self._td1_present
+        if self.printer.state_message == 'Printer is ready' and self.moonraker is not None:
+            if not self.function.is_printing(check_movement=True):
+                present = self.moonraker.check_for_td1()[1]
+                self._td1_present = present
+
+        return present
+
     def _reset_file_callback(self):
         """
         Set timer to check back to see if printer is printing. This is needed as file and print status is set after
@@ -658,6 +683,11 @@ def cmd_LANE_MOVE(self, gcmd):
             return
         lane = gcmd.get('LANE', None)
         distance = gcmd.get_float('DISTANCE', 0)
+
+        if distance == 0:
+            self.error.AFC_error("Distance to move cannot be zero", pause=False)
+            return
+
         if lane not in self.lanes:
             self.logger.info('{} Unknown'.format(lane))
             return
@@ -668,7 +698,6 @@ def cmd_LANE_MOVE(self, gcmd):
         if abs(distance) >= 200: speed_mode = SpeedMode.LONG
 
         cur_lane.set_load_current() # Making current is set correctly when doing lane moves
-        cur_lane.do_enable(True)
         cur_lane.move_advanced(distance, speed_mode, assist_active = AssistActive.YES)
         cur_lane.do_enable(False)
         self.current_state = State.IDLE
@@ -884,7 +913,6 @@ def cmd_HUB_LOAD(self, gcmd):
         if not cur_lane.prep_state: return
         cur_lane.status = AFCLaneState.HUB_LOADING
         if not cur_lane.load_state:
-            cur_lane.do_enable(True)
             while not cur_lane.load_state:
                 cur_lane.move_advanced( cur_hub.move_dis, SpeedMode.SHORT)
         if not cur_lane.loaded_to_hub:
@@ -940,7 +968,6 @@ def LANE_UNLOAD(self, cur_lane):
             # once user removes filament lanes status will go to None
             cur_lane.status = AFCLaneState.EJECTING
             self.save_vars()
-            cur_lane.do_enable(True)
             if cur_lane.loaded_to_hub:
                 cur_lane.move_advanced(cur_lane.dist_hub * -1, SpeedMode.HUB, assist_active = AssistActive.DYNAMIC)
             cur_lane.loaded_to_hub = False
@@ -1045,9 +1072,6 @@ def TOOL_LOAD(self, cur_lane, purge_length=None):
             if self._check_extruder_temp(cur_lane):
                 self.afcDeltaTime.log_with_time("Done heating toolhead")
 
-            # Enable the lane for filament movement.
-            cur_lane.do_enable(True)
-
             # Move filament to the hub if it's not already loaded there.
             if not cur_lane.loaded_to_hub or cur_lane.hub == 'direct':
                 cur_lane.move_advanced(cur_lane.dist_hub, SpeedMode.HUB, assist_active = AssistActive.DYNAMIC)
@@ -1295,9 +1319,6 @@ def TOOL_UNLOAD(self, cur_lane):
             # Synchronize the extruder stepper with the lane.
             cur_lane.sync_to_extruder()
 
-        # Enable the lane for unloading operations.
-        cur_lane.do_enable(True)
-
         # Perform filament cutting and parking if specified.
         if self.tool_cut:
             self.afc_stats.increase_cut_total()
@@ -1354,11 +1375,26 @@ def TOOL_UNLOAD(self, cur_lane):
                     self.error.handle_lane_failure(cur_lane, msg)
                     return False
             cur_lane.sync_to_extruder(False)
-            with cur_lane.assist_move(cur_extruder.tool_unload_speed, True, cur_lane.assisted_unload):
-                self.move_e_pos( cur_extruder.tool_stn_unload * -1, cur_extruder.tool_unload_speed, "Buffer Move")
+            # we only need to do this if we need to move off the extruder gears
+            if cur_extruder.tool_stn_unload > 0:
+                with cur_lane.assist_move(cur_extruder.tool_unload_speed, True, cur_lane.assisted_unload):
+                    self.move_e_pos( cur_extruder.tool_stn_unload * -1, cur_extruder.tool_unload_speed, "Buffer Move")
 
             self.function.log_toolhead_pos("Buffer move after ")
         else:
+
+            if cur_extruder.tool_stn_unload == 0:
+                cur_lane.unsync_to_extruder()
+                while cur_lane.get_toolhead_pre_sensor_state():
+                    # attempt to move filament back from sensor without moving extruder
+                    cur_lane.move_advanced(cur_lane.short_move_dis * -1, SpeedMode.SHORT)
+                    num_tries += 1
+                    if num_tries > self.tool_max_unload_attempts:
+                        # note that this will break out of the loop and immediately fall into the error
+                        # condition of the next loop for messaging to the user
+                        break
+                    self.reactor.pause(self.reactor.monotonic() + 0.1)
+
             while cur_lane.get_toolhead_pre_sensor_state() or cur_extruder.tool_end_state:
                 num_tries += 1
                 if num_tries > self.tool_max_unload_attempts:
@@ -1613,9 +1649,11 @@ def get_status(self, eventtime=None):
         str['current_lane']             = self.current_loading
         str['next_lane']                = self.next_lane_load
         str['current_state']            = self.current_state
-        str["current_toolchange"]       = self.current_toolchange
+        str["current_toolchange"]       = self.current_toolchange if self.current_toolchange >= 0 else 0
         str["number_of_toolchanges"]    = self.number_of_toolchanges
         str['spoolman']                 = self.spoolman
+        str["td1_present"]              = self.td1_present
+        str["lane_data_enabled"]        = self.lane_data_enabled
         str['error_state']              = self.error_state
         str["bypass_state"]             = bool(self._get_bypass_state())
         str["quiet_mode"]               = bool(self._get_quiet_mode())
@@ -1657,6 +1695,8 @@ def _webhooks_status(self, web_request):
         str["system"]['num_lanes']              = numoflanes
         str["system"]['num_extruders']          = len(self.tools)
         str["system"]['spoolman']               = self.spoolman
+        str["system"]["td1_present"]            = self.td1_present
+        str["system"]["lane_data_enabled"]      = self.lane_data_enabled
         str["system"]["current_toolchange"]     = self.current_toolchange
         str["system"]["number_of_toolchanges"]  = self.number_of_toolchanges
         str["system"]["extruders"]              = {}
@@ -1693,6 +1733,7 @@ def cmd_AFC_STATUS(self, gcmd):
         """
         status_msg = ''
 
+        # TODO: Update this function for correct usage with multiple hubs/toolheads
         for unit in self.units.values():
             # Find the maximum length of lane names to determine the column width
             max_lane_length = max(len(lane) for lane in unit.lanes.keys())
@@ -1703,11 +1744,14 @@ def cmd_AFC_STATUS(self, gcmd):
             header_format = '{:<{}} | Prep | Load |\n'
             status_msg += header_format.format("LANE", max_lane_length)
 
+            # Initialize extruder_msg to its default value before processing lanes
+            extruder_msg = '  Tool: <span class=error--text>x</span>'
             for cur_lane in unit.lanes.values():
                 lane_msg = ''
                 if self.current is not None:
                     if self.current == cur_lane.name:
-                        if not cur_lane.get_toolhead_pre_sensor_state() or not cur_lane.hub_obj.state:
+                        if (not cur_lane.get_toolhead_pre_sensor_state() or
+                            not cur_lane.hub_obj.state):
                             lane_msg += '<span class=warning--text>{:<{}} </span>'.format(cur_lane.name, max_lane_length)
                         else:
                             lane_msg += '<span class=success--text>{:<{}} </span>'.format(cur_lane.name, max_lane_length)
@@ -1726,19 +1770,20 @@ def cmd_AFC_STATUS(self, gcmd):
                     lane_msg += '  <span class=error--text>xx</span>  |\n'
                 status_msg += lane_msg
 
+                if cur_lane.extruder_obj.tool_start != "buffer":
+                    if cur_lane.extruder_obj.tool_start_state:
+                        extruder_msg = '  Tool: <span class=success--text><-></span>'
+                else:
+                    if (cur_lane.tool_loaded and
+                        cur_lane.extruder_obj.lane_loaded in unit.lanes):
+                        if cur_lane.get_toolhead_pre_sensor_state():
+                            extruder_msg = '  Tool: <span class=success--text><-></span>'
+
             if cur_lane.hub_obj.state:
                 status_msg += 'HUB: <span class=success--text><-></span>'
             else:
                 status_msg += 'HUB: <span class=error--text>x</span>'
 
-            extruder_msg = '  Tool: <span class=error--text>x</span>'
-            if cur_lane.extruder_obj.tool_start != "buffer":
-                if cur_lane.extruder_obj.tool_start_state:
-                    extruder_msg = '  Tool: <span class=success--text><-></span>'
-            else:
-                if cur_lane.tool_loaded and cur_lane.extruder_obj.lane_loaded in self.units[unit]:
-                    if cur_lane.get_toolhead_pre_sensor_state():
-                        extruder_msg = '  Tool: <span class=success--text><-></span>'
 
             status_msg += extruder_msg
             if cur_lane.extruder_obj.tool_start == 'buffer':
@@ -1851,4 +1896,4 @@ def cmd_AFC_CLEAR_MESSAGE(self, gcmd):
     def cmd__AFC_TEST_MESSAGES(self, gcmd):
         self.logger.error("Test Message 1")
         self.logger.error("Test Message 2")
-        self.logger.error("Test Message 3")
+        self.logger.error("Test Message 3")