Merge branch 'main' into reset_velocity_limits

klippy/__init__.py

@@ -0,0 +1,3 @@
+APP_NAME = "Kalico"
+
+from .printer import *  # noqa: E402, F403

klippy/__main__.py

@@ -0,0 +1,3 @@
+from .printer import main
+
+main()

klippy/compat.py

@@ -0,0 +1,20 @@
+import sys
+
+
+def hotpatch_modules():
+    """
+    This is a compatibility shim for legacy external modules
+     to fix
+    Redirect legacy `import x` to `import klippy.x`
+
+    """
+
+    for module_name, module in list(sys.modules.items()):
+        if not module_name.startswith("klippy."):
+            continue
+
+        hotpatched_name = module_name.removeprefix("klippy.")
+        if hotpatched_name in sys.modules:
+            continue
+
+        sys.modules[hotpatched_name] = module

klippy/configfile.py

@@ -3,8 +3,10 @@
 # Copyright (C) 2016-2021  Kevin O'Connor <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import sys, os, glob, re, time, logging, configparser, io, mathutil
-from extras.danger_options import get_danger_options
+import sys, os, glob, re, time, logging, configparser, io
+from .extras.danger_options import get_danger_options
+from . import mathutil
+
 
 error = configparser.Error
 

klippy/extras/adc_temperature.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging, bisect
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 ######################################################################
 # Interface between MCU adc and heater temperature callbacks

klippy/extras/aht10.py

@@ -6,7 +6,7 @@
 import logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 ######################################################################
 # Compatible Sensors:

