compAIR/compLIB
compAIR/compLIB
Archived
4
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add locking in spi

Browse source
This commit is contained in:
root 2022-01-28 18:09:02 +00:00
parent 2b3f6f86c5
commit fc64706b65
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compLib/Spi.py
View file

@ -1,5 +1,6 @@
import importlib import importlib
from threading import Thread, Lock from threading import Thread
import multiprocessing
from enum import IntEnum from enum import IntEnum
import time import time
import sys import sys
@ -8,13 +9,14 @@ from compLib.LogstashLogging import Logging
SPI_BUS = 1 SPI_BUS = 1
SPI_DEVICE = 2 SPI_DEVICE = 2
SPI_SPEED = 1000000 SPI_SPEED = 4000000
SPI_BUFFER_SIZE = 32 SPI_BUFFER_SIZE = 32
SPI_HEALTH = True SPI_HEALTH = True
# For development purposes # For development purposes
spi_found = importlib.util.find_spec("spidev") is not None spi_found = importlib.util.find_spec("spidev") is not None
spi = None spi = None
spi_lock = multiprocessing.Lock()
if spi_found: if spi_found:
import spidev import spidev
spi = spidev.SpiDev() spi = spidev.SpiDev()
@ -23,8 +25,6 @@ if spi_found:
spi.mode = 0 spi.mode = 0
spi.bits_per_word = 8 spi.bits_per_word = 8
spi_mutex = Lock()
class Register(IntEnum): class Register(IntEnum):
IDENTIFICATION_MODEL_ID = 1, IDENTIFICATION_MODEL_ID = 1,
IDENTIFICATION_MODEL_REV_MAJOR = 2, IDENTIFICATION_MODEL_REV_MAJOR = 2,
@ -115,13 +115,16 @@ class Spi(object):
return [] * SPI_BUFFER_SIZE return [] * SPI_BUFFER_SIZE
write_reg = tx_buffer[1] write_reg = tx_buffer[1]
tx_buffer_copy = tx_buffer.copy()
with spi_lock:
spi.xfer(tx_buffer) spi.xfer(tx_buffer)
rx_buffer = spi.xfer([0] * SPI_BUFFER_SIZE) rx_buffer = spi.xfer([0] * SPI_BUFFER_SIZE)
if rx_buffer[1] != write_reg: if rx_buffer[1] != write_reg:
Logging.get_logger().error(f"SPI error during read/write of register {write_reg}!") Logging.get_logger().error(f"SPI error during read/write of register {write_reg}! Retrying automatically")
return [0] * SPI_BUFFER_SIZE time.sleep(0.01)
return Spi.transfer(tx_buffer_copy)
return rx_buffer return rx_buffer
@ -202,7 +205,7 @@ class Spi(object):
def health_check_loop(): def health_check_loop():
while SPI_HEALTH: while SPI_HEALTH:
Spi.health_check() Spi.health_check()
time.sleep(0.5) time.sleep(5)
@staticmethod @staticmethod
def get_version(): def get_version():