From cfe5ec04f89d27fcb5835f9f60248347bedb8a9e Mon Sep 17 00:00:00 2001 From: Grigor Kolev Date: Thu, 19 Oct 2023 12:54:49 +0300 Subject: [PATCH] Update MFRC522.py --- mfrc522/MFRC522.py | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/mfrc522/MFRC522.py b/mfrc522/MFRC522.py index 1698351..8ba75bb 100644 --- a/mfrc522/MFRC522.py +++ b/mfrc522/MFRC522.py @@ -20,7 +20,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with MFRC522-Python. If not, see . # -import RPi.GPIO as GPIO +#import RPi.GPIO as GPIO import spidev import signal import time @@ -125,22 +125,24 @@ class MFRC522: serNum = [] - def __init__(self, bus=0, device=0, spd=1000000, pin_mode=10, pin_rst=-1, debugLevel='WARNING'): + def __init__(self, bus=1, device=0, spd=1000000, pin_mode=10, pin_rst=-1, log=None): self.spi = spidev.SpiDev() self.spi.open(bus, device) self.spi.max_speed_hz = spd + if log: + self.logger = log + else: + self.logger = logging.getLogger('mfrc522Logger') + self.logger.addHandler(logging.StreamHandler()) + level = logging.getLevelName('DEBUG') + self.logger.setLevel(level) - self.logger = logging.getLogger('mfrc522Logger') - self.logger.addHandler(logging.StreamHandler()) - level = logging.getLevelName(debugLevel) - self.logger.setLevel(level) - - gpioMode = GPIO.getmode() + #gpioMode = GPIO.getmode() - if gpioMode is None: - GPIO.setmode(pin_mode) - else: - pin_mode = gpioMode + #if gpioMode is None: + # GPIO.setmode(pin_mode) + #else: + # pin_mode = gpioMode if pin_rst == -1: if pin_mode == 11: @@ -148,8 +150,8 @@ def __init__(self, bus=0, device=0, spd=1000000, pin_mode=10, pin_rst=-1, debugL else: pin_rst = 22 - GPIO.setup(pin_rst, GPIO.OUT) - GPIO.output(pin_rst, 1) + #GPIO.setup(pin_rst, GPIO.OUT) + #GPIO.output(pin_rst, 1) self.MFRC522_Init() def MFRC522_Reset(self): @@ -164,7 +166,7 @@ def Read_MFRC522(self, addr): def Close_MFRC522(self): self.spi.close() - GPIO.cleanup() + #GPIO.cleanup() def SetBitMask(self, reg, mask): tmp = self.Read_MFRC522(reg)