klippy/extras/bed_mesh.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging, math, json, collections
 from . import probe
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 PROFILE_VERSION = 1
 PROFILE_OPTIONS = {

klippy/extras/bed_tilt.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging
-import mathutil
+from klippy import mathutil
 from . import probe
 
 

klippy/extras/bltouch.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging
 from . import probe
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 SIGNAL_PERIOD = 0.020
 MIN_CMD_TIME = 5 * SIGNAL_PERIOD

klippy/extras/bme280.py

@@ -6,7 +6,7 @@
 import logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 REPORT_TIME = 0.8
 BME280_CHIP_ADDR = 0x76

klippy/extras/bus.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2018,2019  Kevin O'Connor <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import mcu
+from klippy import mcu
 
 
 def resolve_bus_name(mcu, param, bus):

klippy/extras/delta_calibrate.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging
 import math
-import mathutil
+from klippy import mathutil
 from . import probe
 
 # A "stable position" is a 3-tuple containing the number of steps

klippy/extras/ds18b20.py

@@ -3,9 +3,10 @@
 # Copyright (C) 2020 Alan Lord <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import logging, mcu
+import logging
 
-from extras.danger_options import get_danger_options
+from klippy import mcu
+from .danger_options import get_danger_options
 
 DS18_REPORT_TIME = 3.0
 # Temperature can be sampled at any time but conversion time is ~750ms, so

klippy/extras/endstop_phase.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math, logging
-import stepper
+from klippy import stepper
 
 TRINAMIC_DRIVERS = [
     "tmc2130",

klippy/extras/extruder_stepper.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2019 Simo Apell <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-from kinematics import extruder
+from klippy.kinematics import extruder
 
 
 class PrinterExtruderStepper:

klippy/extras/force_move.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math, logging
-import chelper
+from klippy import chelper
 
 BUZZ_DISTANCE = 1.0
 BUZZ_VELOCITY = BUZZ_DISTANCE / 0.250

klippy/extras/gcode_macro.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import traceback, logging, ast, copy, json, threading
 import jinja2, math
-import configfile
+from klippy import configfile
 
 PYTHON_SCRIPT_PREFIX = "!"
 

klippy/extras/homing.py

@@ -5,7 +5,7 @@
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math
 import logging
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 # HOMING_START_DELAY = 0.001
 # ENDSTOP_SAMPLE_TIME = 0.000015

klippy/extras/htu21d.py

@@ -6,7 +6,7 @@
 import logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 ######################################################################
 # NOTE: The implementation requires write support of length 0

klippy/extras/input_shaper.py

@@ -5,7 +5,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import collections
-import chelper
+from klippy import chelper
 from . import shaper_defs
 
 

klippy/extras/lm75.py

@@ -6,7 +6,7 @@
 import logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 LM75_CHIP_ADDR = 0x48
 LM75_I2C_SPEED = 100000

klippy/extras/manual_stepper.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2019-2021  Kevin O'Connor <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import stepper, chelper
+from klippy import stepper, chelper
 from . import force_move
 
 

klippy/extras/motion_report.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging
-import chelper
+from klippy import chelper
 from . import bulk_sensor
 
 

klippy/extras/probe.py

@@ -4,8 +4,8 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging
-import pins
 import math
+from klippy import pins
 from . import manual_probe
 
 HINT_TIMEOUT = """

klippy/extras/probe_eddy_current.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import math, bisect
-import mcu
+from klippy import mcu
 from . import ldc1612, probe, manual_probe
 
 

klippy/extras/pwm_tool.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2017-2023  Kevin O'Connor <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import chelper
+from klippy import chelper
 
 MAX_SCHEDULE_TIME = 5.0
 

klippy/extras/replicape.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import logging, os
-import pins, mcu
+from klippy import pins, mcu
 from . import bus
 
 REPLICAPE_MAX_CURRENT = 3.84

klippy/extras/shaper_calibrate.py

@@ -9,7 +9,7 @@
 import multiprocessing
 import traceback
 
-shaper_defs = importlib.import_module(".shaper_defs", "extras")
+from . import shaper_defs
 
 MIN_FREQ = 5.0
 MAX_FREQ = 200.0

klippy/extras/sht3x.py

@@ -7,7 +7,7 @@
 import logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 ######################################################################
 # Compatible Sensors:

klippy/extras/spi_temperature.py

@@ -7,7 +7,7 @@
 import math, logging
 from . import bus
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 ######################################################################
 # SensorBase

klippy/extras/statistics.py

@@ -4,7 +4,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 import os, time, logging
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 
 class PrinterSysStats:

klippy/extras/sx1509.py

@@ -3,7 +3,7 @@
 # Copyright (C) 2018  Florian Heilmann <[email protected]>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import pins
+from klippy import pins
 from . import bus
 
 # Word registers

klippy/extras/telemetry.py

@@ -10,6 +10,7 @@
 import pathlib
 import platform
 import sys
+import shlex
 import threading
 import urllib.request
 import uuid
@@ -129,9 +130,7 @@ def cmd_TELEMETRY_EXAMPLE(self, gcmd):
         with filename.open("w", encoding="utf-8") as fp:
             json.dump(data, fp, indent=2)
 
-        gcmd.respond_info(
-            f"Example telemetry saved to {filename.relative_to(pathlib.Path.home())}"
-        )
+        gcmd.respond_info(f"Example telemetry saved to {filename}")
 
     def _get_machine_id(self):
         """
@@ -198,26 +197,51 @@ def _collect_platform(self):
 
         {
             "machine": "x86_64",
-            "os_release": {
-                "NAME": "Debian GNU/Linux",
-                "ID": "debian",
-                "PRETTY_NAME": "Debian GNU/Linux trixie/sid",
-                "VERSION_CODENAME": "trixie",
-                "HOME_URL": "https://www.debian.org/",
-                "SUPPORT_URL": "https://www.debian.org/support",
-                "BUG_REPORT_URL": "https://bugs.debian.org/"
-            },
+            "os_release": { ... },
             "version": "#1 SMP PREEMPT_DYNAMIC Debian 6.12~rc6-1~exp1 (2024-11-10)",
             "python": "3.12.7 (main, Nov  8 2024, 17:55:36) [GCC 14.2.0]"
         }
         """
         return {
             "machine": platform.machine(),
-            "os_release": platform.freedesktop_os_release(),
+            "os_release": self._collect_os_release(),
             "version": platform.version(),
             "python": sys.version,
         }
 
+    def _collect_os_release(self):
+        """
+        Collect the freedesktop OS-RELEASE information.
+        See also `platform.freedesktop_os_release()` (available in Python 3.10+)
+
+        {
+            "NAME": "Debian GNU/Linux",
+            "ID": "debian",
+            "PRETTY_NAME": "Debian GNU/Linux trixie/sid",
+            "VERSION_CODENAME": "trixie",
+            "HOME_URL": "https://www.debian.org/",
+            "SUPPORT_URL": "https://www.debian.org/support",
+            "BUG_REPORT_URL": "https://bugs.debian.org/"
+        }
+        """
+        paths = [
+            pathlib.Path("/etc/os-release"),
+            pathlib.Path("/usr/lib/os-release"),
+        ]
+        path = next(filter(pathlib.Path.exists, paths), None)
+        if not path:
+            return
+
+        result = {}
+        with path.open("r") as fp:
+            for line in fp:
+                if "=" not in line:
+                    continue
+                key, value = line.split("=", maxsplit=1)
+                result[key] = shlex.split(value)[0]
+
+        return result
+
     def _collect_printer_objects(self):
         """
         Collect a list of all enabled objects in the current Kalico runtime

klippy/extras/temperature_combined.py

@@ -5,7 +5,7 @@
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 REPORT_TIME = 0.300
 

klippy/extras/temperature_host.py

@@ -6,7 +6,7 @@
 
 import logging
 
-from extras.danger_options import get_danger_options
+from .danger_options import get_danger_options
 
 HOST_REPORT_TIME = 1.0
 RPI_PROC_TEMP_FILE = "/sys/class/thermal/thermal_zone0/temp"