diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2021-03-13 15:02:41 -0500 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2021-03-13 15:02:41 -0500 |
| commit | 4cbcd45ce908e72a04bead980bd631b932e6ef03 (patch) | |
| tree | 1c79a84f9691998deaf5cc9fbb49effcf46de122 | |
| parent | c7dc3e78bfaaf0d4e02726667d14ba8bbc9c4e23 (diff) | |
| download | kutter-4cbcd45ce908e72a04bead980bd631b932e6ef03.tar.gz kutter-4cbcd45ce908e72a04bead980bd631b932e6ef03.tar.xz kutter-4cbcd45ce908e72a04bead980bd631b932e6ef03.zip | |
serialhdl: Only load the CAN module if CAN bus is configured
Temporarily postpone loading the CAN module so that moonraker (and
similar) can improve upgrade scripts.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
| -rw-r--r-- | klippy/serialhdl.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py index 19b67088..9294b120 100644 --- a/klippy/serialhdl.py +++ b/klippy/serialhdl.py @@ -4,7 +4,7 @@ # # This file may be distributed under the terms of the GNU GPLv3 license. import logging, threading, os -import serial, can +import serial import msgproto, chelper, util @@ -103,6 +103,7 @@ class SerialReader: self.serialqueue, receive_window) return True def connect_canbus(self, canbus_uuid, canbus_nodeid, canbus_iface="can0"): + import can # XXX txid = canbus_nodeid * 2 + 256 filters = [{"can_id": txid+1, "can_mask": 0x7ff, "extended": False}] # Prep for SET_NODEID command |