github-personal/klipper-linux
1
0
Fork 0
mirror of https://github.com/outbackdingo/klipper-linux.git synced 2026-01-27 10:19:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated klipper to most recent master HEAD version

Browse Source
This commit is contained in:
Sergey 'Jin' Bostandzhyan
2021-06-03 00:18:02 +02:00
parent e4a3a59f5d
commit b2bdf1e00b
6 changed files with 211 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

353
yocto/meta-klipper/recipes-printing/klipper/files/0001-Use-setuptools-for-packaging.patch → yocto/meta-klipper/recipes-printing/klipper/files/0001-Allow-to-package-klippy-using-setuptools.patch
View File

@@ -1,38 +1,42 @@
From a0f142543f907f0f65a19f6d0df217a526ebda57 Mon Sep 17 00:00:00 2001
From bd3745c73a9204d80f9b5e578bd3ad3d68c9f35b Mon Sep 17 00:00:00 2001
From: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
Date: Sun, 21 Jun 2020 02:38:00 +0200
Subject: [PATCH] Use setuptools for packaging
Date: Wed, 2 Jun 2021 23:57:32 +0200
Subject: [PATCH] Allow to package klippy using setuptools
This allows to cross compile the C parts of klippy, instead of being
forced to build it directly on the target.
---
MANIFEST.in | 2 ++
klippy/__init__.py | 5 +++++
klippy/chelper/__init__.py | 19 +------------------
klippy/extras/bed_screws.py | 2 +-
klippy/extras/bed_tilt.py | 2 +-
klippy/extras/bltouch.py | 2 +-
klippy/extras/bus.py | 2 +-
klippy/extras/delta_calibrate.py | 2 +-
klippy/extras/extruder_stepper.py | 2 +-
klippy/extras/force_move.py | 2 +-
klippy/extras/manual_probe.py | 2 +-
klippy/extras/manual_stepper.py | 2 +-
klippy/extras/probe.py | 2 +-
klippy/extras/replicape.py | 2 +-
klippy/extras/sx1509.py | 2 +-
klippy/extras/z_tilt.py | 2 +-
klippy/kinematics/cartesian.py | 2 +-
klippy/kinematics/corexy.py | 2 +-
klippy/kinematics/delta.py | 2 +-
klippy/kinematics/extruder.py | 2 +-
klippy/kinematics/polar.py | 2 +-
klippy/kinematics/rotary_delta.py | 2 +-
klippy/kinematics/winch.py | 2 +-
klippy/klippy.py | 2 +-
klippy/toolhead.py | 2 +-
setup.py | 29 +++++++++++++++++++++++++++++
26 files changed, 59 insertions(+), 40 deletions(-)
MANIFEST.in | 2 ++
klippy/__init__.py | 6 ++++++
klippy/chelper/__init__.py | 5 +----
klippy/extras/bed_tilt.py | 2 +-
klippy/extras/bus.py | 2 +-
klippy/extras/delta_calibrate.py | 2 +-
klippy/extras/ds18b20.py | 2 +-
klippy/extras/endstop_phase.py | 2 +-
klippy/extras/extruder_stepper.py | 2 +-
klippy/extras/force_move.py | 2 +-
klippy/extras/input_shaper.py | 2 +-
klippy/extras/manual_stepper.py | 2 +-
klippy/extras/probe.py | 2 +-
klippy/extras/replicape.py | 2 +-
klippy/extras/shaper_calibrate.py | 2 +-
klippy/extras/sx1509.py | 2 +-
klippy/extras/temperature_mcu.py | 2 +-
klippy/extras/tmc.py | 2 +-
klippy/extras/z_tilt.py | 2 +-
klippy/kinematics/cartesian.py | 2 +-
klippy/kinematics/corexy.py | 2 +-
klippy/kinematics/corexz.py | 2 +-
klippy/kinematics/delta.py | 2 +-
klippy/kinematics/extruder.py | 2 +-
klippy/kinematics/hybrid_corexy.py | 2 +-
klippy/kinematics/hybrid_corexz.py | 2 +-
klippy/kinematics/polar.py | 2 +-
klippy/kinematics/rotary_delta.py | 2 +-
klippy/kinematics/winch.py | 2 +-
klippy/klippy.py | 2 +-
klippy/toolhead.py | 2 +-
setup.py | 31 ++++++++++++++++++++++++++++++
32 files changed, 68 insertions(+), 32 deletions(-)
create mode 100644 MANIFEST.in
create mode 100644 klippy/__init__.py
create mode 100644 setup.py
@@ -47,78 +51,40 @@ index 00000000..8e306491
+include klippy/extras/display/display.cfg
diff --git a/klippy/__init__.py b/klippy/__init__.py
new file mode 100644
index 00000000..bd206ac5
index 00000000..a6947c8d
--- /dev/null
+++ b/klippy/__init__.py
@@ -0,0 +1,5 @@
@@ -0,0 +1,6 @@
+# Package definition for the extras directory
+#
+# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+
diff --git a/klippy/chelper/__init__.py b/klippy/chelper/__init__.py
index 1a4b2d74..63f1ba07 100644
index 4d199126..90a5e6e9 100644
--- a/klippy/chelper/__init__.py
+++ b/klippy/chelper/__init__.py
@@ -162,20 +162,6 @@ def get_mtimes(srcdir, filelist):
out.append(t)
return out
-# Check if the code needs to be compiled
-def check_build_code(srcdir, target, sources, cmd, other_files=[]):
- src_times = get_mtimes(srcdir, sources + other_files)
- obj_times = get_mtimes(srcdir, [target])
- if not obj_times or max(src_times) > min(obj_times):
- logging.info("Building C code module %s", target)
- srcfiles = [os.path.join(srcdir, fname) for fname in sources]
- destlib = os.path.join(srcdir, target)
- res = os.system(cmd % (destlib, ' '.join(srcfiles)))
- if res:
- msg = "Unable to build C code module (error=%s)" % (res,)
- logging.error(msg)
- raise Exception(msg)
-
FFI_main = None
FFI_lib = None
pyhelper_logging_callback = None
@@ -185,8 +171,6 @@ def get_ffi():
global FFI_main, FFI_lib, pyhelper_logging_callback
if FFI_lib is None:
srcdir = os.path.dirname(os.path.realpath(__file__))
- check_build_code(srcdir, DEST_LIB, SOURCE_FILES, COMPILE_CMD
- , OTHER_FILES)
FFI_main = cffi.FFI()
for d in defs_all:
FFI_main.cdef(d)
@@ -208,12 +192,11 @@ HC_COMPILE_CMD = "gcc -Wall -g -O2 -o %s %s -lusb"
@@ -261,16 +261,13 @@ HC_COMPILE_CMD = "gcc -Wall -g -O2 -o %s %s -lusb"
HC_SOURCE_FILES = ['hub-ctrl.c']
HC_SOURCE_DIR = '../../lib/hub-ctrl'
HC_TARGET = "hub-ctrl"
-HC_CMD = "sudo %s/hub-ctrl -h 0 -P 2 -p %d"
+HC_CMD = "hub-ctrl -h 0 -P 2 -p %d"
+HC_CMD = "%s/hub-ctrl -h 0 -P 2 -p %d"
def run_hub_ctrl(enable_power):
srcdir = os.path.dirname(os.path.realpath(__file__))
hubdir = os.path.join(srcdir, HC_SOURCE_DIR)
- check_build_code(hubdir, HC_TARGET, HC_SOURCE_FILES, HC_COMPILE_CMD)
srcfiles = get_abs_files(hubdir, HC_SOURCE_FILES)
destlib = get_abs_files(hubdir, [HC_TARGET])[0]
- if check_build_code(srcfiles, destlib):
- logging.info("Building C code module %s", HC_TARGET)
- do_build_code(HC_COMPILE_CMD % (destlib, ' '.join(srcfiles)))
os.system(HC_CMD % (hubdir, enable_power))
diff --git a/klippy/extras/bed_screws.py b/klippy/extras/bed_screws.py
index c10a791f..ee5a13ca 100644
--- a/klippy/extras/bed_screws.py
+++ b/klippy/extras/bed_screws.py
@@ -3,7 +3,7 @@
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import homing
+from klippy import homing
def parse_coord(config, param):
pair = config.get(param).strip().split(',', 1)
diff --git a/klippy/extras/bed_tilt.py b/klippy/extras/bed_tilt.py
index dd75655a..83b65908 100644
index cd1ce177..d86768fc 100644
--- a/klippy/extras/bed_tilt.py
+++ b/klippy/extras/bed_tilt.py
@@ -4,7 +4,7 @@
@@ -130,21 +96,8 @@ index dd75655a..83b65908 100644
from . import probe
class BedTilt:
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py
index 50e27e0e..ba0beb7d 100644
--- a/klippy/extras/bltouch.py
+++ b/klippy/extras/bltouch.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import homing
+from klippy import homing
from . import probe
SIGNAL_PERIOD = 0.020
diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py
index 7c6ae440..91c84a4e 100644
index 9b3e476a..dcb25362 100644
--- a/klippy/extras/bus.py
+++ b/klippy/extras/bus.py
@@ -3,7 +3,7 @@
@@ -157,7 +110,7 @@ index 7c6ae440..91c84a4e 100644
def resolve_bus_name(mcu, param, bus):
# Find enumerations for the given bus
diff --git a/klippy/extras/delta_calibrate.py b/klippy/extras/delta_calibrate.py
index c927eb5e..c7f252a2 100644
index 4301c89a..e5a47633 100644
--- a/klippy/extras/delta_calibrate.py
+++ b/klippy/extras/delta_calibrate.py
@@ -4,7 +4,7 @@
@@ -169,8 +122,34 @@ index c927eb5e..c7f252a2 100644
from . import probe
# A "stable position" is a 3-tuple containing the number of steps
diff --git a/klippy/extras/ds18b20.py b/klippy/extras/ds18b20.py
index 49d658a1..da2f0341 100644
--- a/klippy/extras/ds18b20.py
+++ b/klippy/extras/ds18b20.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import mcu
+from klippy import mcu
DS18_REPORT_TIME = 3.0
# Temperature can be sampled at any time but conversion time is ~750ms, so
diff --git a/klippy/extras/endstop_phase.py b/klippy/extras/endstop_phase.py
index a2b2b548..50fa76db 100644
--- a/klippy/extras/endstop_phase.py
+++ b/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", "tmc2208", "tmc2209", "tmc2660", "tmc5160"]
diff --git a/klippy/extras/extruder_stepper.py b/klippy/extras/extruder_stepper.py
index 9678472a..a05fc91b 100644
index a62b3f83..bcec2c7e 100644
--- a/klippy/extras/extruder_stepper.py
+++ b/klippy/extras/extruder_stepper.py
@@ -4,7 +4,7 @@
@@ -183,7 +162,7 @@ index 9678472a..a05fc91b 100644
class ExtruderStepper:
def __init__(self, config):
diff --git a/klippy/extras/force_move.py b/klippy/extras/force_move.py
index 647b0b33..b2247833 100644
index eb2577df..75fd49c8 100644
--- a/klippy/extras/force_move.py
+++ b/klippy/extras/force_move.py
@@ -4,7 +4,7 @@
@@ -195,47 +174,47 @@ index 647b0b33..b2247833 100644
BUZZ_DISTANCE = 1.
BUZZ_VELOCITY = BUZZ_DISTANCE / .250
diff --git a/klippy/extras/manual_probe.py b/klippy/extras/manual_probe.py
index 663f3c8e..f696a0ae 100644
--- a/klippy/extras/manual_probe.py
+++ b/klippy/extras/manual_probe.py
diff --git a/klippy/extras/input_shaper.py b/klippy/extras/input_shaper.py
index 69ac3cde..2ee1717d 100644
--- a/klippy/extras/input_shaper.py
+++ b/klippy/extras/input_shaper.py
@@ -4,7 +4,7 @@
# Copyright (C) 2020 Dmitry Butyugin <dmbutyugin@google.com>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, bisect
-import homing
+from klippy import homing
-import chelper
+from klippy import chelper
class ManualProbe:
class InputShaper:
def __init__(self, config):
diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py
index 5807c04c..965dcbf2 100644
index 2f36b6d1..e3e6e298 100644
--- a/klippy/extras/manual_stepper.py
+++ b/klippy/extras/manual_stepper.py
@@ -3,7 +3,7 @@
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2019-2021 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import stepper, homing, chelper
+from klippy import stepper, homing, chelper
-import stepper, chelper
+from klippy import stepper, chelper
from . import force_move
ENDSTOP_SAMPLE_TIME = .000015
class ManualStepper:
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index 02d1b5b9..b60f9271 100644
index a8fc36a6..a71e9cea 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import pins, homing
+from klippy import pins, homing
-import pins
+from klippy import pins
from . import manual_probe
HINT_TIMEOUT = """
diff --git a/klippy/extras/replicape.py b/klippy/extras/replicape.py
index 9236264f..26d37069 100644
index 0f5bef0e..2507cc13 100644
--- a/klippy/extras/replicape.py
+++ b/klippy/extras/replicape.py
@@ -4,7 +4,7 @@
@@ -247,8 +226,21 @@ index 9236264f..26d37069 100644
from . import bus
REPLICAPE_MAX_CURRENT = 3.84
diff --git a/klippy/extras/shaper_calibrate.py b/klippy/extras/shaper_calibrate.py
index 3c6065de..8c8738de 100644
--- a/klippy/extras/shaper_calibrate.py
+++ b/klippy/extras/shaper_calibrate.py
@@ -184,7 +184,7 @@ class ShaperCalibrate:
def background_process_exec(self, method, args):
if self.printer is None:
return method(*args)
- import queuelogger
+ from klippy import queuelogger
parent_conn, child_conn = multiprocessing.Pipe()
def wrapper():
queuelogger.clear_bg_logging()
diff --git a/klippy/extras/sx1509.py b/klippy/extras/sx1509.py
index 7a4f24db..475857d9 100644
index 8b19dda8..60a0b56c 100644
--- a/klippy/extras/sx1509.py
+++ b/klippy/extras/sx1509.py
@@ -3,7 +3,7 @@
@@ -260,8 +252,34 @@ index 7a4f24db..475857d9 100644
from . import bus
# Word registers
diff --git a/klippy/extras/temperature_mcu.py b/klippy/extras/temperature_mcu.py
index 1a1510da..568f4b30 100644
--- a/klippy/extras/temperature_mcu.py
+++ b/klippy/extras/temperature_mcu.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import mcu
+from klippy import mcu
SAMPLE_TIME = 0.001
SAMPLE_COUNT = 8
diff --git a/klippy/extras/tmc.py b/klippy/extras/tmc.py
index 6868b994..88095dd5 100644
--- a/klippy/extras/tmc.py
+++ b/klippy/extras/tmc.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, collections
-import stepper
+from klippy import stepper
######################################################################
diff --git a/klippy/extras/z_tilt.py b/klippy/extras/z_tilt.py
index 577b7e70..8a49df47 100644
index f8a8c718..3075ff25 100644
--- a/klippy/extras/z_tilt.py
+++ b/klippy/extras/z_tilt.py
@@ -4,7 +4,7 @@
@@ -274,89 +292,128 @@ index 577b7e70..8a49df47 100644
class ZAdjustHelper:
diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py
index df57edce..b400bd1d 100644
index 6c44c120..9237bcdf 100644
--- a/klippy/kinematics/cartesian.py
+++ b/klippy/kinematics/cartesian.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import stepper, homing
+from klippy import stepper, homing
-import stepper
+from klippy import stepper
class CartKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/corexy.py b/klippy/kinematics/corexy.py
index f04b3009..2da29c97 100644
index 33f5fcf5..df4b47f4 100644
--- a/klippy/kinematics/corexy.py
+++ b/klippy/kinematics/corexy.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
-import stepper, homing
+from klippy import stepper, homing
-import stepper
+from klippy import stepper
class CoreXYKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/corexz.py b/klippy/kinematics/corexz.py
index dbd5c372..a2510cdd 100644
--- a/klippy/kinematics/corexz.py
+++ b/klippy/kinematics/corexz.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
-import stepper
+from klippy import stepper
class CoreXZKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/delta.py b/klippy/kinematics/delta.py
index 885ce940..1c334547 100644
index 104d2122..7ecc0f0a 100644
--- a/klippy/kinematics/delta.py
+++ b/klippy/kinematics/delta.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, mathutil
+from klippy import stepper, homing, mathutil
-import stepper, mathutil
+from klippy import stepper, mathutil
# Slow moves once the ratio of tower to XY movement exceeds SLOW_RATIO
SLOW_RATIO = 3.
diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py
index 3a03b606..e36c02f1 100644
index 6f2138ae..4b9f1c7e 100644
--- a/klippy/kinematics/extruder.py
+++ b/klippy/kinematics/extruder.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, chelper
+from klippy import stepper, homing, chelper
-import stepper, chelper
+from klippy import stepper, chelper
class PrinterExtruder:
def __init__(self, config, extruder_num):
diff --git a/klippy/kinematics/hybrid_corexy.py b/klippy/kinematics/hybrid_corexy.py
index 43cf7dd9..304194fa 100644
--- a/klippy/kinematics/hybrid_corexy.py
+++ b/klippy/kinematics/hybrid_corexy.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import stepper
+from klippy import stepper
# The hybrid-corexy kinematic is also known as Markforged kinematics
class HybridCoreXYKinematics:
diff --git a/klippy/kinematics/hybrid_corexz.py b/klippy/kinematics/hybrid_corexz.py
index 47aa430e..d8d02a52 100644
--- a/klippy/kinematics/hybrid_corexz.py
+++ b/klippy/kinematics/hybrid_corexz.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import stepper
+from klippy import stepper
# The hybrid-corexz kinematic is also known as Markforged kinematics
class HybridCoreXZKinematics:
diff --git a/klippy/kinematics/polar.py b/klippy/kinematics/polar.py
index e3ee3241..f2643552 100644
index ef8c0d97..e250e853 100644
--- a/klippy/kinematics/polar.py
+++ b/klippy/kinematics/polar.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
-import stepper, homing
+from klippy import stepper, homing
-import stepper
+from klippy import stepper
class PolarKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/rotary_delta.py b/klippy/kinematics/rotary_delta.py
index 415a2e7f..ff62ba49 100644
index 1eb050ba..71e02920 100644
--- a/klippy/kinematics/rotary_delta.py
+++ b/klippy/kinematics/rotary_delta.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, mathutil, chelper
+from klippy import stepper, homing, mathutil, chelper
-import stepper, mathutil, chelper
+from klippy import stepper, mathutil, chelper
class RotaryDeltaKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/winch.py b/klippy/kinematics/winch.py
index 04e2d498..4de65d58 100644
index 11475d24..4d4787d8 100644
--- a/klippy/kinematics/winch.py
+++ b/klippy/kinematics/winch.py
@@ -3,7 +3,7 @@
# Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
# Copyright (C) 2018-2021 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import stepper, mathutil
@@ -365,10 +422,10 @@ index 04e2d498..4de65d58 100644
class WinchKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 84450aea..091dbc3c 100644
index 5914c1ca..389a8940 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -106,7 +106,7 @@ class Printer:
@@ -118,7 +118,7 @@ class Printer:
if default is not configfile.sentinel:
return default
raise self.config_error("Unable to load module '%s'" % (section,))
@@ -378,11 +435,11 @@ index 84450aea..091dbc3c 100644
if len(module_parts) > 1:
init_func = 'load_config_prefix'
diff --git a/klippy/toolhead.py b/klippy/toolhead.py
index 617186f6..d3e680d3 100644
index abb4eb5f..ec243d9a 100644
--- a/klippy/toolhead.py
+++ b/klippy/toolhead.py
@@ -250,7 +250,7 @@ class ToolHead:
self.extruder = kinematics.extruder.DummyExtruder()
@@ -252,7 +252,7 @@ class ToolHead:
self.extruder = kinematics.extruder.DummyExtruder(self.printer)
kin_name = config.get('kinematics')
try:
- mod = importlib.import_module('kinematics.' + kin_name)
@@ -392,10 +449,10 @@ index 617186f6..d3e680d3 100644
raise
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..8d407ace
index 00000000..548cc9ea
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,29 @@
@@ -0,0 +1,31 @@
+from setuptools import setup, find_packages, Extension
+
+c_helper = Extension('klippy/chelper/c_helper',
@@ -404,10 +461,12 @@ index 00000000..8d407ace
+ sources = [ 'klippy/chelper/itersolve.c',
+ 'klippy/chelper/kin_cartesian.c',
+ 'klippy/chelper/kin_corexy.c',
+ 'klippy/chelper/kin_corexz.c',
+ 'klippy/chelper/kin_delta.c',
+ 'klippy/chelper/kin_extruder.c',
+ 'klippy/chelper/kin_polar.c',
+ 'klippy/chelper/kin_rotary_delta.c',
+ 'klippy/chelper/kin_shaper.c',
+ 'klippy/chelper/kin_winch.c',
+ 'klippy/chelper/pyhelper.c',
+ 'klippy/chelper/serialqueue.c',
@@ -416,7 +475,7 @@ index 00000000..8d407ace
+
+setup(
+ name = 'klipper',
+ version = '0.8.0+git',
+ version = '0.9.1+git',
+ description = 'Klipper 3D Printing Firmware',
+ packages=find_packages(),
+ include_package_data = True,
@@ -426,5 +485,5 @@ index 00000000..8d407ace
+)
+
--
2.25.4
2.31.1

455
yocto/meta-klipper/recipes-printing/klipper/files/0001-Attempt-to-package-klippy-using-setuptools.patch
View File

@@ -1,455 +0,0 @@
From b0705462f569e3f820ee30eb251880b651fe7b56 Mon Sep 17 00:00:00 2001
From: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
Date: Mon, 11 May 2020 17:38:41 +0200
Subject: [PATCH 1/3] Attempt to package klippy using setuptools
I am totally unfamiliar with python packaging, so not sure if there is a
better way, but at least it seems to work.
Custom compilation of c module code was removed, setuptools will take
care of that and also allow to cross compile the module.
---
klippy/__init__.py | 7 +++++++
klippy/chelper/__init__.py | 17 -----------------
klippy/extras/bed_screws.py | 2 +-
klippy/extras/bed_tilt.py | 3 ++-
klippy/extras/bltouch.py | 5 +++--
klippy/extras/bus.py | 2 +-
klippy/extras/delta_calibrate.py | 3 ++-
klippy/extras/display/uc1701.py | 3 ++-
klippy/extras/endstop_phase.py | 2 +-
klippy/extras/extruder_stepper.py | 2 +-
klippy/extras/force_move.py | 2 +-
klippy/extras/manual_probe.py | 2 +-
klippy/extras/manual_stepper.py | 3 ++-
klippy/extras/probe.py | 3 ++-
klippy/extras/replicape.py | 3 ++-
klippy/extras/sx1509.py | 2 +-
klippy/extras/z_tilt.py | 3 ++-
klippy/kinematics/cartesian.py | 2 +-
klippy/kinematics/corexy.py | 2 +-
klippy/kinematics/delta.py | 2 +-
klippy/kinematics/extruder.py | 2 +-
klippy/kinematics/polar.py | 2 +-
klippy/kinematics/rotary_delta.py | 2 +-
klippy/kinematics/winch.py | 2 +-
klippy/klippy.py | 2 +-
klippy/toolhead.py | 2 +-
setup.py | 27 +++++++++++++++++++++++++++
27 files changed, 67 insertions(+), 42 deletions(-)
create mode 100644 klippy/__init__.py
create mode 100644 setup.py
diff --git a/klippy/__init__.py b/klippy/__init__.py
new file mode 100644
index 00000000..b3884662
--- /dev/null
+++ b/klippy/__init__.py
@@ -0,0 +1,7 @@
+# Package definition for the extras directory
+#
+# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+
+__all__ = [ 'chelper', 'extras', 'kinematics' ]
diff --git a/klippy/chelper/__init__.py b/klippy/chelper/__init__.py
index 1a4b2d74..14e115f8 100644
--- a/klippy/chelper/__init__.py
+++ b/klippy/chelper/__init__.py
@@ -162,20 +162,6 @@ def get_mtimes(srcdir, filelist):
out.append(t)
return out
-# Check if the code needs to be compiled
-def check_build_code(srcdir, target, sources, cmd, other_files=[]):
- src_times = get_mtimes(srcdir, sources + other_files)
- obj_times = get_mtimes(srcdir, [target])
- if not obj_times or max(src_times) > min(obj_times):
- logging.info("Building C code module %s", target)
- srcfiles = [os.path.join(srcdir, fname) for fname in sources]
- destlib = os.path.join(srcdir, target)
- res = os.system(cmd % (destlib, ' '.join(srcfiles)))
- if res:
- msg = "Unable to build C code module (error=%s)" % (res,)
- logging.error(msg)
- raise Exception(msg)
-
FFI_main = None
FFI_lib = None
pyhelper_logging_callback = None
@@ -185,8 +171,6 @@ def get_ffi():
global FFI_main, FFI_lib, pyhelper_logging_callback
if FFI_lib is None:
srcdir = os.path.dirname(os.path.realpath(__file__))
- check_build_code(srcdir, DEST_LIB, SOURCE_FILES, COMPILE_CMD
- , OTHER_FILES)
FFI_main = cffi.FFI()
for d in defs_all:
FFI_main.cdef(d)
@@ -213,7 +197,6 @@ HC_CMD = "sudo %s/hub-ctrl -h 0 -P 2 -p %d"
def run_hub_ctrl(enable_power):
srcdir = os.path.dirname(os.path.realpath(__file__))
hubdir = os.path.join(srcdir, HC_SOURCE_DIR)
- check_build_code(hubdir, HC_TARGET, HC_SOURCE_FILES, HC_COMPILE_CMD)
os.system(HC_CMD % (hubdir, enable_power))
diff --git a/klippy/extras/bed_screws.py b/klippy/extras/bed_screws.py
index c10a791f..ee5a13ca 100644
--- a/klippy/extras/bed_screws.py
+++ b/klippy/extras/bed_screws.py
@@ -3,7 +3,7 @@
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import homing
+from klippy import homing
def parse_coord(config, param):
pair = config.get(param).strip().split(',', 1)
diff --git a/klippy/extras/bed_tilt.py b/klippy/extras/bed_tilt.py
index 910b40a9..7b66f759 100644
--- a/klippy/extras/bed_tilt.py
+++ b/klippy/extras/bed_tilt.py
@@ -4,7 +4,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import probe, mathutil
+import probe
+from klippy import mathutil
class BedTilt:
def __init__(self, config):
diff --git a/klippy/extras/bltouch.py b/klippy/extras/bltouch.py
index 8e9166bd..1c2bb094 100644
--- a/klippy/extras/bltouch.py
+++ b/klippy/extras/bltouch.py
@@ -3,8 +3,9 @@
# Copyright (C) 2018-2020 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import logging
-import homing, probe
+import math, logging
+from klippy import homing
+import probe
SIGNAL_PERIOD = 0.020
MIN_CMD_TIME = 5 * SIGNAL_PERIOD
diff --git a/klippy/extras/bus.py b/klippy/extras/bus.py
index 7c6ae440..91c84a4e 100644
--- a/klippy/extras/bus.py
+++ b/klippy/extras/bus.py
@@ -3,7 +3,7 @@
# Copyright (C) 2018,2019 Kevin O'Connor <kevin@koconnor.net>
#
# 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):
# Find enumerations for the given bus
diff --git a/klippy/extras/delta_calibrate.py b/klippy/extras/delta_calibrate.py
index abea7cc6..2e6c862a 100644
--- a/klippy/extras/delta_calibrate.py
+++ b/klippy/extras/delta_calibrate.py
@@ -4,7 +4,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging, collections
-import probe, mathutil
+import probe
+from klippy import mathutil
# A "stable position" is a 3-tuple containing the number of steps
# taken since hitting the endstop on each delta tower. Delta
diff --git a/klippy/extras/display/uc1701.py b/klippy/extras/display/uc1701.py
index f19d9f97..b5b1cf10 100644
--- a/klippy/extras/display/uc1701.py
+++ b/klippy/extras/display/uc1701.py
@@ -5,7 +5,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import icons, font8x14, extras.bus
+import icons, font8x14
+from klippy.extras import bus
BACKGROUND_PRIORITY_CLOCK = 0x7fffffff00000000
diff --git a/klippy/extras/endstop_phase.py b/klippy/extras/endstop_phase.py
index 8cfea7fd..f6e75fe2 100644
--- a/klippy/extras/endstop_phase.py
+++ b/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 homing
+from klippy import homing
TRINAMIC_DRIVERS = ["tmc2130", "tmc2208", "tmc2209", "tmc2660", "tmc5160"]
diff --git a/klippy/extras/extruder_stepper.py b/klippy/extras/extruder_stepper.py
index f6d0e9ea..74b2e956 100644
--- a/klippy/extras/extruder_stepper.py
+++ b/klippy/extras/extruder_stepper.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import stepper
+from klippy import stepper
class ExtruderStepper:
def __init__(self, config):
diff --git a/klippy/extras/force_move.py b/klippy/extras/force_move.py
index 647b0b33..b2247833 100644
--- a/klippy/extras/force_move.py
+++ b/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.
BUZZ_VELOCITY = BUZZ_DISTANCE / .250
diff --git a/klippy/extras/manual_probe.py b/klippy/extras/manual_probe.py
index 663f3c8e..f696a0ae 100644
--- a/klippy/extras/manual_probe.py
+++ b/klippy/extras/manual_probe.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, bisect
-import homing
+from klippy import homing
class ManualProbe:
def __init__(self, config):
diff --git a/klippy/extras/manual_stepper.py b/klippy/extras/manual_stepper.py
index c549a951..92ac24a3 100644
--- a/klippy/extras/manual_stepper.py
+++ b/klippy/extras/manual_stepper.py
@@ -3,7 +3,8 @@
# Copyright (C) 2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import stepper, homing, force_move, chelper
+import force_move
+from klippy import stepper, homing, chelper
ENDSTOP_SAMPLE_TIME = .000015
ENDSTOP_SAMPLE_COUNT = 4
diff --git a/klippy/extras/probe.py b/klippy/extras/probe.py
index e58b6080..121efe78 100644
--- a/klippy/extras/probe.py
+++ b/klippy/extras/probe.py
@@ -4,7 +4,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import pins, homing, manual_probe
+from klippy import pins, homing
+import manual_probe
HINT_TIMEOUT = """
Make sure to home the printer before probing. If the probe
diff --git a/klippy/extras/replicape.py b/klippy/extras/replicape.py
index 5938502e..907cb46f 100644
--- a/klippy/extras/replicape.py
+++ b/klippy/extras/replicape.py
@@ -4,7 +4,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, os
-import pins, mcu, bus
+from klippy import pins, mcu
+import bus
REPLICAPE_MAX_CURRENT = 3.84
REPLICAPE_PCA9685_BUS = 2
diff --git a/klippy/extras/sx1509.py b/klippy/extras/sx1509.py
index 27f335c9..3f38337c 100644
--- a/klippy/extras/sx1509.py
+++ b/klippy/extras/sx1509.py
@@ -3,7 +3,7 @@
# Copyright (C) 2018 Florian Heilmann <Florian.Heilmann@gmx.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import pins
+from klippy import pins
import bus
# Word registers
diff --git a/klippy/extras/z_tilt.py b/klippy/extras/z_tilt.py
index ef69c0e6..00b19699 100644
--- a/klippy/extras/z_tilt.py
+++ b/klippy/extras/z_tilt.py
@@ -4,7 +4,8 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import probe, mathutil
+import probe
+from klippy import mathutil
class ZAdjustHelper:
def __init__(self, config, z_count):
diff --git a/klippy/kinematics/cartesian.py b/klippy/kinematics/cartesian.py
index df57edce..b400bd1d 100644
--- a/klippy/kinematics/cartesian.py
+++ b/klippy/kinematics/cartesian.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging
-import stepper, homing
+from klippy import stepper, homing
class CartKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/corexy.py b/klippy/kinematics/corexy.py
index f04b3009..2da29c97 100644
--- a/klippy/kinematics/corexy.py
+++ b/klippy/kinematics/corexy.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
-import stepper, homing
+from klippy import stepper, homing
class CoreXYKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/delta.py b/klippy/kinematics/delta.py
index 885ce940..1c334547 100644
--- a/klippy/kinematics/delta.py
+++ b/klippy/kinematics/delta.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, mathutil
+from klippy import stepper, homing, mathutil
# Slow moves once the ratio of tower to XY movement exceeds SLOW_RATIO
SLOW_RATIO = 3.
diff --git a/klippy/kinematics/extruder.py b/klippy/kinematics/extruder.py
index c0ba299c..d314cdc3 100644
--- a/klippy/kinematics/extruder.py
+++ b/klippy/kinematics/extruder.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, chelper
+from klippy import stepper, homing, chelper
class PrinterExtruder:
def __init__(self, config, extruder_num):
diff --git a/klippy/kinematics/polar.py b/klippy/kinematics/polar.py
index e3ee3241..f2643552 100644
--- a/klippy/kinematics/polar.py
+++ b/klippy/kinematics/polar.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import logging, math
-import stepper, homing
+from klippy import stepper, homing
class PolarKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/rotary_delta.py b/klippy/kinematics/rotary_delta.py
index 415a2e7f..ff62ba49 100644
--- a/klippy/kinematics/rotary_delta.py
+++ b/klippy/kinematics/rotary_delta.py
@@ -4,7 +4,7 @@
#
# This file may be distributed under the terms of the GNU GPLv3 license.
import math, logging
-import stepper, homing, mathutil, chelper
+from klippy import stepper, homing, mathutil, chelper
class RotaryDeltaKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/kinematics/winch.py b/klippy/kinematics/winch.py
index 04e2d498..4de65d58 100644
--- a/klippy/kinematics/winch.py
+++ b/klippy/kinematics/winch.py
@@ -3,7 +3,7 @@
# Copyright (C) 2018-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import stepper, mathutil
+from klippy import stepper, mathutil
class WinchKinematics:
def __init__(self, toolhead, config):
diff --git a/klippy/klippy.py b/klippy/klippy.py
index 84450aea..091dbc3c 100644
--- a/klippy/klippy.py
+++ b/klippy/klippy.py
@@ -106,7 +106,7 @@ class Printer:
if default is not configfile.sentinel:
return default
raise self.config_error("Unable to load module '%s'" % (section,))
- mod = importlib.import_module('extras.' + module_name)
+ mod = importlib.import_module('klippy.extras.' + module_name)
init_func = 'load_config'
if len(module_parts) > 1:
init_func = 'load_config_prefix'
diff --git a/klippy/toolhead.py b/klippy/toolhead.py
index cf8fba4a..e811a467 100644
--- a/klippy/toolhead.py
+++ b/klippy/toolhead.py
@@ -250,7 +250,7 @@ class ToolHead:
self.extruder = kinematics.extruder.DummyExtruder()
kin_name = config.get('kinematics')
try:
- mod = importlib.import_module('kinematics.' + kin_name)
+ mod = importlib.import_module('klippy.kinematics.' + kin_name)
self.kin = mod.load_kinematics(self, config)
except config.error as e:
raise
diff --git a/setup.py b/setup.py
new file mode 100644
index 00000000..faa2d895
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,27 @@
+from setuptools import setup, find_packages, Extension
+
+c_helper = Extension('klippy/chelper/c_helper',
+ define_macros = [('MAJOR_VERSION', '1'),
+ ('MINOR_VERSION', '0')],
+ sources = [ 'klippy/chelper/itersolve.c',
+ 'klippy/chelper/kin_cartesian.c',
+ 'klippy/chelper/kin_corexy.c',
+ 'klippy/chelper/kin_delta.c',
+ 'klippy/chelper/kin_extruder.c',
+ 'klippy/chelper/kin_polar.c',
+ 'klippy/chelper/kin_rotary_delta.c',
+ 'klippy/chelper/kin_winch.c',
+ 'klippy/chelper/pyhelper.c',
+ 'klippy/chelper/serialqueue.c',
+ 'klippy/chelper/stepcompress.c',
+ 'klippy/chelper/trapq.c' ])
+
+setup(
+ name = 'klipper',
+ version = '0.8.0+git',
+ description = 'Klipper 3D Printing Firmware',
+ packages=find_packages(),
+ entry_points = { "console_scripts": [ "klippy = klippy.klippy:main" ] },
+ url = "https://www.klipper3d.org/",
+ ext_modules = [ c_helper ]
+)
--
2.25.4

