kumi/MicroPython_PN532
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30 from FoamyGuy/master

Browse source 
Change get_firmware_version() function to a property
This commit is contained in:
Kattni 2020-03-17 15:23:09 -04:00 committed by GitHub
commit 42192bfeaf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adafruit_pn532/adafruit_pn532.py
View file

@ -196,11 +196,11 @@ class PN532:
try: try:
self._wakeup() self._wakeup()
self.get_firmware_version() # first time often fails, try 2ce _ = self.firmware_version # first time often fails, try 2ce
return return
except (BusyError, RuntimeError): except (BusyError, RuntimeError):
pass pass
self.get_firmware_version() _ = self.firmware_version
def _read_data(self, count): def _read_data(self, count):
# Read raw data from device, not including status bytes: # Read raw data from device, not including status bytes:
@ -317,7 +317,8 @@ class PN532:
# Return response data. # Return response data.
return response[2:] return response[2:]
def get_firmware_version(self): @property
def firmware_version(self):
"""Call PN532 GetFirmwareVersion function and return a tuple with the IC, """Call PN532 GetFirmwareVersion function and return a tuple with the IC,
Ver, Rev, and Support values. Ver, Rev, and Support values.
""" """

2
examples/pn532_readwrite_mifare.py
View file

@ -62,7 +62,7 @@ pn532 = PN532_I2C(i2c, debug=False)
#uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100) #uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100)
#pn532 = PN532_UART(uart, debug=False) #pn532 = PN532_UART(uart, debug=False)
ic, ver, rev, support = pn532.get_firmware_version() ic, ver, rev, support = pn532.firmware_version
print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev)) print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev))
# Configure PN532 to communicate with MiFare cards # Configure PN532 to communicate with MiFare cards

2
examples/pn532_readwrite_ntag2xx.py
View file

@ -58,7 +58,7 @@ pn532 = PN532_SPI(spi, cs_pin, debug=False)
#uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100) #uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100)
#pn532 = PN532_UART(uart, debug=False) #pn532 = PN532_UART(uart, debug=False)
ic, ver, rev, support = pn532.get_firmware_version() ic, ver, rev, support = pn532.firmware_version
print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev)) print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev))
# Configure PN532 to communicate with MiFare cards # Configure PN532 to communicate with MiFare cards

2
examples/pn532_simpletest.py
View file

@ -38,7 +38,7 @@ pn532 = PN532_I2C(i2c, debug=False, reset=reset_pin, req=req_pin)
#uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100) #uart = busio.UART(board.TX, board.RX, baudrate=115200, timeout=100)
#pn532 = PN532_UART(uart, debug=False) #pn532 = PN532_UART(uart, debug=False)
ic, ver, rev, support = pn532.get_firmware_version() ic, ver, rev, support = pn532.firmware_version
print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev)) print('Found PN532 with firmware version: {0}.{1}'.format(ver, rev))
# Configure PN532 to communicate with MiFare cards # Configure PN532 to communicate with MiFare cards