From ec8bedfdfbea871e13155c199ee5704b51bfb5ce Mon Sep 17 00:00:00 2001 From: wolfy Date: Fri, 24 Jan 2025 13:31:11 -0600 Subject: [PATCH 1/3] Update klippy.py --- klippy/klippy.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/klippy/klippy.py b/klippy/klippy.py index 316343cbd..a1643c9bf 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -8,6 +8,8 @@ import sys, os, gc, optparse, logging, time, collections, importlib import util, reactor, queuelogger, msgproto import gcode, configfile, pins, mcu, toolhead, webhooks +init_filename = "__init__.py" + message_ready = "Printer is ready" message_startup = """ @@ -95,7 +97,7 @@ class Printer: py_name = os.path.join(os.path.dirname(__file__), 'extras', module_name + '.py') py_dirname = os.path.join(os.path.dirname(__file__), - 'extras', module_name, '__init__.py') + 'extras', module_name, init_filename) if not os.path.exists(py_name) and not os.path.exists(py_dirname): if default is not configfile.sentinel: return default @@ -236,10 +238,10 @@ def import_test(): dname = os.path.dirname(__file__) for mname in ['extras', 'kinematics']: for fname in os.listdir(os.path.join(dname, mname)): - if fname.endswith('.py') and fname != '__init__.py': + if fname.endswith('.py') and fname != init_filename: module_name = fname[:-3] else: - iname = os.path.join(dname, mname, fname, '__init__.py') + iname = os.path.join(dname, mname, fname, init_filename) if not os.path.exists(iname): continue module_name = fname From 8c1037ef1bb0afa7470974b454df0307fef36ebc Mon Sep 17 00:00:00 2001 From: Pedro Lamas Date: Fri, 24 Jan 2025 11:04:45 +0000 Subject: [PATCH 2/3] screws_tilt_adjust: initialize status result as a dictionary Signed-off-by: Pedro Lamas --- klippy/extras/screws_tilt_adjust.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/klippy/extras/screws_tilt_adjust.py b/klippy/extras/screws_tilt_adjust.py index 521744af3..fec54185e 100644 --- a/klippy/extras/screws_tilt_adjust.py +++ b/klippy/extras/screws_tilt_adjust.py @@ -12,7 +12,7 @@ class ScrewsTiltAdjust: self.config = config self.printer = config.get_printer() self.screws = [] - self.results = [] + self.results = {} self.max_diff = None self.max_diff_error = False # Read config From 0114d72a6cd8140d7dc80a590fc50e7073069edc Mon Sep 17 00:00:00 2001 From: John Date: Fri, 24 Jan 2025 21:46:08 -0500 Subject: [PATCH 3/3] config: Update generic-creality-v4.2.7.cfg (#6790) Corrected Filament Runout Sensor Pin (as per schematic - see https://github.com/LeeOtts/Ender3v2-Klipper-Configs/blob/main/Creality.4.2.7.-.Schematic.28-5-22-1.pdf ) Signed-off-by: John Minor --- config/generic-creality-v4.2.7.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/generic-creality-v4.2.7.cfg b/config/generic-creality-v4.2.7.cfg index 21e99da59..6b8644c5e 100644 --- a/config/generic-creality-v4.2.7.cfg +++ b/config/generic-creality-v4.2.7.cfg @@ -95,4 +95,4 @@ max_z_accel: 100 aliases: EXP1_1=PC6,EXP1_3=PB10,EXP1_5=PB14,EXP1_7=PB12,EXP1_9=, EXP1_2=PB2,EXP1_4=PB11,EXP1_6=PB13,EXP1_8=PB15,EXP1_10=<5V>, - PROBE_IN=PB0,PROBE_OUT=PB1,FIL_RUNOUT=PC6 + PROBE_IN=PB0,PROBE_OUT=PB1,FIL_RUNOUT=PA4