26
yocto/meta-klipper/recipes-printing/klipper/files/0002-Assume-hub-ctrl-is-installed-on-the-system-and-is-in.patch
View File

@@ -1,26 +0,0 @@
From 4fe5073b0220df48a0ead9118745c79a0e1eee2b Mon Sep 17 00:00:00 2001
From: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
Date: Mon, 11 May 2020 17:49:27 +0200
Subject: [PATCH 2/3] Assume hub-ctrl is installed on the system and is in
$PATH
---
klippy/chelper/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/klippy/chelper/__init__.py b/klippy/chelper/__init__.py
index 14e115f8..63f1ba07 100644
--- a/klippy/chelper/__init__.py
+++ b/klippy/chelper/__init__.py
@@ -192,7 +192,7 @@ HC_COMPILE_CMD = "gcc -Wall -g -O2 -o %s %s -lusb"
HC_SOURCE_FILES = ['hub-ctrl.c']
HC_SOURCE_DIR = '../../lib/hub-ctrl'
HC_TARGET = "hub-ctrl"
-HC_CMD = "sudo %s/hub-ctrl -h 0 -P 2 -p %d"
+HC_CMD = "hub-ctrl -h 0 -P 2 -p %d"
def run_hub_ctrl(enable_power):
srcdir = os.path.dirname(os.path.realpath(__file__))
--
2.25.4

