Skip to content

Update MFRC522.py #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dedalgr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update MFRC522.py #60

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions mfrc522/MFRC522.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with MFRC522-Python. If not, see <http://www.gnu.org/licenses/>.
#
import RPi.GPIO as GPIO
#import RPi.GPIO as GPIO
import spidev
import signal
import time
Expand Down Expand Up @@ -125,31 +125,33 @@ 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:
pin_rst = 15
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):
Expand All @@ -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)
Expand Down