aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2019-07-11 17:56:41 -0400
committerKevin O'Connor <kevin@koconnor.net>2019-07-12 11:39:14 -0400
commitbc78bc486477b37ad137462cd5fffe8dd9be2738 (patch)
tree10cf88a024215d7e53b29b23710c9f5df352c6cd
parent25438a790199e16c64b56817f8fa15628849e8cd (diff)
downloadkutter-bc78bc486477b37ad137462cd5fffe8dd9be2738.tar.gz
kutter-bc78bc486477b37ad137462cd5fffe8dd9be2738.tar.xz
kutter-bc78bc486477b37ad137462cd5fffe8dd9be2738.zip
replicape: Try to detect shift register spi on spidev2.1
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
-rw-r--r--klippy/extras/replicape.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/klippy/extras/replicape.py b/klippy/extras/replicape.py
index 12eb1454..b6419217 100644
--- a/klippy/extras/replicape.py
+++ b/klippy/extras/replicape.py
@@ -1,13 +1,12 @@
# Code to configure miscellaneous chips
#
-# Copyright (C) 2017,2018 Kevin O'Connor <kevin@koconnor.net>
+# Copyright (C) 2017-2019 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.
-import logging
+import logging, os
import pins, mcu, bus
REPLICAPE_MAX_CURRENT = 3.84
-REPLICAPE_SHIFT_REGISTER_BUS = "spidev1.1"
REPLICAPE_PCA9685_BUS = 2
REPLICAPE_PCA9685_ADDRESS = 0x70
REPLICAPE_PCA9685_CYCLE_TIME = .001
@@ -198,7 +197,11 @@ class Replicape:
and self.stepper_dacs):
shift_registers[4] &= ~1
self.sr_enabled = list(reversed(shift_registers))
- self.sr_spi = bus.MCU_SPI(self.host_mcu, REPLICAPE_SHIFT_REGISTER_BUS,
+ sr_spi_bus = "spidev1.1"
+ if not self.host_mcu.is_fileoutput() and os.path.exists(
+ '/sys/devices/platform/ocp/481a0000.spi/spi_master/spi2'):
+ sr_spi_bus = "spidev2.1"
+ self.sr_spi = bus.MCU_SPI(self.host_mcu, sr_spi_bus,
None, 0, 50000000, self.sr_disabled)
self.sr_spi.spi_send(self.sr_disabled)
def note_pwm_start_value(self, channel, start_value, shutdown_value):