34
yocto/meta-klipper/recipes-printing/klipper/files/0003-Make-sure-to-also-distribute-menu.cfg.patch
View File

@@ -1,34 +0,0 @@
From d01c56d64db32953a035ca1be6ee191325646028 Mon Sep 17 00:00:00 2001
From: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
Date: Mon, 11 May 2020 18:07:54 +0200
Subject: [PATCH 3/3] Make sure to also distribute menu.cfg
---
MANIFEST.in | 2 ++
setup.py | 1 +
2 files changed, 3 insertions(+)
create mode 100644 MANIFEST.in
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 00000000..8e306491
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,2 @@
+include klippy/extras/display/menu.cfg
+include klippy/extras/display/display.cfg
diff --git a/setup.py b/setup.py
index faa2d895..25a7da1b 100644
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,7 @@ setup(
version = '0.8.0+git',
description = 'Klipper 3D Printing Firmware',
packages=find_packages(),
+ include_package_data = True,
entry_points = { "console_scripts": [ "klippy = klippy.klippy:main" ] },
url = "https://www.klipper3d.org/",
ext_modules = [ c_helper ]
--
2.25.4

2
yocto/meta-klipper/recipes-printing/klipper/files/klipper.run
View File

@@ -18,7 +18,7 @@ fi
PRINTER_CONFIG="$PRINTER_CONFIG_DIR/printer.cfg"
OPTIONS="$PRINTER_CONFIG -l $LOGDIR/klipper.log"
OPTIONS="$PRINTER_CONFIG -l $LOGDIR/klipper.log -a /tmp/klippy_uds"
if [ ! -x $DAEMON ] || [ ! -s $PRINTER_CONFIG ]; then
echo "$0: $DAEMON or $PRINTER_CONFIG not found!"

7
yocto/meta-klipper/recipes-printing/klipper/klipper_git.bb
View File

@@ -10,13 +10,14 @@ DEPENDS += "libusb"
SRC_URI = "\
git://github.com/KevinOConnor/klipper.git;protocol=https \
file://0001-Use-setuptools-for-packaging.patch \
file://0001-Allow-to-package-klippy-using-setuptools.patch \
file://klipper.default \
file://klipper.run \
"
SRCREV = "${AUTOREV}"
PV = "0.8.0+gitr${SRCPV}"
#SRCREV = "${AUTOREV}"
SRCREV = "c148f17ea3391e3720961270a12eb0645f688e12"
PV = "0.9.1+gitr${SRCPV}"
S = "${WORKDIR}/git"